diff --git a/src/Sis/Database.hs b/src/Sis/Database.hs index 8d95210..d5d0aaa 100644 --- a/src/Sis/Database.hs +++ b/src/Sis/Database.hs @@ -50,11 +50,11 @@ import System.Directory (createDirectoryIfMissing) import System.FilePath (takeDirectory) import Text.Read (readMaybe) -import Sis.Types -import Sis.Auth (hashPassword) import Crypto.Random.Entropy (getEntropy) import Data.ByteString.Base64 qualified as B64 import Data.Text.Encoding qualified as TE +import Sis.Auth (hashPassword) +import Sis.Types ---------------------------------------------------------------------- -- Effect definition diff --git a/src/Sis/Page/Activity.hs b/src/Sis/Page/Activity.hs index aeeb275..75dabad 100644 --- a/src/Sis/Page/Activity.hs +++ b/src/Sis/Page/Activity.hs @@ -98,7 +98,6 @@ page = do case mSession of Nothing -> do redirect (routeUri RLogin) - Just us -> do hhs <- getUserHouseholds (UserId (usUserId us)) case hhs of diff --git a/src/Sis/Page/Chores.hs b/src/Sis/Page/Chores.hs index b7aa36a..ef84924 100644 --- a/src/Sis/Page/Chores.hs +++ b/src/Sis/Page/Chores.hs @@ -95,7 +95,6 @@ page = do case mSession of Nothing -> do redirect (routeUri RLogin) - Just us -> do hhs <- getUserHouseholds (UserId (usUserId us)) case hhs of diff --git a/src/Sis/Page/Dashboard.hs b/src/Sis/Page/Dashboard.hs index 9b83350..7a1bfee 100644 --- a/src/Sis/Page/Dashboard.hs +++ b/src/Sis/Page/Dashboard.hs @@ -111,7 +111,6 @@ page = do case mSession of Nothing -> do redirect (routeUri RLogin) - Just us -> do today <- liftIO (utctDay <$> getCurrentTime) hhs <- getUserHouseholds (UserId (usUserId us)) diff --git a/src/Sis/Page/Household.hs b/src/Sis/Page/Household.hs index ba50b41..5fe4526 100644 --- a/src/Sis/Page/Household.hs +++ b/src/Sis/Page/Household.hs @@ -120,7 +120,6 @@ page = do case mSession of Nothing -> do redirect (routeUri RLogin) - Just us -> do hhs <- getUserHouseholds (UserId (usUserId us)) case hhs of diff --git a/src/Sis/Page/Login.hs b/src/Sis/Page/Login.hs index f777415..fc5bb58 100644 --- a/src/Sis/Page/Login.hs +++ b/src/Sis/Page/Login.hs @@ -42,7 +42,6 @@ instance (DB :> es, IOE :> es) => HyperView LoginPage es where | verifyPassword (lfPassword formData') (userPasswordHash u) -> do saveSession (UserSession (unUserId (userId u))) pure (loginSuccessView) - _ -> pure (loginView (Just "Invalid email or password")) update Noop = pure (loginView Nothing) @@ -80,5 +79,4 @@ page = do case mSession of Just _ -> do redirect (routeUri RDashboard) - Nothing -> pure $ hyper LoginPage $ loginView Nothing diff --git a/src/Sis/Page/Signup.hs b/src/Sis/Page/Signup.hs index cb88db7..16517b1 100644 --- a/src/Sis/Page/Signup.hs +++ b/src/Sis/Page/Signup.hs @@ -89,5 +89,4 @@ page = do case mSession of Just _ -> do redirect (routeUri RDashboard) - Nothing -> pure $ hyper SignupPage $ signupView Nothing