Fixed imports

flora-pm · Nov 26, 2023 · fdef7fe · fdef7fe
1 parent 64f24ee
commit fdef7fe
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 50 deletions.
diff --git a/environment.docker.sh b/environment.docker.sh
@@ -6,3 +6,5 @@ export FLORA_HTTP_PORT=8084
 export FLORA_DB_CONNSTRING="host=${FLORA_DB_HOST} dbname=${FLORA_DB_DATABASE}\
   user=${FLORA_DB_USER} password=${FLORA_DB_PASSWORD}"
 export PGPASSWORD=${FLORA_DB_PASSWORD}
+
+export FLORA_PG_URI="postgresql://${FLORA_DB_USER}:${FLORA_DB_PASSWORD}@${FLORA_DB_HOST}:${FLORA_DB_PORT}/${FLORA_DB_DATABASE}"
diff --git a/src/core/Flora/Model/PackageIndex/Types.hs b/src/core/Flora/Model/PackageIndex/Types.hs
@@ -25,8 +25,8 @@ newtype PackageIndexId = PackageIndexId {getPackageIndexId :: UUID}
 data PackageIndex = PackageIndex
   { packageIndexId :: PackageIndexId
   , repository :: Text
-  , url :: Text
   , timestamp :: Maybe UTCTime
+  , url :: Text
   }
   deriving stock (Eq, Show, Generic)
   deriving anyclass (FromRow, ToRow, NFData)

diff --git a/src/web/FloraWeb/Pages/Templates/Packages.hs b/src/web/FloraWeb/Pages/Templates/Packages.hs
@@ -3,14 +3,10 @@ module FloraWeb.Pages.Templates.Packages where
 import Control.Monad.Extra (whenJust)
 import Control.Monad.Reader (ask)
 import Control.Monad (when)
-import Data.Foldable (fold)
-import Data.Foldable (fold)
-import Data.Foldable (fold, forM_)
+import Data.Foldable ( fold, forM_ )
 import Data.List qualified as List
 import Data.Map.Strict qualified as Map
-import Data.Maybe (fromJust)
-import Data.Maybe (fromJust, fromMaybe)
-import Data.Maybe (fromJust, fromMaybe, isJust)
+import Data.Maybe ( fromJust, fromMaybe, isJust )
 import Data.Positive
 import Data.Text.Display
 import Data.Text qualified as Text
@@ -22,8 +18,6 @@ import Data.Vector qualified as Vector
 import Data.Vector (Vector)
 import Distribution.Orphans ()
 import Distribution.Pretty (pretty)
-import Distribution.Pretty (pretty)
-import Distribution.Pretty (pretty)
 import Distribution.SPDX.License qualified as SPDX
 import Distribution.Types.Flag (PackageFlag (..))
 import Distribution.Types.Flag qualified as Flag
@@ -68,14 +62,13 @@ presentationHeaderForSubpage
   -> Word
   -> FloraHTML
 presentationHeaderForSubpage namespace packageName release target numberOfPackages = div_ [class_ "divider"] $ do
-  div_ [class_ "page-title"] $ do
-    h1_ [class_ ""] $ do
-      span_ [class_ "headline"] $ do
-        displayNamespace namespace
-        chevronRightOutline
-        linkToPackageWithVersion namespace packageName (release.version)
-        chevronRightOutline
-        toHtml (display target)
+  div_ [class_ "page-title"] $ h1_ [class_ ""] $ do
+    span_ [class_ "headline"] $ do
+      displayNamespace namespace
+      chevronRightOutline
+      linkToPackageWithVersion namespace packageName (release.version)
+      chevronRightOutline
+      toHtml (display target)
   p_ [class_ "synopsis"] $
     span_ [class_ "version"] $
       toHtml $
@@ -87,14 +80,13 @@ presentationHeaderForVersions
   -> Word
   -> FloraHTML
 presentationHeaderForVersions namespace packageName numberOfReleases = div_ [class_ "divider"] $ do
-  div_ [class_ "page-title"] $ do
-    h1_ [class_ ""] $ do
-      span_ [class_ "headline"] $ do
-        displayNamespace namespace
-        chevronRightOutline
-        linkToPackage namespace packageName
-        chevronRightOutline
-        toHtml (display Versions)
+  div_ [class_ "page-title"] $ h1_ [class_ ""] $ do
+    span_ [class_ "headline"] $ do
+      displayNamespace namespace
+      chevronRightOutline
+      linkToPackage namespace packageName
+      chevronRightOutline
+      toHtml (display Versions)
   p_ [class_ "synopsis"] $
     span_ [class_ "version"] $
       toHtml $
@@ -144,7 +136,7 @@ listVersions namespace packageName releases =
     ul_ [class_ "package-list"] $
       Vector.forM_
         releases
-        ( \release -> versionListItem namespace packageName release
+        ( versionListItem namespace packageName
         )
 
 versionListItem :: Namespace -> PackageName -> Release -> FloraHTML
@@ -175,9 +167,8 @@ packageListing
 packageListing mExactMatchItems packages =
   ul_ [class_ "package-list"] $ do
     whenJust mExactMatchItems $ \exactMatchItems ->
-      forM_ exactMatchItems $ \em -> do
-        div_ [class_ "exact-match"] $
-          packageListItem (em.namespace, em.name, em.synopsis, em.version, em.license)
+      forM_ exactMatchItems $ \em -> div_ [class_ "exact-match"] $
+      packageListItem (em.namespace, em.name, em.synopsis, em.version, em.license)
     Vector.forM_
       packages
       ( \PackageInfo{..} -> packageListItem (namespace, name, synopsis, version, license)
@@ -188,17 +179,16 @@ requirementListing requirements =
   ul_ [class_ "component-list"] $ requirementListItem requirements
 
 showChangelog :: Namespace -> PackageName -> Version -> Maybe TextHtml -> FloraHTML
-showChangelog namespace packageName version mChangelog = div_ [class_ "container"] $ do
-  div_ [class_ "divider"] $ do
-    div_ [class_ "page-title"] $
-      h1_ [class_ ""] $ do
-        span_ [class_ "headline"] $ toHtml ("Changelog of " <> display namespace <> "/" <> display packageName)
-        toHtmlRaw @Text "&nbsp;"
-        span_ [class_ "version"] $ toHtml $ display version
-    section_ [class_ "release-changelog"] $ do
-      case mChangelog of
-        Nothing -> toHtml @Text "This release does not have a Changelog"
-        Just (MkTextHtml changelogText) -> relaxHtmlT changelogText
+showChangelog namespace packageName version mChangelog = div_ [class_ "container"] $ div_ [class_ "divider"] $ do
+  div_ [class_ "page-title"] $
+    h1_ [class_ ""] $ do
+      span_ [class_ "headline"] $ toHtml ("Changelog of " <> display namespace <> "/" <> display packageName)
+      toHtmlRaw @Text "&nbsp;"
+      span_ [class_ "version"] $ toHtml $ display version
+  section_ [class_ "release-changelog"] $ do
+    case mChangelog of
+      Nothing -> toHtml @Text "This release does not have a Changelog"
+      Just (MkTextHtml changelogText) -> relaxHtmlT changelogText
 
 displayReleaseVersion :: Version -> FloraHTML
 displayReleaseVersion = toHtml
@@ -295,13 +285,12 @@ displayVersions namespace packageName versions numberOfReleases =
               toHtml $ Time.formatTime defaultTimeLocale "%a, %_d %b %Y" ts
               case release.revisedAt of
                 Nothing -> span_ [] ""
-                Just revisionDate -> do
-                  span_
-                    [ dataText_
-                        ("Revised on " <> display (Time.formatTime defaultTimeLocale "%a, %_d %b %Y, %R %EZ" revisionDate))
-                    , class_ "revised-date"
-                    ]
-                    pen
+                Just revisionDate -> span_
+                  [ dataText_
+                      ("Revised on " <> display (Time.formatTime defaultTimeLocale "%a, %_d %b %Y, %R %EZ" revisionDate))
+                  , class_ "revised-date"
+                  ]
+                  pen
 
 displayDependencies
   :: (Namespace, PackageName, Version)
@@ -341,7 +330,7 @@ displayInstructions namespace packageName latestRelease =
         , readonly_ "readonly"
         ]
       TemplateEnv{features} <- ask
-      when (isJust $ features.blobStoreImpl) $ do
+      when (isJust features.blobStoreImpl) $ do
         label_ [for_ "tarball", class_ "font-light"] "Download"
         let v = display latestRelease.version
             tarballName = display packageName <> "-" <> v <> ".tar.gz"
@@ -470,8 +459,7 @@ displayPackageFlag MkPackageFlag{flagName, flagDescription, flagDefault} = case
       pre_ [class_ "package-flag-name"] (toHtml $ Text.pack (Flag.unFlagName flagName))
       toHtmlRaw @Text "&nbsp;"
       defaultMarker flagDefault
-    div_ [class_ "package-flag-description"] $ do
-      renderHaddock $ Text.pack flagDescription
+    div_ [class_ "package-flag-description"] $ renderHaddock $ Text.pack flagDescription
 
 defaultMarker :: Bool -> FloraHTML
 defaultMarker True = em_ "(on by default)"