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" ? "" : "[email protected]",
-      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>
 

quasar/src/components/auth/LoginForm.vue

@@ -41,7 +41,7 @@ export default {
     return {
       email: "",
       password: "",
-      visible: false
+      visible: false,
     };
   },
   methods: {
@@ -51,7 +51,7 @@ export default {
         .then(() => {
           this.$q.notify({
             title: "User registered",
-            message: "Thank you for registering!"
+            message: "Thank you for registering!",
           });
           this.visible = false;
           this.$router.push("/");
@@ -60,8 +60,8 @@ export default {
           this.visible = false;
           this.$q.notify("There was an error.");
         });
-    }
-  }
+    },
+  },
 };
 </script>
 

quasar/src/components/auth/SignUpForm.vue

@@ -9,25 +9,25 @@ export default {
   props: {
     href: {
       type: String,
-      default: "#"
+      default: "#",
     },
     name: {
       type: String,
-      default: ""
+      default: "",
     },
     icon: {
       type: String,
-      default: ""
+      default: "",
     },
     target: {
       type: String,
-      default: "_blank"
+      default: "_blank",
     },
     type: {
       type: String,
-      default: "a"
-    }
-  }
+      default: "a",
+    },
+  },
 };
 </script>
 

quasar/src/components/services/ServiceLink.vue

@@ -7,13 +7,13 @@ export default {
   props: {
     color: {
       type: String,
-      default: "white"
-    }
+      default: "white",
+    },
   },
   textColor: {
     type: String,
-    default: "black"
-  }
+    default: "black",
+  },
 };
 </script>
 

quasar/src/components/ui/BaseBtn.vue

@@ -1,7 +1,6 @@
 <template>
   <q-input v-bind="$attrs" v-on="$listeners" :dark="$store.getters.isDark">
-    <template v-slot:prepend>
-      <slot></slot> </template
+    <template v-slot:prepend> <slot></slot> </template
   ></q-input>
 </template>
 

quasar/src/components/ui/BaseInput.vue

@@ -13,8 +13,8 @@ export default {
   methods: {
     getStyle() {
       return { color: "white" };
-    }
-  }
+    },
+  },
 };
 </script>
 

quasar/src/components/ui/BasePage.vue

@@ -11,9 +11,9 @@ export default {
       },
       set() {
         this.$store.commit("toggleDarkMode");
-      }
-    }
-  }
+      },
+    },
+  },
 };
 </script>
 

quasar/src/components/ui/DarkMode.vue

@@ -12,8 +12,8 @@ export default {
   props: {
     size: {
       type: Number,
-      default: 1.25
-    }
-  }
+      default: 1.25,
+    },
+  },
 };
 </script>

quasar/src/components/ui/PageText.vue

@@ -1,5 +1,5 @@
 import leftDrawer from "./leftDrawer";
 
 export default {
-  ...leftDrawer
+  ...leftDrawer,
 };

quasar/src/i18n/cn-cn/index.js

@@ -3,5 +3,5 @@ import leftDrawer from "./leftDrawer";
 export default {
   ...leftDrawer,
   failed: "Hello",
-  success: "Action was successful"
+  success: "Action was successful",
 };

quasar/src/i18n/en-us/index.js

@@ -3,5 +3,5 @@ import cnCN from "./cn-cn";
 
 export default {
   "en-us": enUS,
-  "cn-cn": cnCN
+  "cn-cn": cnCN,
 };

quasar/src/i18n/index.js

@@ -7,7 +7,7 @@
     <meta name="description" content="<%= htmlWebpackPlugin.options.productDescription %>">
     <meta name="format-detection" content="telephone=no">
     <meta name="msapplication-tap-highlight" content="no">
-    <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (htmlWebpackPlugin.options.ctx.mode.cordova || htmlWebpackPlugin.options.ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>">
+    <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>">
 
     <link rel="icon" type="image/png" href="statics/app-logo-128x128.png">
     <link rel="icon" type="image/png" sizes="16x16" href="statics/icons/favicon-16x16.png">

quasar/src/index.template.html

@@ -16,7 +16,7 @@
 
 <script>
 export default {
-  name: "MainLayout"
+  name: "MainLayout",
 };
 </script>