diff options
Diffstat (limited to 'lisp/webapps/resume/clojurescript')
| -rw-r--r-- | lisp/webapps/resume/clojurescript/resume/src/resume/core.clj | 155 | ||||
| -rw-r--r-- | lisp/webapps/resume/clojurescript/resume/src/resume/core.cljs | 2 |
2 files changed, 78 insertions, 79 deletions
diff --git a/lisp/webapps/resume/clojurescript/resume/src/resume/core.clj b/lisp/webapps/resume/clojurescript/resume/src/resume/core.clj index 0e4333d..b07ea64 100644 --- a/lisp/webapps/resume/clojurescript/resume/src/resume/core.clj +++ b/lisp/webapps/resume/clojurescript/resume/src/resume/core.clj @@ -32,98 +32,97 @@ (defn ~(symbol (namespace ::x) (str "render-" component)) [] (ajax.core/GET ~(str "/resume/" component) {:handler handler-resume})) - )) - ;; (hiccups/defhtml ~(symbol (namespace ::x) (str "template-" component "-view")) [jsonobj] - ;; [:div {:style "text-align: right"} - ;; [:img {:src "/static/images/add.png" - ;; :style "cursor:pointer; cursor:hand" - ;; :onclick (str (namespace ::x) ".on_contactinfo_add_clicked()")}]] - ;; (generic-table ~component jsonobj)) + (hiccups/defhtml ~(symbol (namespace ::x) (str "template-" component "-view")) [jsonobj] + [:div {:style "text-align: right"} + [:img {:src "/static/images/add.png" + :style "cursor:pointer; cursor:hand" + :onclick (str (namespace ::x) ".on_contactinfo_add_clicked()")}]] + (generic-table ~component jsonobj)) - ;; (defn ~(symbol (namespace ::x) (str "handler-" component "-view")) [response] - ;; (let [jsonobj (js->clj (js/JSON.parse response))] - ;; (dommy/set-html! (dommy/sel1 :#content) (~(symbol (namespace ::x) (str "template-" component "-view")) jsonobj)))) + (defn ~(symbol (namespace ::x) (str "handler-" component "-view")) [response] + (let [jsonobj (js->clj (js/JSON.parse response))] + (dommy/set-html! (dommy/sel1 :#content) (~(symbol (namespace ::x) (str "template-" component "-view")) jsonobj)))) - ;; (defn ~(symbol (namespace ::x) (str "render-" component "-view")) [] - ;; (ajax.core/GET ~(str "/resume/" component "/view") - ;; {:handler ~(symbol (namespace ::x) (str "handler-" component "-view"))})) + (defn ~(symbol (namespace ::x) (str "render-" component "-view")) [] + (ajax.core/GET ~(str "/resume/" component "/view") + {:handler ~(symbol (namespace ::x) (str "handler-" component "-view"))})) - ;; (defn ~(symbol (namespace ::x) (str "on-" component "-add-clicked")) [] - ;; (~(symbol (namespace ::x) (str "render-" component "-add")))) + (defn ~(symbol (namespace ::x) (str "on-" component "-add-clicked")) [] + (~(symbol (namespace ::x) (str "render-" component "-add")))) - ;; (defn ~(symbol (namespace ::x) (str "handler-" component "-add")) [response] - ;; (let [jsonobj (js->clj (js/JSON.parse response))] - ;; (auth-notifications jsonobj) - ;; (dommy/set-html! (dommy/sel1 :#modify-title) (get jsonobj "title")) - ;; (dommy/set-html! (dommy/sel1 :#modify-body) (generic-component-add-modify jsonobj)) - ;; (.modal (jquery "#modify")))) + (defn ~(symbol (namespace ::x) (str "handler-" component "-add")) [response] + (let [jsonobj (js->clj (js/JSON.parse response))] + (auth-notifications jsonobj) + (dommy/set-html! (dommy/sel1 :#modify-title) (get jsonobj "title")) + (dommy/set-html! (dommy/sel1 :#modify-body) (generic-component-add-modify jsonobj)) + (.modal (jquery "#modify")))) - ;; (defn ~(symbol (namespace ::x) (str "render-" component "-add")) [] - ;; (ajax.core/POST ~(str "/resume/" component "/add") - ;; {:handler ~(symbol (namespace ::x) (str "handler-" component "-add"))})) + (defn ~(symbol (namespace ::x) (str "render-" component "-add")) [] + (ajax.core/POST ~(str "/resume/" component "/add") + {:handler ~(symbol (namespace ::x) (str "handler-" component "-add"))})) - ;; (defn ~(symbol (namespace ::x) (str "on-" component "-add-submit-clicked")) [] - ;; (when (-> (jquery ~(str "#" component "-add-form")) - ;; (.get "0") - ;; (.checkValidity)) - ;; (.modal (jquery "#modify") "hide") - ;; (~(symbol (namespace ::x) (str "render-" component "-add-submit"))))) + (defn ~(symbol (namespace ::x) (str "on-" component "-add-submit-clicked")) [] + (when (-> (jquery ~(str "#" component "-add-form")) + (.get "0") + (.checkValidity)) + (.modal (jquery "#modify") "hide") + (~(symbol (namespace ::x) (str "render-" component "-add-submit"))))) - ;; (defn ~(symbol (namespace ::x) (str "handler-" component "-add-submit")) [response] - ;; (let [jsonobj (js->clj (js/JSON.parse response))] - ;; (auth-notifications jsonobj) - ;; (on-menu-clicked ~(str "/resume/" component)))) + (defn ~(symbol (namespace ::x) (str "handler-" component "-add-submit")) [response] + (let [jsonobj (js->clj (js/JSON.parse response))] + (auth-notifications jsonobj) + (on-menu-clicked ~(str "/resume/" component)))) - ;; (defn ~(symbol (namespace ::x) (str "render-" component "-add-submit")) [] - ;; (ajax.core/POST ~(str "/resume/" component "/add/submit") - ;; {:format :raw - ;; :params (form-fields-to-map ~(str "#" component "-add-form :input")) - ;; :handler ~(symbol (namespace ::x) (str "handler-" component "-add-submit"))})) + (defn ~(symbol (namespace ::x) (str "render-" component "-add-submit")) [] + (ajax.core/POST ~(str "/resume/" component "/add/submit") + {:format :raw + :params (form-fields-to-map ~(str "#" component "-add-form :input")) + :handler ~(symbol (namespace ::x) (str "handler-" component "-add-submit"))})) - ;; (defn ~(symbol (namespace ::x) (str "on-" component "-modify-clicked")) [id] - ;; (~(symbol (namespace ::x) (str "render-" component "-modify")) id)) + (defn ~(symbol (namespace ::x) (str "on-" component "-modify-clicked")) [id] + (~(symbol (namespace ::x) (str "render-" component "-modify")) id)) - ;; (defn ~(symbol (namespace ::x) (str "handler-" component "-modify")) [response] - ;; (let [jsonobj (js->clj (js/JSON.parse response))] - ;; (auth-notifications jsonobj) - ;; (dommy/set-html! (dommy/sel1 :#modify-title) (get jsonobj "title")) - ;; (dommy/set-html! (dommy/sel1 :#modify-body) (generic-component-add-modify jsonobj)) - ;; (.modal (jquery "#modify")))) + (defn ~(symbol (namespace ::x) (str "handler-" component "-modify")) [response] + (let [jsonobj (js->clj (js/JSON.parse response))] + (auth-notifications jsonobj) + (dommy/set-html! (dommy/sel1 :#modify-title) (get jsonobj "title")) + (dommy/set-html! (dommy/sel1 :#modify-body) (generic-component-add-modify jsonobj)) + (.modal (jquery "#modify")))) - ;; (defn ~(symbol (namespace ::x) (str "render-" component "-modify")) [id] - ;; (ajax.core/POST ~(str "/resume/" component "/modify") - ;; {:format :raw - ;; :params {:id id} - ;; :handler ~(symbol (namespace ::x) (str "handler-" component "-modify"))})) + (defn ~(symbol (namespace ::x) (str "render-" component "-modify")) [id] + (ajax.core/POST ~(str "/resume/" component "/modify") + {:format :raw + :params {:id id} + :handler ~(symbol (namespace ::x) (str "handler-" component "-modify"))})) - ;; (defn ~(symbol (namespace ::x) (str "on-" component "-modify-submit-clicked")) [id] - ;; (when (-> (jquery ~(str "#" component "-modify-form")) - ;; (.get "0") - ;; (.checkValidity)) - ;; (.modal (jquery "#modify") "hide") - ;; (~(symbol (namespace ::x) (str "render-" component "-modify-submit")) id))) + (defn ~(symbol (namespace ::x) (str "on-" component "-modify-submit-clicked")) [] + (when (-> (jquery ~(str "#" component "-modify-form")) + (.get "0") + (.checkValidity)) + (.modal (jquery "#modify") "hide") + (~(symbol (namespace ::x) (str "render-" component "-modify-submit"))))) - ;; (defn ~(symbol (namespace ::x) (str "handler-" component "-modify-submit")) [response] - ;; (let [jsonobj (js->clj (js/JSON.parse response))] - ;; (auth-notifications jsonobj) - ;; (on-menu-clicked ~(str "/resume/" component)))) + (defn ~(symbol (namespace ::x) (str "handler-" component "-modify-submit")) [response] + (let [jsonobj (js->clj (js/JSON.parse response))] + (auth-notifications jsonobj) + (on-menu-clicked ~(str "/resume/" component)))) - ;; (defn ~(symbol (namespace ::x) (str "render-" component "-modify-submit")) [id] - ;; (ajax.core/POST ~(str "/resume/" component "/modify/submit") - ;; {:format :raw - ;; :params (form-fields-to-map ~(str "#" component "-modify-form :input")) - ;; :handler ~(symbol (namespace ::x) (str "handler-" component "-modify-submit"))})) + (defn ~(symbol (namespace ::x) (str "render-" component "-modify-submit")) [] + (ajax.core/POST ~(str "/resume/" component "/modify/submit") + {:format :raw + :params (form-fields-to-map ~(str "#" component "-modify-form :input")) + :handler ~(symbol (namespace ::x) (str "handler-" component "-modify-submit"))})) - ;; (defn ~(symbol (namespace ::x) (str "on-" component" -delete-clicked")) [id] - ;; (when (js/confirm (str "Are you sure you want to delete " id "? This action cannot be undone.")) - ;; (~(symbol (namespace ::x) (str "render-" component "-delete")) id))) + (defn ~(symbol (namespace ::x) (str "on-" component" -delete-clicked")) [id] + (when (js/confirm (str "Are you sure you want to delete " id "? This action cannot be undone.")) + (~(symbol (namespace ::x) (str "render-" component "-delete")) id))) - ;; (defn ~(symbol (namespace ::x) (str "handler-" component "-delete")) [response] - ;; (let [jsonobj (js->clj (js/JSON.parse response))] - ;; (auth-notifications jsonobj) - ;; (on-menu-clicked ~(str "/resume/" component)))) + (defn ~(symbol (namespace ::x) (str "handler-" component "-delete")) [response] + (let [jsonobj (js->clj (js/JSON.parse response))] + (auth-notifications jsonobj) + (on-menu-clicked ~(str "/resume/" component)))) - ;; (defn ~(symbol (namespace ::x) (str "render-" component "-delete")) [id] - ;; (ajax.core/DELETE (str "/resume/" ~component "/delete/" id) - ;; {:format :raw - ;; :handler ~(symbol (namespace ::x) (str "handler-" component "-delete"))})))) + (defn ~(symbol (namespace ::x) (str "render-" component "-delete")) [id] + (ajax.core/DELETE (str "/resume/" ~component "/delete/" id) + {:format :raw + :handler ~(symbol (namespace ::x) (str "handler-" component "-delete"))})))) diff --git a/lisp/webapps/resume/clojurescript/resume/src/resume/core.cljs b/lisp/webapps/resume/clojurescript/resume/src/resume/core.cljs index 833039f..b2274fd 100644 --- a/lisp/webapps/resume/clojurescript/resume/src/resume/core.cljs +++ b/lisp/webapps/resume/clojurescript/resume/src/resume/core.cljs @@ -1327,7 +1327,7 @@ ;; contactinfo -(define-resume-component "contactinfo") +;;(define-resume-component "contactinfo") ;; (hiccups/defhtml template-contactinfo [jsonobj] ;; [:h3 {:style "text-align: center"} (get jsonobj "title")] |