Rename hp to website

This commit is contained in:
Akira Tempaku 2025-05-02 09:39:55 +09:00
parent 33e23d9f95
commit e1905255d7
Signed by: paku
GPG key ID: 5B4E8402BCC50607
21 changed files with 77 additions and 70 deletions

View file

@ -1,5 +1,5 @@
HP_ENV= WEBSITE_ENV=
HP_URL= WEBSITE_URL=
MICROCMS_SERVICE_DOMAIN= MICROCMS_SERVICE_DOMAIN=
MICROCMS_API_KEY= MICROCMS_API_KEY=
CLOUDFLARE_ZONE_ID= CLOUDFLARE_ZONE_ID=

View file

@ -51,7 +51,7 @@ lem: ## Open Lem with TailwindCSS server
kill $$WATCH_PID kill $$WATCH_PID
docker-build: ## Build docker image docker-build: ## Build docker image
docker build -t hp . docker build -t website .
docker-run: ## Run docker container docker-run: ## Run docker container
docker run -p 3000:3000 hp docker run -p 3000:3000 website

View file

@ -1 +1 @@
# hp # website

View file

@ -2,7 +2,7 @@
set -e set -e
echo "Starting server..." echo "Starting server..."
.qlot/bin/clackup --system hp --server woo --address 0.0.0.0 --port 3000 src/app.lisp & .qlot/bin/clackup --system website --server woo --address 0.0.0.0 --port 3000 src/app.lisp &
SERVER_PID=$! SERVER_PID=$!

View file

@ -1,4 +1,4 @@
(defpackage #:hp/app (defpackage #:website/app
(:use #:cl) (:use #:cl)
(:import-from #:jingle (:import-from #:jingle
#:make-app #:make-app
@ -11,19 +11,19 @@
#:*trim-trailing-slash*) #:*trim-trailing-slash*)
(:import-from #:clack-errors (:import-from #:clack-errors
#:*clack-error-middleware*) #:*clack-error-middleware*)
(:import-from #:hp/lib/env (:import-from #:website/lib/env
#:hp-env) #:website-env)
(:import-from #:hp/renderer) (:import-from #:website/renderer)
(:export #:*app*)) (:export #:*app*))
(in-package #:hp/app) (in-package #:website/app)
(defparameter *app* (defparameter *app*
(let ((app (make-app))) (let ((app (make-app)))
(set-routes app :system :hp :target-dir-path "routes") (set-routes app :system :website :target-dir-path "routes")
(install-middleware app (lambda (app) (install-middleware app (lambda (app)
(funcall *clack-error-middleware* (funcall *clack-error-middleware*
app app
:debug (string= (hp-env) "dev")))) :debug (string= (website-env) "dev"))))
(install-middleware app *trim-trailing-slash*) (install-middleware app *trim-trailing-slash*)
(static-path app "/img/" "static/img/") (static-path app "/img/" "static/img/")
(static-path app "/style/" "static/style/") (static-path app "/style/" "static/style/")

View file

@ -1,10 +1,10 @@
(defpackage #:hp/components/header (defpackage #:website/components/header
(:use #:cl (:use #:cl
#:hsx) #:hsx)
(:import-from #:jingle (:import-from #:jingle
#:request-uri) #:request-uri)
(:export #:~header)) (:export #:~header))
(in-package #:hp/components/header) (in-package #:website/components/header)
(defparameter *nav-menu* (defparameter *nav-menu*
'(("/bio" "bio") '(("/bio" "bio")

View file

@ -1,12 +1,12 @@
(defpackage #:hp/components/layout (defpackage #:website/components/layout
(:use #:cl (:use #:cl
#:hsx) #:hsx)
(:import-from #:hp/components/metadata (:import-from #:website/components/metadata
#:~metadata) #:~metadata)
(:import-from #:hp/components/header (:import-from #:website/components/header
#:~header) #:~header)
(:export #:~layout)) (:export #:~layout))
(in-package #:hp/components/layout) (in-package #:website/components/layout)
(defun bust-cache (url) (defun bust-cache (url)
(format nil "~a?v=~a" url #.(get-universal-time))) (format nil "~a?v=~a" url #.(get-universal-time)))

View file

@ -1,10 +1,10 @@
(defpackage #:hp/components/metadata (defpackage #:website/components/metadata
(:use #:cl (:use #:cl
#:hsx) #:hsx)
(:import-from #:hp/lib/env (:import-from #:website/lib/env
#:hp-url) #:website-url)
(:export #:~metadata)) (:export #:~metadata))
(in-package #:hp/components/metadata) (in-package #:website/components/metadata)
(defun create-metadata (&key title (defun create-metadata (&key title
description description
@ -27,7 +27,7 @@
(defun path->url (path) (defun path->url (path)
(concatenate 'string (concatenate 'string
(hp-url) (website-url)
(and (not (string= path "/")) path))) (and (not (string= path "/")) path)))
(defparameter *metadata-template* (defparameter *metadata-template*

View file

@ -1,16 +1,16 @@
(defpackage #:hp/lib/cms (defpackage #:website/lib/cms
(:use #:cl) (:use #:cl)
(:import-from #:microcms (:import-from #:microcms
#:define-list-client #:define-list-client
#:define-object-client) #:define-object-client)
(:import-from #:hp/lib/env (:import-from #:website/lib/env
#:microcms-service-domain #:microcms-service-domain
#:microcms-api-key) #:microcms-api-key)
(:export #:get-blog-list (:export #:get-blog-list
#:get-blog-detail #:get-blog-detail
#:get-bio #:get-bio
#:get-work)) #:get-work))
(in-package :hp/lib/cms) (in-package :website/lib/cms)
(setf microcms:*service-domain* (microcms-service-domain)) (setf microcms:*service-domain* (microcms-service-domain))
(setf microcms:*api-key* (microcms-api-key)) (setf microcms:*api-key* (microcms-api-key))

View file

@ -1,12 +1,12 @@
(defpackage #:hp/lib/env (defpackage #:website/lib/env
(:use #:cl) (:use #:cl)
(:import-from #:cl-dotenv (:import-from #:cl-dotenv
#:load-env) #:load-env)
(:export #:hp-env (:export #:website-env
#:hp-url #:website-url
#:microcms-service-domain #:microcms-service-domain
#:microcms-api-key)) #:microcms-api-key))
(in-package #:hp/lib/env) (in-package #:website/lib/env)
(load-env (merge-pathnames "./.env")) (load-env (merge-pathnames "./.env"))
@ -14,7 +14,7 @@
`(defun ,name () `(defun ,name ()
(or (uiop:getenv ,var) ""))) (or (uiop:getenv ,var) "")))
(env-var hp-env "HP_ENV") (env-var website-env "WEBSITE_ENV")
(env-var hp-url "HP_URL") (env-var website-url "WEBSITE_URL")
(env-var microcms-service-domain "MICROCMS_SERVICE_DOMAIN") (env-var microcms-service-domain "MICROCMS_SERVICE_DOMAIN")
(env-var microcms-api-key "MICROCMS_API_KEY") (env-var microcms-api-key "MICROCMS_API_KEY")

View file

@ -1,4 +1,4 @@
(defpackage #:hp/lib/time (defpackage #:website/lib/time
(:use #:cl) (:use #:cl)
(:import-from #:local-time (:import-from #:local-time
#:reread-timezone-repository #:reread-timezone-repository
@ -7,7 +7,7 @@
#:format-timestring) #:format-timestring)
(:export #:datetime (:export #:datetime
#:jp-datetime)) #:jp-datetime))
(in-package #:hp/lib/time) (in-package #:website/lib/time)
(reread-timezone-repository) (reread-timezone-repository)
(setf local-time:*default-timezone* (setf local-time:*default-timezone*

View file

@ -1,13 +1,13 @@
(defpackage #:hp (defpackage #:website
(:nicknames #:hp/main) (:nicknames #:website/main)
(:use #:cl) (:use #:cl)
(:import-from #:clack) (:import-from #:clack)
(:import-from #:hp/app (:import-from #:website/app
#:*app*) #:*app*)
(:export #:start (:export #:start
#:stop #:stop
#:reload)) #:reload))
(in-package #:hp) (in-package #:website)
(defparameter *handler* nil) (defparameter *handler* nil)
@ -28,5 +28,5 @@
(defun reload () (defun reload ()
(stop) (stop)
(ql:quickload :hp/app) (ql:quickload :website/app)
(start)) (start))

View file

@ -1,4 +1,4 @@
(defpackage #:hp/renderer (defpackage #:website/renderer
(:use #:cl (:use #:cl
#:hsx #:hsx
#:trivia) #:trivia)
@ -6,16 +6,16 @@
#:set-response-header) #:set-response-header)
(:import-from #:hsx/element (:import-from #:hsx/element
#:element) #:element)
(:import-from #:hp/lib/env (:import-from #:website/lib/env
#:hp-url #:website-url
#:hp-env) #:website-env)
(:import-from #:hp/components/layout (:import-from #:website/components/layout
#:~layout)) #:~layout))
(in-package #:hp/renderer) (in-package #:website/renderer)
(defun set-cache-control (strategy) (defun set-cache-control (strategy)
(set-response-header :cache-control (set-response-header :cache-control
(if (string= (hp-env) "dev") (if (string= (website-env) "dev")
"private, no-store" "private, no-store"
(cond (cond
((eq strategy :static) "public, max-age=31536000, immutable") ((eq strategy :static) "public, max-age=31536000, immutable")

View file

@ -1,8 +1,13 @@
(defpackage #:hp/routes/bio (defpackage #:website/routes/bio
(:use #:cl (:use #:cl
#:hsx) #:hsx)
(:import-from #:website/lib/cms
#:get-bio)
(:import-from #:website/lib/time
#:datetime
#:jp-datetime)
(:export #:handle-get)) (:export #:handle-get))
(in-package :hp/routes/bio) (in-package :website/routes/bio)
(defparameter *metadata* (defparameter *metadata*
(list :title "bio" (list :title "bio"
@ -10,8 +15,7 @@
(defcomp ~page () (defcomp ~page ()
(hsx (hsx
(section (p "comming soon")))
(p "Coming soon..."))))
(defun handle-get (params) (defun handle-get (params)
(declare (ignore params)) (declare (ignore params))

View file

@ -1,8 +1,8 @@
(defpackage #:hp/routes/blog (defpackage #:website/routes/blog
(:use #:cl (:use #:cl
#:hsx) #:hsx)
(:export #:handle-get)) (:export #:handle-get))
(in-package :hp/routes/blog) (in-package :website/routes/blog)
(defparameter *metadata* (defparameter *metadata*
(list :title "blog" (list :title "blog"
@ -10,8 +10,7 @@
(defcomp ~page () (defcomp ~page ()
(hsx (hsx
(section (p "comming soon")))
(p "Coming soon..."))))
(defun handle-get (params) (defun handle-get (params)
(declare (ignore params)) (declare (ignore params))

View file

@ -1,9 +1,9 @@
(defpackage #:hp/routes/index (defpackage #:website/routes/index
(:use #:cl (:use #:cl
#:hsx) #:hsx)
(:export #:handle-get (:export #:handle-get
#:handle-head)) #:handle-head))
(in-package #:hp/routes/index) (in-package #:website/routes/index)
(defparameter *links* (defparameter *links*
'(("Keyoxide" "https://keyoxide.org/f39d5b2c951d16732a5cd3528f0c1a22f26d7e62") '(("Keyoxide" "https://keyoxide.org/f39d5b2c951d16732a5cd3528f0c1a22f26d7e62")

View file

@ -1,8 +1,8 @@
(defpackage #:hp/routes/not-found (defpackage #:website/routes/not-found
(:use #:cl (:use #:cl
#:hsx) #:hsx)
(:export #:handle-not-found)) (:export #:handle-not-found))
(in-package #:hp/routes/not-found) (in-package #:website/routes/not-found)
(defparameter *metadata* (defparameter *metadata*
'(:title "404 Not Found" '(:title "404 Not Found"

View file

@ -1,8 +1,13 @@
(defpackage #:hp/routes/work (defpackage #:website/routes/work
(:use #:cl (:use #:cl
#:hsx) #:hsx)
(:import-from #:website/lib/cms
#:get-work)
(:import-from #:website/lib/time
#:datetime
#:jp-datetime)
(:export #:handle-get)) (:export #:handle-get))
(in-package :hp/routes/work) (in-package :website/routes/work)
(defparameter *metadata* (defparameter *metadata*
(list :title "work" (list :title "work"
@ -10,8 +15,7 @@
(defcomp ~page () (defcomp ~page ()
(hsx (hsx
(section (p "comming soon")))
(p "Coming soon..."))))
(defun handle-get (params) (defun handle-get (params)
(declare (ignore params)) (declare (ignore params))

View file

@ -1,7 +1,7 @@
(defpackage #:hp-tests/example (defpackage #:website-tests/example
(:use #:cl (:use #:cl
#:fiveam)) #:fiveam))
(in-package #:hp-tests/example) (in-package #:website-tests/example)
(def-suite example-test) (def-suite example-test)
(in-suite example-test) (in-suite example-test)

View file

@ -1,7 +1,7 @@
(defsystem "hp-tests" (defsystem "website-tests"
:class :package-inferred-system :class :package-inferred-system
:pathname "tests" :pathname "tests"
:depends-on ("fiveam" :depends-on ("fiveam"
"hp-tests/example") "website-tests/example")
:perform (test-op (o c) :perform (test-op (o c)
(symbol-call :fiveam :run-all-tests))) (symbol-call :fiveam :run-all-tests)))

View file

@ -1,7 +1,7 @@
(defsystem "hp" (defsystem "website"
:description "My personal website" :description "My personal website"
:author "Akira Tempaku <paku@skyizwhite.dev>" :author "Akira Tempaku <paku@skyizwhite.dev>"
:class :package-inferred-system :class :package-inferred-system
:pathname "src" :pathname "src"
:depends-on ("hp/main") :depends-on ("website/main")
:in-order-to ((test-op (test-op "hp-tests")))) :in-order-to ((test-op (test-op "website-tests"))))