Start9/registry
2
0
Fork 0
mirror of https://github.com/Start9Labs/registry.git synced 2026-03-26 02:11:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

make description optional

Browse Source
This commit is contained in:
Lucy Cifferello
2022-09-19 15:39:27 -06:00
parent 0caeab5b6b
commit 771c0f209d
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Handler/Package/V0/Info.hs
View File

@@ -6,14 +6,14 @@ import Foundation (Handler, RegistryCtx (..))
import Handler.Util (tickleMAU) import Handler.Util (tickleMAU)
import Model (Category (..), EntityField (..)) import Model (Category (..), EntityField (..))
import Settings (AppSettings (..)) import Settings (AppSettings (..))
import Startlude (Generic, Show, Text, pure, ($), (.), (<$>), (&&&)) import Startlude (Generic, Show, Text, pure, ($), (.), (<$>), (&&&), Maybe)
import Yesod (ToContent (..), ToTypedContent (..), YesodPersist (runDB), getsYesod) import Yesod (ToContent (..), ToTypedContent (..), YesodPersist (runDB), getsYesod)
import Yesod.Core.Types (JSONResponse (..)) import Yesod.Core.Types (JSONResponse (..))
data InfoRes = InfoRes data InfoRes = InfoRes
{ name :: !Text { name :: !Text
, description:: !Text , description:: !(Maybe Text)
, categories :: ![Text] , categories :: ![Text]
} }
deriving (Show, Generic) deriving (Show, Generic)

6
src/Settings.hs
View File

@@ -39,7 +39,7 @@ import Data.Aeson ( (.!=)
) )
import Data.Aeson.Types ( parseMaybe ) import Data.Aeson.Types ( parseMaybe )
import Data.FileEmbed ( embedFile ) import Data.FileEmbed ( embedFile )
import Data.Maybe ( fromJust ) import Data.Maybe ( fromJust, Maybe )
import Data.Version ( showVersion ) import Data.Version ( showVersion )
import Data.Yaml ( decodeEither' ) import Data.Yaml ( decodeEither' )
import Data.Yaml.Config ( applyEnvValue ) import Data.Yaml.Config ( applyEnvValue )
@@ -85,7 +85,7 @@ data AppSettings = AppSettings
, staticBinDir :: !FilePath , staticBinDir :: !FilePath
, errorLogRoot :: !FilePath , errorLogRoot :: !FilePath
, marketplaceName :: !Text , marketplaceName :: !Text
, marketplaceDescription :: !Text , marketplaceDescription :: !(Maybe Text)
} }
instance Has PkgRepo AppSettings where instance Has PkgRepo AppSettings where
extract = liftA2 PkgRepo ((</> "apps") . resourcesDir) staticBinDir extract = liftA2 PkgRepo ((</> "apps") . resourcesDir) staticBinDir
@@ -115,7 +115,7 @@ instance FromJSON AppSettings where
staticBinDir <- o .: "static-bin-dir" staticBinDir <- o .: "static-bin-dir"
errorLogRoot <- o .: "error-log-root" errorLogRoot <- o .: "error-log-root"
marketplaceName <- o .: "marketplace-name" marketplaceName <- o .: "marketplace-name"
marketplaceDescription <- o .: "marketplace-description" marketplaceDescription <- o .:? "marketplace-description"
let sslKeyLocation = sslPath </> "key.pem" let sslKeyLocation = sslPath </> "key.pem"
let sslCsrLocation = sslPath </> "certificate.csr" let sslCsrLocation = sslPath </> "certificate.csr"