diff options
| author | ckonstanski <carlos.konstanski@olo.com> | 2024-12-22 18:32:18 -0700 |
|---|---|---|
| committer | ckonstanski <carlos.konstanski@olo.com> | 2024-12-22 18:32:18 -0700 |
| commit | cf684daa1eacac996223f6c407074abd019ede4a (patch) | |
| tree | f79ffd0809f243ca8dbdff51d943181bca2e7de0 /lisp | |
| parent | 947d1d69e344fefd604bfab000522b903bbb7b21 (diff) | |
rename to bogenherrc
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/bogenherr.asd (renamed from lisp/woodriverlessons.asd) | 12 | ||||
| -rw-r--r-- | lisp/core/core.lisp | 4 | ||||
| -rw-r--r-- | lisp/service/about-us-service.lisp | 8 | ||||
| -rw-r--r-- | lisp/service/auth-service.lisp | 2 | ||||
| -rw-r--r-- | lisp/service/base-service.lisp | 2 | ||||
| -rw-r--r-- | lisp/service/contact-us-service.lisp | 4 | ||||
| -rw-r--r-- | lisp/service/gallery-service.lisp | 18 | ||||
| -rw-r--r-- | lisp/service/generic-form.lisp | 2 | ||||
| -rw-r--r-- | lisp/service/generics.lisp | 2 | ||||
| -rw-r--r-- | lisp/service/home-service.lisp | 2 | ||||
| -rw-r--r-- | lisp/service/login-service.lisp | 4 | ||||
| -rw-r--r-- | lisp/service/logout-service.lisp | 2 | ||||
| -rw-r--r-- | lisp/service/menu-service.lisp | 4 | ||||
| -rw-r--r-- | lisp/service/messages-service.lisp | 6 | ||||
| -rw-r--r-- | lisp/service/password-service.lisp | 4 | ||||
| -rw-r--r-- | lisp/service/profile-service.lisp | 4 | ||||
| -rw-r--r-- | lisp/service/rest-service.lisp | 2 | ||||
| -rw-r--r-- | lisp/service/testimonials-service.lisp | 8 | ||||
| -rw-r--r-- | lisp/service/users-service.lisp | 20 | ||||
| -rw-r--r-- | lisp/sql/about-us.lisp | 2 | ||||
| -rw-r--r-- | lisp/sql/auth-pkg.lisp | 4 | ||||
| -rw-r--r-- | lisp/sql/contact-pkg.lisp | 2 | ||||
| -rw-r--r-- | lisp/sql/contact-us.lisp | 2 | ||||
| -rw-r--r-- | lisp/sql/gallery.lisp | 2 | ||||
| -rw-r--r-- | lisp/sql/general-pkg.lisp | 2 | ||||
| -rw-r--r-- | lisp/sql/generics.lisp | 6 | ||||
| -rw-r--r-- | lisp/sql/registration.lisp | 2 | ||||
| -rw-r--r-- | lisp/sql/role-group.lisp | 2 | ||||
| -rw-r--r-- | lisp/sql/testimonials.lisp | 2 | ||||
| -rw-r--r-- | lisp/sql/user-role.lisp | 2 | ||||
| -rw-r--r-- | lisp/sql/user-session-pkg.lisp | 12 | ||||
| -rw-r--r-- | lisp/sql/user-session.lisp | 2 | ||||
| -rw-r--r-- | lisp/sql/user.lisp | 2 | ||||
| -rw-r--r-- | lisp/webapps/bogenherr/clojurescript/bogenherr/.gitignore (renamed from lisp/webapps/woodriverlessons/clojurescript/woodriverlessons/.gitignore) | 0 | ||||
| -rw-r--r-- | lisp/webapps/bogenherr/clojurescript/bogenherr/README.md (renamed from lisp/webapps/woodriverlessons/clojurescript/woodriverlessons/README.md) | 0 | ||||
| -rw-r--r-- | lisp/webapps/bogenherr/clojurescript/bogenherr/project.clj (renamed from lisp/webapps/woodriverlessons/clojurescript/woodriverlessons/project.clj) | 2 | ||||
| -rw-r--r-- | lisp/webapps/bogenherr/clojurescript/bogenherr/src/core.cljs (renamed from lisp/webapps/woodriverlessons/clojurescript/woodriverlessons/src/core.cljs) | 4 | ||||
| -rw-r--r-- | lisp/webapps/bogenherr/conf/.gitignore (renamed from lisp/webapps/woodriverlessons/conf/.gitignore) | 0 | ||||
| -rw-r--r-- | lisp/webapps/bogenherr/conf/options.lisp.example | 13 | ||||
| -rw-r--r-- | lisp/webapps/bogenherr/site.lisp (renamed from lisp/webapps/woodriverlessons/site.lisp) | 6 | ||||
| -rw-r--r-- | lisp/webapps/bogenherr/static/css/stylesheet.css (renamed from lisp/webapps/woodriverlessons/static/css/stylesheet.css) | 1 | ||||
| -rw-r--r-- | lisp/webapps/bogenherr/static/images/add.png (renamed from lisp/webapps/woodriverlessons/static/images/add.png) | bin | 1832 -> 1832 bytes | |||
| -rw-r--r-- | lisp/webapps/bogenherr/static/images/classical-bow.jpg (renamed from lisp/webapps/woodriverlessons/static/images/classical-bow.jpg) | bin | 158141 -> 158141 bytes | |||
| -rw-r--r-- | lisp/webapps/bogenherr/static/images/delete.png (renamed from lisp/webapps/woodriverlessons/static/images/delete.png) | bin | 1427 -> 1427 bytes | |||
| -rw-r--r-- | lisp/webapps/bogenherr/static/images/document-open.png (renamed from lisp/webapps/woodriverlessons/static/images/document-open.png) | bin | 608 -> 608 bytes | |||
| -rw-r--r-- | lisp/webapps/bogenherr/static/images/down.png (renamed from lisp/webapps/woodriverlessons/static/images/down.png) | bin | 1297 -> 1297 bytes | |||
| -rw-r--r-- | lisp/webapps/bogenherr/static/images/download.png (renamed from lisp/webapps/woodriverlessons/static/images/download.png) | bin | 577 -> 577 bytes | |||
| -rw-r--r-- | lisp/webapps/bogenherr/static/images/edit-redo.png (renamed from lisp/webapps/woodriverlessons/static/images/edit-redo.png) | bin | 1584 -> 1584 bytes | |||
| -rw-r--r-- | lisp/webapps/bogenherr/static/images/edit-undo.png (renamed from lisp/webapps/woodriverlessons/static/images/edit-undo.png) | bin | 1585 -> 1585 bytes | |||
| -rw-r--r-- | lisp/webapps/bogenherr/static/images/edit.png (renamed from lisp/webapps/woodriverlessons/static/images/edit.png) | bin | 1034 -> 1034 bytes | |||
| -rw-r--r-- | lisp/webapps/bogenherr/static/images/emblem-favorite.png (renamed from lisp/webapps/woodriverlessons/static/images/emblem-favorite.png) | bin | 1523 -> 1523 bytes | |||
| -rw-r--r-- | lisp/webapps/bogenherr/static/images/emblem-nowrite.png (renamed from lisp/webapps/woodriverlessons/static/images/emblem-nowrite.png) | bin | 1032 -> 1032 bytes | |||
| -rw-r--r-- | lisp/webapps/bogenherr/static/images/instrument-cabinet.jpg (renamed from lisp/webapps/woodriverlessons/static/images/instrument-cabinet.jpg) | bin | 4547021 -> 4547021 bytes | |||
| -rw-r--r-- | lisp/webapps/bogenherr/static/images/no.png (renamed from lisp/webapps/woodriverlessons/static/images/no.png) | bin | 1089 -> 1089 bytes | |||
| -rw-r--r-- | lisp/webapps/bogenherr/static/images/sort-alpha.png (renamed from lisp/webapps/woodriverlessons/static/images/sort-alpha.png) | bin | 625 -> 625 bytes | |||
| -rw-r--r-- | lisp/webapps/bogenherr/static/images/up.png (renamed from lisp/webapps/woodriverlessons/static/images/up.png) | bin | 1315 -> 1315 bytes | |||
| -rw-r--r-- | lisp/webapps/bogenherr/static/images/violin-strip.jpg (renamed from lisp/webapps/woodriverlessons/static/images/violin-strip.jpg) | bin | 198050 -> 198050 bytes | |||
| -rw-r--r-- | lisp/webapps/bogenherr/static/images/yes.png (renamed from lisp/webapps/woodriverlessons/static/images/yes.png) | bin | 1013 -> 1013 bytes | |||
| l--------- | lisp/webapps/bogenherr/static/js/cljs | 1 | ||||
| -rw-r--r-- | lisp/webapps/generics.lisp | 2 | ||||
| -rw-r--r-- | lisp/webapps/webapp-loader.lisp | 4 | ||||
| -rw-r--r-- | lisp/webapps/woodriverlessons/conf/options.lisp.example | 13 | ||||
| l--------- | lisp/webapps/woodriverlessons/static/js/cljs | 1 |
63 files changed, 100 insertions, 101 deletions
diff --git a/lisp/woodriverlessons.asd b/lisp/bogenherr.asd index 2ceb824..e614545 100644 --- a/lisp/woodriverlessons.asd +++ b/lisp/bogenherr.asd @@ -3,8 +3,8 @@ (in-package :cl) -(defpackage :woodriverlessons-system (:use :cl :asdf)) -(in-package :woodriverlessons-system) +(defpackage :bogenherr-system (:use :cl :asdf)) +(in-package :bogenherr-system) (defmacro do-defsystem (&key name version maintainer author description long-description depends-on components) `(defsystem ,name @@ -24,12 +24,12 @@ (loop for pkg in *quicklisp-packages* do (ql:quickload (symbol-name pkg))) -(do-defsystem :name "woodriverlessons" +(do-defsystem :name "bogenherr" :version "1" :maintainer "Carlos Konstanski <me@ckons.org>" :author "Carlos Konstanski <me@ckons.org>" - :description "woodriverlessons" - :long-description "woodriverlessons 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 Violin and Viola Lessons in the Wood River Valley." + :description "bogenherr" + :long-description "bogenherr 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 Violin and Viola Lessons in Pocatello ID." :depends-on *all-packages* :components ((:module core :components ((:file "core"))) @@ -72,6 +72,6 @@ :depends-on (service) :components ((:file "generics") (:file "webapp-loader" :depends-on ("generics")) - (:module woodriverlessons + (:module bogenherr :depends-on ("webapp-loader") :components ((:file "site"))))))) diff --git a/lisp/core/core.lisp b/lisp/core/core.lisp index cdcb9d9..08a11d8 100644 --- a/lisp/core/core.lisp +++ b/lisp/core/core.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(defpackage :woodriverlessons +(defpackage :bogenherr (:use :cl :cl-log :hunchentoot :org-ckons-sql)) -(in-package :woodriverlessons) +(in-package :bogenherr) diff --git a/lisp/service/about-us-service.lisp b/lisp/service/about-us-service.lisp index 3ae7c87..e3df34a 100644 --- a/lisp/service/about-us-service.lisp +++ b/lisp/service/about-us-service.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(in-package :woodriverlessons) +(in-package :bogenherr) (defclass about-us-service (rest-service) () @@ -26,7 +26,7 @@ (with-valid-user (user "about-us-modify") (setf (admin-p instance) nil) (setf (admin-p instance) t)) - (with-woodriverlessons-database + (with-bogenherr-database (let* ((general-pkg (make-instance 'general-pkg)) (about-us (get-about-us general-pkg))) (when about-us @@ -42,7 +42,7 @@ (defun about-us-modify-json () (with-auth (instance about-us/modify-service "about-us-modify") - (with-woodriverlessons-database + (with-bogenherr-database (let* ((general-pkg (make-instance 'general-pkg)) (about-us (get-about-us general-pkg))) (setf (form instance) (make-form "about-us-modify-form" @@ -53,7 +53,7 @@ (defun about-us-modify-submit-json (content) (with-auth (instance about-us/modify-service "about-us-modify") - (with-woodriverlessons-database + (with-bogenherr-database (let* ((general-pkg (make-instance 'general-pkg)) (about-us (get-about-us general-pkg))) (when about-us diff --git a/lisp/service/auth-service.lisp b/lisp/service/auth-service.lisp index b6ce12e..aff5d01 100644 --- a/lisp/service/auth-service.lisp +++ b/lisp/service/auth-service.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(in-package :woodriverlessons) +(in-package :bogenherr) (defclass auth-service (rest-service) () diff --git a/lisp/service/base-service.lisp b/lisp/service/base-service.lisp index 3edc118..77df817 100644 --- a/lisp/service/base-service.lisp +++ b/lisp/service/base-service.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(in-package :woodriverlessons) +(in-package :bogenherr) (defclass base-service () () diff --git a/lisp/service/contact-us-service.lisp b/lisp/service/contact-us-service.lisp index 7c10bd3..4e2aada 100644 --- a/lisp/service/contact-us-service.lisp +++ b/lisp/service/contact-us-service.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(in-package :woodriverlessons) +(in-package :bogenherr) (defclass contact-us-service (rest-service) () @@ -43,7 +43,7 @@ (defun contact-us-email-json (first_name last_name email phone comments) (declare (special first_name last_name email phone comments)) (with-noauth (instance contact-us/email-service) - (with-woodriverlessons-database + (with-bogenherr-database (let ((contact-pkg (make-instance 'contact-pkg)) (contact-us-post (make-instance 'contact-us-post))) (loop for param in (sb-introspect:function-lambda-list #'contact-us-email-json) diff --git a/lisp/service/gallery-service.lisp b/lisp/service/gallery-service.lisp index b034075..c3d0825 100644 --- a/lisp/service/gallery-service.lisp +++ b/lisp/service/gallery-service.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(in-package :woodriverlessons) +(in-package :bogenherr) (defclass gallery-service (auth-service) ((admin-p :initarg :admin-p @@ -27,7 +27,7 @@ (with-valid-user (user "gallery-modify") (setf (admin-p instance) nil) (setf (admin-p instance) t)) - (with-woodriverlessons-database + (with-bogenherr-database (let ((general-pkg (make-instance 'general-pkg))) (setf (results instance) (get-galleries general-pkg)))) (setf (message instance) (session-value :message)) @@ -54,7 +54,7 @@ (defun gallery-add-submit-json (description video_embed_url upload) (declare (special description video_embed_url)) (with-auth (instance gallery/add-modify-delete-service "gallery-modify") - (with-woodriverlessons-database + (with-bogenherr-database (let ((general-pkg (make-instance 'general-pkg)) (gallery (make-instance 'gallery)) (tmp-filepath (first upload)) @@ -65,7 +65,7 @@ (sb-introspect:function-lambda-list #'gallery-add-submit-json)) do (setf (slot-value gallery param) (symbol-value param))) (when upload - (let ((tmpdir (tmpdir:mkdtemp :prefix "woodriverlessons-gallery-"))) + (let ((tmpdir (tmpdir:mkdtemp :prefix "bogenherr-gallery-"))) (setf new-filepath (format nil "~a~a" tmpdir (file-namestring tmp-filepath))) (fad:copy-file tmp-filepath new-filepath) (setf (filename gallery) orig-filename) @@ -76,7 +76,7 @@ (defun gallery-modify-json (id) (with-auth (instance gallery/add-modify-delete-service "gallery-modify") - (with-woodriverlessons-database + (with-bogenherr-database (let* ((general-pkg (make-instance 'general-pkg)) (gallery (get-gallery general-pkg id))) (if gallery @@ -93,7 +93,7 @@ (defun gallery-modify-submit-json (id description video_embed_url upload) (declare (special description video_embed_url)) (with-auth (instance gallery/add-modify-delete-service "gallery-modify") - (with-woodriverlessons-database + (with-bogenherr-database (let* ((general-pkg (make-instance 'general-pkg)) (gallery (get-gallery general-pkg id))) (if gallery @@ -105,7 +105,7 @@ (sb-introspect:function-lambda-list #'gallery-add-submit-json)) do (setf (slot-value gallery param) (symbol-value param))) (when upload - (let ((tmpdir (tmpdir:mkdtemp :prefix "woodriverlessons-gallery-"))) + (let ((tmpdir (tmpdir:mkdtemp :prefix "bogenherr-gallery-"))) (setf new-filepath (format nil "~a~a" tmpdir (file-namestring tmp-filepath))) (fad:copy-file tmp-filepath new-filepath) (setf (filename gallery) orig-filename) @@ -117,7 +117,7 @@ (defun gallery-delete-json (id) (with-auth (instance gallery/add-modify-delete-service "gallery-modify") - (with-woodriverlessons-database + (with-bogenherr-database (let* ((general-pkg (make-instance 'general-pkg)) (gallery (get-gallery general-pkg id))) (if gallery @@ -128,7 +128,7 @@ (defun gallery-file-view (id) (with-noauth-raw (instance gallery/view-service) - (with-woodriverlessons-database + (with-bogenherr-database (let* ((general-pkg (make-instance 'general-pkg)) (gallery (get-gallery general-pkg id))) (when gallery diff --git a/lisp/service/generic-form.lisp b/lisp/service/generic-form.lisp index 4b3d2e9..2605e28 100644 --- a/lisp/service/generic-form.lisp +++ b/lisp/service/generic-form.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(in-package :woodriverlessons) +(in-package :bogenherr) (defclass generic-form (base-service) ((name :initarg :name diff --git a/lisp/service/generics.lisp b/lisp/service/generics.lisp index 4b58078..592d245 100644 --- a/lisp/service/generics.lisp +++ b/lisp/service/generics.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(in-package :woodriverlessons) +(in-package :bogenherr) (defgeneric copy-from-record (base-service record) (:documentation "Copies the fields from `record' to diff --git a/lisp/service/home-service.lisp b/lisp/service/home-service.lisp index 99bd3e7..da6ded6 100644 --- a/lisp/service/home-service.lisp +++ b/lisp/service/home-service.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(in-package :woodriverlessons) +(in-package :bogenherr) (defclass home-service (rest-service) ((content :initarg :content diff --git a/lisp/service/login-service.lisp b/lisp/service/login-service.lisp index 5f27236..5e029ba 100644 --- a/lisp/service/login-service.lisp +++ b/lisp/service/login-service.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(in-package :woodriverlessons) +(in-package :bogenherr) (defclass login-service (rest-service) ((form :initarg :form @@ -50,7 +50,7 @@ (if (or (org-ckons-core::null-or-empty-p username) (org-ckons-core::null-or-empty-p pwd)) (setf (session-value :errormsg) "Login failed.") - (with-woodriverlessons-database + (with-bogenherr-database (let* ((auth-pkg (make-instance 'auth-pkg)) (user (get-active-user-by-username-pwd auth-pkg username pwd))) (cond (user diff --git a/lisp/service/logout-service.lisp b/lisp/service/logout-service.lisp index ce6a09f..d0564a5 100644 --- a/lisp/service/logout-service.lisp +++ b/lisp/service/logout-service.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(in-package :woodriverlessons) +(in-package :bogenherr) (defclass logout-service (rest-service) ((location-p :initform nil)) diff --git a/lisp/service/menu-service.lisp b/lisp/service/menu-service.lisp index 8bb7d9a..9c4845c 100644 --- a/lisp/service/menu-service.lisp +++ b/lisp/service/menu-service.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(in-package :woodriverlessons) +(in-package :bogenherr) (defparameter *menu-config* '((:id "a_menu_home" :label "Home" :handler "/home" :permissions "_Public") (:id "a_menu_about_us" :label "About the Studio" :handler "/about-us" :permissions "_Public") @@ -53,7 +53,7 @@ (:documentation "")) (defmethod initialize-instance :after ((menu-service menu-service) &key user menu-config) - (with-woodriverlessons-database + (with-bogenherr-database (let ((auth-pkg (make-instance 'auth-pkg)) (user-logged-in-p (and user (not (= (id user) 0)))) roles) diff --git a/lisp/service/messages-service.lisp b/lisp/service/messages-service.lisp index e5bd6d0..18999ab 100644 --- a/lisp/service/messages-service.lisp +++ b/lisp/service/messages-service.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(in-package :woodriverlessons) +(in-package :bogenherr) (defclass messages-service (auth-service) ((title :initarg :title @@ -32,7 +32,7 @@ (defun messages-results-json (read) (with-auth (instance messages/results-service "messages-view") (when read (setf (session-value :messages-read) read)) - (with-woodriverlessons-database + (with-bogenherr-database (let ((contact-pkg (make-instance 'contact-pkg))) (setf (results instance) (get-contact-us-posts contact-pkg (id (get-user)) @@ -47,7 +47,7 @@ (defun messages-mark-json (read id) (with-auth (instance messages/mark-service "messages-view") - (with-woodriverlessons-database + (with-bogenherr-database (handler-case (let ((contact-pkg (make-instance 'contact-pkg))) (mark-contact-us-post contact-pkg id (id (get-user)) (string= read "read")) diff --git a/lisp/service/password-service.lisp b/lisp/service/password-service.lisp index bd22248..fee720e 100644 --- a/lisp/service/password-service.lisp +++ b/lisp/service/password-service.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(in-package :woodriverlessons) +(in-package :bogenherr) (defclass password-service (auth-service user) ((form :initarg :form @@ -35,7 +35,7 @@ (declare (special pwd pwd2)) (with-auth (instance password/modify-service "profile-modify") (setf (title instance) "Change Password") - (with-woodriverlessons-database + (with-bogenherr-database (let ((user (get-user))) (if (and (= id (id user)) (string= pwd pwd2)) diff --git a/lisp/service/profile-service.lisp b/lisp/service/profile-service.lisp index 0334652..c5783ad 100644 --- a/lisp/service/profile-service.lisp +++ b/lisp/service/profile-service.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(in-package :woodriverlessons) +(in-package :bogenherr) (defclass profile-service (auth-service user) ((title :initarg :title @@ -46,7 +46,7 @@ (defun profile-modify-submit-json (id username first_name last_name email phone) (declare (special username first_name last_name email phone)) (with-auth (instance profile/modify-service "profile-modify") - (with-woodriverlessons-database + (with-bogenherr-database (let ((user (get-user))) (if (= id (id user)) (let ((auth-pkg (make-instance 'auth-pkg))) diff --git a/lisp/service/rest-service.lisp b/lisp/service/rest-service.lisp index eed7a51..eda0948 100644 --- a/lisp/service/rest-service.lisp +++ b/lisp/service/rest-service.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(in-package :woodriverlessons) +(in-package :bogenherr) (defclass rest-service (base-service) ((location :initarg :location diff --git a/lisp/service/testimonials-service.lisp b/lisp/service/testimonials-service.lisp index 8f3d3e0..97133f7 100644 --- a/lisp/service/testimonials-service.lisp +++ b/lisp/service/testimonials-service.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(in-package :woodriverlessons) +(in-package :bogenherr) (defclass testimonials-service (rest-service) ((title :initarg :title @@ -31,7 +31,7 @@ (with-valid-user (user "testimonials-modify") (setf (admin-p instance) nil) (setf (admin-p instance) t)) - (with-woodriverlessons-database + (with-bogenherr-database (let* ((general-pkg (make-instance 'general-pkg)) (testimonials (get-testimonials general-pkg))) (when testimonials @@ -44,7 +44,7 @@ (defun testimonials-modify-json () (with-auth (instance testimonials/modify-service "testimonials-modify") (setf (title instance) "Testimonials - Modify") - (with-woodriverlessons-database + (with-bogenherr-database (let* ((general-pkg (make-instance 'general-pkg)) (testimonials (get-testimonials general-pkg)) content) @@ -59,7 +59,7 @@ (defun testimonials-modify-submit-json (content) (with-auth (instance testimonials/modify-service "testimonials-modify") (setf (title instance) "Testimonials - Modify") - (with-woodriverlessons-database + (with-bogenherr-database (let* ((general-pkg (make-instance 'general-pkg)) (testimonials (get-testimonials general-pkg))) (when testimonials diff --git a/lisp/service/users-service.lisp b/lisp/service/users-service.lisp index e41d5e4..fa56c53 100644 --- a/lisp/service/users-service.lisp +++ b/lisp/service/users-service.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(in-package :woodriverlessons) +(in-package :bogenherr) (defclass users-service (auth-service) ((title :initarg :title @@ -22,7 +22,7 @@ (defun users-view-json () (with-auth (instance users/view-service "users-view") - (with-woodriverlessons-database + (with-bogenherr-database (let ((auth-pkg (make-instance 'auth-pkg))) (setf (users instance) (get-all-users auth-pkg)))) (sanitize-rest-json instance) @@ -51,7 +51,7 @@ (defun users-add-json () (with-auth (instance users/add-service "users-modify") (setf (title instance) "Users - Add") - (with-woodriverlessons-database + (with-bogenherr-database (let* ((auth-pkg (make-instance 'auth-pkg)) (user (get-user)) (role-groups (get-all-role-groups auth-pkg user))) @@ -67,7 +67,7 @@ (defun users-add-submit-json (role_groups first_name last_name email) (declare (special role_groups first_name last_name email)) (with-auth (instance users/add-service "users-modify") - (with-woodriverlessons-database + (with-bogenherr-database (let ((registration (make-instance 'registration))) (loop for param in (sb-introspect:function-lambda-list #'users-add-submit-json) do (setf (slot-value registration param) (symbol-value param))) @@ -140,7 +140,7 @@ (defun users-register-form-json (hash) (with-noauth (instance users/register/form-service) - (with-woodriverlessons-database + (with-bogenherr-database (let* ((auth-pkg (make-instance 'auth-pkg)) (registration (get-registration-by-hash auth-pkg hash))) (registrations-gc auth-pkg) @@ -165,7 +165,7 @@ (defun users-register-submit-json (hash username pwd pwd2 phone) (with-noauth (instance users/register/submit-service) - (with-woodriverlessons-database + (with-bogenherr-database (let ((auth-pkg (make-instance 'auth-pkg)) registration) (registrations-gc auth-pkg) @@ -202,7 +202,7 @@ (defun users-modify-json (id) (with-auth (instance users/modify-service "users-modify") (setf (title instance) "Users - Modify") - (with-woodriverlessons-database + (with-bogenherr-database (let* ((auth-pkg (make-instance 'auth-pkg)) (me (get-user)) (user (get-user-by-id auth-pkg id)) @@ -225,7 +225,7 @@ (defun users-modify-submit-json (id role_groups username first_name last_name email phone) (declare (special role_groups username first_name last_name email phone)) (with-auth (instance users/modify-service "users-modify") - (with-woodriverlessons-database + (with-bogenherr-database (let* ((auth-pkg (make-instance 'auth-pkg)) (user (get-active-user-by-id auth-pkg id))) (if user @@ -251,7 +251,7 @@ (defun users-toggle-active-json (id) (with-auth (instance users/toggle-service "users-modify") - (with-woodriverlessons-database + (with-bogenherr-database (let* ((auth-pkg (make-instance 'auth-pkg)) (user (get-user-by-id auth-pkg id))) (if user @@ -269,7 +269,7 @@ (defun users-delete-json (id) (with-auth (instance users/delete-service "users-modify") - (with-woodriverlessons-database + (with-bogenherr-database (let* ((auth-pkg (make-instance 'auth-pkg)) (user (get-user-by-id auth-pkg id))) (if user diff --git a/lisp/sql/about-us.lisp b/lisp/sql/about-us.lisp index 51e4409..ea09ee8 100644 --- a/lisp/sql/about-us.lisp +++ b/lisp/sql/about-us.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(in-package :woodriverlessons) +(in-package :bogenherr) (defclass about-us (postgres-record) ((id :initarg :id diff --git a/lisp/sql/auth-pkg.lisp b/lisp/sql/auth-pkg.lisp index 54f8c3e..c5f8839 100644 --- a/lisp/sql/auth-pkg.lisp +++ b/lisp/sql/auth-pkg.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(in-package :woodriverlessons) +(in-package :bogenherr) (defparameter *authenticated-user-session-key* "authenticated-user") @@ -165,7 +165,7 @@ (if ,session-name (let* ((auth-pkg (make-instance 'auth-pkg)) (has-all-roles-p (let ((has-all-roles-p t)) - (with-woodriverlessons-database + (with-bogenherr-database (loop for role in (if (listp ,roles) ,roles (list ,roles)) do (when (not (has-role auth-pkg ,session-name role)) (setf has-all-roles-p nil))) diff --git a/lisp/sql/contact-pkg.lisp b/lisp/sql/contact-pkg.lisp index 390d861..82dbd2b 100644 --- a/lisp/sql/contact-pkg.lisp +++ b/lisp/sql/contact-pkg.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(in-package :woodriverlessons) +(in-package :bogenherr) (defclass contact-pkg (record-pkg) () diff --git a/lisp/sql/contact-us.lisp b/lisp/sql/contact-us.lisp index 9a7f30b..094e436 100644 --- a/lisp/sql/contact-us.lisp +++ b/lisp/sql/contact-us.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(in-package :woodriverlessons) +(in-package :bogenherr) (defclass contact-us (postgres-record) ((id :initarg :id diff --git a/lisp/sql/gallery.lisp b/lisp/sql/gallery.lisp index 501691d..56e6e20 100644 --- a/lisp/sql/gallery.lisp +++ b/lisp/sql/gallery.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(in-package :woodriverlessons) +(in-package :bogenherr) (defclass gallery (postgres-record) ((id :initarg :id diff --git a/lisp/sql/general-pkg.lisp b/lisp/sql/general-pkg.lisp index 0d1b3db..571bec6 100644 --- a/lisp/sql/general-pkg.lisp +++ b/lisp/sql/general-pkg.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(in-package :woodriverlessons) +(in-package :bogenherr) (defclass general-pkg (record-pkg) () diff --git a/lisp/sql/generics.lisp b/lisp/sql/generics.lisp index e45327c..48c50c7 100644 --- a/lisp/sql/generics.lisp +++ b/lisp/sql/generics.lisp @@ -1,10 +1,10 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(in-package :woodriverlessons) +(in-package :bogenherr) -(defmacro with-woodriverlessons-database (&body body) - `(with-database (getf (databases *webapp*) :db-woodriverlessons) ,@body)) +(defmacro with-bogenherr-database (&body body) + `(with-database (getf (databases *webapp*) :db-bogenherr) ,@body)) (defgeneric insert-user (auth-pkg user) (:documentation "Inserts a new user into the database.")) diff --git a/lisp/sql/registration.lisp b/lisp/sql/registration.lisp index a1a2919..43ed915 100644 --- a/lisp/sql/registration.lisp +++ b/lisp/sql/registration.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(in-package :woodriverlessons) +(in-package :bogenherr) (defclass registration (postgres-record) ((id :initarg :id diff --git a/lisp/sql/role-group.lisp b/lisp/sql/role-group.lisp index 50d73f7..396acdc 100644 --- a/lisp/sql/role-group.lisp +++ b/lisp/sql/role-group.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(in-package :woodriverlessons) +(in-package :bogenherr) (defclass role-group (postgres-record) ((user_role_group_id :initarg :user_role_group_id diff --git a/lisp/sql/testimonials.lisp b/lisp/sql/testimonials.lisp index 37ac3d3..a1c21a9 100644 --- a/lisp/sql/testimonials.lisp +++ b/lisp/sql/testimonials.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(in-package :woodriverlessons) +(in-package :bogenherr) (defclass testimonials (postgres-record) ((id :initarg :id diff --git a/lisp/sql/user-role.lisp b/lisp/sql/user-role.lisp index 3042aab..fb5636c 100644 --- a/lisp/sql/user-role.lisp +++ b/lisp/sql/user-role.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(in-package :woodriverlessons) +(in-package :bogenherr) (defclass user-role (postgres-record) ((user_role_group_id :initarg :user_role_group_id diff --git a/lisp/sql/user-session-pkg.lisp b/lisp/sql/user-session-pkg.lisp index 8741fff..5c7871d 100644 --- a/lisp/sql/user-session-pkg.lisp +++ b/lisp/sql/user-session-pkg.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(in-package :woodriverlessons) +(in-package :bogenherr) (defclass user-session-pkg (record-pkg) () @@ -42,7 +42,7 @@ (defun get-session-object (session-key) "Returns the object stored in the user session under the given `session-key'." - (with-woodriverlessons-database + (with-bogenherr-database (let* ((user-session-pkg (make-instance 'user-session-pkg)) (user-session-object (get-user-session-object user-session-pkg session-key)) object) @@ -55,7 +55,7 @@ "Sets the object into the user-session under the given `session-key'. Will not write anything if the session given by `*sessionid*' does not exist." - (with-woodriverlessons-database + (with-bogenherr-database (let* ((user-session-pkg (make-instance 'user-session-pkg)) (user-session-object (get-user-session-object user-session-pkg session-key))) (if user-session-object @@ -75,14 +75,14 @@ (defun flush-session-object (session-key) "Removes the object from the user session under the given `session-key'." - (with-woodriverlessons-database + (with-bogenherr-database (let ((user-session-pkg (make-instance 'user-session-pkg))) (flush-user-session-object user-session-pkg *sessionid* session-key)))) (defun ensure-user-session-exists (&optional force-new-sessionid-p) "Ensures that the user has a valid sessionid cookie. Returns the `sessionid'. If the session does exist, update its timestamp." - (with-woodriverlessons-database + (with-bogenherr-database (let* ((user-session-pkg (make-instance 'user-session-pkg)) (sessionid (when (not force-new-sessionid-p) (org-ckons-session::get-sessionid-from-request))) @@ -100,7 +100,7 @@ inactive for a period of time determined by the `*session-timeout*' variable." (when (> (- (get-universal-time) org-ckons-session::*gc-last-cycle-timestamp*) org-ckons-session::*gc-interval*) (setf org-ckons-session::*gc-last-cycle-timestamp* (get-universal-time)) - (with-woodriverlessons-database + (with-bogenherr-database (let ((user-session-pkg (make-instance 'user-session-pkg))) (loop for user-session in (get-user-sessions user-session-pkg) do (let ((inactive-time (- org-ckons-session::*gc-last-cycle-timestamp* (datetime user-session)))) diff --git a/lisp/sql/user-session.lisp b/lisp/sql/user-session.lisp index afaa28b..8ecc305 100644 --- a/lisp/sql/user-session.lisp +++ b/lisp/sql/user-session.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(in-package :woodriverlessons) +(in-package :bogenherr) (defclass user-session (postgres-record) ((id :initarg :id diff --git a/lisp/sql/user.lisp b/lisp/sql/user.lisp index a181ff4..34e7b53 100644 --- a/lisp/sql/user.lisp +++ b/lisp/sql/user.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(in-package :woodriverlessons) +(in-package :bogenherr) (defclass user (org-ckons-session::session-object postgres-record) ((id :initarg :id diff --git a/lisp/webapps/woodriverlessons/clojurescript/woodriverlessons/.gitignore b/lisp/webapps/bogenherr/clojurescript/bogenherr/.gitignore index 864ae75..864ae75 100644 --- a/lisp/webapps/woodriverlessons/clojurescript/woodriverlessons/.gitignore +++ b/lisp/webapps/bogenherr/clojurescript/bogenherr/.gitignore diff --git a/lisp/webapps/woodriverlessons/clojurescript/woodriverlessons/README.md b/lisp/webapps/bogenherr/clojurescript/bogenherr/README.md index 53ca866..53ca866 100644 --- a/lisp/webapps/woodriverlessons/clojurescript/woodriverlessons/README.md +++ b/lisp/webapps/bogenherr/clojurescript/bogenherr/README.md diff --git a/lisp/webapps/woodriverlessons/clojurescript/woodriverlessons/project.clj b/lisp/webapps/bogenherr/clojurescript/bogenherr/project.clj index 9b93c1e..06003f5 100644 --- a/lisp/webapps/woodriverlessons/clojurescript/woodriverlessons/project.clj +++ b/lisp/webapps/bogenherr/clojurescript/bogenherr/project.clj @@ -1,4 +1,4 @@ -(defproject woodriverlessons "0.1.0-SNAPSHOT" +(defproject bogenherr "0.1.0-SNAPSHOT" :description "FIXME" :url "FIXME" :license "public domain" diff --git a/lisp/webapps/woodriverlessons/clojurescript/woodriverlessons/src/core.cljs b/lisp/webapps/bogenherr/clojurescript/bogenherr/src/core.cljs index e1b26bb..60a6b55 100644 --- a/lisp/webapps/woodriverlessons/clojurescript/woodriverlessons/src/core.cljs +++ b/lisp/webapps/bogenherr/clojurescript/bogenherr/src/core.cljs @@ -1,4 +1,4 @@ -(ns woodriverlessons.core +(ns bogenherr.core (:require-macros [hiccups.core :as hiccups :refer [html]]) (:require [ajax.core :refer [GET POST raw-response-format]] [dommy.core :as dommy] @@ -250,7 +250,7 @@ ;; home (hiccups/defhtml template-home [jsonobj] - [:h1 {:style "text-align: center"} "Welcome to the studio of Carlos Konstanski"] + [:h1 {:style "text-align: center"} "Welcome to the music studio of Carlos Konstanski<br/>a.k.a. <i>der Bogenherr</i>"] [:div {:style "text-align: center"} [:img {:style "width: 100%" :src "/static/images/instrument-cabinet.jpg"}]]) diff --git a/lisp/webapps/woodriverlessons/conf/.gitignore b/lisp/webapps/bogenherr/conf/.gitignore index 14fa7a6..14fa7a6 100644 --- a/lisp/webapps/woodriverlessons/conf/.gitignore +++ b/lisp/webapps/bogenherr/conf/.gitignore diff --git a/lisp/webapps/bogenherr/conf/options.lisp.example b/lisp/webapps/bogenherr/conf/options.lisp.example new file mode 100644 index 0000000..fbd48d8 --- /dev/null +++ b/lisp/webapps/bogenherr/conf/options.lisp.example @@ -0,0 +1,13 @@ +(:name "bogenherr" + :url "bogenherr.org" + :document-root "bogenherr" + :title "Bogenherr" + :meta-description "The Bogenherr website written in Common Lisp/Hunchentoot and ClojureScript." + :databases (:db-bogenherr ("127.0.0.1" "bogenherr" "bogenherr" "password")) + :mail-mx "mail.ckons.org" + :mail-from "postmaster@ckons.org" + :mail-postmaster "postmaster@ckons.org" + :mail-webmaster "webmaster@ckons.org" + :mail-info "info@ckons.org" + :mail-login-notify "me@ckons.org" + :mail-authentication ("me@ckons.org" "password")) diff --git a/lisp/webapps/woodriverlessons/site.lisp b/lisp/webapps/bogenherr/site.lisp index d47b2b6..6b58a81 100644 --- a/lisp/webapps/woodriverlessons/site.lisp +++ b/lisp/webapps/bogenherr/site.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(in-package :woodriverlessons) +(in-package :bogenherr) (defmacro .base (&optional (onload-fn "goto_location('/home')")) `(org-ckons-http::html5 @@ -18,12 +18,12 @@ `((script :type "text/javascript" :src ,(getf js :src) :integrity ,(getf js :integrity) :crossorigin ,(getf js :crossorigin)))) '((:src "https://code.jquery.com/jquery-3.7.1.slim.min.js" :integrity "ha256-kmHvs0B+OpCW5GVHUNjv9rOmY0IvSIRcf7zGUDTDQM8=" :crossorigin "anonymous"))) ((script :type "text/javascript" :src "/static/js/cljs/main.js"))) - ((body :onload ,(format nil "woodriverlessons.core.~a" ,onload-fn)) + ((body :onload ,(format nil "bogenherr.core.~a" ,onload-fn)) ((div :class "container-fluid") ((div :class "banner") ((table :width "100%" :height "100%") (tr - ((td :class "banner-title") "Wood River Lessons") + ((td :class "banner-title") "Bogen-<i>Herr</i>") ((td :class "banner-menu") ((div :id "menu-user")))))) ((div :id "menu" :class "well")) diff --git a/lisp/webapps/woodriverlessons/static/css/stylesheet.css b/lisp/webapps/bogenherr/static/css/stylesheet.css index efb4c07..9cc9e0d 100644 --- a/lisp/webapps/woodriverlessons/static/css/stylesheet.css +++ b/lisp/webapps/bogenherr/static/css/stylesheet.css @@ -44,7 +44,6 @@ hr { width: *; color: #59200e; font-size: 28px; - font-style: italic; font-weight: bold; text-align: center; } diff --git a/lisp/webapps/woodriverlessons/static/images/add.png b/lisp/webapps/bogenherr/static/images/add.png Binary files differindex 1055df8..1055df8 100644 --- a/lisp/webapps/woodriverlessons/static/images/add.png +++ b/lisp/webapps/bogenherr/static/images/add.png diff --git a/lisp/webapps/woodriverlessons/static/images/classical-bow.jpg b/lisp/webapps/bogenherr/static/images/classical-bow.jpg Binary files differindex fce1392..fce1392 100644 --- a/lisp/webapps/woodriverlessons/static/images/classical-bow.jpg +++ b/lisp/webapps/bogenherr/static/images/classical-bow.jpg diff --git a/lisp/webapps/woodriverlessons/static/images/delete.png b/lisp/webapps/bogenherr/static/images/delete.png Binary files differindex ec140b7..ec140b7 100644 --- a/lisp/webapps/woodriverlessons/static/images/delete.png +++ b/lisp/webapps/bogenherr/static/images/delete.png diff --git a/lisp/webapps/woodriverlessons/static/images/document-open.png b/lisp/webapps/bogenherr/static/images/document-open.png Binary files differindex 20b7ca8..20b7ca8 100644 --- a/lisp/webapps/woodriverlessons/static/images/document-open.png +++ b/lisp/webapps/bogenherr/static/images/document-open.png diff --git a/lisp/webapps/woodriverlessons/static/images/down.png b/lisp/webapps/bogenherr/static/images/down.png Binary files differindex e2d15bf..e2d15bf 100644 --- a/lisp/webapps/woodriverlessons/static/images/down.png +++ b/lisp/webapps/bogenherr/static/images/down.png diff --git a/lisp/webapps/woodriverlessons/static/images/download.png b/lisp/webapps/bogenherr/static/images/download.png Binary files differindex 3973b3c..3973b3c 100644 --- a/lisp/webapps/woodriverlessons/static/images/download.png +++ b/lisp/webapps/bogenherr/static/images/download.png diff --git a/lisp/webapps/woodriverlessons/static/images/edit-redo.png b/lisp/webapps/bogenherr/static/images/edit-redo.png Binary files differindex 3d4db6c..3d4db6c 100644 --- a/lisp/webapps/woodriverlessons/static/images/edit-redo.png +++ b/lisp/webapps/bogenherr/static/images/edit-redo.png diff --git a/lisp/webapps/woodriverlessons/static/images/edit-undo.png b/lisp/webapps/bogenherr/static/images/edit-undo.png Binary files differindex 367fc5a..367fc5a 100644 --- a/lisp/webapps/woodriverlessons/static/images/edit-undo.png +++ b/lisp/webapps/bogenherr/static/images/edit-undo.png diff --git a/lisp/webapps/woodriverlessons/static/images/edit.png b/lisp/webapps/bogenherr/static/images/edit.png Binary files differindex 550dacd..550dacd 100644 --- a/lisp/webapps/woodriverlessons/static/images/edit.png +++ b/lisp/webapps/bogenherr/static/images/edit.png diff --git a/lisp/webapps/woodriverlessons/static/images/emblem-favorite.png b/lisp/webapps/bogenherr/static/images/emblem-favorite.png Binary files differindex 6535d5d..6535d5d 100644 --- a/lisp/webapps/woodriverlessons/static/images/emblem-favorite.png +++ b/lisp/webapps/bogenherr/static/images/emblem-favorite.png diff --git a/lisp/webapps/woodriverlessons/static/images/emblem-nowrite.png b/lisp/webapps/bogenherr/static/images/emblem-nowrite.png Binary files differindex 997fedf..997fedf 100644 --- a/lisp/webapps/woodriverlessons/static/images/emblem-nowrite.png +++ b/lisp/webapps/bogenherr/static/images/emblem-nowrite.png diff --git a/lisp/webapps/woodriverlessons/static/images/instrument-cabinet.jpg b/lisp/webapps/bogenherr/static/images/instrument-cabinet.jpg Binary files differindex a683c45..a683c45 100644 --- a/lisp/webapps/woodriverlessons/static/images/instrument-cabinet.jpg +++ b/lisp/webapps/bogenherr/static/images/instrument-cabinet.jpg diff --git a/lisp/webapps/woodriverlessons/static/images/no.png b/lisp/webapps/bogenherr/static/images/no.png Binary files differindex 1dc1b7c..1dc1b7c 100644 --- a/lisp/webapps/woodriverlessons/static/images/no.png +++ b/lisp/webapps/bogenherr/static/images/no.png diff --git a/lisp/webapps/woodriverlessons/static/images/sort-alpha.png b/lisp/webapps/bogenherr/static/images/sort-alpha.png Binary files differindex 0e4a831..0e4a831 100644 --- a/lisp/webapps/woodriverlessons/static/images/sort-alpha.png +++ b/lisp/webapps/bogenherr/static/images/sort-alpha.png diff --git a/lisp/webapps/woodriverlessons/static/images/up.png b/lisp/webapps/bogenherr/static/images/up.png Binary files differindex 55bab86..55bab86 100644 --- a/lisp/webapps/woodriverlessons/static/images/up.png +++ b/lisp/webapps/bogenherr/static/images/up.png diff --git a/lisp/webapps/woodriverlessons/static/images/violin-strip.jpg b/lisp/webapps/bogenherr/static/images/violin-strip.jpg Binary files differindex 6149a87..6149a87 100644 --- a/lisp/webapps/woodriverlessons/static/images/violin-strip.jpg +++ b/lisp/webapps/bogenherr/static/images/violin-strip.jpg diff --git a/lisp/webapps/woodriverlessons/static/images/yes.png b/lisp/webapps/bogenherr/static/images/yes.png Binary files differindex b9cadf5..b9cadf5 100644 --- a/lisp/webapps/woodriverlessons/static/images/yes.png +++ b/lisp/webapps/bogenherr/static/images/yes.png diff --git a/lisp/webapps/bogenherr/static/js/cljs b/lisp/webapps/bogenherr/static/js/cljs new file mode 120000 index 0000000..ead7d4a --- /dev/null +++ b/lisp/webapps/bogenherr/static/js/cljs @@ -0,0 +1 @@ +../../clojurescript/bogenherr/resources/public/cljs
\ No newline at end of file diff --git a/lisp/webapps/generics.lisp b/lisp/webapps/generics.lisp index 58c9ad8..c986e5b 100644 --- a/lisp/webapps/generics.lisp +++ b/lisp/webapps/generics.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(in-package :woodriverlessons) +(in-package :bogenherr) (defgeneric get-site-file-path (webapp) (:documentation "Builds a full filesystem path to a webapp's site diff --git a/lisp/webapps/webapp-loader.lisp b/lisp/webapps/webapp-loader.lisp index aafa6f3..5ac5b1c 100644 --- a/lisp/webapps/webapp-loader.lisp +++ b/lisp/webapps/webapp-loader.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- (declaim (optimize (speed 0) (safety 3) (debug 3))) -(in-package :woodriverlessons) +(in-package :bogenherr) (defvar *acceptor* nil) (defvar *dispatch-table* '(#'dispatch-easy-handlers #'default-dispatcher)) @@ -138,7 +138,7 @@ with the new one." :mail-authentication (getf form :mail-authentication) :mail-ssl (getf form :mail-ssl))))))) -(defun woodriverlessons () +(defun bogenherr () "Call this to start the server." (when (null *acceptor*) (let ((package (string-downcase (package-name #.*package*)))) diff --git a/lisp/webapps/woodriverlessons/conf/options.lisp.example b/lisp/webapps/woodriverlessons/conf/options.lisp.example deleted file mode 100644 index d2afe8e..0000000 --- a/lisp/webapps/woodriverlessons/conf/options.lisp.example +++ /dev/null @@ -1,13 +0,0 @@ -(:name "woodriverlessons" - :url "woodriverlessons.org" - :document-root "woodriverlessons" - :title "Wood River Orchestra" - :meta-description "A website for the members of the Wood River Orchestra written in Common Lisp/Hunchentoot and ClojureScript." - :databases (:db-woodriverlessons ("127.0.0.1" "woodriverlessons" "woodriverlessons" "password")) - :mail-mx "mail.ckons.org" - :mail-from "postmaster@ckons.org" - :mail-postmaster "postmaster@ckons.org" - :mail-webmaster "webmaster@ckons.org" - :mail-info "info@ckons.org" - :mail-login-notify "me@ckons.org" - :mail-authentication ("me@ckons.org" "password")) diff --git a/lisp/webapps/woodriverlessons/static/js/cljs b/lisp/webapps/woodriverlessons/static/js/cljs deleted file mode 120000 index 88f0c64..0000000 --- a/lisp/webapps/woodriverlessons/static/js/cljs +++ /dev/null @@ -1 +0,0 @@ -../../clojurescript/woodriverlessons/resources/public/cljs
\ No newline at end of file |
