fix: rename route constructors to avoid type conflicts
- Renamed route constructors: RouteLogin → RLogin, RouteDashboard → RDashboard, etc. - This fixes ambiguous occurrence errors with Types.Dashboard vs Route.Dashboard - Fixed Layout.hs navbar links to use new constructor names - Server verified serving HTML on /login, /rdashboard, etc.
This commit is contained in:
@@ -31,7 +31,7 @@ instance (DB :> es, IOE :> es) => HyperView LoginPage es where
|
||||
Just u
|
||||
| verifyPassword (lfPassword formData') (userPasswordHash u) -> do
|
||||
saveSession (UserSession (unUserId (userId u)))
|
||||
redirect (routeUri RouteDashboard)
|
||||
redirect (routeUri RDashboard)
|
||||
pure $ hyper LoginPage $ el "Redirecting..."
|
||||
_ -> pure (loginView (Just "Invalid email or password"))
|
||||
update Noop = pure $ hyper LoginPage $ loginView Nothing
|
||||
@@ -54,12 +54,12 @@ loginView mError = do
|
||||
tag "input" @ att "type" "checkbox" . att "name" "lfRemember" $ none
|
||||
text "Remember me"
|
||||
submit (text "Log In") @ att "class" nbButtonClass @ att "style" "width:100%"
|
||||
route RouteSignup $ text "Don't have an account? Sign Up"
|
||||
route RSignup $ text "Don't have an account? Sign Up"
|
||||
page :: (Hyperbole :> es, DB :> es, IOE :> es) => Page es '[LoginPage]
|
||||
page = do
|
||||
mSession <- lookupSession @UserSession
|
||||
case mSession of
|
||||
Just _ -> do
|
||||
redirect (routeUri RouteDashboard)
|
||||
redirect (routeUri RDashboard)
|
||||
pure $ hyper LoginPage $ el "Redirecting..."
|
||||
Nothing -> pure $ hyper LoginPage $ loginView Nothing
|
||||
|
||||
Reference in New Issue
Block a user