diff options
Diffstat (limited to 'lisp/webapps')
| -rw-r--r-- | lisp/webapps/bogenherr/clojurescript/bogenherr/src/core.cljs | 6 | ||||
| -rw-r--r-- | lisp/webapps/bogenherr/site.lisp | 6 | ||||
| -rw-r--r-- | lisp/webapps/webapp-loader.lisp | 41 |
3 files changed, 25 insertions, 28 deletions
diff --git a/lisp/webapps/bogenherr/clojurescript/bogenherr/src/core.cljs b/lisp/webapps/bogenherr/clojurescript/bogenherr/src/core.cljs index 80862b3..6e5276d 100644 --- a/lisp/webapps/bogenherr/clojurescript/bogenherr/src/core.cljs +++ b/lisp/webapps/bogenherr/clojurescript/bogenherr/src/core.cljs @@ -164,7 +164,7 @@ (declare goto-location) (declare reset-app) (declare goto-register) -(declare site) +(declare comp-app) (declare start-render) (declare start-nav-state) (declare reset-nav-state) @@ -204,7 +204,7 @@ ;; body -(defn site [] +(defn comp-app [] [:div {:class "container-fluid"} [:div {:class "banner"} [:table {:width "100%" :height "100%"} @@ -226,7 +226,7 @@ (defn start-render [] (let [app-root (rdc/create-root (js/document.getElementById "app"))] - (rdc/render app-root [site]))) + (rdc/render app-root [comp-app]))) (defn start-nav-state [] (cond (str/starts-with? (@nav-state :location) "/register/") diff --git a/lisp/webapps/bogenherr/site.lisp b/lisp/webapps/bogenherr/site.lisp index 37f33cd..9bb1b2d 100644 --- a/lisp/webapps/bogenherr/site.lisp +++ b/lisp/webapps/bogenherr/site.lisp @@ -196,8 +196,8 @@ (define-endpoint ("/gallery/add/submit" :method :post) (&post (description :parameter-type 'string) (video_embed_url :parameter-type 'string) (upload :parameter-type 'string)) .gallery-add-submit) (define-endpoint ("/gallery/modify" :method :post) (&post (id :parameter-type 'integer)) .gallery-modify) (define-endpoint ("/gallery/modify/submit" :method :post) (&post (id :parameter-type 'integer) (description :parameter-type 'string) (video_embed_url :parameter-type 'string) (upload :parameter-type 'string)) .gallery-modify-submit) -(define-endpoint ("/gallery/delete/:id" :method :delete) () .gallery-delete) -(define-endpoint ("/gallery/file/view/:id" :method :get) () .gallery-file-view) +(define-endpoint ("/gallery/delete/:id" :method :delete) (&path (id 'integer)) .gallery-delete) +(define-endpoint ("/gallery/file/view/:id" :method :get) (&path (id 'integer)) .gallery-file-view) (define-endpoint ("/testimonials" :method :get) () .testimonials) (define-endpoint ("/testimonials/view" :method :get) () .testimonials-view) (define-endpoint ("/testimonials/modify" :method :post) () .testimonials-modify) @@ -212,7 +212,7 @@ (define-endpoint ("/users/view" :method :get) () .users-view) (define-endpoint ("/users/add" :method :post) () .users-add) (define-endpoint ("/users/add/submit" :method :post) (&post (role_groups :parameter-type 'string) (first_name :parameter-type 'string) (last_name :parameter-type 'string) (email :parameter-type 'string)) .users-add-submit) -(define-endpoint ("/register/:hash" :method :get) () .base hash) +(define-endpoint ("/register/:hash" :method :get) (&path (hash 'string)) .base (format nil "/register/~a" hash)) (define-endpoint ("/users/register" :method :post) (&post (hash :parameter-type 'string)) .users-register) (define-endpoint ("/users/register/form" :method :post) (&post (hash :parameter-type 'string)) .users-register-form) (define-endpoint ("/users/register/submit" :method :post) (&post (hash :parameter-type 'string) (username :parameter-type 'string) (pwd :parameter-type 'string) (pwd2 :parameter-type 'string) (phone :parameter-type 'string)) .users-register-submit) diff --git a/lisp/webapps/webapp-loader.lisp b/lisp/webapps/webapp-loader.lisp index 7f1461e..e18f661 100644 --- a/lisp/webapps/webapp-loader.lisp +++ b/lisp/webapps/webapp-loader.lisp @@ -118,25 +118,25 @@ with the new one." (gethash key *webapps*)) (defun populate-webapps () - (loop for options-file in (get-options-files) do - (with-open-file (input options-file :direction :input) - (let* ((form (read input))) - (set-webapp (make-instance 'webapp - :name (getf form :name) - :scheme (getf form :scheme) - :url (getf form :url) - :document-root (make-webapp-path (getf form :document-root)) - :title (getf form :title) - :meta-description (getf form :meta-description) - :databases (getf form :databases) - :mail-mx (getf form :mail-mx) - :mail-from (getf form :mail-from) - :mail-postmaster (getf form :mail-postmaster) - :mail-webmaster (getf form :mail-webmaster) - :mail-info (getf form :mail-info) - :mail-login-notify (getf form :mail-login-notify) - :mail-authentication (getf form :mail-authentication) - :mail-ssl (getf form :mail-ssl))))))) + (loop for options-file in (get-options-files) + do (with-open-file (input options-file :direction :input) + (let* ((form (read input))) + (set-webapp (make-instance 'webapp + :name (getf form :name) + :scheme (getf form :scheme) + :url (getf form :url) + :document-root (make-webapp-path (getf form :document-root)) + :title (getf form :title) + :meta-description (getf form :meta-description) + :databases (getf form :databases) + :mail-mx (getf form :mail-mx) + :mail-from (getf form :mail-from) + :mail-postmaster (getf form :mail-postmaster) + :mail-webmaster (getf form :mail-webmaster) + :mail-info (getf form :mail-info) + :mail-login-notify (getf form :mail-login-notify) + :mail-authentication (getf form :mail-authentication) + :mail-ssl (getf form :mail-ssl))))))) (defun bogenherr () "Call this to start the server." @@ -175,6 +175,3 @@ you wish to publish." (easy-routes:defroute ,name ,template-and-options ,var-list (with-request-wrapper ,uri ,page-function ,@args))))) - ;; (define-easy-handler (,name :uri ,uri :default-request-type ,request-type) - ;; ,var-list - ;; (with-request-wrapper ,uri ,page-function ,@args))))) |