stuff

2 files changed, 373 insertions, 158 deletions

diff --git a/lisp/webapps/resume/clojurescript/resume/src/core.cljs b/lisp/webapps/resume/clojurescript/resume/src/core.cljs
index 532a52b..6f21e53 100644
--- a/lisp/webapps/resume/clojurescript/resume/src/core.cljs
+++ b/lisp/webapps/resume/clojurescript/resume/src/core.cljs
@@ -126,29 +126,29 @@
 (declare on-users-delete-clicked)
 (declare handler-users-delete)
 (declare render-users-delete)
-(declare template-resumes)
-(declare handler-resumes)
-(declare render-resumes)
-(declare template-resumes-view)
-(declare handler-resumes-view)
-(declare render-resumes-view)
-(declare on-resumes-add-clicked)
-(declare template-resumes-add)
-(declare handler-resumes-add)
-(declare render-resumes-add)
-(declare on-resumes-add-submit-clicked)
-(declare handler-resumes-add-submit)
-(declare render-resumes-add-submit)
-(declare on-resumes-modify-clicked)
-(declare template-resumes-modify)
-(declare handler-resumes-modify)
-(declare render-resumes-modify)
-(declare on-resumes-modify-submit-clicked)
-(declare handler-resumes-modify-submit)
-(declare render-resumes-modify-submit)
-(declare on-resumes-delete-clicked)
-(declare handler-resumes-delete)
-(declare render-resumes-delete)
+(declare template-resume)
+(declare handler-resume)
+(declare render-resume)
+(declare template-resume-view)
+(declare handler-resume-view)
+(declare render-resume-view)
+(declare on-resume-add-clicked)
+(declare template-resume-add)
+(declare handler-resume-add)
+(declare render-resume-add)
+(declare on-resume-add-submit-clicked)
+(declare handler-resume-add-submit)
+(declare render-resume-add-submit)
+(declare on-resume-modify-clicked)
+(declare template-resume-modify)
+(declare handler-resume-modify)
+(declare render-resume-modify)
+(declare on-resume-modify-submit-clicked)
+(declare handler-resume-modify-submit)
+(declare render-resume-modify-submit)
+(declare on-resume-delete-clicked)
+(declare handler-resume-delete)
+(declare render-resume-delete)
 (declare template-contactinfo)
 (declare handler-contactinfo)
 (declare render-contactinfo)
@@ -218,6 +218,29 @@
 (declare on-language-delete-clicked)
 (declare handler-language-delete)
 (declare render-language-delete)
+(declare template-skill)
+(declare handler-skill)
+(declare render-skill)
+(declare template-skill-view)
+(declare handler-skill-view)
+(declare render-skill-view)
+(declare on-skill-add-clicked)
+(declare template-skill-add)
+(declare handler-skill-add)
+(declare render-skill-add)
+(declare on-skill-add-submit-clicked)
+(declare handler-skill-add-submit)
+(declare render-skill-add-submit)
+(declare on-skill-modify-clicked)
+(declare template-skill-modify)
+(declare handler-skill-modify)
+(declare render-skill-modify)
+(declare on-skill-modify-submit-clicked)
+(declare handler-skill-modify-submit)
+(declare render-skill-modify-submit)
+(declare on-skill-delete-clicked)
+(declare handler-skill-delete)
+(declare render-skill-delete)
 (declare on-menu-clicked)
 (declare handler-location)
 (declare goto-location)
@@ -1096,9 +1119,9 @@
           {:format :raw
            :handler handler-users-delete}))
 
-;; resumes
+;; resume
 
-(hiccups/defhtml template-resumes [jsonobj]
+(hiccups/defhtml template-resume [jsonobj]
   [:h3 {:style "text-align: center"} (get jsonobj "title")]
   [:div {:id "content"}]
   [:div {:id "modify"
@@ -1123,22 +1146,22 @@
        [:span {:class "glyphicon glyphicon-remove"}]
        "Cancel"]]]]])
 
-(defn handler-resumes [response]
+(defn handler-resume [response]
   (let [jsonobj (js->clj (js/JSON.parse response))]
     (notifications jsonobj)
-    (dommy/set-html! (dommy/sel1 :#body) (template-resumes jsonobj))
-    (render-resumes-view)))
+    (dommy/set-html! (dommy/sel1 :#body) (template-resume jsonobj))
+    (render-resume-view)))
 
-(defn render-resumes []
-  (GET "/resumes" {:handler handler-resumes}))
+(defn render-resume []
+  (GET "/resume" {:handler handler-resume}))
 
-;; resumes-view
+;; resume-view
 
-(hiccups/defhtml template-resumes-view [jsonobj]
+(hiccups/defhtml template-resume-view [jsonobj]
   [:div {:style "text-align: right"}
    [:img {:src "/static/images/add.png"
           :style "cursor:pointer; cursor:hand"
-          :onclick (str (namespace ::x) ".on_resumes_add_clicked()")}]]
+          :onclick (str (namespace ::x) ".on_resume_add_clicked()")}]]
   [:table {:class "table table-striped table-hover table-sm"}
    [:thead
     [:tr
@@ -1151,113 +1174,113 @@
        [:td (get resume "name")]
        [:td {:width "30"}
         [:img {:src "/static/images/modify.png"
-               :onclick (str (namespace ::x) ".on_resumes_modify_clicked(" (get resume "id") ")")}]]
+               :onclick (str (namespace ::x) ".on_resume_modify_clicked(" (get resume "id") ")")}]]
        [:td {:width "30"}
         [:img {:src "/static/images/delete.png"
-               :onclick (str (namespace ::x) ".on_resumes_delete_clicked(" (get resume "id") ", '" (get resume "name") "')")}]]])]])
+               :onclick (str (namespace ::x) ".on_resume_delete_clicked(" (get resume "id") ", '" (get resume "name") "')")}]]])]])
 
-(defn handler-resumes-view [response]
+(defn handler-resume-view [response]
   (let [jsonobj (js->clj (js/JSON.parse response))]
-    (dommy/set-html! (dommy/sel1 :#content) (template-resumes-view jsonobj))))
+    (dommy/set-html! (dommy/sel1 :#content) (template-resume-view jsonobj))))
 
-(defn render-resumes-view []
-  (GET "/resumes/view" {:handler handler-resumes-view}))
+(defn render-resume-view []
+  (GET "/resume/view" {:handler handler-resume-view}))
 
-;; resumes-add
+;; resume-add
 
-(defn on-resumes-add-clicked []
-  (render-resumes-add))
+(defn on-resume-add-clicked []
+  (render-resume-add))
 
-(hiccups/defhtml template-resumes-add [jsonobj]
+(hiccups/defhtml template-resume-add [jsonobj]
   (ck-form/template-generic-form (get jsonobj "form") (namespace ::x)))
 
-(defn handler-resumes-add [response]
+(defn handler-resume-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) (template-resumes-add jsonobj))
+    (dommy/set-html! (dommy/sel1 :#modify-body) (template-resume-add jsonobj))
     (.modal (jquery "#modify"))))
 
-(defn render-resumes-add []
-  (POST "/resumes/add" {:handler handler-resumes-add}))
+(defn render-resume-add []
+  (POST "/resume/add" {:handler handler-resume-add}))
 
-;; resumes-add-submit
+;; resume-add-submit
 
-(defn on-resumes-add-submit-clicked []
-  (when (-> (jquery "#resumes-add-form")
+(defn on-resume-add-submit-clicked []
+  (when (-> (jquery "#resume-add-form")
             (.get "0")
             (.checkValidity))
     (.modal (jquery "#modify") "hide")
-    (render-resumes-add-submit)))
+    (render-resume-add-submit)))
 
-(defn handler-resumes-add-submit [response]
+(defn handler-resume-add-submit [response]
   (let [jsonobj (js->clj (js/JSON.parse response))]
     (auth-notifications jsonobj)
-    (on-menu-clicked "/resumes")))
+    (on-menu-clicked "/resume")))
 
-(defn render-resumes-add-submit []
-  (POST "/resumes/add/submit"
+(defn render-resume-add-submit []
+  (POST "/resume/add/submit"
         {:format :raw
          :params {:name (dommy/value (dommy/sel1 :#name))}
-         :handler handler-resumes-add-submit}))
+         :handler handler-resume-add-submit}))
 
-;; resumes-modify
+;; resume-modify
 
-(defn on-resumes-modify-clicked [id]
-  (render-resumes-modify id))
+(defn on-resume-modify-clicked [id]
+  (render-resume-modify id))
 
-(hiccups/defhtml template-resumes-modify [jsonobj]
+(hiccups/defhtml template-resume-modify [jsonobj]
   (ck-form/template-generic-form (get jsonobj "form") (namespace ::x)))
 
-(defn handler-resumes-modify [response]
+(defn handler-resume-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) (template-resumes-modify jsonobj))
+    (dommy/set-html! (dommy/sel1 :#modify-body) (template-resume-modify jsonobj))
     (.modal (jquery "#modify"))))
 
-(defn render-resumes-modify [id]
-  (POST "/resumes/modify"
+(defn render-resume-modify [id]
+  (POST "/resume/modify"
         {:format :raw
          :params {:id id}
-         :handler handler-resumes-modify}))
+         :handler handler-resume-modify}))
 
-;; resumes-modify-submit
+;; resume-modify-submit
 
-(defn on-resumes-modify-submit-clicked []
-  (when (-> (jquery "#resumes-modify-form")
+(defn on-resume-modify-submit-clicked []
+  (when (-> (jquery "#resume-modify-form")
             (.get "0")
             (.checkValidity))
     (.modal (jquery "#modify") "hide")
-    (render-resumes-modify-submit)))
+    (render-resume-modify-submit)))
 
-(defn handler-resumes-modify-submit [response]
+(defn handler-resume-modify-submit [response]
   (let [jsonobj (js->clj (js/JSON.parse response))]
     (auth-notifications jsonobj)
-    (on-menu-clicked "/resumes")))
+    (on-menu-clicked "/resume")))
 
-(defn render-resumes-modify-submit []
-  (POST "/resumes/modify/submit"
+(defn render-resume-modify-submit []
+  (POST "/resume/modify/submit"
         {:format :raw
          :params {:id (dommy/value (dommy/sel1 :#id))
                   :name (dommy/value (dommy/sel1 :#name))}
-         :handler handler-resumes-modify-submit}))
+         :handler handler-resume-modify-submit}))
 
-;; resumes-delete
+;; resume-delete
 
-(defn on-resumes-delete-clicked [id name]
+(defn on-resume-delete-clicked [id name]
   (when (js/confirm (str "Are you sure you want to delete " name  "? This action cannot be undone."))
-    (render-resumes-delete id)))
+    (render-resume-delete id)))
 
-(defn handler-resumes-delete [response]
+(defn handler-resume-delete [response]
   (let [jsonobj (js->clj (js/JSON.parse response))]
     (auth-notifications jsonobj)
-    (on-menu-clicked "/resumes")))
+    (on-menu-clicked "/resume")))
 
-(defn render-resumes-delete [id]
-  (DELETE (str "/resumes/delete/" id)
+(defn render-resume-delete [id]
+  (DELETE (str "/resume/delete/" id)
           {:format :raw
-           :handler handler-resumes-delete}))
+           :handler handler-resume-delete}))
 
 ;; contactinfo
 
@@ -1293,7 +1316,7 @@
     (render-contactinfo-view)))
 
 (defn render-contactinfo []
-  (GET "/resumes/contactinfo" {:handler handler-contactinfo}))
+  (GET "/resume/contactinfo" {:handler handler-contactinfo}))
 
 ;; contactinfo-view
 
@@ -1334,7 +1357,7 @@
     (dommy/set-html! (dommy/sel1 :#content) (template-contactinfo-view jsonobj))))
 
 (defn render-contactinfo-view []
-  (GET "/resumes/contactinfo/view" {:handler handler-contactinfo-view}))
+  (GET "/resume/contactinfo/view" {:handler handler-contactinfo-view}))
 
 ;; contactinfo-add
 
@@ -1352,7 +1375,7 @@
     (.modal (jquery "#modify"))))
 
 (defn render-contactinfo-add []
-  (POST "/resumes/contactinfo/add" {:handler handler-contactinfo-add}))
+  (POST "/resume/contactinfo/add" {:handler handler-contactinfo-add}))
 
 ;; contactinfo-add-submit
 
@@ -1366,10 +1389,10 @@
 (defn handler-contactinfo-add-submit [response]
   (let [jsonobj (js->clj (js/JSON.parse response))]
     (auth-notifications jsonobj)
-    (on-menu-clicked "/resumes/contactinfo")))
+    (on-menu-clicked "/resume/contactinfo")))
 
 (defn render-contactinfo-add-submit []
-  (POST "/resumes/contactinfo/add/submit"
+  (POST "/resume/contactinfo/add/submit"
         {:format :raw
          :params {:address (dommy/value (dommy/sel1 :#address))
                   :city (dommy/value (dommy/sel1 :#city))
@@ -1395,7 +1418,7 @@
     (.modal (jquery "#modify"))))
 
 (defn render-contactinfo-modify [id]
-  (POST "/resumes/contactinfo/modify"
+  (POST "/resume/contactinfo/modify"
         {:format :raw
          :params {:id id}
          :handler handler-contactinfo-modify}))
@@ -1412,10 +1435,10 @@
 (defn handler-contactinfo-modify-submit [response]
   (let [jsonobj (js->clj (js/JSON.parse response))]
     (auth-notifications jsonobj)
-    (on-menu-clicked "/resumes/contactinfo")))
+    (on-menu-clicked "/resume/contactinfo")))
 
 (defn render-contactinfo-modify-submit []
-  (POST "/resumes/contactinfo/modify/submit"
+  (POST "/resume/contactinfo/modify/submit"
         {:format :raw
          :params {:id (dommy/value (dommy/sel1 :#id))
                   :address (dommy/value (dommy/sel1 :#address))
@@ -1435,10 +1458,10 @@
 (defn handler-contactinfo-delete [response]
   (let [jsonobj (js->clj (js/JSON.parse response))]
     (auth-notifications jsonobj)
-    (on-menu-clicked "/resumes/contactinfo")))
+    (on-menu-clicked "/resume/contactinfo")))
 
 (defn render-contactinfo-delete [id]
-  (DELETE (str "/resumes/contactinfo/delete/" id)
+  (DELETE (str "/resume/contactinfo/delete/" id)
           {:format :raw
            :handler handler-contactinfo-delete}))
 
@@ -1476,7 +1499,7 @@
     (render-education-view)))
 
 (defn render-education []
-  (GET "/resumes/education" {:handler handler-education}))
+  (GET "/resume/education" {:handler handler-education}))
 
 ;; education-view
 
@@ -1519,7 +1542,7 @@
     (dommy/set-html! (dommy/sel1 :#content) (template-education-view jsonobj))))
 
 (defn render-education-view []
-  (GET "/resumes/education/view" {:handler handler-education-view}))
+  (GET "/resume/education/view" {:handler handler-education-view}))
 
 ;; education-add
 
@@ -1537,7 +1560,7 @@
     (.modal (jquery "#modify"))))
 
 (defn render-education-add []
-  (POST "/resumes/education/add" {:handler handler-education-add}))
+  (POST "/resume/education/add" {:handler handler-education-add}))
 
 ;; education-add-submit
 
@@ -1551,10 +1574,10 @@
 (defn handler-education-add-submit [response]
   (let [jsonobj (js->clj (js/JSON.parse response))]
     (auth-notifications jsonobj)
-    (on-menu-clicked "/resumes/education")))
+    (on-menu-clicked "/resume/education")))
 
 (defn render-education-add-submit []
-  (POST "/resumes/education/add/submit"
+  (POST "/resume/education/add/submit"
         {:format :raw
          :params {:school (dommy/value (dommy/sel1 :#school))
                   :major (dommy/value (dommy/sel1 :#major))
@@ -1581,7 +1604,7 @@
     (.modal (jquery "#modify"))))
 
 (defn render-education-modify [id]
-  (POST "/resumes/education/modify"
+  (POST "/resume/education/modify"
         {:format :raw
          :params {:id id}
          :handler handler-education-modify}))
@@ -1598,10 +1621,10 @@
 (defn handler-education-modify-submit [response]
   (let [jsonobj (js->clj (js/JSON.parse response))]
     (auth-notifications jsonobj)
-    (on-menu-clicked "/resumes/education")))
+    (on-menu-clicked "/resume/education")))
 
 (defn render-education-modify-submit []
-  (POST "/resumes/education/modify/submit"
+  (POST "/resume/education/modify/submit"
         {:format :raw
          :params {:id (dommy/value (dommy/sel1 :#id))
                   :school (dommy/value (dommy/sel1 :#school))
@@ -1622,10 +1645,10 @@
 (defn handler-education-delete [response]
   (let [jsonobj (js->clj (js/JSON.parse response))]
     (auth-notifications jsonobj)
-    (on-menu-clicked "/resumes/education")))
+    (on-menu-clicked "/resume/education")))
 
 (defn render-education-delete [id]
-  (DELETE (str "/resumes/education/delete/" id)
+  (DELETE (str "/resume/education/delete/" id)
           {:format :raw
            :handler handler-education-delete}))
 
@@ -1663,7 +1686,7 @@
     (render-language-view)))
 
 (defn render-language []
-  (GET "/resumes/language" {:handler handler-language}))
+  (GET "/resume/language" {:handler handler-language}))
 
 ;; language-view
 
@@ -1704,7 +1727,7 @@
     (dommy/set-html! (dommy/sel1 :#content) (template-language-view jsonobj))))
 
 (defn render-language-view []
-  (GET "/resumes/language/view" {:handler handler-language-view}))
+  (GET "/resume/language/view" {:handler handler-language-view}))
 
 ;; language-add
 
@@ -1722,7 +1745,7 @@
     (.modal (jquery "#modify"))))
 
 (defn render-language-add []
-  (POST "/resumes/language/add" {:handler handler-language-add}))
+  (POST "/resume/language/add" {:handler handler-language-add}))
 
 ;; language-add-submit
 
@@ -1736,10 +1759,10 @@
 (defn handler-language-add-submit [response]
   (let [jsonobj (js->clj (js/JSON.parse response))]
     (auth-notifications jsonobj)
-    (on-menu-clicked "/resumes/language")))
+    (on-menu-clicked "/resume/language")))
 
 (defn render-language-add-submit []
-  (POST "/resumes/language/add/submit"
+  (POST "/resume/language/add/submit"
         {:format :raw
          :params {:name (dommy/value (dommy/sel1 :#name))
                   :understanding_listening (dommy/value (dommy/sel1 :#understanding_listening))
@@ -1765,7 +1788,7 @@
     (.modal (jquery "#modify"))))
 
 (defn render-language-modify [id]
-  (POST "/resumes/language/modify"
+  (POST "/resume/language/modify"
         {:format :raw
          :params {:id id}
          :handler handler-language-modify}))
@@ -1782,10 +1805,10 @@
 (defn handler-language-modify-submit [response]
   (let [jsonobj (js->clj (js/JSON.parse response))]
     (auth-notifications jsonobj)
-    (on-menu-clicked "/resumes/language")))
+    (on-menu-clicked "/resume/language")))
 
 (defn render-language-modify-submit []
-  (POST "/resumes/language/modify/submit"
+  (POST "/resume/language/modify/submit"
         {:format :raw
          :params {:id (dommy/value (dommy/sel1 :#id))
                   :name (dommy/value (dommy/sel1 :#name))
@@ -1805,13 +1828,176 @@
 (defn handler-language-delete [response]
   (let [jsonobj (js->clj (js/JSON.parse response))]
     (auth-notifications jsonobj)
-    (on-menu-clicked "/resumes/language")))
+    (on-menu-clicked "/resume/language")))
 
 (defn render-language-delete [id]
-  (DELETE (str "/resumes/language/delete/" id)
+  (DELETE (str "/resume/language/delete/" id)
           {:format :raw
            :handler handler-language-delete}))
 
+;; skill
+
+(hiccups/defhtml template-skill [jsonobj]
+  [:h3 {:style "text-align: center"} (get jsonobj "title")]
+  [:div {:id "content"}]
+  [:div {:id "modify"
+         :class "modal fade"
+         :role "dialog"
+         :tabindex "-1"}
+   [:div {:class "modal-dialog modal-lg"}
+    [:div {:class "modal-content"}
+     [:div {:class "modal-header"}
+      [:h5 [:span {:id "modify-title"}]]
+      [:button {:type "button"
+                :class "close"
+                :data-dismiss "modal"}
+       "×"]]
+     [:div {:id "modify-body"
+            :class "modal-body"
+            :style "height: 450px;"}]
+     [:div {:class "modal-footer"}
+      [:button {:type "submit"
+                :class "btn btn-danger btn-default"
+                :data-dismiss "modal"}
+       [:span {:class "glyphicon glyphicon-remove"}]
+       "Cancel"]]]]])
+
+(defn handler-skill [response]
+  (let [jsonobj (js->clj (js/JSON.parse response))]
+    (notifications jsonobj)
+    (dommy/set-html! (dommy/sel1 :#body) (template-skill jsonobj))
+    (render-skill-view)))
+
+(defn render-skill []
+  (GET "/resume/skill" {:handler handler-skill}))
+
+;; skill-view
+
+(hiccups/defhtml template-skill-view [jsonobj]
+  [:div {:style "text-align: right"}
+   [:img {:src "/static/images/add.png"
+          :style "cursor:pointer; cursor:hand"
+          :onclick (str (namespace ::x) ".on_skill_add_clicked()")}]]
+  [:table {:class "table table-striped table-hover table-sm"}
+   [:thead
+    [:tr
+     [:th {:scope "col"} "Skill"]
+     [:th {:scope "col"} "Mod"]
+     [:th {:scope "col"} "Del"]]]
+   [:tbody
+    (for [skill (get jsonobj "skills")]
+      [:tr
+       [:td (get skill "skill")]
+       [:td {:width "30"}
+        [:img {:src "/static/images/modify.png"
+               :onclick (str (namespace ::x) ".on_skill_modify_clicked(" (get skill "id") ")")}]]
+       [:td {:width "30"}
+        [:img {:src "/static/images/delete.png"
+               :onclick (str (namespace ::x) ".on_skill_delete_clicked(" (get skill "id") ", '" (get skill "skill") "')")}]]])]])
+
+(defn handler-skill-view [response]
+  (let [jsonobj (js->clj (js/JSON.parse response))]
+    (dommy/set-html! (dommy/sel1 :#content) (template-skill-view jsonobj))))
+
+(defn render-skill-view []
+  (GET "/resume/skill/view" {:handler handler-skill-view}))
+
+;; skill-add
+
+(defn on-skill-add-clicked []
+  (render-skill-add))
+
+(hiccups/defhtml template-skill-add [jsonobj]
+  (ck-form/template-generic-form (get jsonobj "form") (namespace ::x)))
+
+(defn handler-skill-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) (template-skill-add jsonobj))
+    (.modal (jquery "#modify"))))
+
+(defn render-skill-add []
+  (POST "/resume/skill/add" {:handler handler-skill-add}))
+
+;; skill-add-submit
+
+(defn on-skill-add-submit-clicked []
+  (when (-> (jquery "#skill-add-form")
+            (.get "0")
+            (.checkValidity))
+    (.modal (jquery "#modify") "hide")
+    (render-skill-add-submit)))
+
+(defn handler-skill-add-submit [response]
+  (let [jsonobj (js->clj (js/JSON.parse response))]
+    (auth-notifications jsonobj)
+    (on-menu-clicked "/resume/skill")))
+
+(defn render-skill-add-submit []
+  (POST "/resume/skill/add/submit"
+        {:format :raw
+         :params {:skill (dommy/value (dommy/sel1 :#skill))}
+         :handler handler-skill-add-submit}))
+
+;; skill-modify
+
+(defn on-skill-modify-clicked [id]
+  (render-skill-modify id))
+
+(hiccups/defhtml template-skill-modify [jsonobj]
+  (ck-form/template-generic-form (get jsonobj "form") (namespace ::x)))
+
+(defn handler-skill-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) (template-skill-modify jsonobj))
+    (.modal (jquery "#modify"))))
+
+(defn render-skill-modify [id]
+  (POST "/resume/skill/modify"
+        {:format :raw
+         :params {:id id}
+         :handler handler-skill-modify}))
+
+;; skill-modify-submit
+
+(defn on-skill-modify-submit-clicked []
+  (when (-> (jquery "#skill-modify-form")
+            (.get "0")
+            (.checkValidity))
+    (.modal (jquery "#modify") "hide")
+    (render-skill-modify-submit)))
+
+(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 []
+  (POST "/resume/skill/modify/submit"
+        {:format :raw
+         :params {:id (dommy/value (dommy/sel1 :#id))
+                  :skill (dommy/value (dommy/sel1 :#skill))}
+         :handler handler-skill-modify-submit}))
+
+;; skill-delete
+
+(defn on-skill-delete-clicked [id name]
+  (when (js/confirm (str "Are you sure you want to delete " name "? This action cannot be undone."))
+    (render-skill-delete id)))
+
+(defn handler-skill-delete [response]
+  (let [jsonobj (js->clj (js/JSON.parse response))]
+    (auth-notifications jsonobj)
+    (on-menu-clicked "/resume/skill")))
+
+(defn render-skill-delete [id]
+  (DELETE (str "/resume/skill/delete/" id)
+          {:format :raw
+           :handler handler-skill-delete}))
+
 ;; location
 
 (defn on-menu-clicked [handler]
@@ -1825,10 +2011,11 @@
         (= handler "/contact-us") (render-contact-us)
         (= handler "/messages") (render-messages)
         (= handler "/users") (render-users)
-        (= handler "/resumes") (render-resumes)
-        (= handler "/resumes/contactinfo") (render-contactinfo)
-        (= handler "/resumes/education") (render-education)
-        (= handler "/resumes/language") (render-language)))
+        (= handler "/resume") (render-resume)
+        (= handler "/resume/contactinfo") (render-contactinfo)
+        (= handler "/resume/education") (render-education)
+        (= handler "/resume/language") (render-language)
+        (= handler "/resume/skill") (render-skill)))
 
 (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 584c0b7..a8af2d6 100644
--- a/lisp/webapps/resume/site.lisp
+++ b/lisp/webapps/resume/site.lisp
@@ -131,26 +131,26 @@
 (defmacro .users-delete ()
   `(users-delete-json id))
 
-(defmacro .resumes ()
-  `(resumes-json))
+(defmacro .resume ()
+  `(resume-json))
 
-(defmacro .resumes-view ()
-  `(resumes-view-json))
+(defmacro .resume-view ()
+  `(resume-view-json))
 
-(defmacro .resumes-add ()
-  `(resumes-add-json))
+(defmacro .resume-add ()
+  `(resume-add-json))
 
-(defmacro .resumes-add-submit ()
-  `(resumes-add-submit-json name))
+(defmacro .resume-add-submit ()
+  `(resume-add-submit-json name))
 
-(defmacro .resumes-modify ()
-  `(resumes-modify-json id))
+(defmacro .resume-modify ()
+  `(resume-modify-json id))
 
-(defmacro .resumes-modify-submit ()
-  `(resumes-modify-submit-json id name))
+(defmacro .resume-modify-submit ()
+  `(resume-modify-submit-json id name))
 
-(defmacro .resumes-delete ()
-  `(resumes-delete-json id))
+(defmacro .resume-delete ()
+  `(resume-delete-json id))
 
 (defmacro .contactinfo ()
   `(contactinfo-json))
@@ -215,6 +215,27 @@
 (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 ("/" :method :get) () .base)
 (define-endpoint ("/location" :method :post) (&post (location :parameter-type 'string)) .location)
 (define-endpoint ("/home" :method :get) () .home-get)
@@ -252,31 +273,38 @@
 (define-endpoint ("/users/modify/submit" :method :post) (&post (id :parameter-type 'integer) (role_groups :parameter-type 'string) (username :parameter-type 'string) (first_name :parameter-type 'string) (last_name :parameter-type 'string) (email :parameter-type 'string) (phone :parameter-type 'string)) .users-modify-submit)
 (define-endpoint ("/users/toggle-active" :method :post) (&post (id :parameter-type 'integer)) .users-toggle-active)
 (define-endpoint ("/users/delete/:id" :method :delete) (&path (id 'integer)) .users-delete)
-(define-endpoint ("/resumes" :method :get) () .resumes)
-(define-endpoint ("/resumes/view" :method :get) () .resumes-view)
-(define-endpoint ("/resumes/add" :method :post) () .resumes-add)
-(define-endpoint ("/resumes/add/submit" :method :post) (&post (name :parameter-type 'string)) .resumes-add-submit)
-(define-endpoint ("/resumes/modify" :method :post) (&post (id :parameter-type 'integer)) .resumes-modify)
-(define-endpoint ("/resumes/modify/submit" :method :post) (&post (id :parameter-type 'integer) (name :parameter-type 'string)) .resumes-modify-submit)
-(define-endpoint ("/resumes/delete/:id" :method :delete) (&path (id 'integer)) .resumes-delete)
-(define-endpoint ("/resumes/contactinfo" :method :get) () .contactinfo)
-(define-endpoint ("/resumes/contactinfo/view" :method :get) () .contactinfo-view)
-(define-endpoint ("/resumes/contactinfo/add" :method :post) () .contactinfo-add)
-(define-endpoint ("/resumes/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 ("/resumes/contactinfo/modify" :method :post) (&post (id :parameter-type 'integer)) .contactinfo-modify)
-(define-endpoint ("/resumes/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 ("/resumes/contactinfo/delete/:id" :method :delete) (&path (id 'integer)) .contactinfo-delete)
-(define-endpoint ("/resumes/education" :method :get) () .education)
-(define-endpoint ("/resumes/education/view" :method :get) () .education-view)
-(define-endpoint ("/resumes/education/add" :method :post) () .education-add)
-(define-endpoint ("/resumes/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 ("/resumes/education/modify" :method :post) (&post (id :parameter-type 'integer)) .education-modify)
-(define-endpoint ("/resumes/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 ("/resumes/education/delete/:id" :method :delete) (&path (id 'integer)) .education-delete)
-(define-endpoint ("/resumes/language" :method :get) () .language)
-(define-endpoint ("/resumes/language/view" :method :get) () .language-view)
-(define-endpoint ("/resumes/language/add" :method :post) () .language-add)
-(define-endpoint ("/resumes/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 ("/resumes/language/modify" :method :post) (&post (id :parameter-type 'integer)) .language-modify)
-(define-endpoint ("/resumes/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 ("/resumes/language/delete/:id" :method :delete) (&path (id 'integer)) .language-delete)
+(define-endpoint ("/resume" :method :get) () .resume)
+(define-endpoint ("/resume/view" :method :get) () .resume-view)
+(define-endpoint ("/resume/add" :method :post) () .resume-add)
+(define-endpoint ("/resume/add/submit" :method :post) (&post (name :parameter-type 'string)) .resume-add-submit)
+(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)