Merge branch 'release/2.7.0'

.github/workflows/build_master.yml

@@ -5,34 +5,32 @@ name: Deploy Live
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
 #   pull_request:
 #     branches: [ master ]
 
-
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v2
-      - name: Setup Node.js 12
+      - name: Setup Node.js 16
         uses: actions/setup-node@v2
         with:
-          node-version: '12'
-          cache: 'npm'
+          node-version: "16"
+          cache: "npm"
       - run: npm i -g @quasar/cli@latest
       - run: npm ci
-      
+
       - name: Create env file
         run: |
-            cat << EOF >> .env.production.local
-            ${{ secrets.ENV_FILE }}
-            EOF
-      
+          cat << EOF >> .env.production.local
+          ${{ secrets.ENV_FILE }}
+          EOF
+
       - run: quasar build -m ssr --if-present
-      
+
       # Login against a Docker registry except on PR
       # https://github.com/docker/login-action
       - name: Log into registry Docker Hub
@@ -58,5 +56,3 @@ jobs:
           context: .
           push: true
           tags: harmlesskey/harmlesskey
-
-

.github/workflows/build_staging.yml

@@ -5,32 +5,30 @@ name: Deploy Staging
 
 on:
   push:
-    branches: [ develop ]
+    branches: [develop]
   pull_request:
-    branches: [ develop ]
+    branches: [develop]
   workflow_dispatch:
 
-
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v2
-      - name: Setup Node.js 12
+      - name: Setup Node.js 16
         uses: actions/setup-node@v2
         with:
-          node-version: '12'
+          node-version: '16'
           cache: 'npm'
       - run: npm i -g @quasar/cli@latest
       - run: npm ci
 
       - name: Create env file
         run: |
-            cat << EOF >> .env.production.local
-            ${{ secrets.STAGING_ENV_FILE }}
-            EOF
+          cat << EOF >> .env.production.local
+          ${{ secrets.STAGING_ENV_FILE }}
+          EOF
 
       # - run: npm run build in debug mode --if-present
       - run: quasar build -m ssr -d --if-present
@@ -60,4 +58,3 @@ jobs:
           context: .
           push: true
           tags: harmlesskey/harmlesskey_staging
-

.husky/pre-push

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npm run lint

.prettierrc

@@ -1,6 +1,9 @@
 {
-  "trailingComma": "es5",
-  "tabWidth": 2,
-  "semi": true,
-  "singleQuote": true
+	"printWidth": 100,
+	"trailingComma": "es5",
+	"tabWidth": 2,
+	"useTabs": true,
+	"semi": true,
+	"htmlWhitespaceSensitivity": "css",
+	"endOfLine": "lf"
 }

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:12
+FROM node:16
 
 WORKDIR /app