Add access to helper

qlfile

@@ -10,3 +10,4 @@ git microcms https://github.com/skyizwhite/microcms-lisp-sdk
 ql local-time
 ql function-cache
 ql jonathan
+ql access

qlfile.lock

@@ -50,3 +50,7 @@
  (:class qlot/source/ql:source-ql
   :initargs (:%version :latest)
   :version "ql-2020-09-25"))
+("access" .
+ (:class qlot/source/ql:source-ql
+  :initargs (:%version :latest)
+  :version "ql-2024-10-12"))

src/components/header.lisp

@@ -1,7 +1,6 @@
 (defpackage #:website/components/header
   (:use #:cl
-        #:hsx
+        #:website/helper)
-        #:jingle)
   (:export #:~header))
 (in-package #:website/components/header)
 

src/components/metadata.lisp

@@ -1,7 +1,6 @@
 (defpackage #:website/components/metadata
   (:use #:cl
-        #:hsx
+        #:website/helper)
-        #:jingle)
   (:import-from #:website/lib/env
                 #:website-url)
   (:export #:~metadata))

src/helper.lisp

@@ -1,6 +1,9 @@
-(defpackage #:website/helper
+(uiop:define-package #:website/helper
-  (:use #:cl
+  (:use #:cl)
-        #:jingle)
+  (:use-reexport #:hsx
+                 #:jingle
+                 #:jonathan
+                 #:access)
   (:export #:api-p))
 (in-package #:website/helper)
 

src/renderer.lisp

@@ -1,9 +1,6 @@
 (defpackage #:website/renderer
   (:use #:cl
-        #:hsx
+        #:website/helper)
-        #:jingle
-        #:website/helper
-        #:jonathan)
   (:import-from #:hsx/element
                 #:element)
   (:import-from #:website/components/metadata

src/routes/about.lisp

@@ -1,7 +1,6 @@
 (defpackage #:website/routes/about
   (:use #:cl
-        #:hsx
+        #:website/helper)
-        #:jingle)
   (:import-from #:website/lib/cms
                 #:get-about)
   (:import-from #:website/lib/time
@@ -25,7 +24,7 @@
            (div  :class "flex justify-center"
              (figure :class "flex flex-col items-center"
                (img
-                 :src (getf (getf about :avatar) :url)
+                 :src (accesses about :avatar :url)
                  :alt "avatar" :class "size-40 rounded-xl shadow-sm avatar")
                (figcaption (getf about :avatar-caption))))
            (raw! (getf about :content))

src/routes/blog.lisp

@@ -1,7 +1,6 @@
 (defpackage #:website/routes/blog
   (:use #:cl
-        #:hsx
+        #:website/helper)
-        #:jingle)
   (:export #:handle-get))
 (in-package #:website/routes/blog)
 

src/routes/index.lisp

@@ -1,6 +1,6 @@
 (defpackage #:website/routes/index
   (:use #:cl
-        #:hsx)
+        #:website/helper)
   (:import-from #:website/lib/cms
                 #:get-about)
   (:export #:handle-get
@@ -30,7 +30,7 @@
     (hsx
      (div :class "flex flex-col items-center justify-center h-full"
        (img 
-         :src (getf (getf about :avatar) :url)
+         :src (accesses about :avatar :url)
          :alt "avatar" :class "size-40 rounded-xl shadow-sm avatar")
        (div :class "flex flex-col items-center gap-2 py-6"
          (h1 :class "font-bold text-2xl text-center"

src/routes/not-found.lisp

@@ -1,7 +1,5 @@
 (defpackage #:website/routes/not-found
   (:use #:cl
-        #:hsx
-        #:jingle
         #:website/helper)
   (:export #:handle-not-found))
 (in-package #:website/routes/not-found)

src/routes/work.lisp

@@ -1,7 +1,6 @@
 (defpackage #:website/routes/work
   (:use #:cl
-        #:hsx
+        #:website/helper)
-        #:jingle)
   (:import-from #:website/lib/cms
                 #:get-work)
   (:import-from #:website/lib/time