Bump

zfoh · Jan 8, 2025 · 4bcbf7b · 4bcbf7b
1 parent 0628795
commit 4bcbf7b
Show file tree

Hide file tree

Showing 29 changed files with 51 additions and 1,759 deletions.
diff --git a/lib/Zureg/Database.hs b/lib/Zureg/Database.hs
@@ -5,7 +5,7 @@
 {-# LANGUAGE TypeFamilies      #-}
 module Zureg.Database
     ( Config (..)
-    , defaultConfig
+    , configFromEnv
     , Handle
     , withHandle
     , writeEvents
@@ -26,6 +26,7 @@ import qualified Data.Aeson             as A
 import qualified Data.Aeson.TH.Extended as A
 import qualified Data.Text              as T
 import           Data.UUID              (UUID)
+import           System.Environment     (lookupEnv)
 import           Zureg.Model
 
 data DatabaseException
@@ -37,15 +38,13 @@ data DatabaseException
 instance Exception DatabaseException
 
 data Config = Config
-    { cRegistrantTable :: !T.Text
-    , cEmailTable      :: !T.Text
-    , cSummariesTable  :: !T.Text
+    { cConnectionString :: !T.Text
     }
 
-$(A.deriveJSON A.options ''Config)
-
-defaultConfig :: Config
-defaultConfig = Config "registrants" "emails" "summaries"
+configFromEnv :: IO Config
+configFromEnv = do
+    cstring <- lookupEnv "ZUREG_DB" >>= maybe (fail "ZUREG_DB not set") pure
+    pure Config {cConnectionString = T.pack cstring}
 
 data Handle = Handle
     { hConfig :: !Config

diff --git a/lib/Zureg/Hackathon.hs b/lib/Zureg/Hackathon.hs
@@ -12,11 +12,6 @@ import           Data.List                   (intercalate)
 import           Data.Maybe                  (fromMaybe)
 import           System.Environment          (lookupEnv)
 import           Zureg.Hackathon.Interface
-import qualified Zureg.Hackathon.ZuriHac2019 as ZuriHac2019
-import qualified Zureg.Hackathon.ZuriHac2020 as ZuriHac2020
-import qualified Zureg.Hackathon.ZuriHac2021 as ZuriHac2021
-import qualified Zureg.Hackathon.ZuriHac2022 as ZuriHac2022
-import qualified Zureg.Hackathon.ZuriHac2023 as ZuriHac2023
 import qualified Zureg.Hackathon.ZuriHac2024 as ZuriHac2024
 
 -- | Load the hackathon stored in the 'ZUREG_HACKATHON' environment variable.
@@ -39,10 +34,5 @@ data SomeHackathon =
 
 hackathons :: [(String, IO SomeHackathon)]
 hackathons =
-    [ ("zurihac2019", SomeHackathon <$> ZuriHac2019.newHackathon)
-    , ("zurihac2020", SomeHackathon <$> ZuriHac2020.newHackathon)
-    , ("zurihac2021", SomeHackathon <$> ZuriHac2021.newHackathon)
-    , ("zurihac2022", SomeHackathon <$> ZuriHac2022.newHackathon)
-    , ("zurihac2023", SomeHackathon <$> ZuriHac2023.newHackathon)
-    , ("zurihac2024", SomeHackathon <$> ZuriHac2024.newHackathon)
+    [ ("zurihac2024", SomeHackathon <$> ZuriHac2024.newHackathon)
     ]
diff --git a/lib/Zureg/Hackathon/Interface.hs b/lib/Zureg/Hackathon/Interface.hs
@@ -40,8 +40,6 @@ data Hackathon a = Hackathon
     -- | CSV header
     , csvHeader           :: Csv.Header
 
-    -- | Database configuration
-    , databaseConfig      :: Database.Config
     -- | Email sending configuration
     , sendEmailConfig     :: SendEmail.Config
     -- | Captcha configuration

diff --git a/lib/Zureg/Hackathon/ZuriHac2019.hs b/lib/Zureg/Hackathon/ZuriHac2019.hs
diff --git a/lib/Zureg/Hackathon/ZuriHac2019/Form.hs b/lib/Zureg/Hackathon/ZuriHac2019/Form.hs
diff --git a/lib/Zureg/Hackathon/ZuriHac2019/Main/ProjectsPage.hs b/lib/Zureg/Hackathon/ZuriHac2019/Main/ProjectsPage.hs