Skip to content

Commit 2d118d7

Browse files
committed
[NO-ISSUE] Don't replace the Homepagee link with th flora page
1 parent 4da86c8 commit 2d118d7

3 files changed

Lines changed: 7 additions & 6 deletions

File tree

src/web/FloraWeb/API/Routes/Packages/Types.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ toPackageDTO package release releaseComponents =
6262
synopsis = release.synopsis
6363
description = release.description
6464
releaseDeprecated =
65-
fromMaybe False (release.deprecated)
65+
fromMaybe False release.deprecated
6666
repository = release.repository
6767
uploadedAt = fromJust release.uploadedAt
6868
flags = release.flags

src/web/FloraWeb/Pages/Templates/Packages.hs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,11 +249,13 @@ displayCategories categories =
249249
ul_ [class_ "categories"] $ foldMap renderCategory categories
250250

251251
displayLinks :: Namespace -> PackageName -> Text -> Release -> FloraHTML
252-
displayLinks namespace packageName packageIndexURL release =
252+
displayLinks namespace packageName packageIndexURL release = do
253253
li_ [class_ ""] $ do
254254
h3_ [class_ "package-body-section links"] "Links"
255255
ul_ [class_ "links"] $ do
256-
li_ [class_ "package-link"] $ a_ [href_ (getHomepage release)] "Homepage"
256+
when (release.homepage /= Just "") $
257+
li_ [class_ "package-link"] $
258+
a_ [href_ (getHomepage release)] "Homepage"
257259
li_ [class_ "package-link"] $ a_ [href_ (packageIndexURL <> "/package/" <> display packageName <> "-" <> display release.version)] "Documentation"
258260

259261
li_ [class_ "package-link"] $ displaySourceRepos release.sourceRepos

src/web/FloraWeb/Pages/Templates/Screens/Packages.hs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import Lucid.Orphans ()
1313
import Flora.Model.Category.Types (Category (..))
1414
import Flora.Model.Package.Types
1515
import Flora.Model.Release.Types (Release (..))
16-
import FloraWeb.Components.Icons
16+
import FloraWeb.Components.Icons (chevronRightOutline)
1717
import FloraWeb.Pages.Templates.Packages
1818
( displayCategories
1919
, displayDependencies
@@ -27,7 +27,6 @@ import FloraWeb.Pages.Templates.Packages
2727
, displayPackageFlags
2828
, displayReadme
2929
, displayReleaseDeprecation
30-
, displayReleaseVersion
3130
, displayTestedWith
3231
, displayVersions
3332
)
@@ -80,7 +79,7 @@ presentationHeader release namespace name synopsis =
8079
chevronRightOutline
8180
toHtml name
8281
let versionClass = "version" <> if Just True == release.deprecated then " release-deprecated" else ""
83-
span_ [class_ versionClass] $ displayReleaseVersion release.version
82+
span_ [class_ versionClass] $ toHtml release.version
8483
div_ [class_ "synopsis"] $
8584
p_ [class_ ""] (toHtml synopsis)
8685

0 commit comments

Comments
 (0)