Refactor and a few updates.. eslint etc..

.gitignore

@@ -48,22 +48,22 @@ Thumbs.db
 
 docker/__pycache__/
 
-wg_dashboard_backend/__pycache__/
+wg-manager-backend/__pycache__/
 
-wg_dashboard_frontend/yarn.lock
+wg-manager-frontend/yarn.lock
 
-wg_dashboard_backend/config/server/wg0/clients/4.conf
+wg-manager-backend/config/server/wg0/clients/4.conf
 
-wg_dashboard_backend/config/server/wg0/clients/5.conf
+wg-manager-backend/config/server/wg0/clients/5.conf
 
-wg_dashboard_backend/config/server/wg0/clients/6.conf
+wg-manager-backend/config/server/wg0/clients/6.conf
 
-wg_dashboard_backend/config/server/wg0/clients/7.conf
+wg-manager-backend/config/server/wg0/clients/7.conf
 
-wg_dashboard_backend/config/server/wg0/wg0.conf
+wg-manager-backend/config/server/wg0/wg0.conf
 
 wg-dashboard-py.iml
 
 docker/wg0.conf
 
-wg_dashboard_backend/database.db
+wg-manager-backend/database.db

Dockerfile

@@ -2,7 +2,7 @@ FROM ubuntu:20.04
 ENV TZ=Europe/Minsk
 ENV DEBIAN_FRONTEND=noninteractive
 
-COPY ./wg_dashboard_frontend /tmp/build
+COPY ./wg-manager /tmp/build
 WORKDIR /tmp/build
 
 RUN apt-get update && apt-get install -y \
@@ -25,7 +25,7 @@ WORKDIR /app
 ENV LIBRARY_PATH=/lib:/usr/lib
 ENV TZ=Europe/Oslo
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-COPY wg_dashboard_backend /app
+COPY wg-manager-backend /app
 
 # Install dependencies
 #RUN apk add --no-cache --update wireguard-tools py3-gunicorn python3 py3-pip ip6tables

docs/install.md

@@ -77,7 +77,7 @@ sudo apt install wireguard wireguard-tools -y
 ```
 # Building frontend
 sudo git clone https://github.com/perara/wg-manager.git /opt/wg-manager
-cd /opt/wg-manager/wg_dashboard_frontend
+cd /opt/wg-manager/wg-manager-frontend
 sudo npm install --unsafe-perm > /dev/null && sudo npm install @angular/cli > /dev/null
 sudo node_modules/@angular/cli/bin/ng build --configuration="production"
 ```
@@ -85,8 +85,8 @@ One thing to be aware of is that when issuing the `sudo node_modules/@angular/cl
 
 ## 4. Setup back-end
 ```
-sudo mv dist ../wg_dashboard_backend/build
-cd ../wg_dashboard_backend/
+sudo mv dist ../wg-manager-backend/build
+cd ../wg-manager-backend/
 sudo python3 -m venv venv && source venv/bin/activate
 sudo pip3 install -r requirements.txt
 sudo pip3 install uvicorn

wg-manager-frontend/.eslintrc.json

@@ -0,0 +1,51 @@
+{
+  "root": true,
+  "ignorePatterns": [
+    "projects/**/*"
+  ],
+  "overrides": [
+    {
+      "files": [
+        "*.ts"
+      ],
+      "parserOptions": {
+        "project": [
+          "tsconfig.json",
+          "e2e/tsconfig.json"
+        ],
+        "createDefaultProgram": true
+      },
+      "extends": [
+        "plugin:@angular-eslint/recommended",
+        "plugin:@angular-eslint/template/process-inline-templates"
+      ],
+      "rules": {
+        "@angular-eslint/component-selector": [
+          "error",
+          {
+            "prefix": "app",
+            "style": "kebab-case",
+            "type": "element"
+          }
+        ],
+        "@angular-eslint/directive-selector": [
+          "error",
+          {
+            "prefix": "app",
+            "style": "camelCase",
+            "type": "attribute"
+          }
+        ]
+      }
+    },
+    {
+      "files": [
+        "*.html"
+      ],
+      "extends": [
+        "plugin:@angular-eslint/template/recommended"
+      ],
+      "rules": {}
+    }
+  ]
+}

wg_dashboard_frontend/angular.json → wg-manager-frontend/angular.json

@@ -24,8 +24,7 @@
               "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
               "src/theme/styles.scss"
             ],
-            "scripts": [
-            ]
+            "scripts": []
           },
           "configurations": {
             "production": {
@@ -71,13 +70,11 @@
           }
         },
         "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
+          "builder": "@angular-eslint/builder:lint",
           "options": {
-            "tsConfig": [
-              "src/tsconfig.app.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
+            "lintFilePatterns": [
+              "src/**/*.ts",
+              "src/**/*.html"
             ]
           }
         }
@@ -91,7 +88,8 @@
   },
   "defaultProject": "wg-manager",
   "cli": {
-    "packageManager": "yarn"
+    "packageManager": "yarn",
+    "defaultCollection": "@angular-eslint/schematics"
   },
   "schematics": {
     "@schematics/angular:component": {

wg_dashboard_frontend/package.json → wg-manager-frontend/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "wg_dashboard_frontend",
-  "version": "1.0.0",
+  "name": "wg-manager",
+  "version": "1.1.0",
   "description": "WG Dashboard",
   "keywords": [
     "dashboard"
@@ -11,7 +11,7 @@
     "md-doc": "npm install widdershins && wget http://127.0.0.1:8000/openapi.json -O /tmp/wg-openapi.json && widdershins /tmp/wg-openapi.json --environment widdershins.json --resolve=true --omitHeader=true --language_tabs 'python:Python' -o ../docs/api.md",
     "start": "ng serve --host 0.0.0.0 --disable-host-check",
     "build": "ng build",
-    "buildwatch": "ng build --watch --aot --outputPath=../wg_dashboard_backend/build/ --host 0.0.0.0 --disable-host-check",
+    "buildwatch": "ng build --watch --aot --outputPath=../wg-manager-backend/build/ --host 0.0.0.0 --disable-host-check",
     "tlint": "ng lint",
     "tlint:fix": "ng lint --fix",
     "slint": "stylelint --syntax scss ./**/*.scss",
@@ -30,58 +30,62 @@
   },
   "homepage": "https://github.com/perara/wg-manager",
   "dependencies": {
-    "@angular/animations": "11.0.5",
-    "@angular/cdk": "11.0.3",
-    "@angular/common": "11.0.5",
-    "@angular/compiler": "11.0.5",
-    "@angular/core": "11.0.5",
+    "@angular/animations": "11.2.10",
+    "@angular/cdk": "11.2.9",
+    "@angular/common": "11.2.10",
+    "@angular/compiler": "11.2.10",
+    "@angular/core": "11.2.10",
     "@angular/flex-layout": "11.0.0-beta.33",
-    "@angular/forms": "11.0.5",
-    "@angular/localize": "11.0.5",
-    "@angular/material": "11.0.3",
-    "@angular/platform-browser": "11.0.5",
-    "@angular/platform-browser-dynamic": "11.0.5",
-    "@angular/router": "11.0.5",
-    "@jedmao/ini-parser": "0.2.4",
+    "@angular/forms": "11.2.10",
+    "@angular/localize": "11.2.10",
+    "@angular/material": "11.2.9",
+    "@angular/platform-browser": "11.2.10",
+    "@angular/platform-browser-dynamic": "11.2.10",
+    "@angular/router": "11.2.10",
+    "ngx-cookie-service": "11.0.2",
+    "angularx-qrcode": "11.0.0",
     "angular-material-dynamic-themes": "1.0.4",
-    "angular-notifier": "6.0.1",
-    "angularx-qrcode": "10.0.11",
+    "angular-notifier": "9.0.1",
     "classlist.js": "1.1.20150312",
-    "core-js": "3.6.4",
+    "core-js": "3.10.2",
+    "tslib": "2.2.0",
+    "web-animations-js": "2.3.2",
+    "widdershins": "4.0.1",
+    "zone.js": "0.11.4",
+    "material-icons": "0.6.1",
+    "@jedmao/ini-parser": "0.2.4",
     "file-saver": "2.0.5",
     "hammerjs": "2.0.8",
-    "install": "0.13.0",
     "ip-address": "^7.1.0",
-    "ip-cidr": "2.1.1",
+    "ip-cidr": "2.1.4",
     "js-file-download": "0.4.12",
-    "jszip": "3.5.0",
-    "material-icons": "0.5.1",
-    "ngx-cookie-service": "11.0.2",
-    "npm": "6.14.6",
-    "remove": "0.1.5",
-    "rxjs": "6.5.5",
-    "tslib": "2.0.3",
-    "web-animations-js": "2.3.2",
-    "widdershins": "4.0.1",
-    "zone.js": "0.10.3"
+    "jszip": "3.6.0",
+    "rxjs": "6.6.7"
+
   },
   "devDependencies": {
+    "@angular-devkit/build-angular": "~0.1102.9",
     "@angular-devkit/schematics": "^11.0.5",
-    "@angular-devkit/build-angular": "~0.1100.5",
-    "@angular/cli": "11.0.5",
-    "@angular/compiler-cli": "11.0.5",
-    "@angular/language-service": "11.0.5",
-    "@types/node": "^13.11.0",
-    "codelyzer": "^6.0.0",
-    "sass": "1.32.0",
+    "@angular-eslint/builder": "4.0.0",
+    "@angular-eslint/eslint-plugin": "4.0.0",
+    "@angular-eslint/eslint-plugin-template": "4.0.0",
+    "@angular-eslint/schematics": "4.0.0",
+    "@angular-eslint/template-parser": "4.0.0",
+    "@angular/cli": "11.2.9",
+    "@angular/compiler-cli": "11.2.10",
+    "@angular/language-service": "11.2.10",
+    "@types/node": "^14.14.41",
+    "@typescript-eslint/eslint-plugin": "4.16.1",
+    "@typescript-eslint/parser": "4.16.1",
+    "eslint": "^7.6.0",
     "pre-commit": "1.2.2",
-    "stylelint": "13.3.0",
+    "sass": "1.32.11",
+    "stylelint": "13.12.0",
     "stylelint-config-recommended-scss": "4.2.0",
-    "stylelint-config-standard": "20.0.0",
-    "stylelint-scss": "3.16.0",
-    "ts-node": "8.8.2",
-    "tslint": "~6.1.0",
-    "tslint-angular": "3.0.2",
+    "stylelint-config-standard": "21.0.0",
+    "stylelint-scss": "3.19.0",
+    "ts-node": "9.1.1",
+    "tslint-angular": "3.0.3",
     "tslint-config-airbnb": "5.11.2",
     "typescript": "4.0.5"
   }