From 5f48ff6f256956d26b7bcd8d74610360bd25de1a Mon Sep 17 00:00:00 2001 From: Saku Laesvuori Date: Mon, 25 Sep 2023 21:54:02 +0300 Subject: [PATCH] Rename client and server to backend and frontend --- .guix/modules/datarekisteri-package.scm | 16 +++++----- {client => backend}/COPYING.md | 0 {client => backend}/Setup.hs | 0 .../datarekisteri-backend.cabal | 22 ++++++------- .../db/migrations/20221208114323_init-db.sql | 0 ...20230917064352_split-emails-from-users.sql | 0 {server => backend}/db/schema.sql | 0 .../src/Datarekisteri/Backend.hs | 14 ++++----- .../src/Datarekisteri/Backend}/API.hs | 12 +++---- .../src/Datarekisteri/Backend}/DB.hs | 4 +-- .../src/Datarekisteri/Backend}/DB/Queries.hs | 6 ++-- .../src/Datarekisteri/Backend}/Email.hs | 4 +-- .../src/Datarekisteri/Backend}/Types.hs | 2 +- .../src/Datarekisteri/Backend}/Utils.hs | 4 +-- client/src/Client/Handlers.hs | 31 ------------------- {server => frontend}/COPYING.md | 0 {server => frontend}/Setup.hs | 0 .../datarekisteri-frontend.cabal | 26 ++++++++-------- {client => frontend}/schema.gql | 0 .../src/Datarekisteri/Frontend.hs | 6 ++-- .../Datarekisteri/Frontend}/ApiRequests.hs | 2 +- .../src/Datarekisteri/Frontend}/Auth.hs | 2 +- .../src/Datarekisteri/Frontend}/FormFields.hs | 4 +-- .../src/Datarekisteri/Frontend/Handlers.hs | 31 +++++++++++++++++++ .../Frontend}/Handlers/Applications.hs | 8 ++--- .../Datarekisteri/Frontend}/Handlers/Apply.hs | 8 ++--- .../Frontend}/Handlers/Members.hs | 6 ++-- .../Frontend}/Handlers/Profile.hs | 8 ++--- .../Frontend}/Handlers/VerifyEmail.hs | 6 ++-- .../src/Datarekisteri/Frontend}/Types.hs | 6 ++-- 30 files changed, 114 insertions(+), 114 deletions(-) rename {client => backend}/COPYING.md (100%) rename {client => backend}/Setup.hs (100%) rename server/datarekisteri-server.cabal => backend/datarekisteri-backend.cabal (68%) rename {server => backend}/db/migrations/20221208114323_init-db.sql (100%) rename {server => backend}/db/migrations/20230917064352_split-emails-from-users.sql (100%) rename {server => backend}/db/schema.sql (100%) rename server/src/Server.hs => backend/src/Datarekisteri/Backend.hs (95%) rename {server/src/Server => backend/src/Datarekisteri/Backend}/API.hs (98%) rename {server/src/Server => backend/src/Datarekisteri/Backend}/DB.hs (97%) rename {server/src/Server => backend/src/Datarekisteri/Backend}/DB/Queries.hs (98%) rename {server/src/Server => backend/src/Datarekisteri/Backend}/Email.hs (88%) rename {server/src/Server => backend/src/Datarekisteri/Backend}/Types.hs (98%) rename {server/src/Server => backend/src/Datarekisteri/Backend}/Utils.hs (89%) delete mode 100644 client/src/Client/Handlers.hs rename {server => frontend}/COPYING.md (100%) rename {server => frontend}/Setup.hs (100%) rename client/datarekisteri-client.cabal => frontend/datarekisteri-frontend.cabal (55%) rename {client => frontend}/schema.gql (100%) rename client/src/Client.hs => frontend/src/Datarekisteri/Frontend.hs (93%) rename {client/src/Client => frontend/src/Datarekisteri/Frontend}/ApiRequests.hs (97%) rename {client/src/Client => frontend/src/Datarekisteri/Frontend}/Auth.hs (98%) rename {client/src/Client => frontend/src/Datarekisteri/Frontend}/FormFields.hs (96%) create mode 100644 frontend/src/Datarekisteri/Frontend/Handlers.hs rename {client/src/Client => frontend/src/Datarekisteri/Frontend}/Handlers/Applications.hs (95%) rename {client/src/Client => frontend/src/Datarekisteri/Frontend}/Handlers/Apply.hs (95%) rename {client/src/Client => frontend/src/Datarekisteri/Frontend}/Handlers/Members.hs (92%) rename {client/src/Client => frontend/src/Datarekisteri/Frontend}/Handlers/Profile.hs (97%) rename {client/src/Client => frontend/src/Datarekisteri/Frontend}/Handlers/VerifyEmail.hs (91%) rename {client/src/Client => frontend/src/Datarekisteri/Frontend}/Types.hs (99%) diff --git a/.guix/modules/datarekisteri-package.scm b/.guix/modules/datarekisteri-package.scm index 354a6d6..33ca0bb 100644 --- a/.guix/modules/datarekisteri-package.scm +++ b/.guix/modules/datarekisteri-package.scm @@ -18,11 +18,11 @@ (or (git-predicate (string-append (current-source-directory) "/../..")) (const #t))) -(define-public datarekisteri-server +(define-public datarekisteri-backend (package - (name "datarekisteri-server") + (name "datarekisteri-backend") (version "0.0.1") - (source (local-file "../../server" "datarekisteri-server-checkout" + (source (local-file "../../backend" "datarekisteri-backend-checkout" #:recursive? #t #:select? vcs-file?)) (build-system haskell-build-system) @@ -48,18 +48,18 @@ (add-after 'install 'wrap-binaries (lambda _ (wrap-program - (string-append #$output "/bin/datarekisteri-server") + (string-append #$output "/bin/datarekisteri-backend") `("PATH" prefix (,(string-append #$(this-package-input "dbmate") "/bin"))))))))) (home-page "") (synopsis "") (description "") (license license:agpl3+))) -(define-public datarekisteri-client +(define-public datarekisteri-frontend (package - (name "datarekisteri-client") + (name "datarekisteri-frontend") (version "0.0.1") - (source (local-file "../../client" "datarekisteri-client-checkout" + (source (local-file "../../frontend" "datarekisteri-frontend-checkout" #:recursive? #t #:select? vcs-file?)) (build-system haskell-build-system) @@ -982,4 +982,4 @@ for writing tests which print some outputs using @code{fmt} package.") multiple developers and your production servers.") (license license:expat))) -(list datarekisteri-server datarekisteri-client ghc-datarekisteri-core) +(list datarekisteri-backend datarekisteri-frontend ghc-datarekisteri-core) diff --git a/client/COPYING.md b/backend/COPYING.md similarity index 100% rename from client/COPYING.md rename to backend/COPYING.md diff --git a/client/Setup.hs b/backend/Setup.hs similarity index 100% rename from client/Setup.hs rename to backend/Setup.hs diff --git a/server/datarekisteri-server.cabal b/backend/datarekisteri-backend.cabal similarity index 68% rename from server/datarekisteri-server.cabal rename to backend/datarekisteri-backend.cabal index 403c1d9..211881d 100644 --- a/server/datarekisteri-server.cabal +++ b/backend/datarekisteri-backend.cabal @@ -1,5 +1,5 @@ cabal-version: 3.6 -name: datarekisteri-server +name: datarekisteri-backend version: 0.0.1 author: Saku Laesvuori license: AGPL-3.0-or-later @@ -9,7 +9,7 @@ stability: alpha data-files: db/migrations/*.sql -executable datarekisteri-server +executable datarekisteri-backend build-depends: aeson, base, @@ -41,16 +41,16 @@ executable datarekisteri-server wai-cors, wai-extra, directory - main-is: Server.hs + main-is: Datarekisteri/Backend.hs other-modules: - Server.API, - Server.DB, - Server.DB.Queries, - Server.Email, - Server.Types, - Server.Utils, - Paths_datarekisteri_server + Datarekisteri.Backend.API, + Datarekisteri.Backend.DB, + Datarekisteri.Backend.DB.Queries, + Datarekisteri.Backend.Email, + Datarekisteri.Backend.Types, + Datarekisteri.Backend.Utils, + Paths_datarekisteri_backend autogen-modules: - Paths_datarekisteri_server + Paths_datarekisteri_backend hs-source-dirs: src default-language: Haskell2010 diff --git a/server/db/migrations/20221208114323_init-db.sql b/backend/db/migrations/20221208114323_init-db.sql similarity index 100% rename from server/db/migrations/20221208114323_init-db.sql rename to backend/db/migrations/20221208114323_init-db.sql diff --git a/server/db/migrations/20230917064352_split-emails-from-users.sql b/backend/db/migrations/20230917064352_split-emails-from-users.sql similarity index 100% rename from server/db/migrations/20230917064352_split-emails-from-users.sql rename to backend/db/migrations/20230917064352_split-emails-from-users.sql diff --git a/server/db/schema.sql b/backend/db/schema.sql similarity index 100% rename from server/db/schema.sql rename to backend/db/schema.sql diff --git a/server/src/Server.hs b/backend/src/Datarekisteri/Backend.hs similarity index 95% rename from server/src/Server.hs rename to backend/src/Datarekisteri/Backend.hs index 01280d0..8c03e0e 100644 --- a/server/src/Server.hs +++ b/backend/src/Datarekisteri/Backend.hs @@ -19,18 +19,18 @@ import Network.Wai (Application) import Network.Wai.Handler.Warp (Port, run) import Network.Wai.Middleware.Cors import Network.Wai.Middleware.Gzip -import Server.API -import Server.DB -import Server.DB.Queries (getUserByEmail, getPermissions, getToken) -import Server.Types -import Server.Utils (checkPassword) +import Datarekisteri.Backend.API +import Datarekisteri.Backend.DB +import Datarekisteri.Backend.DB.Queries (getUserByEmail, getPermissions, getToken) +import Datarekisteri.Backend.Types +import Datarekisteri.Backend.Utils (checkPassword) import System.Directory (findExecutable) import System.Process (callProcess) import Options.Applicative hiding (header) import qualified Options.Applicative as O import Web.Scotty.Trans hiding (readEither) import qualified "base64" Data.ByteString.Base64 as B64 (decodeBase64) -import Paths_datarekisteri_server +import Paths_datarekisteri_backend main :: IO () main = do @@ -57,7 +57,7 @@ configOpts = Config <$> optional (strOption (long "sender-name" <> short 'n' <> metavar "NAME" <> help "Display name for email address")) <*> strOption (long "address" <> short 'a' <> metavar "EMAIL" <> help "Email address to send mail")) <*> option auto (long "port" <> short 'p' <> metavar "PORT" <> value 3100 <> help "Port to listen on") - <*> strOption (long "db-url" <> short 'u' <> metavar "URL" <> value "postgres:///id.rekisteri" <> help "Postgresql database url") + <*> strOption (long "db-url" <> short 'u' <> metavar "URL" <> value "postgres:///datarekisteri-backend" <> help "Postgresql database url") runMigrations :: Text -> IO () runMigrations dbUrl = do diff --git a/server/src/Server/API.hs b/backend/src/Datarekisteri/Backend/API.hs similarity index 98% rename from server/src/Server/API.hs rename to backend/src/Datarekisteri/Backend/API.hs index 6fc6c5a..8df4bec 100644 --- a/server/src/Server/API.hs +++ b/backend/src/Datarekisteri/Backend/API.hs @@ -16,7 +16,7 @@ {-# LANGUAGE NoImplicitPrelude #-} -module Server.API (coreApp, runApp, resolver) where +module Datarekisteri.Backend.API (coreApp, runApp, resolver) where import Relude hiding (Undefined, void, when, get) @@ -29,11 +29,11 @@ import Data.Morpheus.Types (Arg(..), GQLType, GQLError, App) import Data.Time (nominalDay) import Database.Persist (Entity, entityVal, entityKey, get, (=.)) import Datarekisteri.Core.Types -import Server.DB -import Server.DB.Queries -import Server.Email (sendVerificationEmail) -import Server.Types -import Server.Utils +import Datarekisteri.Backend.DB +import Datarekisteri.Backend.DB.Queries +import Datarekisteri.Backend.Email (sendVerificationEmail) +import Datarekisteri.Backend.Types +import Datarekisteri.Backend.Utils import qualified "base64" Data.ByteString.Base64 as B64 (encodeBase64) import qualified Data.Text as T (null, chunksOf, intercalate) diff --git a/server/src/Server/DB.hs b/backend/src/Datarekisteri/Backend/DB.hs similarity index 97% rename from server/src/Server/DB.hs rename to backend/src/Datarekisteri/Backend/DB.hs index 3eb3375..85a42db 100644 --- a/server/src/Server/DB.hs +++ b/backend/src/Datarekisteri/Backend/DB.hs @@ -12,7 +12,7 @@ {-# LANGUAGE UndecidableInstances #-} {-# LANGUAGE FlexibleContexts #-} -module Server.DB where +module Datarekisteri.Backend.DB where import Data.ByteString (ByteString) import Data.Text (Text) @@ -21,7 +21,7 @@ import Database.Persist (Entity, Key, entityKey, PersistEntity) import Database.Persist.Sql (fromSqlKey, toSqlKey) import Database.Persist.Postgresql.JSON (Value) import Datarekisteri.Core.Types -import Server.Types +import Datarekisteri.Backend.Types mkPersist sqlSettings [persistUpperCase| DBUser sql=users diff --git a/server/src/Server/DB/Queries.hs b/backend/src/Datarekisteri/Backend/DB/Queries.hs similarity index 98% rename from server/src/Server/DB/Queries.hs rename to backend/src/Datarekisteri/Backend/DB/Queries.hs index 8ce578c..60f0aca 100644 --- a/server/src/Server/DB/Queries.hs +++ b/backend/src/Datarekisteri/Backend/DB/Queries.hs @@ -4,10 +4,10 @@ {-# LANGUAGE TypeApplications #-} {-# LANGUAGE TypeFamilies #-} -module Server.DB.Queries where +module Datarekisteri.Backend.DB.Queries where -import Server.DB as DB -import Server.Types +import Datarekisteri.Backend.DB as DB +import Datarekisteri.Backend.Types import Datarekisteri.Core.Types import Data.Text (Text) import Database.Esqueleto.Experimental diff --git a/server/src/Server/Email.hs b/backend/src/Datarekisteri/Backend/Email.hs similarity index 88% rename from server/src/Server/Email.hs rename to backend/src/Datarekisteri/Backend/Email.hs index 212eba6..8708346 100644 --- a/server/src/Server/Email.hs +++ b/backend/src/Datarekisteri/Backend/Email.hs @@ -1,8 +1,8 @@ {-# LANGUAGE OverloadedStrings #-} -module Server.Email where +module Datarekisteri.Backend.Email where -import Server.Types +import Datarekisteri.Backend.Types import Data.Text (Text) import Data.Text.Lazy (fromStrict) import Datarekisteri.Core.Types diff --git a/server/src/Server/Types.hs b/backend/src/Datarekisteri/Backend/Types.hs similarity index 98% rename from server/src/Server/Types.hs rename to backend/src/Datarekisteri/Backend/Types.hs index 0cdec89..54508e4 100644 --- a/server/src/Server/Types.hs +++ b/backend/src/Datarekisteri/Backend/Types.hs @@ -9,7 +9,7 @@ {-# LANGUAGE NoImplicitPrelude #-} -module Server.Types where +module Datarekisteri.Backend.Types where import Relude diff --git a/server/src/Server/Utils.hs b/backend/src/Datarekisteri/Backend/Utils.hs similarity index 89% rename from server/src/Server/Utils.hs rename to backend/src/Datarekisteri/Backend/Utils.hs index d632d76..e709d30 100644 --- a/server/src/Server/Utils.hs +++ b/backend/src/Datarekisteri/Backend/Utils.hs @@ -1,6 +1,6 @@ {-# LANGUAGE PackageImports #-} -module Server.Utils where +module Datarekisteri.Backend.Utils where import Data.ByteArray.Encoding (convertToBase, Base(..)) import Data.ByteString (ByteString) @@ -8,7 +8,7 @@ import Data.Text.Encoding (decodeUtf8, encodeUtf8) import Data.Text (Text) import qualified Crypto.KDF.BCrypt as Crypt (hashPassword, validatePassword) import "cryptonite" Crypto.Random (MonadRandom) -import Server.Types +import Datarekisteri.Backend.Types base32 :: ByteString -> Text base32 = decodeUtf8 . convertToBase Base32 diff --git a/client/src/Client/Handlers.hs b/client/src/Client/Handlers.hs deleted file mode 100644 index 75b9e17..0000000 --- a/client/src/Client/Handlers.hs +++ /dev/null @@ -1,31 +0,0 @@ -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE DuplicateRecordFields #-} -{-# LANGUAGE DisambiguateRecordFields #-} -{-# LANGUAGE RecordWildCards #-} -{-# LANGUAGE TypeApplications #-} - -{-# LANGUAGE NoImplicitPrelude #-} - -module Client.Handlers - ( module Client.Handlers.Profile - , module Client.Handlers.Apply - , module Client.Handlers.Applications - , module Client.Handlers.VerifyEmail - , module Client.Handlers.Members - , getHomeR - ) where - -import Relude - -import Client.Handlers.Profile -import Client.Handlers.Apply -import Client.Handlers.Applications -import Client.Handlers.VerifyEmail -import Client.Handlers.Members -import Client.Types -import Yesod -import Yesod.Auth - -getHomeR :: Handler Html -getHomeR = ifM (isJust <$> maybeAuthId) (redirect OwnProfileR) (redirect $ AuthR LoginR) diff --git a/server/COPYING.md b/frontend/COPYING.md similarity index 100% rename from server/COPYING.md rename to frontend/COPYING.md diff --git a/server/Setup.hs b/frontend/Setup.hs similarity index 100% rename from server/Setup.hs rename to frontend/Setup.hs diff --git a/client/datarekisteri-client.cabal b/frontend/datarekisteri-frontend.cabal similarity index 55% rename from client/datarekisteri-client.cabal rename to frontend/datarekisteri-frontend.cabal index 0d539f7..a898993 100644 --- a/client/datarekisteri-client.cabal +++ b/frontend/datarekisteri-frontend.cabal @@ -1,5 +1,5 @@ cabal-version: 3.6 -name: datarekisteri-client +name: datarekisteri-frontend version: 0.0.1 author: Saku Laesvuori license: AGPL-3.0-or-later @@ -7,7 +7,7 @@ license-file: COPYING.md build-type: Simple stability: alpha -executable datarekisteri-client +executable datarekisteri-frontend build-depends: aeson, base, @@ -35,17 +35,17 @@ executable datarekisteri-client yesod-core, yesod-static, directory - main-is: Client.hs + main-is: Datarekisteri/Frontend.hs other-modules: - Client.ApiRequests, - Client.Auth, - Client.FormFields, - Client.Handlers, - Client.Handlers.Applications, - Client.Handlers.Apply, - Client.Handlers.Profile, - Client.Handlers.VerifyEmail, - Client.Handlers.Members, - Client.Types + Datarekisteri.Frontend.ApiRequests, + Datarekisteri.Frontend.Auth, + Datarekisteri.Frontend.FormFields, + Datarekisteri.Frontend.Handlers, + Datarekisteri.Frontend.Handlers.Applications, + Datarekisteri.Frontend.Handlers.Apply, + Datarekisteri.Frontend.Handlers.Profile, + Datarekisteri.Frontend.Handlers.VerifyEmail, + Datarekisteri.Frontend.Handlers.Members, + Datarekisteri.Frontend.Types hs-source-dirs: src default-language: Haskell2010 diff --git a/client/schema.gql b/frontend/schema.gql similarity index 100% rename from client/schema.gql rename to frontend/schema.gql diff --git a/client/src/Client.hs b/frontend/src/Datarekisteri/Frontend.hs similarity index 93% rename from client/src/Client.hs rename to frontend/src/Datarekisteri/Frontend.hs index 91a2f03..5b5ce1e 100644 --- a/client/src/Client.hs +++ b/frontend/src/Datarekisteri/Frontend.hs @@ -15,9 +15,9 @@ import Relude hiding (get) import Yesod import Yesod.Auth -import Client.Types -import Client.Handlers -import Client.Auth () +import Datarekisteri.Frontend.Types +import Datarekisteri.Frontend.Handlers +import Datarekisteri.Frontend.Auth () import Yesod.Static (static, Static) import Options.Applicative import System.Directory (createDirectoryIfMissing) diff --git a/client/src/Client/ApiRequests.hs b/frontend/src/Datarekisteri/Frontend/ApiRequests.hs similarity index 97% rename from client/src/Client/ApiRequests.hs rename to frontend/src/Datarekisteri/Frontend/ApiRequests.hs index b17df29..ba7c16a 100644 --- a/client/src/Client/ApiRequests.hs +++ b/frontend/src/Datarekisteri/Frontend/ApiRequests.hs @@ -9,7 +9,7 @@ {-# LANGUAGE NoImplicitPrelude #-} -module Client.ApiRequests where +module Datarekisteri.Frontend.ApiRequests where import Relude diff --git a/client/src/Client/Auth.hs b/frontend/src/Datarekisteri/Frontend/Auth.hs similarity index 98% rename from client/src/Client/Auth.hs rename to frontend/src/Datarekisteri/Frontend/Auth.hs index df67cc5..3224790 100644 --- a/client/src/Client/Auth.hs +++ b/frontend/src/Datarekisteri/Frontend/Auth.hs @@ -10,7 +10,7 @@ {-# LANGUAGE NoImplicitPrelude #-} -module Client.Auth where +module Datarekisteri.Frontend.Auth where import Relude diff --git a/client/src/Client/FormFields.hs b/frontend/src/Datarekisteri/Frontend/FormFields.hs similarity index 96% rename from client/src/Client/FormFields.hs rename to frontend/src/Datarekisteri/Frontend/FormFields.hs index 4c0491a..e7af9c0 100644 --- a/client/src/Client/FormFields.hs +++ b/frontend/src/Datarekisteri/Frontend/FormFields.hs @@ -3,12 +3,12 @@ {-# LANGUAGE NoImplicitPrelude #-} -module Client.FormFields where +module Datarekisteri.Frontend.FormFields where import Relude import Yesod -import Client.Types +import Datarekisteri.Frontend.Types import Datarekisteri.Core.Types emailField :: Field Handler Email diff --git a/frontend/src/Datarekisteri/Frontend/Handlers.hs b/frontend/src/Datarekisteri/Frontend/Handlers.hs new file mode 100644 index 0000000..7b827fc --- /dev/null +++ b/frontend/src/Datarekisteri/Frontend/Handlers.hs @@ -0,0 +1,31 @@ +{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE DuplicateRecordFields #-} +{-# LANGUAGE DisambiguateRecordFields #-} +{-# LANGUAGE RecordWildCards #-} +{-# LANGUAGE TypeApplications #-} + +{-# LANGUAGE NoImplicitPrelude #-} + +module Datarekisteri.Frontend.Handlers + ( module Datarekisteri.Frontend.Handlers.Profile + , module Datarekisteri.Frontend.Handlers.Apply + , module Datarekisteri.Frontend.Handlers.Applications + , module Datarekisteri.Frontend.Handlers.VerifyEmail + , module Datarekisteri.Frontend.Handlers.Members + , getHomeR + ) where + +import Relude + +import Datarekisteri.Frontend.Handlers.Profile +import Datarekisteri.Frontend.Handlers.Apply +import Datarekisteri.Frontend.Handlers.Applications +import Datarekisteri.Frontend.Handlers.VerifyEmail +import Datarekisteri.Frontend.Handlers.Members +import Datarekisteri.Frontend.Types +import Yesod +import Yesod.Auth + +getHomeR :: Handler Html +getHomeR = ifM (isJust <$> maybeAuthId) (redirect OwnProfileR) (redirect $ AuthR LoginR) diff --git a/client/src/Client/Handlers/Applications.hs b/frontend/src/Datarekisteri/Frontend/Handlers/Applications.hs similarity index 95% rename from client/src/Client/Handlers/Applications.hs rename to frontend/src/Datarekisteri/Frontend/Handlers/Applications.hs index 42fcda4..3a09cea 100644 --- a/client/src/Client/Handlers/Applications.hs +++ b/frontend/src/Datarekisteri/Frontend/Handlers/Applications.hs @@ -10,17 +10,17 @@ {-# LANGUAGE NoImplicitPrelude #-} -module Client.Handlers.Applications where +module Datarekisteri.Frontend.Handlers.Applications where import Relude hiding (id) -import Client.ApiRequests -import Client.Types +import Datarekisteri.Frontend.ApiRequests +import Datarekisteri.Frontend.Types import Data.Morpheus.Client import Datarekisteri.Core.Types hiding (Applications) import Yesod hiding (emailField) import Yesod.Auth -import Client.FormFields +import Datarekisteri.Frontend.FormFields import Data.Time (Day) import Data.Maybe (fromJust) diff --git a/client/src/Client/Handlers/Apply.hs b/frontend/src/Datarekisteri/Frontend/Handlers/Apply.hs similarity index 95% rename from client/src/Client/Handlers/Apply.hs rename to frontend/src/Datarekisteri/Frontend/Handlers/Apply.hs index a21a697..ca44230 100644 --- a/client/src/Client/Handlers/Apply.hs +++ b/frontend/src/Datarekisteri/Frontend/Handlers/Apply.hs @@ -10,17 +10,17 @@ {-# LANGUAGE NoImplicitPrelude #-} -module Client.Handlers.Apply where +module Datarekisteri.Frontend.Handlers.Apply where import Relude hiding (id) -import Client.ApiRequests -import Client.Types +import Datarekisteri.Frontend.ApiRequests +import Datarekisteri.Frontend.Types import Data.Morpheus.Client import Datarekisteri.Core.Types import Yesod hiding (emailField) import Yesod.Auth -import Client.FormFields +import Datarekisteri.Frontend.FormFields import Data.Time (Day) declareLocalTypesInline "schema.gql" [raw| diff --git a/client/src/Client/Handlers/Members.hs b/frontend/src/Datarekisteri/Frontend/Handlers/Members.hs similarity index 92% rename from client/src/Client/Handlers/Members.hs rename to frontend/src/Datarekisteri/Frontend/Handlers/Members.hs index 37acf8a..39f9735 100644 --- a/client/src/Client/Handlers/Members.hs +++ b/frontend/src/Datarekisteri/Frontend/Handlers/Members.hs @@ -8,13 +8,13 @@ {-# LANGUAGE NoImplicitPrelude #-} -module Client.Handlers.Members where +module Datarekisteri.Frontend.Handlers.Members where import Relude hiding (id) import Data.Morpheus.Client -import Client.Types -import Client.ApiRequests +import Datarekisteri.Frontend.Types +import Datarekisteri.Frontend.ApiRequests import Datarekisteri.Core.Types import Yesod import Yesod.Auth diff --git a/client/src/Client/Handlers/Profile.hs b/frontend/src/Datarekisteri/Frontend/Handlers/Profile.hs similarity index 97% rename from client/src/Client/Handlers/Profile.hs rename to frontend/src/Datarekisteri/Frontend/Handlers/Profile.hs index e05a833..fd62463 100644 --- a/client/src/Client/Handlers/Profile.hs +++ b/frontend/src/Datarekisteri/Frontend/Handlers/Profile.hs @@ -10,13 +10,13 @@ {-# LANGUAGE NoImplicitPrelude #-} -module Client.Handlers.Profile where +module Datarekisteri.Frontend.Handlers.Profile where import Relude hiding (id) -import Client.ApiRequests -import Client.Types -import Client.FormFields +import Datarekisteri.Frontend.ApiRequests +import Datarekisteri.Frontend.Types +import Datarekisteri.Frontend.FormFields import Data.Morpheus.Client import Datarekisteri.Core.Types import Yesod hiding (emailField) diff --git a/client/src/Client/Handlers/VerifyEmail.hs b/frontend/src/Datarekisteri/Frontend/Handlers/VerifyEmail.hs similarity index 91% rename from client/src/Client/Handlers/VerifyEmail.hs rename to frontend/src/Datarekisteri/Frontend/Handlers/VerifyEmail.hs index 416ac7d..5cd5c70 100644 --- a/client/src/Client/Handlers/VerifyEmail.hs +++ b/frontend/src/Datarekisteri/Frontend/Handlers/VerifyEmail.hs @@ -9,12 +9,12 @@ {-# LANGUAGE NoImplicitPrelude #-} -module Client.Handlers.VerifyEmail where +module Datarekisteri.Frontend.Handlers.VerifyEmail where import Relude -import Client.ApiRequests -import Client.Types +import Datarekisteri.Frontend.ApiRequests +import Datarekisteri.Frontend.Types import Datarekisteri.Core.Types import Data.Morpheus.Client import Yesod diff --git a/client/src/Client/Types.hs b/frontend/src/Datarekisteri/Frontend/Types.hs similarity index 99% rename from client/src/Client/Types.hs rename to frontend/src/Datarekisteri/Frontend/Types.hs index f8aa3e6..5d1ae6f 100644 --- a/client/src/Client/Types.hs +++ b/frontend/src/Datarekisteri/Frontend/Types.hs @@ -13,7 +13,7 @@ {-# LANGUAGE NoImplicitPrelude #-} -module Client.Types where +module Datarekisteri.Frontend.Types where import Relude hiding (id) import Relude.Extra.Foldable1 (maximum1) @@ -26,8 +26,8 @@ import Yesod.Static import Datarekisteri.Core.Types (UserID(..), Scope(..), Permission(..), readPermission) import Data.Time (getCurrentTime) import Data.Time.Format.ISO8601 (iso8601Show) -import Client.Auth -import Client.ApiRequests +import Datarekisteri.Frontend.Auth +import Datarekisteri.Frontend.ApiRequests import Data.Morpheus.Client import Data.Map (findWithDefault)