upgrading to bootstrap 5

mcdamo · Apr 14, 2022 · 8d13af4 · 8d13af4
1 parent 864209d
commit 8d13af4
Show file tree

Hide file tree

Showing 362 changed files with 14,953 additions and 7,720 deletions.
diff --git a/.browserslistrc b/.browserslistrc
@@ -14,4 +14,3 @@ last 2 Edge major versions
 last 2 Safari major versions
 last 2 iOS major versions
 Firefox ESR
-not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -0,0 +1,43 @@
+{
+  "root": true,
+  "parser": "@typescript-eslint/parser",
+  "plugins": [
+    "@typescript-eslint"
+  ],
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:@angular-eslint/recommended"
+  ],
+  "overrides": [
+    {
+      "files": [
+        "*.component.ts"
+      ],
+      "parser": "@typescript-eslint/parser",
+      "parserOptions": {
+        "project": "./src/frontend/tsconfig.app.json",
+        "ecmaVersion": 2020,
+        "sourceType": "module"
+      },
+      "plugins": [
+        "@angular-eslint/template"
+      ],
+      "processor": "@angular-eslint/template/extract-inline-html"
+    },
+    {
+      "files": [
+        "*.component.html"
+      ],
+      "parser": "@angular-eslint/template-parser",
+      "parserOptions": {
+        "project": "./src/frontend/tsconfig.app.json",
+        "ecmaVersion": 2020,
+        "sourceType": "module"
+      },
+      "plugins": [
+        "@angular-eslint/template"
+      ]
+    }
+  ]
+}
diff --git a/angular.json b/angular.json
@@ -1,21 +1,28 @@
 {
   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "cli": {
+    "defaultCollection": "@angular-eslint/schematics"
+  },
   "version": 1,
   "newProjectRoot": "projects",
   "projects": {
     "pigallery2": {
       "root": "",
       "sourceRoot": "src/frontend",
       "projectType": "application",
-      "schematics": {},
+      "schematics": {
+        "@schematics/angular:application": {
+          "strict": true
+        }
+      },
       "prefix": "app",
       "i18n": {
         "sourceLocale": {
           "code": "en",
           "baseHref": ""
         },
         "locales": {
-          "cn": {
+          "zh": {
             "baseHref": "",
             "translation": "src/frontend/translate/messages.cn.xlf"
           },
@@ -185,49 +192,16 @@
           }
         },
         "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
+          "builder": "@angular-eslint/builder:lint",
           "options": {
-            "tsConfig": [
-              "src/tsconfig.app.json",
-              "src/tsconfig.spec.json"
-            ],
-            "exclude": []
-          }
-        }
-      }
-    },
-    "pigallery2-e2e": {
-      "root": "",
-      "sourceRoot": "",
-      "projectType": "application",
-      "architect": {
-        "e2e": {
-          "builder": "@angular-devkit/build-angular:protractor",
-          "options": {
-            "protractorConfig": "./protractor.conf.js",
-            "devServerTarget": "pigallery2:serve"
-          }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "test/e2e/tsconfig.e2e.json"
-            ],
-            "exclude": []
+            "lintFilePatterns": [
+              "src/**/*.ts",
+              "src/**/*.html"
+            ]
           }
         }
       }
     }
   },
-  "defaultProject": "pigallery2",
-  "schematics": {
-    "@schematics/angular:component": {
-      "prefix": "app",
-      "styleext": "css"
-    },
-    "@schematics/angular:directive": {
-      "prefix": "app"
-    }
-  }
+  "defaultProject": "pigallery2"
 }
diff --git a/benchmark/BMConfig.ts b/benchmark/BMConfig.ts
@@ -1,14 +1,10 @@
-/* tslint:disable:no-inferrable-types */
+/* eslint-disable @typescript-eslint/no-inferrable-types */
 import * as path from 'path';
-import {ConfigClass, ConfigClassBuilder} from 'typeconfig/node';
-import {ConfigProperty, SubConfigClass} from 'typeconfig/common';
-import {JobTrigger, JobTriggerType} from '../src/common/entities/job/JobScheduleDTO';
-import {ServerVideoConfig} from '../src/common/config/private/PrivateConfig';
-
-
+import { ConfigClass, ConfigClassBuilder } from 'typeconfig/node';
+import { ConfigProperty, SubConfigClass } from 'typeconfig/common';
 
 @SubConfigClass()
-export class BenchmarksConfig  {
+export class BenchmarksConfig {
   @ConfigProperty()
   bmScanDirectory: boolean = true;
   @ConfigProperty()
@@ -39,25 +35,28 @@ export class BenchmarksConfig  {
       rewriteENVConfig: true,
       enumsAsString: true,
       saveIfNotExist: true,
-      exitOnConfig: true
+      exitOnConfig: true,
     },
     defaults: {
-      enabled: true
-    }
-  }
+      enabled: true,
+    },
+  },
 })
 export class PrivateConfigClass {
-  @ConfigProperty({description: 'Images are loaded from this folder (read permission required)'})
+  @ConfigProperty({
+    description:
+      'Images are loaded from this folder (read permission required)',
+  })
   path: string = '/app/data/images';
-  @ConfigProperty({description: 'Describe your system setup'})
+  @ConfigProperty({ description: 'Describe your system setup' })
   system: string = '';
-  @ConfigProperty({description: 'Number of times to run the benchmark'})
+  @ConfigProperty({ description: 'Number of times to run the benchmark' })
   RUNS: number = 50;
-  @ConfigProperty({description: 'Enables / disables benchmarks'})
+  @ConfigProperty({ description: 'Enables / disables benchmarks' })
   Benchmarks: BenchmarksConfig = new BenchmarksConfig();
-
-
 }
 
-export const BMConfig = ConfigClassBuilder.attachInterface(new PrivateConfigClass());
+export const BMConfig = ConfigClassBuilder.attachInterface(
+  new PrivateConfigClass()
+);
 BMConfig.loadSync();