stuff

4 files changed, 10 insertions, 47 deletions

diff --git a/lisp/resume.asd b/lisp/resume.asd
index 7c7bb44..00d7f9b 100644
--- a/lisp/resume.asd
+++ b/lisp/resume.asd
@@ -29,7 +29,7 @@
   :maintainer "Carlos Konstanski <me@ckons.org>"
   :author "Carlos Konstanski <me@ckons.org>"
   :description "resume"
-  :long-description "resume is a web application written in Common Lisp based on the Hunchentoot web server. The client-side code is written in ClojureScript. Purpose: public website for the Violin and Viola Studio in Pocatello ID."
+  :long-description "resume is a web application written in Common Lisp based on the Hunchentoot web server. The client-side code is written in ClojureScript and React. Purpose: sample code to show of coding skillz masquerading as a resume buliding too."
   :depends-on *all-packages*
   :components ((:module core
                 :components ((:file "core")))
@@ -58,13 +58,11 @@
                              (:file "resume-pkg" :depends-on ("auth-pkg" "contactinfo" "education" "job" "language" "resume" "skill" "states" "visastatus"))))
                (:module service
                 :depends-on (sql)
-                :components ((:file "generics")
-                             (:file "base-service")
+                :components ((:file "base-service")
                              (:file "rest-service" :depends-on ("base-service"))
                              (:file "auth-service" :depends-on ("rest-service"))
                              (:file "generic-form" :depends-on ("rest-service"))
                              (:file "menu-service" :depends-on ("base-service"))
-                             (:file "home-service" :depends-on ("rest-service"))
                              (:file "login-service" :depends-on ("generic-form" "rest-service"))
                              (:file "logout-service" :depends-on ("rest-service"))
                              (:file "profile-service" :depends-on ("generic-form" "auth-service"))
diff --git a/lisp/service/generics.lisp b/lisp/service/generics.lisp
deleted file mode 100644
index caca29b..0000000
--- a/lisp/service/generics.lisp
+++ /dev/null
@@ -1,15 +0,0 @@
-;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
-(declaim (optimize (speed 0) (safety 3) (debug 3)))
-
-(in-package :resume)
-
-(defgeneric copy-from-record (base-service record)
-  (:documentation "Copies the fields from `record' to
-`base-service'."))
-
-(defgeneric copy-to-record (base-service record)
-  (:documentation "Copies the fields from `base-service' to
-`record'."))
-
-(defgeneric sanitize-rest-json (rest-service)
-  (:documentation ""))
diff --git a/lisp/service/home-service.lisp b/lisp/service/home-service.lisp
deleted file mode 100644
index 8e8a740..0000000
--- a/lisp/service/home-service.lisp
+++ /dev/null
@@ -1,18 +0,0 @@
-;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
-(declaim (optimize (speed 0) (safety 3) (debug 3)))
-
-(in-package :resume)
-
-(defclass home-service (rest-service)
-  ((content :initarg :content
-            :initform nil
-            :accessor content))
-  (:documentation ""))
-
-(defmethod initialize-instance :after ((home-service home-service) &key)
-  t)
-
-(defun home-json (&optional message errormsg)
-  (with-noauth (instance home-service)
-    (when (not (org-ckons-core::null-or-empty-p message)) (setf (message instance) message))
-    (when (not (org-ckons-core::null-or-empty-p errormsg)) (setf (errormsg instance) errormsg))))
diff --git a/lisp/webapps/resume/clojurescript/resume/src/resume/core.cljs b/lisp/webapps/resume/clojurescript/resume/src/resume/core.cljs
index ebcfbe8..967ee47 100644
--- a/lisp/webapps/resume/clojurescript/resume/src/resume/core.cljs
+++ b/lisp/webapps/resume/clojurescript/resume/src/resume/core.cljs
@@ -13,8 +13,6 @@
 
 ;; declarations
 
-(declare start-location)
-(declare reset-location)
 (declare reset-login-state)
 (declare reset-profile-state)
 (declare reset-profile-view-state)
@@ -37,10 +35,6 @@
 (declare markdown-to-html)
 (declare reduce-checkboxes)
 (declare form-fields-to-map)
-(declare highlight-row)
-(declare comp-app)
-(declare start-render)
-(declare start)
 (declare notifications)
 (declare auth-notifications)
 (declare comp-menu-main)
@@ -150,7 +144,11 @@
 (declare goto-location)
 (declare goto-register)
 (declare reset-app)
-(declare reset-about-us-category)
+(declare start-location)
+(declare reset-location)
+(declare comp-app)
+(declare start-render)
+(declare start)
 
 (enable-console-print!)
 
@@ -540,11 +538,11 @@
          :params (form-fields-to-map "#password-form :input")
          :handler handler-password-submit}))
 
-;; about-us (home)
+;; about-us
 
 (defn comp-about-us []
   [:div {:style {:display (cond (or (= @location-state "/home")) "block" :else "none")}}
-   [:h3 {:style {:text-align "center"}} (get @login-state "title")
+   [:h3 {:style {:text-align "center"}}
     (cond (= @about-us-category-state "home") "Home")]
    [comp-about-us-view]
    [:div {:id "modify-about-us"
@@ -554,7 +552,7 @@
     [:div {:class "modal-dialog modal-lg"}
      [:div {:class "modal-content"}
       [:div {:class "modal-header"}
-       [:h5 (str (str (cond (= @about-us-category-state "home") "Home") " - Modify"))]
+       [:h5 (str (cond (= @about-us-category-state "home") "Home") " - Modify")]
        [:button {:type "button"
                  :class "close"
                  :data-dismiss "modal"}