chore: cleanup trailing empty lines from sed operations
This commit is contained in:
+2
-2
@@ -50,11 +50,11 @@ import System.Directory (createDirectoryIfMissing)
|
|||||||
import System.FilePath (takeDirectory)
|
import System.FilePath (takeDirectory)
|
||||||
import Text.Read (readMaybe)
|
import Text.Read (readMaybe)
|
||||||
|
|
||||||
import Sis.Types
|
|
||||||
import Sis.Auth (hashPassword)
|
|
||||||
import Crypto.Random.Entropy (getEntropy)
|
import Crypto.Random.Entropy (getEntropy)
|
||||||
import Data.ByteString.Base64 qualified as B64
|
import Data.ByteString.Base64 qualified as B64
|
||||||
import Data.Text.Encoding qualified as TE
|
import Data.Text.Encoding qualified as TE
|
||||||
|
import Sis.Auth (hashPassword)
|
||||||
|
import Sis.Types
|
||||||
|
|
||||||
----------------------------------------------------------------------
|
----------------------------------------------------------------------
|
||||||
-- Effect definition
|
-- Effect definition
|
||||||
|
|||||||
@@ -98,7 +98,6 @@ page = do
|
|||||||
case mSession of
|
case mSession of
|
||||||
Nothing -> do
|
Nothing -> do
|
||||||
redirect (routeUri RLogin)
|
redirect (routeUri RLogin)
|
||||||
|
|
||||||
Just us -> do
|
Just us -> do
|
||||||
hhs <- getUserHouseholds (UserId (usUserId us))
|
hhs <- getUserHouseholds (UserId (usUserId us))
|
||||||
case hhs of
|
case hhs of
|
||||||
|
|||||||
@@ -95,7 +95,6 @@ page = do
|
|||||||
case mSession of
|
case mSession of
|
||||||
Nothing -> do
|
Nothing -> do
|
||||||
redirect (routeUri RLogin)
|
redirect (routeUri RLogin)
|
||||||
|
|
||||||
Just us -> do
|
Just us -> do
|
||||||
hhs <- getUserHouseholds (UserId (usUserId us))
|
hhs <- getUserHouseholds (UserId (usUserId us))
|
||||||
case hhs of
|
case hhs of
|
||||||
|
|||||||
@@ -111,7 +111,6 @@ page = do
|
|||||||
case mSession of
|
case mSession of
|
||||||
Nothing -> do
|
Nothing -> do
|
||||||
redirect (routeUri RLogin)
|
redirect (routeUri RLogin)
|
||||||
|
|
||||||
Just us -> do
|
Just us -> do
|
||||||
today <- liftIO (utctDay <$> getCurrentTime)
|
today <- liftIO (utctDay <$> getCurrentTime)
|
||||||
hhs <- getUserHouseholds (UserId (usUserId us))
|
hhs <- getUserHouseholds (UserId (usUserId us))
|
||||||
|
|||||||
@@ -120,7 +120,6 @@ page = do
|
|||||||
case mSession of
|
case mSession of
|
||||||
Nothing -> do
|
Nothing -> do
|
||||||
redirect (routeUri RLogin)
|
redirect (routeUri RLogin)
|
||||||
|
|
||||||
Just us -> do
|
Just us -> do
|
||||||
hhs <- getUserHouseholds (UserId (usUserId us))
|
hhs <- getUserHouseholds (UserId (usUserId us))
|
||||||
case hhs of
|
case hhs of
|
||||||
|
|||||||
@@ -42,7 +42,6 @@ instance (DB :> es, IOE :> es) => HyperView LoginPage es where
|
|||||||
| verifyPassword (lfPassword formData') (userPasswordHash u) -> do
|
| verifyPassword (lfPassword formData') (userPasswordHash u) -> do
|
||||||
saveSession (UserSession (unUserId (userId u)))
|
saveSession (UserSession (unUserId (userId u)))
|
||||||
pure (loginSuccessView)
|
pure (loginSuccessView)
|
||||||
|
|
||||||
_ -> pure (loginView (Just "Invalid email or password"))
|
_ -> pure (loginView (Just "Invalid email or password"))
|
||||||
update Noop = pure (loginView Nothing)
|
update Noop = pure (loginView Nothing)
|
||||||
|
|
||||||
@@ -80,5 +79,4 @@ page = do
|
|||||||
case mSession of
|
case mSession of
|
||||||
Just _ -> do
|
Just _ -> do
|
||||||
redirect (routeUri RDashboard)
|
redirect (routeUri RDashboard)
|
||||||
|
|
||||||
Nothing -> pure $ hyper LoginPage $ loginView Nothing
|
Nothing -> pure $ hyper LoginPage $ loginView Nothing
|
||||||
|
|||||||
@@ -89,5 +89,4 @@ page = do
|
|||||||
case mSession of
|
case mSession of
|
||||||
Just _ -> do
|
Just _ -> do
|
||||||
redirect (routeUri RDashboard)
|
redirect (routeUri RDashboard)
|
||||||
|
|
||||||
Nothing -> pure $ hyper SignupPage $ signupView Nothing
|
Nothing -> pure $ hyper SignupPage $ signupView Nothing
|
||||||
|
|||||||
Reference in New Issue
Block a user