From 5ad8d76e0a8486f23377738331de20780d7e8f07 Mon Sep 17 00:00:00 2001
From: iacore <iacore@noreply.codeberg.org>
Date: Mon, 19 Aug 2024 23:02:53 +0000
Subject: [PATCH] rename views/ to assets/ rename folders within

---
 .../workflows/compress-assets.yaml.disabled   |   2 +-
 Dockerfile                                    |   2 +-
 {views => assets}/css/style.css               |   0
 {views => assets}/css/style.scss              |   0
 {views/assets => assets/img}/about.svg        |   0
 {views/assets => assets/img}/calendar.png     | Bin
 {views/assets => assets/img}/circlems.svg     |   0
 {views/assets => assets/img}/cog.svg          |   0
 {views/assets => assets/img}/compass.png      | Bin
 {views/assets => assets/img}/cross.png        | Bin
 {views/assets => assets/img}/crown.png        | Bin
 {views/assets => assets/img}/eye.png          | Bin
 {views/assets => assets/img}/facebook.svg     |   0
 {views/assets => assets/img}/favicon.ico      | Bin
 {views/assets => assets/img}/favicon2.ico     | Bin
 {views/assets => assets/img}/font-family.png  | Bin
 {views/assets => assets/img}/font-size.png    | Bin
 {views/assets => assets/img}/globe.png        | Bin
 .../assets => assets/img}/heart-outline.png   | Bin
 {views/assets => assets/img}/heart-red.png    | Bin
 {views/assets => assets/img}/heart-solid.png  | Bin
 {views/assets => assets/img}/heart.png        | Bin
 {views/assets => assets/img}/home.svg         |   0
 {views/assets => assets/img}/instagram.svg    |   0
 {views/assets => assets/img}/like-blue.png    | Bin
 {views/assets => assets/img}/like-outline.png | Bin
 {views/assets => assets/img}/like.png         | Bin
 {views/assets => assets/img}/menu-thin.png    | Bin
 {views/assets => assets/img}/menu.png         | Bin
 {views/assets => assets/img}/orientation.png  | Bin
 {views/assets => assets/img}/pawoo.svg        |   0
 {views/assets => assets/img}/search.png       | Bin
 {views/assets => assets/img}/search.svg       |   0
 {views/assets => assets/img}/settings.png     | Bin
 {views/assets => assets/img}/sparkling.png    | Bin
 {views/assets => assets/img}/tumblr.svg       |   0
 {views/assets => assets/img}/twitter.svg      |   0
 {views/assets => assets/img}/user.png         | Bin
 {views/assets => assets/img}/users.png        | Bin
 {views => assets}/js/htmx@1.9.10.min.js       |   0
 {views => assets}/js/illust-preview.js        |   0
 {views => assets}/js/on-page-load.js          |   0
 .../pages => assets/layout}/_layout.jet.html  |  28 +++++++++---------
 {views/pages => assets/layout}/about.jet.html |   0
 .../pages => assets/layout}/artwork.jet.html  |   0
 .../layout}/artworkMulti.jet.html             |   0
 .../layout}/components/artwork.jet.html       |  16 +++++-----
 .../layout}/components/novel-tn.jet.html      |   4 +--
 .../layout}/components/ranking-tn.jet.html    |   0
 .../layout}/components/small-tn.jet.html      |   0
 .../layout}/components/switcher.jet.html      |   0
 .../layout}/components/thumbnail-at.jet.html  |   0
 .../layout}/components/thumbnail-dt.jet.html  |   0
 .../layout}/components/thumbnail-tt.jet.html  |   0
 .../layout}/discovery.jet.html                |   0
 {views/pages => assets/layout}/error.jet.html |   0
 .../layout}/following.jet.html                |   0
 {views/pages => assets/layout}/index.jet.html |   0
 .../pages => assets/layout}/newest.jet.html   |   0
 {views/pages => assets/layout}/novel.jet.html |  14 ++++-----
 .../layout}/novelDiscovery.jet.html           |   0
 {views/pages => assets/layout}/rank.jet.html  |   0
 .../layout}/rankingCalendar.jet.html          |   0
 .../pages => assets/layout}/settings.jet.html |   0
 {views/pages => assets/layout}/tag.jet.html   |   0
 {views/pages => assets/layout}/temp.jet.html  |   0
 .../layout}/unauthorized.jet.html             |   0
 .../layout}/user.atom.jet.html                |   0
 {views/pages => assets/layout}/user.jet.html  |   4 +--
 {views/assets => assets}/robots.txt           |   0
 main.go                                       |  16 +++++-----
 routes/templateTypes.go                       |   2 ++
 72 files changed, 45 insertions(+), 43 deletions(-)
 rename {views => assets}/css/style.css (100%)
 rename {views => assets}/css/style.scss (100%)
 rename {views/assets => assets/img}/about.svg (100%)
 rename {views/assets => assets/img}/calendar.png (100%)
 rename {views/assets => assets/img}/circlems.svg (100%)
 rename {views/assets => assets/img}/cog.svg (100%)
 rename {views/assets => assets/img}/compass.png (100%)
 rename {views/assets => assets/img}/cross.png (100%)
 rename {views/assets => assets/img}/crown.png (100%)
 rename {views/assets => assets/img}/eye.png (100%)
 rename {views/assets => assets/img}/facebook.svg (100%)
 rename {views/assets => assets/img}/favicon.ico (100%)
 rename {views/assets => assets/img}/favicon2.ico (100%)
 rename {views/assets => assets/img}/font-family.png (100%)
 rename {views/assets => assets/img}/font-size.png (100%)
 rename {views/assets => assets/img}/globe.png (100%)
 rename {views/assets => assets/img}/heart-outline.png (100%)
 rename {views/assets => assets/img}/heart-red.png (100%)
 rename {views/assets => assets/img}/heart-solid.png (100%)
 rename {views/assets => assets/img}/heart.png (100%)
 rename {views/assets => assets/img}/home.svg (100%)
 rename {views/assets => assets/img}/instagram.svg (100%)
 rename {views/assets => assets/img}/like-blue.png (100%)
 rename {views/assets => assets/img}/like-outline.png (100%)
 rename {views/assets => assets/img}/like.png (100%)
 rename {views/assets => assets/img}/menu-thin.png (100%)
 rename {views/assets => assets/img}/menu.png (100%)
 rename {views/assets => assets/img}/orientation.png (100%)
 rename {views/assets => assets/img}/pawoo.svg (100%)
 rename {views/assets => assets/img}/search.png (100%)
 rename {views/assets => assets/img}/search.svg (100%)
 rename {views/assets => assets/img}/settings.png (100%)
 rename {views/assets => assets/img}/sparkling.png (100%)
 rename {views/assets => assets/img}/tumblr.svg (100%)
 rename {views/assets => assets/img}/twitter.svg (100%)
 rename {views/assets => assets/img}/user.png (100%)
 rename {views/assets => assets/img}/users.png (100%)
 rename {views => assets}/js/htmx@1.9.10.min.js (100%)
 rename {views => assets}/js/illust-preview.js (100%)
 rename {views => assets}/js/on-page-load.js (100%)
 rename {views/pages => assets/layout}/_layout.jet.html (76%)
 rename {views/pages => assets/layout}/about.jet.html (100%)
 rename {views/pages => assets/layout}/artwork.jet.html (100%)
 rename {views/pages => assets/layout}/artworkMulti.jet.html (100%)
 rename {views/pages => assets/layout}/components/artwork.jet.html (86%)
 rename {views/pages => assets/layout}/components/novel-tn.jet.html (94%)
 rename {views/pages => assets/layout}/components/ranking-tn.jet.html (100%)
 rename {views/pages => assets/layout}/components/small-tn.jet.html (100%)
 rename {views/pages => assets/layout}/components/switcher.jet.html (100%)
 rename {views/pages => assets/layout}/components/thumbnail-at.jet.html (100%)
 rename {views/pages => assets/layout}/components/thumbnail-dt.jet.html (100%)
 rename {views/pages => assets/layout}/components/thumbnail-tt.jet.html (100%)
 rename {views/pages => assets/layout}/discovery.jet.html (100%)
 rename {views/pages => assets/layout}/error.jet.html (100%)
 rename {views/pages => assets/layout}/following.jet.html (100%)
 rename {views/pages => assets/layout}/index.jet.html (100%)
 rename {views/pages => assets/layout}/newest.jet.html (100%)
 rename {views/pages => assets/layout}/novel.jet.html (91%)
 rename {views/pages => assets/layout}/novelDiscovery.jet.html (100%)
 rename {views/pages => assets/layout}/rank.jet.html (100%)
 rename {views/pages => assets/layout}/rankingCalendar.jet.html (100%)
 rename {views/pages => assets/layout}/settings.jet.html (100%)
 rename {views/pages => assets/layout}/tag.jet.html (100%)
 rename {views/pages => assets/layout}/temp.jet.html (100%)
 rename {views/pages => assets/layout}/unauthorized.jet.html (100%)
 rename {views/pages => assets/layout}/user.atom.jet.html (100%)
 rename {views/pages => assets/layout}/user.jet.html (94%)
 rename {views/assets => assets}/robots.txt (100%)
 create mode 100644 routes/templateTypes.go

diff --git a/.forgejo/workflows/compress-assets.yaml.disabled b/.forgejo/workflows/compress-assets.yaml.disabled
index 08f2eff..7d8895f 100644
--- a/.forgejo/workflows/compress-assets.yaml.disabled
+++ b/.forgejo/workflows/compress-assets.yaml.disabled
@@ -24,4 +24,4 @@ jobs:
           mv ./leanify /usr/local/bin
 
       - name: Compress assets
-        run: leanify -p ./views/assets
+        run: leanify -p ./assets/img
diff --git a/Dockerfile b/Dockerfile
index ce26745..f1921c4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,7 +20,7 @@ RUN addgroup -g 1000 -S pixivfe && \
 
 # Copy the compiled application and other necessary files from the builder stage
 COPY --from=builder /app/pixivfe /app/pixivfe
-COPY --from=builder /app/views /app/views
+COPY --from=builder /app/assets /app/assets
 COPY ./docker/entrypoint.sh /entrypoint.sh
 # Include entrypoint script and ensure it's executable
 RUN chmod +x /entrypoint.sh && \
diff --git a/views/css/style.css b/assets/css/style.css
similarity index 100%
rename from views/css/style.css
rename to assets/css/style.css
diff --git a/views/css/style.scss b/assets/css/style.scss
similarity index 100%
rename from views/css/style.scss
rename to assets/css/style.scss
diff --git a/views/assets/about.svg b/assets/img/about.svg
similarity index 100%
rename from views/assets/about.svg
rename to assets/img/about.svg
diff --git a/views/assets/calendar.png b/assets/img/calendar.png
similarity index 100%
rename from views/assets/calendar.png
rename to assets/img/calendar.png
diff --git a/views/assets/circlems.svg b/assets/img/circlems.svg
similarity index 100%
rename from views/assets/circlems.svg
rename to assets/img/circlems.svg
diff --git a/views/assets/cog.svg b/assets/img/cog.svg
similarity index 100%
rename from views/assets/cog.svg
rename to assets/img/cog.svg
diff --git a/views/assets/compass.png b/assets/img/compass.png
similarity index 100%
rename from views/assets/compass.png
rename to assets/img/compass.png
diff --git a/views/assets/cross.png b/assets/img/cross.png
similarity index 100%
rename from views/assets/cross.png
rename to assets/img/cross.png
diff --git a/views/assets/crown.png b/assets/img/crown.png
similarity index 100%
rename from views/assets/crown.png
rename to assets/img/crown.png
diff --git a/views/assets/eye.png b/assets/img/eye.png
similarity index 100%
rename from views/assets/eye.png
rename to assets/img/eye.png
diff --git a/views/assets/facebook.svg b/assets/img/facebook.svg
similarity index 100%
rename from views/assets/facebook.svg
rename to assets/img/facebook.svg
diff --git a/views/assets/favicon.ico b/assets/img/favicon.ico
similarity index 100%
rename from views/assets/favicon.ico
rename to assets/img/favicon.ico
diff --git a/views/assets/favicon2.ico b/assets/img/favicon2.ico
similarity index 100%
rename from views/assets/favicon2.ico
rename to assets/img/favicon2.ico
diff --git a/views/assets/font-family.png b/assets/img/font-family.png
similarity index 100%
rename from views/assets/font-family.png
rename to assets/img/font-family.png
diff --git a/views/assets/font-size.png b/assets/img/font-size.png
similarity index 100%
rename from views/assets/font-size.png
rename to assets/img/font-size.png
diff --git a/views/assets/globe.png b/assets/img/globe.png
similarity index 100%
rename from views/assets/globe.png
rename to assets/img/globe.png
diff --git a/views/assets/heart-outline.png b/assets/img/heart-outline.png
similarity index 100%
rename from views/assets/heart-outline.png
rename to assets/img/heart-outline.png
diff --git a/views/assets/heart-red.png b/assets/img/heart-red.png
similarity index 100%
rename from views/assets/heart-red.png
rename to assets/img/heart-red.png
diff --git a/views/assets/heart-solid.png b/assets/img/heart-solid.png
similarity index 100%
rename from views/assets/heart-solid.png
rename to assets/img/heart-solid.png
diff --git a/views/assets/heart.png b/assets/img/heart.png
similarity index 100%
rename from views/assets/heart.png
rename to assets/img/heart.png
diff --git a/views/assets/home.svg b/assets/img/home.svg
similarity index 100%
rename from views/assets/home.svg
rename to assets/img/home.svg
diff --git a/views/assets/instagram.svg b/assets/img/instagram.svg
similarity index 100%
rename from views/assets/instagram.svg
rename to assets/img/instagram.svg
diff --git a/views/assets/like-blue.png b/assets/img/like-blue.png
similarity index 100%
rename from views/assets/like-blue.png
rename to assets/img/like-blue.png
diff --git a/views/assets/like-outline.png b/assets/img/like-outline.png
similarity index 100%
rename from views/assets/like-outline.png
rename to assets/img/like-outline.png
diff --git a/views/assets/like.png b/assets/img/like.png
similarity index 100%
rename from views/assets/like.png
rename to assets/img/like.png
diff --git a/views/assets/menu-thin.png b/assets/img/menu-thin.png
similarity index 100%
rename from views/assets/menu-thin.png
rename to assets/img/menu-thin.png
diff --git a/views/assets/menu.png b/assets/img/menu.png
similarity index 100%
rename from views/assets/menu.png
rename to assets/img/menu.png
diff --git a/views/assets/orientation.png b/assets/img/orientation.png
similarity index 100%
rename from views/assets/orientation.png
rename to assets/img/orientation.png
diff --git a/views/assets/pawoo.svg b/assets/img/pawoo.svg
similarity index 100%
rename from views/assets/pawoo.svg
rename to assets/img/pawoo.svg
diff --git a/views/assets/search.png b/assets/img/search.png
similarity index 100%
rename from views/assets/search.png
rename to assets/img/search.png
diff --git a/views/assets/search.svg b/assets/img/search.svg
similarity index 100%
rename from views/assets/search.svg
rename to assets/img/search.svg
diff --git a/views/assets/settings.png b/assets/img/settings.png
similarity index 100%
rename from views/assets/settings.png
rename to assets/img/settings.png
diff --git a/views/assets/sparkling.png b/assets/img/sparkling.png
similarity index 100%
rename from views/assets/sparkling.png
rename to assets/img/sparkling.png
diff --git a/views/assets/tumblr.svg b/assets/img/tumblr.svg
similarity index 100%
rename from views/assets/tumblr.svg
rename to assets/img/tumblr.svg
diff --git a/views/assets/twitter.svg b/assets/img/twitter.svg
similarity index 100%
rename from views/assets/twitter.svg
rename to assets/img/twitter.svg
diff --git a/views/assets/user.png b/assets/img/user.png
similarity index 100%
rename from views/assets/user.png
rename to assets/img/user.png
diff --git a/views/assets/users.png b/assets/img/users.png
similarity index 100%
rename from views/assets/users.png
rename to assets/img/users.png
diff --git a/views/js/htmx@1.9.10.min.js b/assets/js/htmx@1.9.10.min.js
similarity index 100%
rename from views/js/htmx@1.9.10.min.js
rename to assets/js/htmx@1.9.10.min.js
diff --git a/views/js/illust-preview.js b/assets/js/illust-preview.js
similarity index 100%
rename from views/js/illust-preview.js
rename to assets/js/illust-preview.js
diff --git a/views/js/on-page-load.js b/assets/js/on-page-load.js
similarity index 100%
rename from views/js/on-page-load.js
rename to assets/js/on-page-load.js
diff --git a/views/pages/_layout.jet.html b/assets/layout/_layout.jet.html
similarity index 76%
rename from views/pages/_layout.jet.html
rename to assets/layout/_layout.jet.html
index 9d97cd0..dbf78f1 100644
--- a/views/pages/_layout.jet.html
+++ b/assets/layout/_layout.jet.html
@@ -49,38 +49,38 @@
         <span class="sidebar-container">
           <input type="checkbox" class="sidebar-toggler" id="sidebar-toggler" />
           <label for="sidebar-toggler" class="sidebar-label">
-            <img src="/assets/menu-thin.png" alt="Menu" width="30" height="30" />
+            <img src="/img/menu-thin.png" alt="Menu" width="30" height="30" />
           </label>
           <div class="sidebar">
             <ul class="sidebar-list">
               <a class="sidebar-item" href="/discovery">
-                <img src="/assets/compass.png" alt="compass" />Discovery</a>
+                <img src="/img/compass.png" alt="compass" />Discovery</a>
               <a class="sidebar-item" href="/ranking">
-                <img src="/assets/crown.png" alt="crown" />Ranking</a>
+                <img src="/img/crown.png" alt="crown" />Ranking</a>
               <a class="sidebar-item" href="/rankingCalendar">
-                <img src="/assets/calendar.png" alt="calendar" />Ranking history</a>
+                <img src="/img/calendar.png" alt="calendar" />Ranking history</a>
               <a class="sidebar-item" href="/newest">
-                <img src="/assets/sparkling.png" alt="sparkling" />Newest</a>
+                <img src="/img/sparkling.png" alt="sparkling" />Newest</a>
               <br />
               <a class="sidebar-item" href="/self/followingWorks">
-                <img src="/assets/users.png" alt="users" />Latest by followed</a>
+                <img src="/img/users.png" alt="users" />Latest by followed</a>
               <a class="sidebar-item" href="/self/bookmarks">
-                <img src="/assets/heart.png" alt="heart" />Your bookmarks</a>
+                <img src="/img/heart.png" alt="heart" />Your bookmarks</a>
               <a class="sidebar-item" href="/self">
-                <img src="/assets/user.png" alt="user" />Your profile</a>
+                <img src="/img/user.png" alt="user" />Your profile</a>
               <br />
               <a class="sidebar-item" href="/settings">
-                <img src="/assets/settings.png" alt="settings" />Settings</a>
+                <img src="/img/settings.png" alt="settings" />Settings</a>
               <a class="sidebar-item" href="/about">
-                <img src="/assets/about.svg" alt="about" />About</a>
+                <img src="/img/about.svg" alt="about" />About</a>
               <br />
               <a class="sidebar-item" href="https://codeberg.org/vnpower/pixivfe">
-                <img src="/assets/globe.png" alt="globe" />Source code</a>
+                <img src="/img/globe.png" alt="globe" />Source code</a>
             </ul>
           </div>
         </span>
         <a class="navbar-brand" href="/">
-          <img src="/assets/favicon.ico" alt="PixivFE icon" />
+          <img src="/img/favicon.ico" alt="PixivFE icon" />
           <span>PixivFE</span>
         </a>
       </span>
@@ -88,13 +88,13 @@
       <span class="navbar-entry">
         <form action="/tags" method="post" class="search-form" autocomplete="off">
           <input type="text" name="name" required="true" class="search-form-text" placeholder="⌕ Search artworks..." />
-          <label class="navbar-entry"><img src="/assets/search.svg" alt="Search" /><input type="submit"
+          <label class="navbar-entry"><img src="/img/search.svg" alt="Search" /><input type="submit"
               hidden /></label>
         </form>
       </span>
 
       <a class="navbar-entry" href="/settings">
-        <img src="/assets/cog.svg" alt="Settings" />
+        <img src="/img/cog.svg" alt="Settings" />
       </a>
     </div>
     <div class="navbar-shadow"></div>
diff --git a/views/pages/about.jet.html b/assets/layout/about.jet.html
similarity index 100%
rename from views/pages/about.jet.html
rename to assets/layout/about.jet.html
diff --git a/views/pages/artwork.jet.html b/assets/layout/artwork.jet.html
similarity index 100%
rename from views/pages/artwork.jet.html
rename to assets/layout/artwork.jet.html
diff --git a/views/pages/artworkMulti.jet.html b/assets/layout/artworkMulti.jet.html
similarity index 100%
rename from views/pages/artworkMulti.jet.html
rename to assets/layout/artworkMulti.jet.html
diff --git a/views/pages/components/artwork.jet.html b/assets/layout/components/artwork.jet.html
similarity index 86%
rename from views/pages/components/artwork.jet.html
rename to assets/layout/components/artwork.jet.html
index 502d38d..ee4a3df 100644
--- a/views/pages/components/artwork.jet.html
+++ b/assets/layout/components/artwork.jet.html
@@ -37,20 +37,20 @@
   <div class="artwork-actions">
     {{ if isset(.BookmarkData) && LoggedIn }}
     <a href="/self/deleteBookmark/{{ .BookmarkID }}?r={{ OriginalURL }}">
-      <img src="/assets/heart-red.png" alt="Bookmarked" />
+      <img src="/img/heart-red.png" alt="Bookmarked" />
     </a>
     {{ else }}
     <a href="/self/addBookmark/{{ .ID }}?r={{ OriginalURL }}">
-      <img src="/assets/heart-outline.png" alt="Bookmark" />
+      <img src="/img/heart-outline.png" alt="Bookmark" />
     </a>
     {{ end }}
 
     {{ if .Liked && LoggedIn}}
-    <img src="/assets/like-blue.png" alt="Liked" />
+    <img src="/img/like-blue.png" alt="Liked" />
 
     {{ else }}
     <a href="/self/like/{{ .ID }}?r={{ OriginalURL }}">
-      <img src="/assets/like-outline.png" alt="Like" />
+      <img src="/img/like-outline.png" alt="Like" />
     </a>
     {{ end }}
   </div>
@@ -62,19 +62,19 @@
 </div>
 <div class="illust-tags">
   <span class="illust-tag-attr">
-    <img src="/assets/eye.png" alt="Views" />
+    <img src="/img/eye.png" alt="Views" />
     {{ .Views }}
   </span>
   <span class="illust-tag-attr">
-    <img src="/assets/heart-solid.png" alt="Bookmarks" />
+    <img src="/img/heart-solid.png" alt="Bookmarks" />
     {{ .Bookmarks }}
   </span>
   <span class="illust-tag-attr">
-    <img src="/assets/like.png" alt="Likes" />
+    <img src="/img/like.png" alt="Likes" />
     {{ .Likes }}
   </span>
   <span class="illust-tag-attr">
-    <img src="/assets/calendar.png" alt="Date" />
+    <img src="/img/calendar.png" alt="Date" />
     {{ parseTime: .Date }}
   </span>
 </div>
diff --git a/views/pages/components/novel-tn.jet.html b/assets/layout/components/novel-tn.jet.html
similarity index 94%
rename from views/pages/components/novel-tn.jet.html
rename to assets/layout/components/novel-tn.jet.html
index 052ee38..cf366c1 100644
--- a/views/pages/components/novel-tn.jet.html
+++ b/assets/layout/components/novel-tn.jet.html
@@ -52,11 +52,11 @@
 
             <div class="illust-tags">
                 <span class="illust-tag-attr">
-                <img src="/assets/heart-solid.png" alt="Bookmarks" />
+                <img src="/img/heart-solid.png" alt="Bookmarks" />
                 {{ .Bookmarks }}
                 </span>
                 <span class="illust-tag-attr">
-                <img src="/assets/calendar.png" alt="Date" />
+                <img src="/img/calendar.png" alt="Date" />
                 {{ parseTime: .CreateDate }}
                 </span>
             </div>
diff --git a/views/pages/components/ranking-tn.jet.html b/assets/layout/components/ranking-tn.jet.html
similarity index 100%
rename from views/pages/components/ranking-tn.jet.html
rename to assets/layout/components/ranking-tn.jet.html
diff --git a/views/pages/components/small-tn.jet.html b/assets/layout/components/small-tn.jet.html
similarity index 100%
rename from views/pages/components/small-tn.jet.html
rename to assets/layout/components/small-tn.jet.html
diff --git a/views/pages/components/switcher.jet.html b/assets/layout/components/switcher.jet.html
similarity index 100%
rename from views/pages/components/switcher.jet.html
rename to assets/layout/components/switcher.jet.html
diff --git a/views/pages/components/thumbnail-at.jet.html b/assets/layout/components/thumbnail-at.jet.html
similarity index 100%
rename from views/pages/components/thumbnail-at.jet.html
rename to assets/layout/components/thumbnail-at.jet.html
diff --git a/views/pages/components/thumbnail-dt.jet.html b/assets/layout/components/thumbnail-dt.jet.html
similarity index 100%
rename from views/pages/components/thumbnail-dt.jet.html
rename to assets/layout/components/thumbnail-dt.jet.html
diff --git a/views/pages/components/thumbnail-tt.jet.html b/assets/layout/components/thumbnail-tt.jet.html
similarity index 100%
rename from views/pages/components/thumbnail-tt.jet.html
rename to assets/layout/components/thumbnail-tt.jet.html
diff --git a/views/pages/discovery.jet.html b/assets/layout/discovery.jet.html
similarity index 100%
rename from views/pages/discovery.jet.html
rename to assets/layout/discovery.jet.html
diff --git a/views/pages/error.jet.html b/assets/layout/error.jet.html
similarity index 100%
rename from views/pages/error.jet.html
rename to assets/layout/error.jet.html
diff --git a/views/pages/following.jet.html b/assets/layout/following.jet.html
similarity index 100%
rename from views/pages/following.jet.html
rename to assets/layout/following.jet.html
diff --git a/views/pages/index.jet.html b/assets/layout/index.jet.html
similarity index 100%
rename from views/pages/index.jet.html
rename to assets/layout/index.jet.html
diff --git a/views/pages/newest.jet.html b/assets/layout/newest.jet.html
similarity index 100%
rename from views/pages/newest.jet.html
rename to assets/layout/newest.jet.html
diff --git a/views/pages/novel.jet.html b/assets/layout/novel.jet.html
similarity index 91%
rename from views/pages/novel.jet.html
rename to assets/layout/novel.jet.html
index e8edb1e..bdee99c 100644
--- a/views/pages/novel.jet.html
+++ b/assets/layout/novel.jet.html
@@ -40,19 +40,19 @@
 
       <div class="illust-tags">
         <span class="illust-tag-attr">
-          <img src="/assets/eye.png" alt="Views" />
+          <img src="/img/eye.png" alt="Views" />
           {{ Novel.Views }}
         </span>
         <span class="illust-tag-attr">
-          <img src="/assets/heart-solid.png" alt="Bookmarks" />
+          <img src="/img/heart-solid.png" alt="Bookmarks" />
           {{ Novel.Bookmarks }}
         </span>
         <span class="illust-tag-attr">
-          <img src="/assets/like.png" alt="Likes" />
+          <img src="/img/like.png" alt="Likes" />
           {{ Novel.Likes }}
         </span>
         <span class="illust-tag-attr">
-          <img src="/assets/calendar.png" alt="Date" />
+          <img src="/img/calendar.png" alt="Date" />
           {{ parseTime: Novel.CreateDate }}
         </span>
       </div>
@@ -65,7 +65,7 @@
         {{ url := "/settings/novelFontType?noredirect=t&r=" + OriginalURL + "#content" }}
         <input type="checkbox" class="dropdown-toggler" id="font-type-toggler" />
         <label for="font-type-toggler" class="dropdown-toggler-label">
-          <img src="/assets/font-family.png" alt="Font family" />
+          <img src="/img/font-family.png" alt="Font family" />
         </label>
         <div class="dropdown-content">
           <div>Font type</div>
@@ -79,12 +79,12 @@
           </form>
         </div>
       </span>
-      <img src="/assets/font-size.png" alt="Font size" />
+      <img src="/img/font-size.png" alt="Font size" />
       <span class="dropdown">
         {{ url := "/settings/novelViewMode?r=" + OriginalURL + "#content" }}
         <input type="checkbox" class="dropdown-toggler" id="view-mode-toggler" />
         <label for="view-mode-toggler" class="dropdown-toggler-label">
-          <img src="/assets/orientation.png" alt="Orientation" />
+          <img src="/img/orientation.png" alt="Orientation" />
         </label>
         <div class="dropdown-content">
           <div>Text orientation</div>
diff --git a/views/pages/novelDiscovery.jet.html b/assets/layout/novelDiscovery.jet.html
similarity index 100%
rename from views/pages/novelDiscovery.jet.html
rename to assets/layout/novelDiscovery.jet.html
diff --git a/views/pages/rank.jet.html b/assets/layout/rank.jet.html
similarity index 100%
rename from views/pages/rank.jet.html
rename to assets/layout/rank.jet.html
diff --git a/views/pages/rankingCalendar.jet.html b/assets/layout/rankingCalendar.jet.html
similarity index 100%
rename from views/pages/rankingCalendar.jet.html
rename to assets/layout/rankingCalendar.jet.html
diff --git a/views/pages/settings.jet.html b/assets/layout/settings.jet.html
similarity index 100%
rename from views/pages/settings.jet.html
rename to assets/layout/settings.jet.html
diff --git a/views/pages/tag.jet.html b/assets/layout/tag.jet.html
similarity index 100%
rename from views/pages/tag.jet.html
rename to assets/layout/tag.jet.html
diff --git a/views/pages/temp.jet.html b/assets/layout/temp.jet.html
similarity index 100%
rename from views/pages/temp.jet.html
rename to assets/layout/temp.jet.html
diff --git a/views/pages/unauthorized.jet.html b/assets/layout/unauthorized.jet.html
similarity index 100%
rename from views/pages/unauthorized.jet.html
rename to assets/layout/unauthorized.jet.html
diff --git a/views/pages/user.atom.jet.html b/assets/layout/user.atom.jet.html
similarity index 100%
rename from views/pages/user.atom.jet.html
rename to assets/layout/user.atom.jet.html
diff --git a/views/pages/user.jet.html b/assets/layout/user.jet.html
similarity index 94%
rename from views/pages/user.jet.html
rename to assets/layout/user.jet.html
index 08a7a21..8a4e357 100644
--- a/views/pages/user.jet.html
+++ b/assets/layout/user.jet.html
@@ -18,11 +18,11 @@
     <small> {{ User.Following }} Following | {{ User.MyPixiv }} MyPixiv </small>
     <div class="user-social">
       {{ if User.Webpage }}
-      <span><a href="{{ User.Webpage }}"><img src="/assets/globe.png" alt="Webpage" /></a></span>
+      <span><a href="{{ User.Webpage }}"><img src="/img/globe.png" alt="Webpage" /></a></span>
       {{ end }} {{ range index, item := User.Social }}
       <span>
         <a href="{{ item.url }}">
-          <img src="/assets/{{ index }}.svg" alt="{{ index }}" />
+          <img src="/img/{{ index }}.svg" alt="{{ index }}" />
         </a>
       </span>
       {{ end }}
diff --git a/views/assets/robots.txt b/assets/robots.txt
similarity index 100%
rename from views/assets/robots.txt
rename to assets/robots.txt
diff --git a/main.go b/main.go
index 0820cd5..73460b0 100644
--- a/main.go
+++ b/main.go
@@ -33,7 +33,7 @@ import (
 
 func CanRequestSkipLimiter(c *fiber.Ctx) bool {
 	path := c.Path()
-	return strings.HasPrefix(path, "/assets/") ||
+	return strings.HasPrefix(path, "/img/") ||
 		strings.HasPrefix(path, "/css/") ||
 		strings.HasPrefix(path, "/js/") ||
 		strings.HasPrefix(path, "/proxy/s.pximg.net/")
@@ -50,7 +50,7 @@ func main() {
 	config.GlobalServerConfig.InitializeConfig()
 	core_http.Init()
 
-	engine := jet.New("./views/pages", ".jet.html")
+	engine := jet.New("./assets/layout", ".jet.html")
 	engine.AddFuncMap(serve.GetTemplateFunctions())
 	if config.GlobalServerConfig.InDevelopment {
 		engine.Reload(true)
@@ -238,11 +238,11 @@ func main() {
 		return nil
 	})
 
-	server.Static("/favicon.ico", "./views/assets/favicon.ico")
-	server.Static("/robots.txt", "./views/assets/robots.txt")
-	server.Static("/assets/", "./views/assets")
-	server.Static("/css/", "./views/css")
-	server.Static("/js/", "./views/js")
+	server.Static("/favicon.ico", "./assets/img/favicon.ico")
+	server.Static("/robots.txt", "./assets/robots.txt")
+	server.Static("/img/", "./assets/img")
+	server.Static("/css/", "./assets/css")
+	server.Static("/js/", "./assets/js")
 
 	server.Use(recover.New(recover.Config{EnableStackTrace: config.GlobalServerConfig.InDevelopment}))
 
@@ -301,7 +301,7 @@ func main() {
 	// run sass when in development mode
 	if config.GlobalServerConfig.InDevelopment {
 		go func() {
-			cmd := exec.Command("sass", "--watch", "views/css")
+			cmd := exec.Command("sass", "--watch", "assets/css")
 			cmd.Stdout = os.Stderr // Sass quirk
 			cmd.Stderr = os.Stderr
 			cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true, Pdeathsig: syscall.SIGHUP}
diff --git a/routes/templateTypes.go b/routes/templateTypes.go
new file mode 100644
index 0000000..80c6966
--- /dev/null
+++ b/routes/templateTypes.go
@@ -0,0 +1,2 @@
+package pages
+