From 7ebc6b0eda35a73ff2ef86c59de5c0325c4ce30d Mon Sep 17 00:00:00 2001 From: Saku Laesvuori Date: Fri, 5 Jan 2024 13:01:31 +0200 Subject: [PATCH] Modularise the UI with widgets --- frontend/datarekisteri-frontend.cabal | 3 +- frontend/src/Datarekisteri/Frontend/Auth.hs | 20 +- .../Frontend/Handlers/Applications.hs | 82 +++--- .../Datarekisteri/Frontend/Handlers/Apply.hs | 23 +- .../Frontend/Handlers/Members.hs | 6 + .../Frontend/Handlers/Profile.hs | 31 ++- .../Frontend/Handlers/VerifyEmail.hs | 9 +- frontend/src/Datarekisteri/Frontend/Types.hs | 252 +++++++----------- .../src/Datarekisteri/Frontend/Widgets.hs | 124 +++++++++ 9 files changed, 327 insertions(+), 223 deletions(-) create mode 100644 frontend/src/Datarekisteri/Frontend/Widgets.hs diff --git a/frontend/datarekisteri-frontend.cabal b/frontend/datarekisteri-frontend.cabal index b12e5ac..0cb1e2c 100644 --- a/frontend/datarekisteri-frontend.cabal +++ b/frontend/datarekisteri-frontend.cabal @@ -49,6 +49,7 @@ executable datarekisteri-frontend Datarekisteri.Frontend.Handlers.Profile, Datarekisteri.Frontend.Handlers.VerifyEmail, Datarekisteri.Frontend.Handlers.Members, - Datarekisteri.Frontend.Types + Datarekisteri.Frontend.Types, + Datarekisteri.Frontend.Widgets hs-source-dirs: src default-language: Haskell2010 diff --git a/frontend/src/Datarekisteri/Frontend/Auth.hs b/frontend/src/Datarekisteri/Frontend/Auth.hs index b187f83..4cfd7f2 100644 --- a/frontend/src/Datarekisteri/Frontend/Auth.hs +++ b/frontend/src/Datarekisteri/Frontend/Auth.hs @@ -21,6 +21,8 @@ import Yesod.Auth import qualified Yesod.Auth.Message as Msg +import Datarekisteri.Frontend.Widgets + pluginName = "externalBasic" loginR = PluginR pluginName ["login"] @@ -53,14 +55,16 @@ loginForm :: YesodAuth site => (Route Auth -> Route site) -> WidgetFor site () loginForm toParent = do emailId <- newIdent passwordId <- newIdent + let formContent = [whamlet| +