summaryrefslogtreecommitdiff
path: root/lisp/webapps
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/webapps')
-rw-r--r--lisp/webapps/resume/clojurescript/resume/src/core.cljs33
-rw-r--r--lisp/webapps/resume/site.lisp112
2 files changed, 17 insertions, 128 deletions
diff --git a/lisp/webapps/resume/clojurescript/resume/src/core.cljs b/lisp/webapps/resume/clojurescript/resume/src/core.cljs
index 036e866..0a3e6c2 100644
--- a/lisp/webapps/resume/clojurescript/resume/src/core.cljs
+++ b/lisp/webapps/resume/clojurescript/resume/src/core.cljs
@@ -1525,7 +1525,7 @@
[:th {:scope "col"} "Mod"]
[:th {:scope "col"} "Del"]]]
[:tbody
- (for [education (get jsonobj "educations")]
+ (for [education (get jsonobj "components")]
[:tr
[:td (get education "school")]
[:td (get education "start_date")]
@@ -1615,22 +1615,22 @@
;; education-modify-submit
-(defn on-education-modify-submit-clicked []
+(defn on-education-modify-submit-clicked [id]
(when (-> (jquery "#education-modify-form")
(.get "0")
(.checkValidity))
(.modal (jquery "#modify") "hide")
- (render-education-modify-submit)))
+ (render-education-modify-submit id)))
(defn handler-education-modify-submit [response]
(let [jsonobj (js->clj (js/JSON.parse response))]
(auth-notifications jsonobj)
(on-menu-clicked "/resume/education")))
-(defn render-education-modify-submit []
+(defn render-education-modify-submit [id]
(POST "/resume/education/modify/submit"
{:format :raw
- :params {:id (dommy/value (dommy/sel1 :#id))
+ :params {:id id
:school (dommy/value (dommy/sel1 :#school))
:major (dommy/value (dommy/sel1 :#major))
:minor (dommy/value (dommy/sel1 :#minor))
@@ -1711,7 +1711,7 @@
[:th {:scope "col"} "Mod"]
[:th {:scope "col"} "Del"]]]
[:tbody
- (for [language (get jsonobj "languages")]
+ (for [language (get jsonobj "components")]
[:tr
[:td (get language "name")]
[:td (get language "understanding_listening")]
@@ -1799,22 +1799,22 @@
;; language-modify-submit
-(defn on-language-modify-submit-clicked []
+(defn on-language-modify-submit-clicked [id]
(when (-> (jquery "#language-modify-form")
(.get "0")
(.checkValidity))
(.modal (jquery "#modify") "hide")
- (render-language-modify-submit)))
+ (render-language-modify-submit id)))
(defn handler-language-modify-submit [response]
(let [jsonobj (js->clj (js/JSON.parse response))]
(auth-notifications jsonobj)
(on-menu-clicked "/resume/language")))
-(defn render-language-modify-submit []
+(defn render-language-modify-submit [id]
(POST "/resume/language/modify/submit"
{:format :raw
- :params {:id (dommy/value (dommy/sel1 :#id))
+ :params {:id id
:name (dommy/value (dommy/sel1 :#name))
:understanding_listening (dommy/value (dommy/sel1 :#understanding_listening))
:understanding_reading (dommy/value (dommy/sel1 :#understanding_reading))
@@ -1889,7 +1889,7 @@
[:th {:scope "col"} "Mod"]
[:th {:scope "col"} "Del"]]]
[:tbody
- (for [skill (get jsonobj "skills")]
+ (for [skill (get jsonobj "components")]
[:tr
[:td (get skill "skill")]
[:td {:width "30"}
@@ -1967,22 +1967,22 @@
;; skill-modify-submit
-(defn on-skill-modify-submit-clicked []
+(defn on-skill-modify-submit-clicked [id]
(when (-> (jquery "#skill-modify-form")
(.get "0")
(.checkValidity))
(.modal (jquery "#modify") "hide")
- (render-skill-modify-submit)))
+ (render-skill-modify-submit id)))
(defn handler-skill-modify-submit [response]
(let [jsonobj (js->clj (js/JSON.parse response))]
(auth-notifications jsonobj)
(on-menu-clicked "/resume/skill")))
-(defn render-skill-modify-submit []
+(defn render-skill-modify-submit [id]
(POST "/resume/skill/modify/submit"
{:format :raw
- :params {:id (dommy/value (dommy/sel1 :#id))
+ :params {:id id
:skill (dommy/value (dommy/sel1 :#skill))}
:handler handler-skill-modify-submit}))
@@ -2019,7 +2019,8 @@
(= handler "/resume/contactinfo") (render-contactinfo)
(= handler "/resume/education") (render-education)
(= handler "/resume/language") (render-language)
- (= handler "/resume/skill") (render-skill)))
+ (= handler "/resume/skill") (render-skill)
+ (= handler "/resume/job") (render-job)))
(defn handler-location [response]
(let [jsonobj (js->clj (js/JSON.parse response))]
diff --git a/lisp/webapps/resume/site.lisp b/lisp/webapps/resume/site.lisp
index 8ebce16..1a1c7a7 100644
--- a/lisp/webapps/resume/site.lisp
+++ b/lisp/webapps/resume/site.lisp
@@ -129,90 +129,6 @@
(defmacro .resume-delete ()
`(resume-delete-json id))
-;; (defmacro .contactinfo ()
-;; `(contactinfo-json))
-
-;; (defmacro .contactinfo-view ()
-;; `(contactinfo-view-json))
-
-;; (defmacro .contactinfo-add ()
-;; `(contactinfo-add-json))
-
-;; (defmacro .contactinfo-add-submit ()
-;; `(contactinfo-add-submit-json address city state_id phone email visastatus_id))
-
-;; (defmacro .contactinfo-modify ()
-;; `(contactinfo-modify-json id))
-
-;; (defmacro .contactinfo-modify-submit ()
-;; `(contactinfo-modify-submit-json id address city state_id phone email visastatus_id))
-
-;; (defmacro .contactinfo-delete ()
-;; `(contactinfo-delete-json id))
-
-;; (defmacro .education ()
-;; `(education-json))
-
-;; (defmacro .education-view ()
-;; `(education-view-json))
-
-;; (defmacro .education-add ()
-;; `(education-add-json))
-
-;; (defmacro .education-add-submit ()
-;; `(education-add-submit-json school major minor degree progress start_date end_date))
-
-;; (defmacro .education-modify ()
-;; `(education-modify-json id))
-
-;; (defmacro .education-modify-submit ()
-;; `(education-modify-submit-json id school major minor degree progress start_date end_date))
-
-;; (defmacro .education-delete ()
-;; `(education-delete-json id))
-
-;; (defmacro .language ()
-;; `(language-json))
-
-;; (defmacro .language-view ()
-;; `(language-view-json))
-
-;; (defmacro .language-add ()
-;; `(language-add-json))
-
-;; (defmacro .language-add-submit ()
-;; `(language-add-submit-json name understanding_listening understanding_reading speaking_interaction speaking_production writing))
-
-;; (defmacro .language-modify ()
-;; `(language-modify-json id))
-
-;; (defmacro .language-modify-submit ()
-;; `(language-modify-submit-json id name understanding_listening understanding_reading speaking_interaction speaking_production writing))
-
-;; (defmacro .language-delete ()
-;; `(language-delete-json id))
-
-;; (defmacro .skill ()
-;; `(skill-json))
-
-;; (defmacro .skill-view ()
-;; `(skill-view-json))
-
-;; (defmacro .skill-add ()
-;; `(skill-add-json))
-
-;; (defmacro .skill-add-submit ()
-;; `(skill-add-submit-json skill))
-
-;; (defmacro .skill-modify ()
-;; `(skill-modify-json id))
-
-;; (defmacro .skill-modify-submit ()
-;; `(skill-modify-submit-json id skill))
-
-;; (defmacro .skill-delete ()
-;; `(skill-delete-json id))
-
(define-endpoint ("/location" :method :post) (&post (location :parameter-type 'string)) .location)
(define-endpoint ("/home" :method :get) () .home-get)
(define-endpoint ("/home" :method :post) (&post (message :parameter-type 'string) (errormsg :parameter-type 'string)) .home-post)
@@ -256,31 +172,3 @@
(define-endpoint ("/resume/modify" :method :post) (&post (id :parameter-type 'integer)) .resume-modify)
(define-endpoint ("/resume/modify/submit" :method :post) (&post (id :parameter-type 'integer) (name :parameter-type 'string)) .resume-modify-submit)
(define-endpoint ("/resume/delete/:id" :method :delete) (&path (id 'integer)) .resume-delete)
-;; (define-endpoint ("/resume/contactinfo" :method :get) () .contactinfo)
-;; (define-endpoint ("/resume/contactinfo/view" :method :get) () .contactinfo-view)
-;; (define-endpoint ("/resume/contactinfo/add" :method :post) () .contactinfo-add)
-;; (define-endpoint ("/resume/contactinfo/add/submit" :method :post) (&post (address :parameter-type 'string) (city :parameter-type 'string) (state_id :parameter-type 'integer) (phone :parameter-type 'string) (email :parameter-type 'string) (visastatus_id :parameter-type 'integer)) .contactinfo-add-submit)
-;; (define-endpoint ("/resume/contactinfo/modify" :method :post) (&post (id :parameter-type 'integer)) .contactinfo-modify)
-;; (define-endpoint ("/resume/contactinfo/modify/submit" :method :post) (&post (id :parameter-type 'integer) (address :parameter-type 'string) (city :parameter-type 'string) (state_id :parameter-type 'integer) (phone :parameter-type 'string) (email :parameter-type 'string) (visastatus_id :parameter-type 'integer)) .contactinfo-modify-submit)
-;; (define-endpoint ("/resume/contactinfo/delete/:id" :method :delete) (&path (id 'integer)) .contactinfo-delete)
-;; (define-endpoint ("/resume/education" :method :get) () .education)
-;; (define-endpoint ("/resume/education/view" :method :get) () .education-view)
-;; (define-endpoint ("/resume/education/add" :method :post) () .education-add)
-;; (define-endpoint ("/resume/education/add/submit" :method :post) (&post (school :parameter-type 'string) (major :parameter-type 'string) (minor :parameter-type 'string) (degree :parameter-type 'string) (progress :parameter-type 'string) (start_date :parameter-type 'string) (end_date :parameter-type 'string)) .education-add-submit)
-;; (define-endpoint ("/resume/education/modify" :method :post) (&post (id :parameter-type 'integer)) .education-modify)
-;; (define-endpoint ("/resume/education/modify/submit" :method :post) (&post (id :parameter-type 'integer) (school :parameter-type 'string) (major :parameter-type 'string) (minor :parameter-type 'string) (degree :parameter-type 'string) (progress :parameter-type 'string) (start_date :parameter-type 'string) (end_date :parameter-type 'string)) .education-modify-submit)
-;; (define-endpoint ("/resume/education/delete/:id" :method :delete) (&path (id 'integer)) .education-delete)
-;; (define-endpoint ("/resume/language" :method :get) () .language)
-;; (define-endpoint ("/resume/language/view" :method :get) () .language-view)
-;; (define-endpoint ("/resume/language/add" :method :post) () .language-add)
-;; (define-endpoint ("/resume/language/add/submit" :method :post) (&post (name :parameter-type 'string) (understanding_listening :parameter-type 'string) (understanding_reading :parameter-type 'string) (speaking_interaction :parameter-type 'string) (speaking_production :parameter-type 'string) (writing :parameter-type 'string)) .language-add-submit)
-;; (define-endpoint ("/resume/language/modify" :method :post) (&post (id :parameter-type 'integer)) .language-modify)
-;; (define-endpoint ("/resume/language/modify/submit" :method :post) (&post (id :parameter-type 'integer) (name :parameter-type 'string) (understanding_listening :parameter-type 'string) (understanding_reading :parameter-type 'string) (speaking_interaction :parameter-type 'string) (speaking_production :parameter-type 'string) (writing :parameter-type 'string)) .language-modify-submit)
-;; (define-endpoint ("/resume/language/delete/:id" :method :delete) (&path (id 'integer)) .language-delete)
-;; (define-endpoint ("/resume/skill" :method :get) () .skill)
-;; (define-endpoint ("/resume/skill/view" :method :get) () .skill-view)
-;; (define-endpoint ("/resume/skill/add" :method :post) () .skill-add)
-;; (define-endpoint ("/resume/skill/add/submit" :method :post) (&post (skill :parameter-type 'string)) .skill-add-submit)
-;; (define-endpoint ("/resume/skill/modify" :method :post) (&post (id :parameter-type 'integer)) .skill-modify)
-;; (define-endpoint ("/resume/skill/modify/submit" :method :post) (&post (id :parameter-type 'integer) (skill :parameter-type 'string)) .skill-modify-submit)
-;; (define-endpoint ("/resume/skill/delete/:id" :method :delete) (&path (id 'integer)) .skill-delete)