diff --git a/src/components/header.lisp b/src/components/header.lisp index 9a65038..b8610bc 100644 --- a/src/components/header.lisp +++ b/src/components/header.lisp @@ -14,26 +14,22 @@ (hsx (header :class "hidden md:flex justify-between py-4 border-b-1 top-0 bg-white" (h1 :class "z-20 text-3xl font-bold" - (a :href "/" - "skyizwhite")) + (a :href "/" "skyizwhite")) (nav :class "flex items-end" (ul :preload "mouseover" :class "flex gap-4 text-xl font-medium" (loop :for (href label) :in *nav-menu* :collect - (if (search href (request-uri jingle:*request*)) - (hsx (li :class "text-pink-500" - label)) - (hsx (li (a :href href :class "hover:text-pink-500" - label)))))))))) + (if (search href (request-uri *request*)) + (hsx (li :class "text-pink-500" label)) + (hsx (li (a :href href :class "hover:text-pink-500" label)))))))))) (defcomp ~sp-header () (hsx (header - :id "sp-header" :x-data "{ open: false }" :hx-preserve t + :id "sp-header" :x-data "{ open: false }" :class "flex md:hidden justify-between py-2 border-b-1 top-0 bg-white" (h1 :class "z-20 text-2xl font-bold" - (a :href "/" :@click "open = false" - "skyizwhite")) + (a :href "/" "skyizwhite")) (div (button :class "z-20 size-8 flex flex-col justify-center cursor-pointer relative" @@ -67,7 +63,7 @@ :class "flex flex-col h-fit gap-8 text-3xl font-medium" (loop :for (href label) :in (append '(("/" "home")) *nav-menu*) :collect - (hsx (li (a :href href :@click "open = false" label)))))))))) + (hsx (li (a :href href label)))))))))) (defcomp ~header () (hsx diff --git a/src/components/metadata.lisp b/src/components/metadata.lisp index 63bbbd9..03f7667 100644 --- a/src/components/metadata.lisp +++ b/src/components/metadata.lisp @@ -28,7 +28,7 @@ type image error) - (let ((path (request-uri jingle:*request*))) + (let ((path (request-uri *request*))) (hsx (<> (meta :charset "UTF-8") diff --git a/src/components/scripts.lisp b/src/components/scripts.lisp index 2b6893d..0c58f9a 100644 --- a/src/components/scripts.lisp +++ b/src/components/scripts.lisp @@ -17,6 +17,4 @@ (script :src "https://cdn.jsdelivr.net/npm/htmx-ext-preload@2.1.1/dist/preload.min.js") (script :src "https://cdn.jsdelivr.net/npm/htmx-ext-head-support@2.0.4/dist/head-support.min.js") (script :src "https://cdn.jsdelivr.net/npm/htmx-ext-response-targets@2.0.3/dist/response-targets.min.js") - (script :src "https://cdn.jsdelivr.net/npm/htmx-ext-alpine-morph@2.0.1/alpine-morph.min.js") - (script :src "https://cdn.jsdelivr.net/npm/@alpinejs/morph@3.14.9/dist/cdn.min.js" :defer t) (script :src "https://cdn.jsdelivr.net/npm/alpinejs@3.14.9/dist/cdn.min.js" :defer t)))) diff --git a/src/lib/cms.lisp b/src/lib/cms.lisp index f8ba8df..75b7354 100644 --- a/src/lib/cms.lisp +++ b/src/lib/cms.lisp @@ -10,7 +10,7 @@ #:get-blog-detail #:get-about #:get-work)) -(in-package :website/lib/cms) +(in-package #:website/lib/cms) (setf microcms:*service-domain* (microcms-service-domain)) (setf microcms:*api-key* (microcms-api-key)) diff --git a/src/renderer.lisp b/src/renderer.lisp index c153a49..8b0ba29 100644 --- a/src/renderer.lisp +++ b/src/renderer.lisp @@ -16,12 +16,12 @@ (defmethod jingle:process-response ((app jingle:app) result) (set-response-header :content-type "text/html; charset=utf-8") - (set-response-header :cache-control (if (string= (website-env) "dev") - "private, no-store" - "public, max-age=60")) - + (when (eq (request-method *request*) :get) + (set-response-header :cache-control (if (string= (website-env) "dev") + "private, no-store" + "public, max-age=60"))) (call-next-method app - (hsx:render-to-string + (render-to-string (hsx (html :lang "ja" (head (~metadata :metadata (context :metadata)) diff --git a/src/routes/about.lisp b/src/routes/about.lisp index 6a59580..5f74a4d 100644 --- a/src/routes/about.lisp +++ b/src/routes/about.lisp @@ -8,7 +8,7 @@ #:datetime #:jp-datetime) (:export #:handle-get)) -(in-package :website/routes/about) +(in-package #:website/routes/about) (defparameter *metadata* (list :title "about")) diff --git a/src/routes/blog.lisp b/src/routes/blog.lisp index c96bc3a..307009d 100644 --- a/src/routes/blog.lisp +++ b/src/routes/blog.lisp @@ -3,7 +3,7 @@ #:hsx #:jingle) (:export #:handle-get)) -(in-package :website/routes/blog) +(in-package #:website/routes/blog) (defparameter *metadata* (list :title "blog")) diff --git a/src/routes/work.lisp b/src/routes/work.lisp index 94e5453..2a62a27 100644 --- a/src/routes/work.lisp +++ b/src/routes/work.lisp @@ -8,7 +8,7 @@ #:datetime #:jp-datetime) (:export #:handle-get)) -(in-package :website/routes/work) +(in-package #:website/routes/work) (defparameter *metadata* (list :title "work"))