Bump django from 3.0.6 to 3.0.7 in /backend/requirements

.env.template

@@ -1,13 +1,6 @@
 SECRET_KEY=secret
 DEBUG=True
 
-POSTGRES_NAME=postgres
-POSTGRES_USERNAME=postgres
-POSTGRES_PASSWORD=postgres
-POSTGRES_SERVICE_HOST=postgres
-POSTGRES_SERVICE_PORT=5432
-
-
 # social auth
 GITHUB_KEY=yourkey
 GITHUB_SECRET=yoursecret
@@ -18,9 +11,6 @@ GOOGLE_OAUTH2_SECRET=abcde-fghij
 SOCIAL_AUTH_FACEBOOK_KEY = ''
 SOCIAL_AUTH_FACEBOOK_SECRET = ''
 
-CELERY_BROKER_URL=redis://redis:6379/0
-CELERY_RESULT_BACKEND=redis://redis:6379/1
-
 DJANGO_EMAIL_HOST=mailhog
 DJANGO_EMAIL_PORT=1025
 

backend/.dockerignore

@@ -0,0 +1,2 @@
+media
+static

backend/backend/settings/base.py

@@ -11,15 +11,13 @@
 """
 
 import os
+from pathlib import Path
 
 from kombu import Queue
 import redis
 
-# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
-BASE_DIR = os.path.dirname(
-    os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-)
-
+# Build paths inside the project like this: BASE_DIR / 'subdir'.
+BASE_DIR = Path(__file__).resolve(strict=True).parent.parent.parent
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/2.1/howto/deployment/checklist/
@@ -269,7 +267,7 @@
 # Assets
 
 STATIC_URL = "/static/"
-STATIC_ROOT = "/static/"
+STATIC_ROOT = os.path.join(BASE_DIR, "static")
 
 MEDIA_URL = "/media/"
 MEDIA_ROOT = os.path.join(BASE_DIR, "media")

backend/requirements/base.txt

@@ -11,7 +11,7 @@ daphne==2.5.0
 graphene-django==2.10.1
 django-graphql-jwt==0.3.1
 
-Django==3.0.6
+Django==3.0.7
 django-filter==2.2.0
 djangorestframework==3.11.0
 djangorestframework_simplejwt==4.4.0

backend/requirements/dev.txt

@@ -3,4 +3,8 @@ django-extensions==2.2.9  # NOTE: in installed_apps
 Werkzeug==1.0.1 # used for runserver_plus exception console
 ipython==7.14.0
 jupyter==1.0.0
-gql==2.0.0
+gql==2.0.0
+
+watchdog==0.10.3
+pyyaml==5.3.1
+argh==0.26.2

docker-compose.yml

@@ -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
@@ -40,8 +38,8 @@ services:
   nginx:
     container_name: nginx
     build:
-      context: .
-      dockerfile: nginx/dev/Dockerfile
+      context: ./nginx
+      dockerfile: dev/Dockerfile
     ports:
       - "80:80"
     depends_on:
@@ -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}
@@ -129,18 +119,42 @@ services:
   celery:
     <<: *backend
     container_name: celery
-    command: bash -c 'python3 manage.py watch_celery --queue default --concurrency=2'
-    volumes:
-      - ./backend:/code
+    command:
+      - "watchmedo"
+      - "auto-restart"
+      - "--directory=./"
+      - "--pattern=*.py"
+      - "--recursive"
+      - "--"
+      - "celery"
+      - "worker"
+      - "--app=backend.celery_app:app"
+      - "-Q"
+      - "default"
+      - "--concurrency=1"
+      - "--loglevel=INFO"
     ports: []
 
   beat:
     <<: *backend
-    build:
-      context: ./backend
-      dockerfile: scripts/dev/Dockerfile
     container_name: beat
-    command: /start_beat.sh
+    command:
+      - "sh"
+      - "-c"
+      - |
+        # remove celerybeat.pid and celerybeat-schedule if they exist
+        rm -f /code/celerybeat*;
+        watchmedo \
+          auto-restart \
+          --directory=./ \
+          --pattern=*.py \
+          --recursive \
+          -- \
+          celery \
+          beat \
+          --app=backend.celery_app:app \
+          --loglevel=INFO \
+          --pidfile=/code/celerybeat.pid
     volumes:
       - ./backend:/code
     ports: []
@@ -150,7 +164,7 @@ services:
     container_name: flower
     command: --url_prefix=flower --inspect_timeout=20000
     environment:
-      - CELERY_BROKER_URL=${CELERY_BROKER_URL}
+      - CELERY_BROKER_URL=redis://redis:6379/0
       - FLOWER_PORT=5555
     ports:
       - 5555:5555
@@ -187,7 +201,7 @@ services:
     restart: unless-stopped
 
 volumes:
-  pg-data:
+  pgdata:
   django-static:
   redis-data:
   pgadmin:

nginx/dev/Dockerfile

@@ -1,5 +1,4 @@
 FROM nginx:1.18.0-alpine
-COPY nginx/dev/dev.conf /etc/nginx/nginx.conf
-COPY backend/static /usr/src/app/static/
+COPY dev/dev.conf /etc/nginx/nginx.conf
 EXPOSE 80
 CMD ["nginx", "-g", "daemon off;"]

quasar/.dockerignore

@@ -0,0 +1 @@
+node_modules

quasar/Dockerfile

@@ -1,13 +1,7 @@
-FROM node:12.16.3
+FROM node:10-alpine
 
 WORKDIR /app/
 
 COPY . .
 
-RUN npm install -g @quasar/cli && \
-    npm install -g @vue/cli && \
-    npm install -g @vue/cli-init
-
-COPY start_dev.sh .
-
 CMD ["/app/start_dev.sh"]

quasar/package.json

@@ -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/quasar.conf.js

@@ -84,14 +84,14 @@ module.exports = function (ctx) {
       env: ctx.dev
         ? {
             API_URL: JSON.stringify(`http://${process.env.FULL_DOMAIN_NAME}`),
-            WS_URL: JSON.stringify(`ws://${process.env.FULL_DOMAIN_NAME}`),
+            WS_URL: `ws://${process.env.FULL_DOMAIN_NAME}`,
             GITHUB_KEY: JSON.stringify(process.env.GITHUB_KEY),
             GOOGLE_OAUTH2_KEY: JSON.stringify(process.env.GOOGLE_OAUTH2_KEY),
             FACEBOOK_KEY: JSON.stringify(process.env.FACEBOOK_KEY),
           }
         : {
             API_URL: JSON.stringify(`https://${process.env.FULL_DOMAIN_NAME}`),
-            WS_URL: JSON.stringify(`$wss://${process.env.FULL_DOMAIN_NAME}`),
+            WS_URL: `wss://${process.env.FULL_DOMAIN_NAME}`,
             GITHUB_KEY: JSON.stringify(process.env.GITHUB_KEY),
             GOOGLE_OAUTH2_KEY: JSON.stringify(process.env.GOOGLE_OAUTH2_KEY),
             FACEBOOK_KEY: JSON.stringify(process.env.FACEBOOK_KEY),
@@ -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: {