1 files changed, 7 insertions, 15 deletions
diff --git a/lisp/webapps/resume/clojurescript/resume/src/resume/core.cljs b/lisp/webapps/resume/clojurescript/resume/src/resume/core.cljs
index 1551957..fdba0f2 100644
--- a/lisp/webapps/resume/clojurescript/resume/src/resume/core.cljs
+++ b/lisp/webapps/resume/clojurescript/resume/src/resume/core.cljs
@@ -32,7 +32,6 @@
 (declare reset-users-add-state)
 (declare reset-users-register-state)
 (declare reset-users-register-form-state)
-(declare reset-users-register-submit-state)
 (declare reset-users-modify-state)
 (declare date-sql-to-pretty)
 (declare markdown-to-html)
@@ -130,7 +129,6 @@
 (declare handler-users-register-form-impl)
 (declare render-users-register-form)
 (declare on-users-register-submit-clicked)
-(declare comp-users-register-submit)
 (declare handler-users-register-submit)
 (declare render-users-register-submit)
 (declare on-users-modify-clicked)
@@ -181,7 +179,6 @@
 (def users-add-state (r/atom {}))
 (def users-register-state (r/atom {}))
 (def users-register-form-state (r/atom {}))
-(def users-register-submit-state (r/atom {}))
 (def users-modify-state (r/atom {}))
 (def menu-hooks (atom {}))
 
@@ -246,9 +243,6 @@
 (defn reset-users-register-form-state [jsonobj]
   (reset! users-register-form-state jsonobj))
 
-(defn reset-users-register-submit-state [jsonobj]
-  (reset! users-register-submit-state jsonobj))
-
 (defn reset-users-modify-state [jsonobj]
   (reset! users-modify-state jsonobj))
 
@@ -940,13 +934,14 @@
 ;; users-register
 
 (defn comp-users-register []
-  [:div {:style {:display (cond (or (= @location-state "/register")) "block" :else "none")}}
-   [:h3 {:style {:style "text-align: center"}} (get @users-register-state "title")]
+  [:div {:style {:display (cond (or (= @location-state "/users/register")) "block" :else "none")}}
+   [:h3 {:style {:text-align "center"}} (get @users-register-state "title")]
    [comp-users-register-form]])
 
 (defn handler-users-register [response]
   (let [jsonobj (js->clj (js/JSON.parse response))]
-    (reset-users-register-state jsonobj)))
+    (reset-users-register-state jsonobj)
+    (render-users-register-form (get jsonobj "hash"))))
 
 (defn render-users-register [hash]
   (POST "/users/register"
@@ -988,15 +983,10 @@
             (.checkValidity))
     (render-users-register-submit)))
 
-(defn comp-users-register-submit []
-  [:div
-   [:a {:href (str "javascript:" (namespace ::x) ".reset_app()")}
-    "Click here to start using the website!"]])
-
 (defn handler-users-register-submit [response]
   (let [jsonobj (js->clj (js/JSON.parse response))]
     (notifications jsonobj)
-    (reset-users-register-submit-state jsonobj)))
+    (reset-app)))
 
 (defn render-users-register-submit []
   (POST "/users/register/submit"
@@ -1096,6 +1086,7 @@
 (push-menu-hook {:handler "/contact-us" :func #(render-contact-us)})
 (push-menu-hook {:handler "/messages" :func #(render-messages)})
 (push-menu-hook {:handler "/users" :func #(render-users)})
+(push-menu-hook {:handler "/users/register" :func #(render-users)})
 (push-menu-hook {:handler "/resume/resume" :func #(render-resume)})
 (push-menu-hook {:handler "/resume/contactinfo" :func #(render-contactinfo)})
 (push-menu-hook {:handler "/resume/education" :func #(render-education)})
@@ -1157,6 +1148,7 @@
    [comp-contact-us]
    [comp-messages]
    [comp-users]
+   [comp-users-register]
    [:div {:id "footer"}
     [:hr]
     "Carlos Konstanski (970) 294-9708"