ISSUE-130: fix lint errors (mathisGarberg#131)

Co-authored-by: Mathis Garberg <[email protected]>

Author: mathisGarberg

.eslintrc.json

@@ -1,18 +1,11 @@
 {
   "root": true,
-  "ignorePatterns": [
-    "projects/**/*"
-  ],
+  "ignorePatterns": ["projects/**/*"],
   "overrides": [
     {
-      "files": [
-        "*.ts"
-      ],
+      "files": ["*.ts"],
       "parserOptions": {
-        "project": [
-          "tsconfig.json",
-          "e2e/tsconfig.json"
-        ],
+        "project": ["tsconfig.json", "e2e/tsconfig.json"],
         "createDefaultProgram": true
       },
       "extends": [
@@ -31,16 +24,14 @@
         ],
         "id-blacklist": "off",
         "id-match": "off",
-        "no-underscore-dangle": "off"
+        "no-underscore-dangle": "off",
+        "prefer-arrow/prefer-arrow-functions": "off",
+        "no-var": "off"
       }
     },
     {
-      "files": [
-        "*.html"
-      ],
-      "extends": [
-        "plugin:@angular-eslint/template/recommended"
-      ],
+      "files": ["*.html"],
+      "extends": ["plugin:@angular-eslint/template/recommended"],
       "rules": {}
     }
   ]

package.json

@@ -8,7 +8,7 @@
     "dev": "ng serve --aot",
     "build": "ng build",
     "test": "npm run lint && ng test --configuration=test",
-    "lint": "ng lint",
+    "lint": "npx ng lint angular-folder-structure",
     "e2e": "ng e2e",
     "watch": "ng test --configuration=test --browsers ChromeHeadless --watch",
     "build:prod": "ng build --configuration production --vendor-chunk",
@@ -69,11 +69,11 @@
   "devDependencies": {
     "@angular-devkit/build-angular": "~12.2.5",
     "@angular-devkit/core": "^12.2.5",
-    "@angular-eslint/builder": "^12.0.0",
-    "@angular-eslint/eslint-plugin": "^12.0.0",
-    "@angular-eslint/eslint-plugin-template": "^12.0.0",
+    "@angular-eslint/builder": "12.4.1",
+    "@angular-eslint/eslint-plugin": "12.4.1",
+    "@angular-eslint/eslint-plugin-template": "12.4.1",
     "@angular-eslint/schematics": "12.4.1",
-    "@angular-eslint/template-parser": "^12.0.0",
+    "@angular-eslint/template-parser": "12.4.1",
     "@angular/cli": "^12.2.5",
     "@angular/compiler-cli": "^12.2.5",
     "@angular/language-service": "^12.2.5",

src/app/core/guard/module-import.guard.ts

@@ -1,5 +1,7 @@
 export function throwIfAlreadyLoaded(parentModule: any, moduleName: string) {
-    if (parentModule) {
-        throw new Error(`${moduleName} has already been loaded. Import ${moduleName} modules in the AppModule only.`);
-    }
-}
+  if (parentModule) {
+    throw new Error(
+      `${moduleName} has already been loaded. Import ${moduleName} modules in the AppModule only.`
+    );
+  }
+}

src/app/core/logger.service.spec.ts

@@ -6,12 +6,11 @@ import data from './json/data.json';
   providedIn: 'root'
 })
 export class JsonApiService {
-
   get(url: string): Observable<any> {
     switch (url) {
       case '/projects':
         return of(data.projects);
-      default: 
+      default:
         const id = url.substring(url.lastIndexOf('/') + 1);
         return of(data.projects[id]);
     }

src/app/core/logger.service.ts

@@ -13,8 +13,6 @@ import { ThemeService } from '@core/service/theme.service';
 export class ContentLayoutComponent implements OnInit {
   currentTheme: string;
 
-  private overlayContainer: OverlayContainer;
-
   currentActiveTheme$ = this.themeService.getDarkTheme().pipe(
     map((isDarkTheme: boolean) => {
       const [lightTheme, darkTheme] = themes;
@@ -37,6 +35,8 @@ export class ContentLayoutComponent implements OnInit {
     })
   );
 
+  private overlayContainer: OverlayContainer;
+
   constructor(private themeService: ThemeService) {}
 
   ngOnInit(): void {

src/app/data/service/json-api.service.ts

@@ -48,14 +48,14 @@ export class LoginComponent implements OnInit, OnDestroy {
       .subscribe();
   }
 
+  ngOnDestroy(): void {
+    this.sub.unsubscribe();
+  }
+
   private buildForm(): void {
     this.loginForm = this.formBuilder.group({
       username: ['', Validators.required],
       password: ['', Validators.required]
     });
   }
-
-  ngOnDestroy(): void {
-    this.sub.unsubscribe();
-  }
 }

src/app/layout/content-layout/content-layout.component.ts

@@ -8,4 +8,4 @@ const routes: Routes = [
   }
 ];
 
-export const ContactRoutes = RouterModule.forChild(routes);
+export const contactRoutes = RouterModule.forChild(routes);

src/app/modules/auth/page/login/login.component.ts

@@ -1,16 +1,11 @@
 import { NgModule } from '@angular/core';
 
 import { SharedModule } from '@shared/shared.module';
-import { ContactRoutes } from './contact-routing.module';
+import { contactRoutes } from './contact-routing.module';
 import { ContactComponent } from './page/contact/contact.component';
 
-
 @NgModule({
   declarations: [ContactComponent],
-  imports: [
-    ContactRoutes,
-
-    SharedModule
-  ]
+  imports: [contactRoutes, SharedModule]
 })
-export class ContactModule { }
+export class ContactModule {}

src/app/modules/contact/contact-routing.module.ts

@@ -5,6 +5,5 @@ export const environment = {
   production: true,
   version: env.npm_package_version,
   serverUrl: '/api',
-  envName: 'PROD',
-  API_URL: 'assets/api'
+  envName: 'PROD'
 };

src/app/modules/contact/contact.module.ts

@@ -9,8 +9,7 @@ export const environment = {
   production: false,
   version: env.npm_package_version + '-dev',
   serverUrl: '/api',
-  envName: 'DEV',
-  API_URL: 'assets/api'
+  envName: 'DEV'
 };
 
 /*