diff --git a/.gitignore b/.gitignore index 790aa7c..3719f35 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ .qlot bin/tailwindcss -static/style/dist.css +assets/style/dist.css .env diff --git a/Dockerfile b/Dockerfile index 647256b..f3c3611 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ RUN mkdir -p ./bin \ && chmod +x tailwindcss-linux-x64 \ && mv tailwindcss-linux-x64 ${TW_BIN} -RUN ${TW_BIN} -i ./static/style/global.css -o ./static/style/dist.css --minify +RUN ${TW_BIN} -i ./assets/style/global.css -o ./assets/style/dist.css --minify RUN qlot install --quiet --no-color diff --git a/Makefile b/Makefile index ef4ad66..f74a006 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ TW_VERSION=4.1.3 TW_BIN=./bin/tailwindcss -STYLE_SRC=./static/style/global.css -STYLE_DIST=./static/style/dist.css +STYLE_SRC=./assets/style/global.css +STYLE_DIST=./assets/style/dist.css UNAME_S := $(shell uname -s) diff --git a/static/img/apple-touch-icon.png b/assets/img/apple-touch-icon.png similarity index 100% rename from static/img/apple-touch-icon.png rename to assets/img/apple-touch-icon.png diff --git a/static/img/favicon-96x96.png b/assets/img/favicon-96x96.png similarity index 100% rename from static/img/favicon-96x96.png rename to assets/img/favicon-96x96.png diff --git a/static/img/favicon.ico b/assets/img/favicon.ico similarity index 100% rename from static/img/favicon.ico rename to assets/img/favicon.ico diff --git a/static/img/favicon.svg b/assets/img/favicon.svg similarity index 100% rename from static/img/favicon.svg rename to assets/img/favicon.svg diff --git a/static/img/icon/discussion.svg b/assets/img/icon/discussion.svg similarity index 100% rename from static/img/icon/discussion.svg rename to assets/img/icon/discussion.svg diff --git a/static/img/icon/forgejo.svg b/assets/img/icon/forgejo.svg similarity index 100% rename from static/img/icon/forgejo.svg rename to assets/img/icon/forgejo.svg diff --git a/static/img/icon/github.svg b/assets/img/icon/github.svg similarity index 100% rename from static/img/icon/github.svg rename to assets/img/icon/github.svg diff --git a/static/img/icon/key.svg b/assets/img/icon/key.svg similarity index 100% rename from static/img/icon/key.svg rename to assets/img/icon/key.svg diff --git a/static/img/icon/server.svg b/assets/img/icon/server.svg similarity index 100% rename from static/img/icon/server.svg rename to assets/img/icon/server.svg diff --git a/static/img/og.jpg b/assets/img/og.jpg similarity index 100% rename from static/img/og.jpg rename to assets/img/og.jpg diff --git a/static/img/site.webmanifest b/assets/img/site.webmanifest similarity index 100% rename from static/img/site.webmanifest rename to assets/img/site.webmanifest diff --git a/static/img/web-app-manifest-192x192.png b/assets/img/web-app-manifest-192x192.png similarity index 100% rename from static/img/web-app-manifest-192x192.png rename to assets/img/web-app-manifest-192x192.png diff --git a/static/img/web-app-manifest-512x512.png b/assets/img/web-app-manifest-512x512.png similarity index 100% rename from static/img/web-app-manifest-512x512.png rename to assets/img/web-app-manifest-512x512.png diff --git a/static/style/global.css b/assets/style/global.css similarity index 100% rename from static/style/global.css rename to assets/style/global.css diff --git a/src/app.lisp b/src/app.lisp index ad8cdb7..63dbebe 100644 --- a/src/app.lisp +++ b/src/app.lisp @@ -21,8 +21,7 @@ app :debug (string= (website-env) "dev")))) (install-middleware app *trim-trailing-slash*) - (static-path app "/img/" "static/img/") - (static-path app "/style/" "static/style/") + (static-path app "/assets/" "assets/") (configure app))) *app* diff --git a/src/components/metadata.lisp b/src/components/metadata.lisp index f8fb04a..1708240 100644 --- a/src/components/metadata.lisp +++ b/src/components/metadata.lisp @@ -25,7 +25,7 @@ :description "The personal website of Akira Tempaku (paku)" :canonical nil :type "website" - :image (list :url (path->url "/img/og.jpg") + :image (list :url (path->url "/assets/img/og.jpg") :height 1024 :width 1024) :error nil)) @@ -56,9 +56,9 @@ (meta :property "og:image:width" :content (getf image :width)) (meta :property "og:image:height" :content (getf image :height)) (link :rel "canonical" :href (path->url (or canonical path)))))) - (link :rel "icon" :type "image/png" :href "/img/favicon-96x96.png" :sizes "96x96") - (link :rel "icon" :type "image/svg+xml" :href "/img/favicon.svg") - (link :rel "shortcut icon" :href "/img/favicon.ico") - (link :rel "apple-touch-icon" :sizes "180x180" :href "/img/apple-touch-icon.png") + (link :rel "icon" :type "image/png" :href "/assets/img/favicon-96x96.png" :sizes "96x96") + (link :rel "icon" :type "image/svg+xml" :href "/assets/img/favicon.svg") + (link :rel "shortcut icon" :href "/assets/img/favicon.ico") + (link :rel "apple-touch-icon" :sizes "180x180" :href "/assets/img/apple-touch-icon.png") (meta :name "apple-mobile-web-app-title" :content "skyizwhite") - (link :rel "manifest" :href "/img/site.webmanifest")))))) + (link :rel "manifest" :href "/assets/img/site.webmanifest")))))) diff --git a/src/components/scripts.lisp b/src/components/scripts.lisp index e5b6e49..67edfff 100644 --- a/src/components/scripts.lisp +++ b/src/components/scripts.lisp @@ -13,7 +13,7 @@ (defcomp ~scripts () (hsx (<> - (link :rel "stylesheet" :href (bust-cache "/style/dist.css")) + (link :rel "stylesheet" :href (bust-cache "/assets/style/dist.css")) (link :rel "preconnect" :href "https://fonts.gstatic.com" :crossorigin t) (link :rel "preconnect" :href "https://fonts.googleapis.com") (link diff --git a/src/routes/index.lisp b/src/routes/index.lisp index 2e5a16f..2999d9e 100644 --- a/src/routes/index.lisp +++ b/src/routes/index.lisp @@ -11,19 +11,19 @@ (defparameter *links* '(("Keyoxide" "https://keyoxide.org/f39d5b2c951d16732a5cd3528f0c1a22f26d7e62" - "/img/icon/key.svg") + "/assets/img/icon/key.svg") ("GitHub" "https://github.com/skyizwhite" - "/img/icon/github.svg") + "/assets/img/icon/github.svg") ("Forgejo" "https://code.skyizwhite.dev/paku" - "/img/icon/forgejo.svg") + "/assets/img/icon/forgejo.svg") ("Fediverse" "https://himagine.club/@skyizwhite" - "/img/icon/discussion.svg") + "/assets/img/icon/discussion.svg") ("Status" "https://status.skyizwhite.dev" - "/img/icon/server.svg"))) + "/assets/img/icon/server.svg"))) (defun handle-get (params) (declare (ignore params))