Feature/code refactor part1 (mathisGarberg#58)

* Minor edits; cleaned up unused constructors

* Renamed ILoginContext (vb code style) to LoginContextInterface (php style); do not export interface as it is not used

* Removed orphan index.ts

* Add constructor to theme service; remove unused observable

* Refactored core

* Refactored data

* Refactored layout

* Refactored shared

Author: TomHAnderson

src/app/core/core.module.ts

@@ -11,23 +11,22 @@ import { NgxSpinnerModule } from 'ngx-spinner';
 
 
 @NgModule({
-    imports: [
-        HttpClientModule,
-        NgxSpinnerModule
-    ],
-    providers: [
-        AuthGuard,
-        NoAuthGuard,
-
-        {
-            provide: HTTP_INTERCEPTORS,
-            useClass: TokenInterceptor,
-            multi: true
-        }
-    ]
+  imports: [
+    HttpClientModule,
+    NgxSpinnerModule
+  ],
+  providers: [
+    AuthGuard,
+    NoAuthGuard,
+    {
+      provide: HTTP_INTERCEPTORS,
+      useClass: TokenInterceptor,
+      multi: true
+    }
+  ]
 })
 export class CoreModule {
-    constructor(@Optional() @SkipSelf() parentModule: CoreModule) {
-        throwIfAlreadyLoaded(parentModule, 'CoreModule');
-    }
+  constructor(@Optional() @SkipSelf() parentModule: CoreModule) {
+    throwIfAlreadyLoaded(parentModule, 'CoreModule');
+  }
 }

src/app/core/guard/auth.guard.ts

@@ -3,11 +3,7 @@ import { CanActivate } from '@angular/router';
 
 @Injectable()
 export class AuthGuard implements CanActivate {
-    
-    constructor() {}
-
-    canActivate(): boolean {
-        return true;
-    }
-
+  canActivate(): boolean {
+    return true;
+  }
 }

src/app/core/guard/no-auth.guard.ts

@@ -3,11 +3,7 @@ import { CanActivate } from '@angular/router';
 
 @Injectable()
 export class NoAuthGuard implements CanActivate {
-    
-    constructor() {}
-
-    canActivate(): boolean {
-        return true;
-    }
-
+  canActivate(): boolean {
+    return true;
+  }
 }

src/app/core/interceptor/token.interceptor.ts

@@ -12,4 +12,4 @@ export class TokenInterceptor implements HttpInterceptor {
   intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
     return next.handle(request);
   }
-}
+}

src/app/core/logger.service.ts

@@ -35,80 +35,81 @@
  * LogLevel.Off is never emitted and only used with Logger.level property to disable logs.
  */
 export enum LogLevel {
-    Off = 0,
-    Error,
-    Warning,
-    Info,
-    Debug
-  }
+  Off = 0,
+  Error,
+  Warning,
+  Info,
+  Debug
+}
 
+/**
+ * Log output handler function.
+ */
+export type LogOutput = (source: string, level: LogLevel, ...objects: any[]) => void;
+
+export class Logger {
+
   /**
-   * Log output handler function.
+   * Current logging level.
+   * Set it to LogLevel.Off to disable logs completely.
    */
-  export type LogOutput = (source: string, level: LogLevel, ...objects: any[]) => void;
-  
-  export class Logger {
-  
-    /**
-     * Current logging level.
-     * Set it to LogLevel.Off to disable logs completely.
-     */
-    static level = LogLevel.Debug;
-  
-    /**
-     * Additional log outputs.
-     */
-    static outputs: LogOutput[] = [];
-  
-    /**
-     * Enables production mode.
-     * Sets logging level to LogLevel.Warning.
-     */
-    static enableProductionMode() {
-      Logger.level = LogLevel.Warning;
-    }
-  
-    constructor(private source?: string) { }
-  
-    /**
-     * Logs messages or objects  with the debug level.
-     * Works the same as console.log().
-     */
-    debug(...objects: any[]) {
-      this.log(console.log, LogLevel.Debug, objects);
-    }
-  
-    /**
-     * Logs messages or objects  with the info level.
-     * Works the same as console.log().
-     */
-    info(...objects: any[]) {
-      this.log(console.info, LogLevel.Info, objects);
-    }
-  
-    /**
-     * Logs messages or objects  with the warning level.
-     * Works the same as console.log().
-     */
-    warn(...objects: any[]) {
-      this.log(console.warn, LogLevel.Warning, objects);
-    }
-  
-    /**
-     * Logs messages or objects  with the error level.
-     * Works the same as console.log().
-     */
-    error(...objects: any[]) {
-      this.log(console.error, LogLevel.Error, objects);
-    }
-  
-    private log(func: Function, level: LogLevel, objects: any[]) {
-      if (level <= Logger.level) {
-        const log = this.source ? ['[' + this.source + ']'].concat(objects) : objects;
-        func.apply(console, log);
-        Logger.outputs.forEach((output) => output.apply(output, [this.source, level].concat(objects)));
-      }
-    }
-  
+  static level = LogLevel.Debug;
+
+  /**
+   * Additional log outputs.
+   */
+  static outputs: LogOutput[] = [];
+
+  /**
+   * Enables production mode.
+   * Sets logging level to LogLevel.Warning.
+   */
+  static enableProductionMode() {
+    Logger.level = LogLevel.Warning;
+  }
+
+  constructor(
+    private source?: string
+  ) {}
+
+  /**
+   * Logs messages or objects  with the debug level.
+   * Works the same as console.log().
+   */
+  debug(...objects: any[]) {
+    this.log(console.log, LogLevel.Debug, objects);
   }
-  
+
+  /**
+   * Logs messages or objects  with the info level.
+   * Works the same as console.log().
+   */
+  info(...objects: any[]) {
+    this.log(console.info, LogLevel.Info, objects);
+  }
+
+  /**
+   * Logs messages or objects  with the warning level.
+   * Works the same as console.log().
+   */
+  warn(...objects: any[]) {
+    this.log(console.warn, LogLevel.Warning, objects);
+  }
+
+  /**
+   * Logs messages or objects  with the error level.
+   * Works the same as console.log().
+   */
+  error(...objects: any[]) {
+    this.log(console.error, LogLevel.Error, objects);
+  }
+
+  private log(func: Function, level: LogLevel, objects: any[]) {
+    if (level <= Logger.level) {
+      const log = this.source ? ['[' + this.source + ']'].concat(objects) : objects;
+      func.apply(console, log);
+      Logger.outputs.forEach((output) => 
+        output.apply(output, [this.source, level].concat(objects)));
+    }
+  }  
+}

src/app/core/service/auth.service.ts

@@ -3,7 +3,7 @@ import { of, Observable, throwError } from 'rxjs';
 
 import { User } from '../../data/schema/user';
 
-export class ILoginContext {
+interface LoginContextInterface {
   username: string;
   password: string;
   token: string;
@@ -21,12 +21,11 @@ const defaultUser = {
 export class AuthService {
   token: string;
 
-  constructor() { }
-
-  login(loginContext: ILoginContext): Observable<User> {
+  login(loginContext: LoginContextInterface): Observable<User> {
     if (
       loginContext.username === defaultUser.username &&
-      loginContext.password === defaultUser.password) {
+      loginContext.password === defaultUser.password
+    ) {
         return of(defaultUser);
     }
 
@@ -40,5 +39,4 @@ export class AuthService {
   getToken() {
     return this.getToken;
   }
-
 }

src/app/core/service/index.ts

@@ -1,14 +1,23 @@
 import { Injectable } from '@angular/core';
 import { Subject } from 'rxjs/Subject';
+import { Observable } from 'rxjs';
 
 @Injectable({
   providedIn: 'root'
 })
 export class ThemeService {
-  private darkTheme: Subject<boolean> = new Subject<boolean>();
-  isDarkTheme = this.darkTheme.asObservable();
+  private isDarkTheme: Subject<boolean>;
+
+  constructor() {
+    this.isDarkTheme = new Subject<boolean>();
+    this.isDarkTheme.next(false);
+  }
 
   setDarkTheme(isDarkTheme: boolean) {
-    this.darkTheme.next(isDarkTheme);
+    this.isDarkTheme.next(isDarkTheme);
+  }
+
+  getDarkTheme(): Observable<boolean> {
+    return this.isDarkTheme;
   }
 }

src/app/core/service/theme.service.ts

@@ -1,8 +1,6 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 
-
-
 @NgModule({
   declarations: [],
   imports: [

src/app/data/data.module.ts

@@ -1,5 +1,5 @@
 export class Project {
-    link: string;
-    title: string;
-    thumbnail: string;
+  link: string;
+  title: string;
+  thumbnail: string;
 }

src/app/data/schema/project.ts

@@ -1,8 +1,5 @@
 import { Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-import { Observable, throwError, of } from 'rxjs';
-import { delay, catchError } from 'rxjs/operators';
-import { environment } from '@env/environment';
+import { Observable, of } from 'rxjs';
 import data from './json/data.json';
 
 @Injectable({

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

@@ -2,7 +2,6 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 
 import { Project } from '../schema/project';
-import { ApiService } from './api.service';
 import { JsonApiService } from './json-api.service';
 
 @Injectable({

src/app/data/service/project.service.ts

@@ -1,20 +1,11 @@
 import { Injectable } from '@angular/core';
-
 import { JsonApiService } from './json-api.service';
 
-const routes = {
-    users: '/users'
-};
-
 @Injectable({
   providedIn: 'root'
 })
 export class UserService {
-
   constructor(
     private jsonApiService: JsonApiService
   ) {}
-
-  getAll() {
-  }
 }

src/app/data/service/user.service.ts

@@ -1,4 +1,3 @@
-
 <div class="container-fluid full-width-image">
   <div class="auth-container">
     <div class="auth-box">

src/app/layout/auth-layout/auth-layout.component.html

@@ -1,15 +1,9 @@
-import { Component, OnInit } from '@angular/core';
+import { Component } from '@angular/core';
 
 @Component({
   selector: 'app-auth-layout',
   templateUrl: './auth-layout.component.html',
   styleUrls: ['./auth-layout.component.scss']
 })
-export class AuthLayoutComponent implements OnInit {
-
-  constructor() { }
-
-  ngOnInit() {
-  }
-
+export class AuthLayoutComponent {
 }

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

@@ -6,6 +6,6 @@
         <router-outlet></router-outlet>
       </div>
 
-    <app-footer (changeTheme)="onThemeChange($event)"></app-footer>
+    <app-footer></app-footer>
   </div>
 </div>