Fixes GH-39

edu-python-course · Feb 21, 2024 · 1e5726b · 1e5726b
1 parent e0ba5fb
commit 1e5726b
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 24 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tasktracker-bootstrap",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Task tracker site bootstrap5 templates",
   "private": true,
   "scripts": {

diff --git a/src/views/detail_view.hbs b/src/views/detail_view.hbs
@@ -7,8 +7,8 @@
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
   <meta name="description" content="Task tracker templates package - EDU Python course">
   <meta name="author" content="Serhii Horodilov <[email protected]>">
-  <link rel="icon" type="image/svg+xml" href="../img/favicon.svg">
-  <link rel="icon" type="image/png" href="../img/favicon.png">
+  <link rel="icon" type="image/svg+xml" href="{{favicon_svg}}">
+  <link rel="icon" type="image/png" href="{{favicon_png}}">
   <title>{{title}} | Task Tracker</title>
 </head>
 <body>

diff --git a/src/views/form_view.hbs b/src/views/form_view.hbs
@@ -7,8 +7,8 @@
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
   <meta name="description" content="Task tracker templates package - EDU Python course">
   <meta name="author" content="Serhii Horodilov <[email protected]>">
-  <link rel="icon" type="image/svg+xml" href="../img/favicon.svg">
-  <link rel="icon" type="image/png" href="../img/favicon.png">
+  <link rel="icon" type="image/svg+xml" href="{{favicon_svg}}">
+  <link rel="icon" type="image/png" href="{{favicon_png}}">
   <title>{{title}} | Task Tracker</title>
 </head>
 <body>

diff --git a/src/views/list_view.hbs b/src/views/list_view.hbs
@@ -7,8 +7,8 @@
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
   <meta name="description" content="Task tracker templates package - EDU Python course">
   <meta name="author" content="Serhii Horodilov <[email protected]>">
-  <link rel="icon" type="image/svg+xml" href="../img/favicon.svg">
-  <link rel="icon" type="image/png" href="../img/favicon.png">
+  <link rel="icon" type="image/svg+xml" href="{{favicon_svg}}">
+  <link rel="icon" type="image/png" href="{{favicon_png}}">
   <title>{{title}} | Task Tracker</title>
 </head>
 <body>

diff --git a/src/views/profile_view.hbs b/src/views/profile_view.hbs
@@ -7,8 +7,8 @@
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
   <meta name="description" content="Task tracker templates package - EDU Python course">
   <meta name="author" content="Serhii Horodilov <[email protected]>">
-  <link rel="icon" type="image/svg+xml" href="../img/favicon.svg">
-  <link rel="icon" type="image/png" href="../img/favicon.png">
+  <link rel="icon" type="image/svg+xml" href="{{favicon_svg}}">
+  <link rel="icon" type="image/png" href="{{favicon_png}}">
   <title>{{title}} | Task Tracker</title>
 </head>
 <body>

diff --git a/src/views/signin_view.hbs b/src/views/signin_view.hbs
@@ -7,8 +7,8 @@
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
   <meta name="description" content="Task tracker templates package - EDU Python course">
   <meta name="author" content="Serhii Horodilov <[email protected]>">
-  <link rel="icon" type="image/svg+xml" href="../img/favicon.svg">
-  <link rel="icon" type="image/png" href="../img/favicon.png">
+  <link rel="icon" type="image/svg+xml" href="{{favicon_svg}}">
+  <link rel="icon" type="image/png" href="{{favicon_png}}">
   <title>{{title}} | Task Tracker</title>
 </head>
 <body>

diff --git a/src/views/signup_view.hbs b/src/views/signup_view.hbs
@@ -7,8 +7,8 @@
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
   <meta name="description" content="Task tracker templates package - EDU Python course">
   <meta name="author" content="Serhii Horodilov <[email protected]>">
-  <link rel="icon" type="image/svg+xml" href="../img/favicon.svg">
-  <link rel="icon" type="image/png" href="../img/favicon.png">
+  <link rel="icon" type="image/svg+xml" href="{{favicon_svg}}">
+  <link rel="icon" type="image/png" href="{{favicon_png}}">
   <title>{{title}} | Task Tracker</title>
 </head>
 <body>

diff --git a/webpack.config.js b/webpack.config.js
@@ -14,12 +14,17 @@ const HTMLWebpackPlugin = require("html-webpack-plugin")
 const MiniCSSExtractPlugin = require("mini-css-extract-plugin")
 const api = require("./api/settings")
 
+const templateParameters = {
+    favicon_png: "../assets/img/favicon.png",
+    favicon_svg: "../assets/img/favicon.svg",
+}
+
 // webpack config object
 // noinspection WebpackConfigHighlighting,HttpUrlsUsage
 module.exports = {
     mode: "development",
     output: {
-        filename: "js/main.bundle.js",
+        filename: "assets/js/main.bundle.js",
         path: path.resolve(__dirname, "dist"),
         clean: true
     },
@@ -35,46 +40,52 @@ module.exports = {
         }
     },
     plugins: [
-        new MiniCSSExtractPlugin({filename: "css/main.min.css"}),
+        new MiniCSSExtractPlugin({filename: "assets/css/main.min.css"}),
         new HTMLWebpackPlugin({
             template: path.resolve(__dirname, "src/views/list_view.hbs"),
-            filename: "tasks/task_list.html",
+            filename: "templates/task_list.html",
             templateParameters: {
+                ...templateParameters,
                 title: "Tasks List",
             }
         }),
         new HTMLWebpackPlugin({
             template: path.resolve(__dirname, "src/views/detail_view.hbs"),
-            filename: "tasks/task_detail.html",
+            filename: "templates/task_detail.html",
             templateParameters: {
+                ...templateParameters,
                 title: "Tasks Details",
             }
         }),
         new HTMLWebpackPlugin({
             template: path.resolve(__dirname, "src/views/form_view.hbs"),
-            filename: "tasks/task_form.html",
+            filename: "templates/task_form.html",
             templateParameters: {
+                ...templateParameters,
                 title: "Task Form",
             }
         }),
         new HTMLWebpackPlugin({
             template: path.resolve(__dirname, "src/views/profile_view.hbs"),
-            filename: "users/profile.html",
+            filename: "templates/profile.html",
             templateParameters: {
+                ...templateParameters,
                 title: "User Profile",
             }
         }),
         new HTMLWebpackPlugin({
             template: path.resolve(__dirname, "src/views/signup_view.hbs"),
-            filename: "auth/signup.html",
+            filename: "templates/signup.html",
             templateParameters: {
+                ...templateParameters,
                 title: "Sign Up",
             }
         }),
         new HTMLWebpackPlugin({
             template: path.resolve(__dirname, "src/views/signin_view.hbs"),
-            filename: "auth/signin.html",
+            filename: "templates/signin.html",
             templateParameters: {
+                ...templateParameters,
                 title: "Sign In",
             }
         }),
@@ -101,22 +112,22 @@ module.exports = {
                 test: /\.(png|svg|jpg|jpeg|gif)$/i,
                 type: "asset/resource",
                 generator: {
-                    filename: "img/[name][ext]"
+                    filename: "assets/img/[name][ext]"
                 }
             },
             {
                 test: /\.(woff|woff2|ttf|eot)$/,
                 type: "asset/resource",
                 generator: {
-                    filename: "fonts/[name][ext][query]"
+                    filename: "assets/fonts/[name][ext][query]"
                 }
             },
             {
                 mimetype: "image/svg+xml",
                 scheme: "data",
                 type: "asset/resource",
                 generator: {
-                    filename: "icons/[hash].svg"
+                    filename: "assets/icons/[hash].svg"
                 }
             },
             {