diff --git a/qlfile b/qlfile index 16af1e5..147aee5 100644 --- a/qlfile +++ b/qlfile @@ -5,4 +5,4 @@ ql alexandria ql lack ql clack ql cl-jingle -git flute https://github.com/skyizwhite/flute.git +git piccolo https://github.com/skyizwhite/piccolo.git diff --git a/qlfile.lock b/qlfile.lock index 2710411..85624f6 100644 --- a/qlfile.lock +++ b/qlfile.lock @@ -30,7 +30,7 @@ (:class qlot/source/ql:source-ql :initargs (:%version :latest) :version "ql-2023-10-21")) -("flute" . +("piccolo" . (:class qlot/source/git:source-git - :initargs (:remote-url "https://github.com/skyizwhite/flute.git") - :version "git-a4bf72232f5de50b826d618f7b6ae0e75494e6f3")) + :initargs (:remote-url "https://github.com/skyizwhite/piccolo.git") + :version "git-8f4a7c4907f2115f98ceb6dd111ac77f75d1be04")) diff --git a/src/routes/index.lisp b/src/routes/index.lisp index 6181ac0..a6b2504 100644 --- a/src/routes/index.lisp +++ b/src/routes/index.lisp @@ -1,6 +1,6 @@ (defpackage #:hp/routes/index (:use #:cl) - (:local-nicknames (#:f #:flute)) + (:local-nicknames (#:pi #:piccolo)) (:local-nicknames (#:jg #:jingle)) (:local-nicknames (#:ui #:hp/ui/*)) (:local-nicknames (#:utils #:hp/utils/*)) @@ -9,21 +9,19 @@ ;;; View -(f:define-element page () - (f:h +(pi:define-element page () + (pi:h (ui:layout - (section - :class "h-full flex justify-center items-center" - (h1 - :class "text-4xl text-amber-500" - "Hello HTMX from Common Lisp!"))))) + (section :class "h-full flex justify-center items-center" + (h1 :class "text-4xl text-amber-500" + "Hello HTMX from Common Lisp!"))))) ;;; Controller (defun index (params) (declare (ignore params)) (jg:with-html-response - (f:element-string (page)))) + (pi:element-string (page)))) (defparameter *index-app* (jg:make-app)) diff --git a/src/ui/layout.lisp b/src/ui/layout.lisp index 5b9f4f3..4888963 100644 --- a/src/ui/layout.lisp +++ b/src/ui/layout.lisp @@ -1,16 +1,16 @@ (defpackage #:hp/ui/layout (:use #:cl) - (:local-nicknames (#:f #:flute)) + (:local-nicknames (#:pi #:piccolo)) (:export #:layout)) (in-package #:hp/ui/layout) -(f:define-element layout () - (f:h +(pi:define-element layout () + (pi:h (html - (head - (title "skyizwhite.dev") - (script :src "/static/htmx.min.js") - (link :href "/static/main.css" :rel "stylesheet") - (link :href "/static/tailwind.css" :rel "stylesheet")) - (body :class "h-[100svh]" - f:children)))) + (head + (title "skyizwhite.dev") + (script :src "/static/htmx.min.js") + (link :href "/static/main.css" :rel "stylesheet") + (link :href "/static/tailwind.css" :rel "stylesheet")) + (body :class "h-[100svh]" + pi:children))))