resolved merge conflicts after updating 'what's new' in the app

Co-authored-by: Daniel Garan <[email protected]>
Co-authored-by: Kevin Can <[email protected]>
Co-authored-by: Anthony Herrera <[email protected]>
Co-authored-by: Rob Sinzieri <[email protected]>
Co-authored-by: Roderick de Leon <[email protected]>

Author: anthonyHerr

README.md

@@ -1,5 +1,5 @@
 <h1 align="center">
-  <img src="src/assets/overvue_256x256_old.png">
+  <img width="235 height ="235" src="src/assets/right_sidebar325x325.svg">
 </h1>
 
 <p align="center"><b>Prototyping Development Tool for Vue Developers</b></p>

__mocks__/styleMock.js

@@ -0,0 +1,2 @@
+module.exports = {}
+

jest.config.js

@@ -53,7 +53,8 @@ module.exports = {
     '^pages/(.*)$': '<rootDir>/src/pages/$1',
     '^assets/(.*)$': '<rootDir>/src/assets/$1',
     '^boot/(.*)$': '<rootDir>/src/boot/$1',
-    '.*css$': '@quasar/quasar-app-extension-testing-unit-jest/stub.css',
+    '\\.(css)$': '<rootDir>/__mocks__/styleMock.js',
+    '^@/(.*)$': '<rootDir>/src/$1',
   },
   preset: 'ts-jest',
   transform: {

package-lock.json

@@ -42,12 +42,14 @@
     "core-js": "^3.21.1",
     "dotenv": "^16.0.0",
     "element-plus": "^2.2.16",
+    "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
     "http": "^0.0.1-security",
     "https": "^1.0.0",
     "jest": "^29.6.4",
     "jest-cli": "^29.6.4",
     "jest-environment-jsdom": "^29.6.4",
+    "jest-serializer-vue": "^3.1.0",
     "localforage": "^1.10.0",
     "lodash.clonedeep": "^4.5.0",
     "lodash.isequal": "^4.5.0",

package.json

@@ -101,7 +101,7 @@ module.exports = configure(function (ctx) {
     // Full list of options: https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-devServer
     devServer: {
       server: {
-        type: "http",
+        type: "https",
       },
       port: 8080,
       open: true, // opens browser window automatically
@@ -177,31 +177,31 @@ module.exports = configure(function (ctx) {
         background_color: "#ffffff",
         theme_color: "#027be3",
         icons: [
-          {
-            src: "statics/icons/icon-128x128.png",
-            sizes: "128x128",
-            type: "image/png",
-          },
-          {
-            src: "statics/icons/icon-192x192.png",
-            sizes: "192x192",
-            type: "image/png",
-          },
-          {
-            src: "statics/icons/icon-256x256.png",
-            sizes: "256x256",
-            type: "image/png",
-          },
-          {
-            src: "statics/icons/icon-384x384.png",
-            sizes: "384x384",
-            type: "image/png",
-          },
-          {
-            src: "statics/icons/icon-512x512.png",
-            sizes: "512x512",
-            type: "image/png",
-          },
+          // {
+          //   src: "statics/icons/icon-128x128.png",
+          //   sizes: "128x128",
+          //   type: "image/png",
+          // },
+          // {
+          //   src: "statics/icons/icon-192x192.png",
+          //   sizes: "192x192",
+          //   type: "image/png",
+          // },
+          // {
+          //   src: "statics/icons/icon-256x256.png",
+          //   sizes: "256x256",
+          //   type: "image/png",
+          // },
+          // {
+          //   src: "statics/icons/icon-384x384.png",
+          //   sizes: "384x384",
+          //   type: "image/png",
+          // },
+          // {
+          //   src: "statics/icons/icon-512x512.png",
+          //   sizes: "512x512",
+          //   type: "image/png",
+          // },
         ],
       },
     },
@@ -251,7 +251,14 @@ module.exports = configure(function (ctx) {
           },
         ],
       },
-
+      extendWebpack (cfg) {
+        cfg.module.rules.push({
+          test: /\.svg$/,
+          use: [
+            'file-loader'
+          ]
+        })
+      },
       // "chain" is a webpack-chain object https://github.com/neutrinojs/webpack-chain
       chainWebpackMain(chain) {
         chain