diff --git a/config/settings.yml b/config/settings.yml index 4db7bea..9975484 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -32,4 +32,6 @@ database: poolsize: "_env:MYSQL_POOLSIZE:10" title: 00dani.me +app-name: lebd +repository: https://gitlab.com/00dani/lebd #analytics: UA-YOURCODE diff --git a/package.yaml b/package.yaml index 6242801..e7a3a8f 100644 --- a/package.yaml +++ b/package.yaml @@ -46,6 +46,7 @@ dependencies: - time - case-insensitive - wai +- gitrev >= 1.3 && <1.4 - libravatar >=0.4 && <0.5 - yesod-sitemap >=1.4 && <1.5 diff --git a/src/Foundation.hs b/src/Foundation.hs index 03f2793..ac5ac45 100644 --- a/src/Foundation.hs +++ b/src/Foundation.hs @@ -20,6 +20,11 @@ import Yesod.Default.Util (addStaticContentExternal) import Yesod.Core.Types (Logger) import qualified Yesod.Core.Unsafe as Unsafe +import Development.GitRev (gitBranch) + +appVersion :: Text +appVersion = $(gitBranch) + -- | The foundation datatype for your application. This can be a good place to -- keep settings and values requiring initialization before your application -- starts running, such as database connections. Every handler will have diff --git a/src/Settings.hs b/src/Settings.hs index e1ea0d1..c127a64 100644 --- a/src/Settings.hs +++ b/src/Settings.hs @@ -64,6 +64,10 @@ data AppSettings = AppSettings -- ^ Google Analytics code , appTitle :: Maybe Text -- ^ Site-wide title. + , appName :: Text + -- ^ Name of application used to generate site. + , appRepository :: Text + -- ^ URL of repository for application source. , appAuthDummyLogin :: Bool -- ^ Indicate if auth dummy login should be enabled. @@ -94,6 +98,8 @@ instance FromJSON AppSettings where appAnalytics <- o .:? "analytics" appTitle <- o .:? "title" + appName <- o .: "app-name" + appRepository <- o .: "repository" -- This code enables MySQL's strict mode, without which MySQL will truncate data. -- See https://github.com/yesodweb/persistent/wiki/Database-Configuration#strict-mode for details diff --git a/templates/default-layout-wrapper.hamlet b/templates/default-layout-wrapper.hamlet index 434486c..96a0d0a 100644 --- a/templates/default-layout-wrapper.hamlet +++ b/templates/default-layout-wrapper.hamlet @@ -7,6 +7,7 @@ $doctype 5