Merge pull request #955 from QutEcoacoustics/report-forms

Contact Us and Report Problem Forms
QutEcoacoustics · Apr 13, 2021 · 85a25ea · 85a25ea
2 parents 2131539 + 12c1e18
commit 85a25ea
Show file tree

Hide file tree

Showing 97 changed files with 2,108 additions and 1,771 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,7 +1,7 @@
 node_modules/
 coverage/
 dist/
-src/assets/old-client/
+src/assets/
 baw-client/
 decorate-angular-cli.js
 e2e/protractor.conf.js
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,45 +1,45 @@
 {
-  "root": true,
   "ignorePatterns": ["projects/**/*"],
   "overrides": [
     {
-      "files": ["*.ts"],
-      "parserOptions": {
-        "project": ["tsconfig.json", "tsconfig.e2e.json"],
-        "createDefaultProgram": true
-      },
       "extends": [
+        "eslint:recommended",
+        "plugin:@typescript-eslint/recommended",
         "plugin:@angular-eslint/ng-cli-compat",
         "plugin:@angular-eslint/ng-cli-compat--formatting-add-on",
-        "plugin:@angular-eslint/template/process-inline-templates"
+        "plugin:@angular-eslint/template/process-inline-templates",
+        "plugin:import/errors",
+        "plugin:import/warnings",
+        "plugin:import/typescript"
+      ],
+      "files": ["*.ts"],
+      "parserOptions": {
+        "createDefaultProgram": true,
+        "project": ["tsconfig.json", "tsconfig.e2e.json"]
+      },
+      "plugins": [
+        "eslint-plugin-rxjs",
+        "rxjs-angular",
+        "@typescript-eslint",
+        "import"
       ],
-      "plugins": ["eslint-plugin-rxjs", "rxjs-angular"],
       "rules": {
-        "no-implicit-globals": "error",
-        "no-underscore-dangle": "off",
-        "@typescript-eslint/member-ordering": "off",
-        "no-shadow": "off",
-        "@typescript-eslint/no-shadow": ["error"],
-        "quotes": ["error", "double", { "avoidEscape": true }],
-        "@typescript-eslint/quotes": [
-          "error",
-          "double",
-          { "avoidEscape": true }
-        ],
+        "import/no-unresolved": "off",
+        "import/no-deprecated": "error",
         "@angular-eslint/component-selector": [
           "error",
           {
-            "type": "element",
             "prefix": ["baw"],
-            "style": "kebab-case"
+            "style": "kebab-case",
+            "type": "element"
           }
         ],
         "@angular-eslint/directive-selector": [
           "error",
           {
-            "type": "attribute",
             "prefix": ["baw"],
-            "style": "camelCase"
+            "style": "camelCase",
+            "type": "attribute"
           }
         ],
         "@angular-eslint/use-component-view-encapsulation": "error",
@@ -52,6 +52,7 @@
             "accessibility": "explicit"
           }
         ],
+        "@typescript-eslint/explicit-module-boundary-types": "off",
         "@typescript-eslint/member-delimiter-style": [
           "off",
           {
@@ -65,26 +66,57 @@
             }
           }
         ],
+        "@typescript-eslint/member-ordering": "off",
+        "@typescript-eslint/no-shadow": ["error"],
+        "@typescript-eslint/no-unused-vars": [
+          "error",
+          {
+            "argsIgnorePattern": "^_"
+          }
+        ],
+        "@typescript-eslint/quotes": [
+          "error",
+          "double",
+          {
+            "avoidEscape": true
+          }
+        ],
         "@typescript-eslint/semi": ["off", null],
         "arrow-parens": ["off", "always"],
         "brace-style": ["error", "1tbs"],
         "eqeqeq": ["error", "always"],
         "guard-for-in": "off",
         "import/order": "error",
+        "no-implicit-globals": "error",
         "no-multiple-empty-lines": "error",
+        "no-shadow": "off",
+        "no-underscore-dangle": "off",
         "prefer-arrow/prefer-arrow-functions": "off",
+        "quotes": [
+          "error",
+          "double",
+          {
+            "avoidEscape": true
+          }
+        ],
+        "rxjs-angular/prefer-takeuntil": [
+          "error",
+          {
+            "checkDestroy": false
+          }
+        ],
         "rxjs/no-create": "error",
         "rxjs/no-internal": "error",
         "rxjs/no-nested-subscribe": "error",
         "rxjs/no-unsafe-takeuntil": "error",
-        "rxjs-angular/prefer-takeuntil": ["error", { "checkDestroy": false }],
         "space-before-function-paren": "off"
       }
     },
     {
-      "files": ["*.html"],
       "extends": ["plugin:@angular-eslint/template/recommended"],
+      "files": ["*.html"],
       "rules": {}
     }
-  ]
+  ],
+  "root": true
 }
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -194,7 +194,7 @@ jobs:
     # Do not run on dependabot requests because of https://github.com/EnricoMi/publish-unit-test-result-action/issues/95
     if: >
       github.event_name == 'pull_request' &&
-      !(startsWith(github.ref, 'refs/heads/dependabot/'))
+      github.actor != 'dependabot[bot]'
 
     steps:
       - name: Download Artifacts
@@ -240,7 +240,9 @@ jobs:
     needs: ["test", "build"]
     # needs: ["test", "e2e", "build"]
 
-    if: github.event_name == 'pull_request' && github.actor == 'dependabot[bot]'
+    if: >
+      github.event_name == 'pull_request' &&
+      github.actor == 'dependabot[bot]'
 
     steps:
       - name: "Merge pull request"

diff --git a/e2e/src/app.e2e-spec.ts b/e2e/src/app.e2e-spec.ts
@@ -1,13 +1,10 @@
 import { AppPage } from "./app.po";
-import { LoginPage } from "./login.po";
 
 describe("workbench-client", () => {
   let page: AppPage;
-  let loginPage: LoginPage;
 
   beforeEach(() => {
     page = new AppPage();
-    loginPage = new LoginPage();
     page.navigateTo();
   });