Explorar o código

Move CSS and JS Folders to src/ to separate the distribution bundle and the source assets more clearly.
In the future, moving of the html templates may also be desired.

MeFisto94 %!s(int64=4) %!d(string=hai) anos
pai
achega
a79d56471c
Modificáronse 46 ficheiros con 61 adicións e 44 borrados
  1. 1 1
      www/admin/badges.html
  2. 1 1
      www/admin/categories.html
  3. 1 1
      www/admin/index.html
  4. 1 1
      www/admin/pages.html
  5. 1 1
      www/admin/user.html
  6. 1 1
      www/admin/users.html
  7. 1 1
      www/create-page.html
  8. 2 2
      www/edit-page.html
  9. 3 5
      www/index.html
  10. 5 5
      www/layout/layout.html
  11. 1 1
      www/rejection/rejections.html
  12. 0 0
      www/src/css/edit-page.css
  13. 0 0
      www/src/css/store-index.css
  14. 0 0
      www/src/css/style.css
  15. 0 0
      www/src/css/user/control-panel.css
  16. 0 0
      www/src/css/view-page.css
  17. 0 0
      www/src/js/admin/page-badges.js
  18. 0 0
      www/src/js/admin/page-categories.js
  19. 0 0
      www/src/js/admin/page-index.js
  20. 0 0
      www/src/js/admin/page-pages.js
  21. 0 0
      www/src/js/admin/page-user.js
  22. 0 0
      www/src/js/admin/page-users.js
  23. 0 0
      www/src/js/category/index.js
  24. 0 0
      www/src/js/common.js
  25. 0 0
      www/src/js/create-page.js
  26. 0 0
      www/src/js/edit-page.js
  27. 0 0
      www/src/js/messages-index.js
  28. 0 0
      www/src/js/page-api.js
  29. 0 0
      www/src/js/rejection/rejections.js
  30. 0 0
      www/src/js/search/index.js
  31. 0 0
      www/src/js/store-index-carousel.js
  32. 2 0
      www/src/js/store-index.js
  33. 9 6
      www/src/js/test.js
  34. 1 1
      www/src/js/toast.js
  35. 0 0
      www/src/js/user/index.js
  36. 0 0
      www/src/js/user/login.js
  37. 0 0
      www/src/js/user/my-pages.js
  38. 0 0
      www/src/js/user/profile.js
  39. 0 0
      www/src/js/user/reset-password.js
  40. 0 0
      www/src/js/view-message.js
  41. 24 11
      www/src/js/view-page.js
  42. 0 0
      www/src/js/websocket.js
  43. 3 2
      www/test.html
  44. 1 1
      www/user/login.html
  45. 1 1
      www/user/profile.html
  46. 2 2
      www/view-page.html

+ 1 - 1
www/admin/badges.html

@@ -4,7 +4,7 @@
 <head>
 	<title>Asset Store :: Administration</title>
 
-	<script src="/js/admin/page-badges.js" defer></script>
+	<script src="/src/js/admin/page-badges.js" defer></script>
 </head>
 
 <body>

+ 1 - 1
www/admin/categories.html

@@ -4,7 +4,7 @@
 <head>
 	<title>Administrator :: Dashboard</title>
 
-	<script src="/js/admin/page-categories.js" defer></script>
+	<script src="/src/js/admin/page-categories.js" defer></script>
 </head>
 
 <body>

+ 1 - 1
www/admin/index.html

@@ -4,7 +4,7 @@
 <head>
 	<title>Administrator :: Dashboard</title>
 
-	<script src="/js/admin/page-index.js" defer></script>
+	<script src="/src/js/admin/page-index.js" defer></script>
 </head>
 
 <body>

+ 1 - 1
www/admin/pages.html

@@ -4,7 +4,7 @@
 <head>
 	<title>Store Pages :: Administration</title>
 
-	<script type="text/javascript" src="/js/admin/page-pages.js" defer></script>
+	<script type="text/javascript" src="/src/js/admin/page-pages.js" defer></script>
 </head>
 
 <body>

+ 1 - 1
www/admin/user.html

@@ -4,7 +4,7 @@
 <head>
 	<title>Asset Store :: Administration</title>
 
-	<script src="/js/admin/page-user.js" defer></script>
+	<script src="/src/js/admin/page-user.js" defer></script>
 </head>
 
 <body>

+ 1 - 1
www/admin/users.html

@@ -4,7 +4,7 @@
 <head>
 	<title>Asset Store :: Administration</title>
 
-	<script src="/js/admin/page-users.js" defer></script>
+	<script src="/src/js/admin/page-users.js" defer></script>
 </head>
 
 <body>

+ 1 - 1
www/create-page.html

@@ -4,7 +4,7 @@
 <head>
 	<title>Create New Store Page</title>
 
-	<script src="/js/create-page.js" defer></script>
+	<script src="/src/js/create-page.js" defer></script>
 </head>
 
 <body>

+ 2 - 2
www/edit-page.html

@@ -4,9 +4,9 @@
 <head>
 	<title>Edit Page</title>
 
-	<link rel="stylesheet" type="text/css" href="/css/edit-page.css" />
+	<link rel="stylesheet" type="text/css" href="/src/css/edit-page.css" />
 
-	<script src="/js/edit-page.js" defer></script>
+	<script src="/src/js/edit-page.js" defer></script>
 </head>
 
 <body>

+ 3 - 5
www/index.html

@@ -3,11 +3,9 @@
 
 <head>
 	<title>Home</title>
-
-	<link rel="stylesheet" href="/css/store-index.css" />
-
-	<script type="text/javascript" src="/libs/vue-carousel/0.2.0/vue-carousel-3d.min.js"></script>
-	<script type="text/javascript" src="/js/test.js" defer></script>
+    <link rel="stylesheet" href="./libs/semantic/dist/semantic.css" />
+	<link rel="stylesheet" href="/src/css/store-index.css" />
+	<script src="/src/js/test.js" defer></script>
 
 </head>
 

+ 5 - 5
www/layout/layout.html

@@ -6,7 +6,7 @@
 
 	<title layout:title-pattern="$CONTENT_TITLE - $LAYOUT_TITLE" th:text="${pageTitle}"></title>
 
-	<link rel="shortcut icon" type="image/icon" href="/favicon.ico" />
+	<link rel="shortcut icon" type="image/icon" href="../favicon.ico" />
 
 	<!-- Global site tag (gtag.js) - Google Analytics -->
 	<script async src="https://www.googletagmanager.com/gtag/js?id=UA-143545224-1"></script>
@@ -21,18 +21,18 @@
 		gtag("config", "UA-143545224-1");
 	</script>
 
-	<link rel="stylesheet" type="text/css" href="/css/style.css" />
 	<link rel="stylesheet" type="text/css" href="/libs/semantic/dist/semantic.min.css" />
+	<link rel="stylesheet" type="text/css" href="/src/css/style.css" />
 
 	<script src="/libs/jquery/jquery-3.5.1.min.js"></script>
 	<script src="/libs/semantic/dist/semantic.min.js"></script>
 	<script src="/libs/moment/2.24.0/moment.min.js"></script>
 	<script src="/libs/vuejs/2.6.11/vue.js"></script>
 
-	<script src="/js/page-api.js"></script>
+	<script src="/src/js/page-api.js"></script>
 
-	<script src="/js/toast.js" defer></script>
-	<script src="/js/common.js" defer></script>
+	<script src="/src/js/toast.js" defer></script>
+	<script src="/src/js/common.js" defer></script>
 </head>
 
 <body>

+ 1 - 1
www/rejection/rejections.html

@@ -2,7 +2,7 @@
 <html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout/layout}">
 	<head>
 		<title>Page Rejections</title>
-		<script src="/js/rejection/rejections.js" defer></script>
+		<script src="/src/js/rejection/rejections.js" defer></script>
 	</head>
 	<body>
 		<div layout:fragment="content" class="ui container" id="app">

+ 0 - 0
www/css/edit-page.css → www/src/css/edit-page.css


+ 0 - 0
www/css/store-index.css → www/src/css/store-index.css


+ 0 - 0
www/css/style.css → www/src/css/style.css


+ 0 - 0
www/css/user/control-panel.css → www/src/css/user/control-panel.css


+ 0 - 0
www/css/view-page.css → www/src/css/view-page.css


+ 0 - 0
www/js/admin/page-badges.js → www/src/js/admin/page-badges.js


+ 0 - 0
www/js/admin/page-categories.js → www/src/js/admin/page-categories.js


+ 0 - 0
www/js/admin/page-index.js → www/src/js/admin/page-index.js


+ 0 - 0
www/js/admin/page-pages.js → www/src/js/admin/page-pages.js


+ 0 - 0
www/js/admin/page-user.js → www/src/js/admin/page-user.js


+ 0 - 0
www/js/admin/page-users.js → www/src/js/admin/page-users.js


+ 0 - 0
www/js/category/index.js → www/src/js/category/index.js


+ 0 - 0
www/js/common.js → www/src/js/common.js


+ 0 - 0
www/js/create-page.js → www/src/js/create-page.js


+ 0 - 0
www/js/edit-page.js → www/src/js/edit-page.js


+ 0 - 0
www/js/messages-index.js → www/src/js/messages-index.js


+ 0 - 0
www/js/page-api.js → www/src/js/page-api.js


+ 0 - 0
www/js/rejection/rejections.js → www/src/js/rejection/rejections.js


+ 0 - 0
www/js/search/index.js → www/src/js/search/index.js


+ 0 - 0
www/js/store-index-carousel.js → www/src/js/store-index-carousel.js


+ 2 - 0
www/js/store-index.js → www/src/js/store-index.js

@@ -1,3 +1,5 @@
+import Vue from 'vue';
+
 var app = new Vue({
 
 	el: '#app',

+ 9 - 6
www/js/test.js → www/src/js/test.js

@@ -1,4 +1,9 @@
-var app = new Vue({
+import Vue from "vue";
+import { Carousel3d, Slide } from 'vue-carousel-3d';
+import { toast } from "/src/js/toast.js";
+import 'highlight.js/styles/monokai-sublime.css';
+
+const app = new Vue({
 
 	el: '#app',
 
@@ -13,8 +18,8 @@ var app = new Vue({
   },
 
 	components: {
-    'carousel-3d': Carousel3d.Carousel3d,
-    'slide': Carousel3d.Slide
+    'carousel-3d': Carousel3d,
+    'slide': Slide
   },
 
 	 mounted: function() {
@@ -35,9 +40,7 @@ var app = new Vue({
 						app.assets.recently_updated = data.recently_updated;
 
 					},
-					error: function(xhr, status, error) {
-						app.displayToast("Error " + xhr.status + ": " + xhr.responseJSON.message);
-					},
+					error: toast.defaultAjaxError,
 					complete: function(jqXHR, textStatus) {
 						$("#pageLoader").removeClass("active");
 					}

+ 1 - 1
www/js/toast.js → www/src/js/toast.js

@@ -2,7 +2,7 @@ let toastPosition = "bottom left";
 let progressPosition = "bottom";
 let displayTime = 5000;
 
-class toast {
+module.exports = class toast {
 	static defaultAjaxError(xhr, status, error) {
 		let title = "";
 		let message = "";

+ 0 - 0
www/js/user/index.js → www/src/js/user/index.js


+ 0 - 0
www/js/user/login.js → www/src/js/user/login.js


+ 0 - 0
www/js/user/my-pages.js → www/src/js/user/my-pages.js


+ 0 - 0
www/js/user/profile.js → www/src/js/user/profile.js


+ 0 - 0
www/js/user/reset-password.js → www/src/js/user/reset-password.js


+ 0 - 0
www/js/view-message.js → www/src/js/view-message.js


+ 24 - 11
www/js/view-page.js → www/src/js/view-page.js

@@ -1,4 +1,18 @@
-var app = new Vue({
+import Vue from "vue";
+import MarkdownIt from "markdown-it";
+import MarkdownItAbbr from "markdown-it-abbr";
+import MarkdownItDeflist from "markdown-it-deflist";
+import MarkdownItEmoji from "markdown-it-emoji"; // there is also "markdown-it-emoji/light"
+import MarkdownItFootnote from "markdown-it-footnote";
+import MarkdownItIns from "markdown-it-ins";
+import MarkdownItSub from "markdown-it-sub";
+import MarkdownItSup from "markdown-it-sup";
+import MarkdownItMark from "markdown-it-mark";
+import hljs from "highlight.js";
+import toast from "/src/js/toast.js";
+import 'highlight.js/styles/monokai-sublime.css';
+
+const app = new Vue({
   el: "#app",
 
   data: {
@@ -358,8 +372,7 @@ function mountCarousel() {
 }
 
 function mountMarkdown(content) {
-  let md = window
-    .markdownit({
+  let md = new MarkdownIt({
       linkify: true,
       typographer: true,
       quotes: "“”‘’",
@@ -377,14 +390,14 @@ function mountMarkdown(content) {
         return '<pre class="hljs"><code>' + md.utils.escapeHtml(str) + "</code></pre>";
       }
     })
-    .use(window.markdownitAbbr)
-    .use(window.markdownitDeflist)
-    .use(window.markdownitEmoji)
-    .use(window.markdownitFootnote)
-    .use(window.markdownitIns)
-    .use(window.markdownitMark)
-    .use(window.markdownitSub)
-    .use(window.markdownitSup);
+    .use(MarkdownItAbbr)
+    .use(MarkdownItDeflist)
+    .use(MarkdownItEmoji)
+    .use(MarkdownItFootnote)
+    .use(MarkdownItIns)
+    .use(MarkdownItMark)
+    .use(MarkdownItSub)
+    .use(MarkdownItSup);
 
   md.renderer.rules.table_open = function() {
     return '<table class="ui celled table">\n';

+ 0 - 0
www/js/websocket.js → www/src/js/websocket.js


+ 3 - 2
www/test.html

@@ -2,10 +2,10 @@
 <html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout/layout}">
 	<head>
 		<title>View Page</title>
+        <link rel="stylesheet" href="/src/css/view-page.css" />
 
 		<link rel="stylesheet" href="/libs/blueimp-gallery/2.33.0/css/blueimp-gallery.min.css" />
 		<link rel="stylesheet" href="/libs/highlightjs/9.15.10/styles/monokai-sublime.css" />
-		<link rel="stylesheet" href="/css/view-page.css" />
 
 		<script src="/libs/blueimp-gallery/2.33.0/js/blueimp-gallery.min.js"></script>
 		<script src="/libs/highlightjs/9.15.10/highlight.pack.js"></script>
@@ -20,7 +20,8 @@
 		<script src="/libs/markdown-it/markdown-it-deflist.min.js"></script>
 		<script src="/libs/markdown-it/markdown-it-abbr.min.js"></script>
 
-		<script src="/js/view-page.js" defer></script>
+        <script src="/src/js/test.js" defer></script>
+        <script src="/src/js/view-page.js" defer></script>
 
 		<meta th:if="${preview != null && preview == false}" property="og:title" th:content="${previewTitle}">
 		<meta th:if="${preview != null && preview == false}" property="og:description" th:content="${previewDescription}">

+ 1 - 1
www/user/login.html

@@ -3,7 +3,7 @@
 	<head>
 		<title>Login</title>
 
-		<script src="/js/user/login.js"></script>
+		<script src="/src/js/user/login.js"></script>
 	</head>
 	<body>
 		<div layout:fragment="content" class="ui container">

+ 1 - 1
www/user/profile.html

@@ -4,7 +4,7 @@
 <head>
 	<title>Profile</title>
 
-	<script src="/js/user/profile.js" defer></script>
+	<script src="/src/js/user/profile.js" defer></script>
 </head>
 
 <body>

+ 2 - 2
www/view-page.html

@@ -6,7 +6,7 @@
 
 	<link rel="stylesheet" href="/libs/blueimp-gallery/2.33.0/css/blueimp-gallery.min.css" />
 	<link rel="stylesheet" href="/libs/highlightjs/9.15.10/styles/monokai-sublime.css" />
-	<link rel="stylesheet" href="/css/view-page.css" />
+	<link rel="stylesheet" href="/src/css/view-page.css" />
 
 	<script src="/libs/blueimp-gallery/2.41.0/js/blueimp-gallery.min.js"></script>
 	<script src="/libs/highlightjs/10.0.2/highlight.pack.js"></script>
@@ -21,7 +21,7 @@
 	<script src="/libs/markdown-it/markdown-it-deflist.min.js"></script>
 	<script src="/libs/markdown-it/markdown-it-abbr.min.js"></script>
 
-	<script src="/js/view-page.js" defer></script>
+    <script src="/src/js/view-page.js" defer></script>
 
 	<meta th:if="${preview != null && preview == false}" property="og:title" th:content="${previewTitle}">
 	<meta th:if="${preview != null && preview == false}" property="og:description" th:content="${previewDescription}">