Skip to content

Commit 077de1e

Browse files
committed
update sign up form ui to display error messages
1 parent 4a6103d commit 077de1e

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

src/conduit/ui/account.cljs

+16-8
Original file line numberDiff line numberDiff line change
@@ -115,28 +115,36 @@
115115
(dom/p :.text-xs-center
116116
(dom/a {:href (routes/to-path {:handler :screen/log-in})}
117117
"Have an account?"))
118-
#_
119-
(dom/ul :.error-messages
120-
(dom/li "That email is already taken") )
121-
(dom/form {:onSubmit #(do (.preventDefault %) (prim/transact! this `[(sign-up ~(merge props state))]))}
118+
(when (= :failed status)
119+
(dom/ul :.error-messages
120+
(mapv ui-sign-up-error (get errors :user/email))
121+
(mapv ui-sign-up-error (get errors errors/other-category))))
122+
123+
(dom/form {:onSubmit #(do (.preventDefault %)
124+
(prim/ptransact! this `[(sign-up ~(merge props state))
125+
(finish-sign-up {})]))}
126+
122127
(dom/fieldset :.form-group
123-
(dom/input :.form-control.form-control-lg
128+
(dom/input :.form-control.form-control-lg.form-control-success.form-control-warning.form-control-danger
124129
{:placeholder "Your Name"
125130
:type "text"
126131
:value name
127132
:onBlur #(prim/transact! this
128133
`[(fs/mark-complete! {:field :user/name})])
129134
:onChange #(m/set-string! this :user/name :event %)}))
130-
(dom/fieldset :.form-group
131-
(dom/input :.form-control.form-control-lg
135+
(dom/fieldset {:classes ["form-group"
136+
(when (and (= :failed status) (seq (get errors :user/email)))
137+
"has-danger has-feedback")]}
138+
(dom/input :.form-control.form-control-lg.form-control-success.form-control-warning.form-control-danger
132139
{:placeholder "Email"
133140
:type "text"
134141
:value email
135142
:onBlur #(prim/transact! this
136143
`[(fs/mark-complete! {:field :user/email})])
137144
:onChange #(m/set-string! this :user/email :event %)}))
145+
138146
(dom/fieldset :.form-group
139-
(dom/input :.form-control.form-control-lg
147+
(dom/input :.form-control.form-control-lg.form-control-success.form-control-warning.form-control-danger
140148
{:placeholder "Password"
141149
:type "password"
142150
:value (or password "")

0 commit comments

Comments
 (0)