diff --git a/src/app.lisp b/src/app.lisp index 76963cf..b4ce2a1 100644 --- a/src/app.lisp +++ b/src/app.lisp @@ -14,13 +14,13 @@ :port 3000)) (defun start () - (uiop:run-program (if (cfg:is-dev-p) + (uiop:run-program (if (cfg:dev-mode-p) "make dev" "make build")) (jg:start *app*)) (defun stop () - (when (cfg:is-dev-p) + (when (cfg:dev-mode-p) (uiop:run-program "make stop")) (jg:stop *app*)) diff --git a/src/config.lisp b/src/config.lisp index b55ab3d..26c72df 100644 --- a/src/config.lisp +++ b/src/config.lisp @@ -1,14 +1,17 @@ (defpackage #:hp/config (:use #:cl) + (:import-from #:log4cl) (:export #:*env* - #:is-dev-p - #:is-prod-p)) + #:dev-mode-p + #:prod-mode-p)) (in-package #:hp/config) (defparameter *env* (or (uiop:getenv "HP_ENV") "dev")) -(defun is-dev-p () +(defun dev-mode-p () (string= *env* "dev")) -(defun is-prod-p () +(defun prod-mode-p () (string= *env* "prod")) + +(log:config :nofile) diff --git a/src/routes/about.lisp b/src/routes/about.lisp index 18a5df8..4bbbe77 100644 --- a/src/routes/about.lisp +++ b/src/routes/about.lisp @@ -1,7 +1,7 @@ (defpackage #:hp/routes/about (:use #:cl) (:local-nicknames (#:pi #:piccolo)) - (:local-nicknames (#:view #:hp/view)) + (:local-nicknames (#:view #:hp/view/*)) (:export #:handle-get)) (in-package #:hp/routes/about) diff --git a/src/routes/index.lisp b/src/routes/index.lisp index 69bd28d..857142f 100644 --- a/src/routes/index.lisp +++ b/src/routes/index.lisp @@ -1,7 +1,7 @@ (defpackage #:hp/routes/index (:use #:cl) (:local-nicknames (#:pi #:piccolo)) - (:local-nicknames (#:view #:hp/view)) + (:local-nicknames (#:view #:hp/view/*)) (:export #:handle-get)) (in-package #:hp/routes/index) diff --git a/src/routes/not-found.lisp b/src/routes/not-found.lisp index 3078a05..f6c7f31 100644 --- a/src/routes/not-found.lisp +++ b/src/routes/not-found.lisp @@ -2,7 +2,7 @@ (:use #:cl) (:local-nicknames (#:jg #:jingle)) (:local-nicknames (#:pi #:piccolo)) - (:local-nicknames (#:view #:hp/view)) + (:local-nicknames (#:view #:hp/view/*)) (:export #:handle-not-found)) (in-package #:hp/routes/not-found) diff --git a/src/view.lisp b/src/view/renderer.lisp similarity index 69% rename from src/view.lisp rename to src/view/renderer.lisp index 48d13c8..cad1ef3 100644 --- a/src/view.lisp +++ b/src/view/renderer.lisp @@ -1,19 +1,20 @@ -(defpackage #:hp/view +(defpackage #:hp/view/renderer (:use #:cl) (:local-nicknames (#:jg #:jingle)) (:local-nicknames (#:pi #:piccolo)) + (:local-nicknames (#:cfg #:hp/config)) (:local-nicknames (#:cmp #:hp/components/*)) (:export #:render #:partial-render)) -(in-package #:hp/view) +(in-package #:hp/view/renderer) (defun render (page &key status metadata) (jg:with-html-response - (and status (jg:set-response-status status)) + (jg:set-response-status (or status :ok)) (pi:elem-str (cmp:document metadata (cmp:layout page))))) (defun partial-render (component &key status) (jg:with-html-response - (and status (jg:set-response-status status)) + (jg:set-response-status (or status :ok)) (pi:elem-str component)))