fixed index.template.html for quasar v2, ran npm run lint -- --fix, changed django settings

Author: briancaffey

backend/backend/settings/base.py

@@ -11,6 +11,7 @@
 """
 
 import os
+from pathlib import Path
 
 from kombu import Queue
 import redis
@@ -266,7 +267,7 @@
 # Assets
 
 STATIC_URL = "/static/"
-STATIC_ROOT = os.path.join(BASE_DIR, "media")
+STATIC_ROOT = os.path.join(BASE_DIR, "static")
 
 MEDIA_URL = "/media/"
 MEDIA_ROOT = os.path.join(BASE_DIR, "media")

backend/scripts/ci/Dockerfile

@@ -7,13 +7,11 @@ services:
     networks:
       - main
     ports:
-      - "5434:5432"
+      - "5432:5432"
     volumes:
-      - pg-data:/var/lib/postgresql/data
+      - pgdata:/var/lib/postgresql/data
     environment:
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-      - POSTGRES_USER=${POSTGRES_USERNAME}
-      - POSTGRES_DB=${POSTGRES_NAME}
+      - POSTGRES_PASSWORD=postgres
 
   redis:
     image: redis:alpine
@@ -91,18 +89,10 @@ services:
     networks:
       - main
     environment:
-      - CI_PIPELINE_TRIGGERED=True
       - SECRET_KEY=secret-key-for-development
       - DEBUG=True
       - DJANGO_EMAIL_HOST=${DJANGO_EMAIL_HOST}
       - DJANGO_EMAIL_PORT=${DJANGO_EMAIL_PORT}
-      - POSTGRES_NAME=${POSTGRES_NAME}
-      - POSTGRES_USERNAME=${POSTGRES_USERNAME}
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-      - POSTGRES_SERVICE_HOST=${POSTGRES_SERVICE_HOST}
-      - POSTGRES_SERVICE_PORT=${POSTGRES_SERVICE_PORT}
-      - CELERY_BROKER_URL=${CELERY_BROKER_URL}
-      - CELERY_RESULT_BACKEND=${CELERY_RESULT_BACKEND}
       - DJANGO_SETTINGS_MODULE=backend.settings.development
       - GITHUB_KEY=${GITHUB_KEY}
       - GITHUB_SECRET=${GITHUB_SECRET}
@@ -211,7 +201,7 @@ services:
     restart: unless-stopped
 
 volumes:
-  pg-data:
+  pgdata:
   django-static:
   redis-data:
   pgadmin:

docker-compose.yml

@@ -31,13 +31,14 @@
     "vue-native-websocket": "2.0.14"
   },
   "devDependencies": {
-    "@quasar/app": "1.9.0",
+    "@quasar/app": "^2.0.0",
     "@vue/eslint-config-prettier": "6.0.0",
     "babel-eslint": "10.1.0",
     "eslint": "5.16.0",
     "eslint-loader": "4.0.2",
     "eslint-plugin-prettier": "3.1.3",
-    "eslint-plugin-vue": "6.2.2"
+    "eslint-plugin-vue": "6.2.2",
+    "workbox-webpack-plugin": "^5.1.3"
   },
   "engines": {
     "node": ">= 8.9.0",

quasar/package.json

@@ -137,11 +137,11 @@ module.exports = function (ctx) {
 
     pwa: {
       // workboxPluginMode: "InjectManifest",
+      workboxPluginMode: "GenerateSW", // 'GenerateSW' or 'InjectManifest'
       workboxOptions: {
         navigateFallback: "/index.html",
-        navigateFallbackBlacklist: [
-          /\/[admin,api,flower]+\/.*/,
-          /[admin,api,flower]+\/.*/,
+        navigateFallbackDenylist: [
+          /\/[admin,api,flower,pgadmin,rediscommander]+\/.*/,
         ],
       },
       manifest: {

quasar/quasar.conf.js

@@ -10,7 +10,7 @@
 export default {
   name: "App",
 
-  created: function() {
+  created: function () {
     // if (this.$store.getters.isAuthenticated) {
     //   this.$store.dispatch("USER_REQUEST");
     //   // refresh the token every 4 minutes while the user is logged in in production
@@ -20,7 +20,7 @@ export default {
     //     this.$store.dispatch("AUTH_REFRESH");
     //   }, 1000 * 60 * refreshFrequency);
     // }
-  }
+  },
   // TODO: set this in Vuex
   // const isDesktop = this.$q.platform.is.desktop;
 };

quasar/src/App.vue

@@ -7,7 +7,7 @@ Vue.use(VueI18n);
 const i18n = new VueI18n({
   locale: "en-us",
   fallbackLocale: "en-us",
-  messages
+  messages,
 });
 
 export default ({ app }) => {

quasar/src/boot/i18n.js

@@ -14,7 +14,7 @@
 
 <script>
 export default {
-  props: ["label", "to", "icon", "caption"]
+  props: ["label", "to", "icon", "caption"],
 };
 </script>
 

quasar/src/components/LeftMenuLink.vue

@@ -11,11 +11,9 @@
       padding
       arrows
       height="300px"
-      :class="
-        `text-white shadow-1 rounded-borders ${
-          $store.getters.isDark ? 'carousel-dark' : 'carousel-light'
-        }`
-      "
+      :class="`text-white shadow-1 rounded-borders ${
+        $store.getters.isDark ? 'carousel-dark' : 'carousel-light'
+      }`"
     >
       <q-carousel-slide name="style" class="column no-wrap flex-center">
         <q-icon name="layers" size="56px" />
@@ -47,9 +45,9 @@ export default {
   data() {
     return {
       lorem: "Abc123",
-      slide: "style"
+      slide: "style",
     };
-  }
+  },
 };
 </script>
 

quasar/src/components/MainCarousel.vue

@@ -36,7 +36,7 @@ export default {
   data() {
     return {
       email: process.env.NODE_ENV === "production" ? "" : "admin@company.com",
-      password: process.env.NODE_ENV === "production" ? "" : "password"
+      password: process.env.NODE_ENV === "production" ? "" : "password",
     };
   },
   methods: {
@@ -45,7 +45,7 @@ export default {
       this.$store
         .dispatch("AUTH_REQUEST", {
           email: this.email,
-          password: this.password
+          password: this.password,
         })
         .then(() => {
           vm.$router.push("/");
@@ -57,8 +57,8 @@ export default {
         });
       this.email = "";
       this.password = "";
-    }
-  }
+    },
+  },
 };
 </script>