Skip to content

Commit 42499af

Browse files
paluhpaluh
committed
Reformat project using purty
1 parent 4220d9c commit 42499af

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+3258
-2694
lines changed

‎src/Main.purs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
module WebRow.Main where
2+
23
--
34
-- import Prelude
45
--

‎src/WebRow/Applets/Auth.purs‎

Lines changed: 61 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@ module WebRow.Applets.Auth
33
, localRouter
44
, router
55
, withUserRequired
6-
)
7-
where
6+
) where
87

98
import Prelude
10-
119
import Data.Maybe (Maybe(..))
1210
import Data.Tuple (Tuple(..))
1311
import Data.Variant (Variant, inj, on)
@@ -32,79 +30,83 @@ import WebRow.Routing (printRoute) as Routing
3230
import WebRow.Session (delete, fetch, modify) as Session
3331
import WebRow.Types (WebRow)
3432

35-
type AuthRow messages routes session user eff =
36-
( WebRow
37-
( authFailed ∷ AuthPayload
38-
, invalidEmailFormat ∷ String
39-
, missingValue ∷ Unit
40-
| messages
33+
type AuthRow messages routes session user eff
34+
= ( WebRow
35+
( authFailed ∷ AuthPayload
36+
, invalidEmailFormat ∷ String
37+
, missingValue ∷ Unit
38+
| messages
39+
)
40+
{ user ∷ Maybe (User user) | session }
41+
(RouteRow + routes)
42+
+ Auth user
43+
+ eff
4144
)
42-
{ user ∷ Maybe (User user) | session }
43-
(RouteRow + routes)
44-
+ Auth user
45-
+ eff
46-
)
4745

48-
router
49-
:: ∀ eff messages responses routes routes' session user
50-
. ( Variant routes
51-
→ Run
46+
router ::
47+
∀ eff messages responses routes routes' session user.
48+
( Variant routes →
49+
Run
5250
(AuthRow messages routes' session user + eff)
5351
(Variant (ResponseRow + responses))
54-
)
55-
→ Variant (RouteRow + routes)
56-
→ Run
52+
) →
53+
Variant (RouteRow + routes) →
54+
Run
5755
(AuthRow messages routes' session user + eff)
5856
(Variant (ResponseRow + responses))
5957
router = on _auth (map (inj _auth) <$> localRouter)
6058

61-
localRouter
62-
∷ ∀ eff messages routes session user
63-
. Route
64-
→ Run (AuthRow messages routes session user eff) Response
59+
localRouter ∷
60+
∀ eff messages routes session user.
61+
Route →
62+
Run (AuthRow messages routes session user eff) Response
6563
localRouter = case _ of
6664
Routes.Login → login
6765
Routes.Logout → logout
6866

69-
login
70-
∷ ∀ eff messages routes session user
71-
. Run (AuthRow messages routes session user + eff) Response
72-
login = method >>= case _ of
73-
HTTPure.Post → do
74-
body ← fromBody
75-
Forms.Uni.validate loginForm body >>= case _ of
76-
Tuple Nothing formLayout → do
77-
pure $ LoginResponse (LoginFormValidationFailed formLayout)
78-
Tuple (Just user) formLayout → do
79-
Session.modify _{ user = Just user }
80-
pure $ LoginResponse LoginSuccess
81-
HTTPure.Get → do
82-
form ← Forms.Uni.default loginForm
83-
pure $ LoginResponse (InitialEmailPassordForm form)
84-
method → methodNotAllowed'
67+
login ∷
68+
∀ eff messages routes session user.
69+
Run (AuthRow messages routes session user + eff) Response
70+
login =
71+
method
72+
>>= case _ of
73+
HTTPure.Post → do
74+
body ← fromBody
75+
Forms.Uni.validate loginForm body
76+
>>= case _ of
77+
Tuple Nothing formLayout → do
78+
pure $ LoginResponse (LoginFormValidationFailed formLayout)
79+
Tuple (Just user) formLayout → do
80+
Session.modify _ { user = Just user }
81+
pure $ LoginResponse LoginSuccess
82+
HTTPure.Get → do
83+
form ← Forms.Uni.default loginForm
84+
pure $ LoginResponse (InitialEmailPassordForm form)
85+
method → methodNotAllowed'
8586

86-
logout
87-
∷ ∀ eff messages routes session user
88-
. Run
87+
logout ∷
88+
∀ eff messages routes session user.
89+
Run
8990
( AuthRow
90-
messages
91-
routes
92-
session
93-
user
94-
+ eff
91+
messages
92+
routes
93+
session
94+
user
95+
+ eff
9596
)
9697
Response
9798
logout = do
9899
void $ Session.delete
99100
pure $ LogoutResponse
100101

101-
withUserRequired ∷ ∀ a eff messages routes session user
102-
. (User user → Run (AuthRow messages routes session user + eff) a)
103-
→ Run (AuthRow messages routes session user + eff) a
104-
withUserRequired f = Session.fetch >>= _.user >>> case _ of
105-
Just user → f user
106-
Nothing → do
107-
relativeUrl ← Routing.printRoute (namespace Routes.Login)
108-
redirect (fromRelativeUrl relativeUrl)
109-
110-
102+
withUserRequired ∷
103+
∀ a eff messages routes session user.
104+
(User user → Run (AuthRow messages routes session user + eff) a) →
105+
Run (AuthRow messages routes session user + eff) a
106+
withUserRequired f =
107+
Session.fetch >>= _.user
108+
>>> case _ of
109+
Just user → f user
110+
Nothing → do
111+
relativeUrl ← Routing.printRoute (namespace Routes.Login)
112+
redirect (fromRelativeUrl relativeUrl)

‎src/WebRow/Applets/Auth/Effects.purs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
module WebRow.Applets.Auth.Effects where
22

33
import Prelude
4-
54
import Data.Maybe (Maybe)
65
import Run (FProxy, Run)
76
import Run (lift) as Run
@@ -13,20 +12,22 @@ data AuthF user a
1312

1413
derive instance functorAuthF ∷ Functor (AuthF user)
1514

16-
type AUTH user = FProxy (AuthF user)
15+
type AUTH user
16+
= FProxy (AuthF user)
1717

18-
type Auth user r = (auth ∷ AUTH user | r)
18+
type Auth user r
19+
= ( auth ∷ AUTH user | r )
1920

20-
type User user = { email ∷ Email | user }
21+
type User user
22+
= { email ∷ Email | user }
2123

22-
authenticate
23-
∷ ∀ eff user
24-
. Email
25-
→ Password
26-
→ Run ( auth ∷ AUTH user | eff ) (Maybe (User user))
24+
authenticate ∷
25+
∀ eff user.
26+
Email →
27+
Password →
28+
Run ( auth ∷ AUTH user | eff ) (Maybe (User user))
2729
authenticate email password = Run.lift _auth (Authenticate email password identity)
2830

29-
3031
-- data AuthF user a
3132
-- = CurrentUser (Maybe (User user) → a)
3233
-- | CheckPassword Email Password (Boolean → a)
@@ -40,4 +41,3 @@ authenticate email password = Run.lift _auth (Authenticate email password identi
4041
--
4142
-- checkPassword ∷ ∀ eff user. Email → Password → Run ( auth ∷ AUTH user | eff ) Boolean
4243
-- checkPassword email password = Run.lift _auth (CheckPassword email password identity)
43-

‎src/WebRow/Applets/Auth/Forms.purs‎

Lines changed: 35 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
module WebRow.Applets.Auth.Forms where
22

33
import Prelude
4-
54
import Data.Either (note)
65
import Data.Validation.Semigroup (V(..))
76
import Polyform.Batteries (error) as Batteries
@@ -20,37 +19,47 @@ import WebRow.Mailer (Email)
2019

2120
_authFailed = SProxy ∷ SProxy "authFailed"
2221

23-
type Widgets = (TextInput + ())
24-
type LoginLayout = Forms.Layout Widgets
22+
type Widgets
23+
= (TextInput + ())
24+
25+
type LoginLayout
26+
= Forms.Layout Widgets
2527

26-
type AuthPayload = { email ∷ Email, password ∷ Password }
27-
type AuthFailed r = (authFailed ∷ AuthPayload | r)
28+
type AuthPayload
29+
= { email ∷ Email, password ∷ Password }
2830

29-
loginForm :: forall eff errs user.
31+
type AuthFailed r
32+
= ( authFailed ∷ AuthPayload | r )
33+
34+
loginForm ::
35+
forall eff errs user.
3036
Forms.Uni
3137
(Effects.Auth user + eff)
3238
(AuthFailed + InvalidEmailFormat + MissingValue + errs)
3339
(TextInput + ())
3440
(User user)
35-
loginForm = Uni.build
36-
$ autheticateBuilder
37-
<<< ({ email: _, password: _ } <$> emailFormBuilder <*> passwordFormBuilder)
41+
loginForm =
42+
Uni.build
43+
$ autheticateBuilder
44+
<<< ({ email: _, password: _ } <$> emailFormBuilder <*> passwordFormBuilder)
3845
where
39-
autheticateBuilder
40-
∷ ∀ errs' widgets'
41-
. Uni.Builder
42-
(Effects.Auth user + eff)
43-
(AuthFailed + errs')
44-
widgets'
45-
AuthPayload
46-
(User user)
47-
autheticateBuilder = Uni.sectionValidator $ Validator.liftFnMV \r → ado
48-
res ← Effects.authenticate r.email r.password
49-
in
50-
V (note (Batteries.error _authFailed r) res)
51-
52-
passwordFormBuilder = Password <$> Uni.passwordInputBuilder
53-
{ name: "password", policy: identity }
54-
55-
emailFormBuilder = Uni.emailInputBuilder { name: "email" }
46+
autheticateBuilder ∷
47+
∀ errs' widgets'.
48+
Uni.Builder
49+
(Effects.Auth user + eff)
50+
(AuthFailed + errs')
51+
widgets'
52+
AuthPayload
53+
(User user)
54+
autheticateBuilder =
55+
Uni.sectionValidator
56+
$ Validator.liftFnMV \r → ado
57+
res ← Effects.authenticate r.email r.password
58+
in V (note (Batteries.error _authFailed r) res)
59+
60+
passwordFormBuilder =
61+
Password
62+
<$> Uni.passwordInputBuilder
63+
{ name: "password", policy: identity }
5664

65+
emailFormBuilder = Uni.emailInputBuilder { name: "email" }

‎src/WebRow/Applets/Auth/Interpret.purs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ module WebRow.Auth.Interpret where
22

33
import WebRow.Applets.Auth.Effects (User) as Effects
44

5-
type User = Effects.User ()
6-
5+
type User
6+
= Effects.User ()

‎src/WebRow/Applets/Auth/Interpret/Dummy.purs‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,26 @@
11
module WebRow.Auth.Interpret.Dummy where
22

33
import Prelude
4-
54
import Data.Maybe (Maybe(..))
65
import Effect.Random (random)
76
import Run (EFFECT, Run, liftEffect)
87
import Run (interpret, on, send) as Run
98
import WebRow.Applets.Auth.Effects (AUTH, AuthF(..))
109
import WebRow.Applets.Auth.Types (_auth)
1110

12-
interpret
13-
∷ ∀ eff
14-
. Run
11+
interpret ∷
12+
∀ eff.
13+
Run
1514
( effect ∷ EFFECT
1615
, auth ∷ AUTH ()
1716
| eff
1817
)
19-
~> Run (effect ∷ EFFECT | eff)
18+
~> Run ( effect ∷ EFFECT | eff )
2019
interpret = Run.interpret (Run.on _auth handler Run.send)
2120

22-
handler
23-
∷ ∀ eff
24-
. AuthF () ~> Run (effect ∷ EFFECT | eff)
21+
handler ∷
22+
∀ eff.
23+
AuthF () ~> Run ( effect ∷ EFFECT | eff )
2524
handler (Authenticate email password next) = do
2625
v ← liftEffect random
2726
pure $ next (Just { email })
28-

‎src/WebRow/Applets/Auth/Messages.purs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ module WebRow.Applets.Auth.Messages where
33
import Type.Row (type (+))
44
import WebRow.Applets.Auth.Forms (AuthFailed)
55

6-
type Messages r = AuthFailed + r
6+
type Messages r
7+
= AuthFailed + r

‎src/WebRow/Applets/Auth/Responses.purs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ data Response
1313
= LoginResponse LoginResponse
1414
| LogoutResponse
1515

16-
type ResponseRow responses = Namespace Response responses
16+
type ResponseRow responses
17+
= Namespace Response responses
1718

1819
-- response
1920
-- ∷ ∀ a eff res widgets
@@ -25,7 +26,6 @@ type ResponseRow responses = Namespace Response responses
2526
-- = ∀ res eff a widgets
2627
-- . (Forms.Layout widgets)
2728
-- → Run (response ∷ RESPONSE ( auth ∷ (Response widgets) | res ) | eff) a
28-
2929
-- loginFormValidationFailed ∷ forall widgets. Response widgets
3030
-- loginFormValidationFailed = LoginResponse <<< LoginFormValidationFailed
3131
--

0 commit comments

Comments
 (0)