frontend: reorganise assets

package.json

@@ -1,7 +1,7 @@
 {
   "scripts": {
-    "build:js": "esbuild src/assets/javascripts/main.ts --bundle --outfile=src/assets/bundle.js",
-    "build:css": "esbuild src/assets/stylesheets/app.css --bundle --outfile=src/assets/bundle.css",
+    "build:js": "esbuild src/frontend/js/main.ts --bundle --outfile=src/assets/static/bundle.js",
+    "build:css": "esbuild src/frontend/css/app.css --bundle --outfile=src/assets/static/bundle.css",
     "build": "npm run build:js && npm run build:css"
   },
   "devDependencies": {

src/assets/assets.go

@@ -15,5 +15,5 @@ func Templates() *template.Template {
 }
 
 func StaticFS() fs.FS {
-	return os.DirFS(rootDir)
+	return os.DirFS(rootDir + "/static")
 }

src/assets/assetsfs.go

@@ -8,9 +8,7 @@ import (
 	"io/fs"
 )
 
-//go:embed graphicarts
-//go:embed javascripts
-//go:embed stylesheets
+//go:embed static
 var static embed.FS
 
 //go:embed templates

src/assets/static/bundle.css

@@ -9501,7 +9501,7 @@ a.text-dark:hover {
   }
 }
 
-/* src/assets/stylesheets/app.css */
+/* src/frontend/css/app.css */
 [v-cloak] {
   display: none !important;
 }

src/assets/static/bundle.js

@@ -9998,7 +9998,7 @@
     }
   };
 
-  // src/assets/javascripts/i18n.ts
+  // src/frontend/js/i18n.ts
   var translations = {
     "unread": {
       "en": "Unread",
@@ -10712,7 +10712,7 @@
     }
   };
 
-  // src/assets/javascripts/api.ts
+  // src/frontend/js/api.ts
   var xfetch = function(resource, init) {
     init = init || {};
     if (["post", "put", "delete"].indexOf(init.method) !== -1) {
@@ -10818,7 +10818,7 @@
     }
   };
 
-  // src/assets/javascripts/templates/index.html
+  // src/frontend/js/templates/index.html
   var templates_default = `<div class="d-flex" :class="{'feed-selected': feedSelected !== null, 'item-selected': itemSelected !== null}">
     <!-- feed list -->
     <div id="col-feed-list" class="vh-100 position-relative d-flex flex-column border-right flex-shrink-0" :style="{width: feedListWidth+'px'}">
@@ -11251,103 +11251,103 @@
 </div>
 `;
 
-  // src/assets/graphicarts/anchor.svg
+  // src/frontend/graphicarts/anchor.svg
   var anchor_default = '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-anchor"><circle cx="12" cy="5" r="3"></circle><line x1="12" y1="22" x2="12" y2="8"></line><path d="M5 12H2a10 10 0 0 0 20 0h-3"></path></svg>';
 
-  // src/assets/graphicarts/alert-circle.svg
+  // src/frontend/graphicarts/alert-circle.svg
   var alert_circle_default = '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-alert-circle"><circle cx="12" cy="12" r="10"></circle><line x1="12" y1="8" x2="12" y2="12"></line><line x1="12" y1="16" x2="12.01" y2="16"></line></svg>';
 
-  // src/assets/graphicarts/assorted.svg
+  // src/frontend/graphicarts/assorted.svg
   var assorted_default = '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-bar-chart-2"><line x1="4" y1="6" x2="14" y2="6"></line><line x1="4" y1="12" x2="20" y2="12"></line><line x1="4" y1="18" x2="8" y2="18"></line></svg>\n';
 
-  // src/assets/graphicarts/book-open.svg
+  // src/frontend/graphicarts/book-open.svg
   var book_open_default = '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-book-open"><path d="M2 3h6a4 4 0 0 1 4 4v14a3 3 0 0 0-3-3H2z"></path><path d="M22 3h-6a4 4 0 0 0-4 4v14a3 3 0 0 1 3-3h7z"></path></svg>';
 
-  // src/assets/graphicarts/check.svg
+  // src/frontend/graphicarts/check.svg
   var check_default = '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-check"><polyline points="20 6 9 17 4 12"></polyline></svg>';
 
-  // src/assets/graphicarts/chevron-down.svg
+  // src/frontend/graphicarts/chevron-down.svg
   var chevron_down_default = '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-chevron-down"><polyline points="6 9 12 15 18 9"></polyline></svg>';
 
-  // src/assets/graphicarts/chevron-left.svg
+  // src/frontend/graphicarts/chevron-left.svg
   var chevron_left_default = '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-chevron-left"><polyline points="15 18 9 12 15 6"></polyline></svg>';
 
-  // src/assets/graphicarts/chevron-right.svg
+  // src/frontend/graphicarts/chevron-right.svg
   var chevron_right_default = '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-chevron-right"><polyline points="9 18 15 12 9 6"></polyline></svg>';
 
-  // src/assets/graphicarts/chevron-up.svg
+  // src/frontend/graphicarts/chevron-up.svg
   var chevron_up_default = '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-chevron-up"><polyline points="18 15 12 9 6 15"></polyline></svg>';
 
-  // src/assets/graphicarts/circle.svg
+  // src/frontend/graphicarts/circle.svg
   var circle_default = '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-circle"><circle cx="12" cy="12" r="10"></circle></svg>';
 
-  // src/assets/graphicarts/circle-full.svg
+  // src/frontend/graphicarts/circle-full.svg
   var circle_full_default = '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="currentColor" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-circle"><circle cx="12" cy="12" r="10"></circle></svg>\n';
 
-  // src/assets/graphicarts/download.svg
+  // src/frontend/graphicarts/download.svg
   var download_default = '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-download"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"></path><polyline points="7 10 12 15 17 10"></polyline><line x1="12" y1="15" x2="12" y2="3"></line></svg>';
 
-  // src/assets/graphicarts/edit.svg
+  // src/frontend/graphicarts/edit.svg
   var edit_default = '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-edit"><path d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"></path><path d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"></path></svg>';
 
-  // src/assets/graphicarts/external-link.svg
+  // src/frontend/graphicarts/external-link.svg
   var external_link_default = '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-external-link"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path><polyline points="15 3 21 3 21 9"></polyline><line x1="10" y1="14" x2="21" y2="3"></line></svg>';
 
-  // src/assets/graphicarts/folder.svg
+  // src/frontend/graphicarts/folder.svg
   var folder_default = '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-folder"><path d="M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5l2 3h9a2 2 0 0 1 2 2z"></path></svg>';
 
-  // src/assets/graphicarts/folder-minus.svg
+  // src/frontend/graphicarts/folder-minus.svg
   var folder_minus_default = '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-folder-minus"><path d="M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5l2 3h9a2 2 0 0 1 2 2z"></path><line x1="9" y1="14" x2="15" y2="14"></line></svg>';
 
-  // src/assets/graphicarts/folder-plus.svg
+  // src/frontend/graphicarts/folder-plus.svg
   var folder_plus_default = '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-folder-plus"><path d="M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5l2 3h9a2 2 0 0 1 2 2z"></path><line x1="12" y1="11" x2="12" y2="17"></line><line x1="9" y1="14" x2="15" y2="14"></line></svg>';
 
-  // src/assets/graphicarts/globe.svg
+  // src/frontend/graphicarts/globe.svg
   var globe_default = '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-globe"><circle cx="12" cy="12" r="10"></circle><line x1="2" y1="12" x2="22" y2="12"></line><path d="M12 2a15.3 15.3 0 0 1 4 10 15.3 15.3 0 0 1-4 10 15.3 15.3 0 0 1-4-10 15.3 15.3 0 0 1 4-10z"></path></svg>';
 
-  // src/assets/graphicarts/help-circle.svg
+  // src/frontend/graphicarts/help-circle.svg
   var help_circle_default = '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-help-circle"><circle cx="12" cy="12" r="10"></circle><path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3"></path><line x1="12" y1="17" x2="12.01" y2="17"></line></svg>';
 
-  // src/assets/graphicarts/layers.svg
+  // src/frontend/graphicarts/layers.svg
   var layers_default = '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-layers"><polygon points="12 2 2 7 12 12 22 7 12 2"></polygon><polyline points="2 17 12 22 22 17"></polyline><polyline points="2 12 12 17 22 12"></polyline></svg>';
 
-  // src/assets/graphicarts/log-out.svg
+  // src/frontend/graphicarts/log-out.svg
   var log_out_default = '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-log-out"><path d="M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4"></path><polyline points="16 17 21 12 16 7"></polyline><line x1="21" y1="12" x2="9" y2="12"></line></svg>';
 
-  // src/assets/graphicarts/more-horizontal.svg
+  // src/frontend/graphicarts/more-horizontal.svg
   var more_horizontal_default = '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-more-horizontal"><circle cx="12" cy="12" r="1"></circle><circle cx="19" cy="12" r="1"></circle><circle cx="5" cy="12" r="1"></circle></svg>';
 
-  // src/assets/graphicarts/plus.svg
+  // src/frontend/graphicarts/plus.svg
   var plus_default = '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-plus"><line x1="12" y1="5" x2="12" y2="19"></line><line x1="5" y1="12" x2="19" y2="12"></line></svg>';
 
-  // src/assets/graphicarts/rotate-cw.svg
+  // src/frontend/graphicarts/rotate-cw.svg
   var rotate_cw_default = '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-rotate-cw"><polyline points="23 4 23 10 17 10"></polyline><path d="M20.49 15a9 9 0 1 1-2.12-9.36L23 10"></path></svg>';
 
-  // src/assets/graphicarts/rss.svg
+  // src/frontend/graphicarts/rss.svg
   var rss_default = '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-rss"><path d="M4 11a9 9 0 0 1 9 9"></path><path d="M4 4a16 16 0 0 1 16 16"></path><circle cx="5" cy="19" r="1"></circle></svg>';
 
-  // src/assets/graphicarts/search.svg
+  // src/frontend/graphicarts/search.svg
   var search_default = '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-search"><circle cx="11" cy="11" r="8"></circle><line x1="21" y1="21" x2="16.65" y2="16.65"></line></svg>';
 
-  // src/assets/graphicarts/sliders.svg
+  // src/frontend/graphicarts/sliders.svg
   var sliders_default = '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-sliders"><line x1="4" y1="21" x2="4" y2="14"></line><line x1="4" y1="10" x2="4" y2="3"></line><line x1="12" y1="21" x2="12" y2="12"></line><line x1="12" y1="8" x2="12" y2="3"></line><line x1="20" y1="21" x2="20" y2="16"></line><line x1="20" y1="12" x2="20" y2="3"></line><line x1="1" y1="14" x2="7" y2="14"></line><line x1="9" y1="8" x2="15" y2="8"></line><line x1="17" y1="16" x2="23" y2="16"></line></svg>';
 
-  // src/assets/graphicarts/star.svg
+  // src/frontend/graphicarts/star.svg
   var star_default = '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-star"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"></polygon></svg>';
 
-  // src/assets/graphicarts/star-full.svg
+  // src/frontend/graphicarts/star-full.svg
   var star_full_default = '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="currentColor" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-star"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"></polygon></svg>\n';
 
-  // src/assets/graphicarts/trash.svg
+  // src/frontend/graphicarts/trash.svg
   var trash_default = '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-trash"><polyline points="3 6 5 6 21 6"></polyline><path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"></path></svg>';
 
-  // src/assets/graphicarts/upload.svg
+  // src/frontend/graphicarts/upload.svg
   var upload_default = '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-upload"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"></path><polyline points="17 8 12 3 7 8"></polyline><line x1="12" y1="3" x2="12" y2="15"></line></svg>';
 
-  // src/assets/graphicarts/x.svg
+  // src/frontend/graphicarts/x.svg
   var x_default = '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-x"><line x1="18" y1="6" x2="6" y2="18"></line><line x1="6" y1="6" x2="18" y2="18"></line></svg>';
 
-  // src/assets/javascripts/icons.ts
+  // src/frontend/js/icons.ts
   var icons_default = {
     anchor: anchor_default,
     "alert-circle": alert_circle_default,
@@ -11383,7 +11383,7 @@
     x: x_default
   };
 
-  // src/assets/javascripts/key.ts
+  // src/frontend/js/key.ts
   function setupKeybindings(vm3) {
     var helperFunctions = {
       scrollContent: function(direction) {
@@ -11510,7 +11510,7 @@
     });
   }
 
-  // src/assets/javascripts/app.ts
+  // src/frontend/js/app.ts
   var app = window.app;
   var vm;
   var TITLE = document.title;
@@ -12318,7 +12318,7 @@
     }
   };
 
-  // src/assets/javascripts/templates/login.html
+  // src/frontend/js/templates/login.html
   var login_default = `<div class="login-page">
     <form @submit.prevent="login">
         <img src="./static/graphicarts/anchor.svg" alt="">
@@ -12336,7 +12336,7 @@
 </div>
 `;
 
-  // src/assets/javascripts/login.ts
+  // src/frontend/js/login.ts
   var login_default2 = {
     template: login_default,
     data: function() {
@@ -12360,7 +12360,7 @@
     }
   };
 
-  // src/assets/javascripts/main.ts
+  // src/frontend/js/main.ts
   Vue.use(i18n_default);
   var vm2 = new Vue({
     render: function(h) {