From 302765b5fe5657fbc5f5ede2b4bc67f757094011 Mon Sep 17 00:00:00 2001
From: Zak Timson <zaktimson@gmail.com>
Date: Tue, 1 Jan 2019 19:21:09 -0500
Subject: [PATCH] Rewrote the urls

---
 src/app/app-routing.module.ts            |  6 ++----
 src/app/app.component.html               |  4 +---
 src/app/app.module.ts                    | 18 ++++++++----------
 src/app/settings/settings.component.html |  1 -
 src/app/settings/settings.component.ts   | 14 --------------
 5 files changed, 11 insertions(+), 32 deletions(-)
 delete mode 100644 src/app/settings/settings.component.html
 delete mode 100644 src/app/settings/settings.component.ts

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index bd32764..d00b9af 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -3,19 +3,17 @@ import {Routes, RouterModule} from '@angular/router';
 import {DashboardComponent} from './dashboard/dashboard.component';
 import {WeatherComponent} from './weather/weather.component';
 import {SecurityComponent} from './security/security.component';
-import {SettingsComponent} from './settings/settings.component';
 import {BatteryComponent} from './battery/battery.component';
 import {LoginComponent} from './login/login.component';
 import {LoginGuard} from './login/login.guard';
 
 const routes: Routes = [
     {path: 'battery', component: BatteryComponent, canActivate: [LoginGuard]},
-    {path: 'dashboard', component: DashboardComponent, canActivate: [LoginGuard]},
     {path: 'login', component: LoginComponent, data: {hide: true, noAnimation: true}},
     {path: 'security', component: SecurityComponent, canActivate: [LoginGuard]},
-    {path: 'settings', component: SettingsComponent, canActivate: [LoginGuard]},
     {path: 'weather', component: WeatherComponent, canActivate: [LoginGuard]},
-    {path: '**', redirectTo: '/dashboard'}
+    {path: '', component: DashboardComponent, canActivate: [LoginGuard]},
+    {path: '**', redirectTo: '/'}
 ];
 
 @NgModule({
diff --git a/src/app/app.component.html b/src/app/app.component.html
index a89ea4d..726410e 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -10,7 +10,7 @@
     <mat-drawer class="bg-primary" [mode]="mobile ? 'push' : 'side'" [opened]="open" [disableClose]="!mobile" [autoFocus]="false">
         <mat-nav-list class="p-0">
             <mat-divider></mat-divider>
-            <a mat-list-item routerLink="dashboard" routerLinkActive="active"><span class="p-3 pl-0 mr-5"><mat-icon class="mr-2">insert_chart</mat-icon> Dashboard</span></a>
+            <a mat-list-item routerLink="" routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}"><span class="p-3 pl-0 mr-5"><mat-icon class="mr-2">insert_chart</mat-icon> Dashboard</span></a>
             <mat-divider></mat-divider>
             <a mat-list-item routerLink="battery" routerLinkActive="active"><span class="p-3 pl-0 mr-5"><mat-icon class="mr-2">{{batteryService.icon}}</mat-icon> Powerwall</span></a>
             <mat-divider></mat-divider>
@@ -18,8 +18,6 @@
             <mat-divider></mat-divider>
             <a mat-list-item routerLink="security" routerLinkActive="active"><span class="p-3 pl-0 mr-5"><mat-icon class="mr-2">security</mat-icon> Security</span></a>
             <mat-divider></mat-divider>
-            <a mat-list-item routerLink="settings" routerLinkActive="active"><span class="p-3 pl-0 mr-5"><mat-icon class="mr-2">settings</mat-icon> Settings</span></a>
-            <mat-divider></mat-divider>
             <a mat-list-item (click)="logout()"><span class="p-3 pl-0 mr-5" style="color: darkred"><mat-icon class="mr-2">logout</mat-icon> Logout</span></a>
             <mat-divider></mat-divider>
         </mat-nav-list>
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index cfcac47..0c72f16 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -14,18 +14,17 @@ import {
     MatSidenavModule,
     MatToolbarModule
 } from '@angular/material';
-import { DashboardComponent } from './dashboard/dashboard.component';
-import { BatteryComponent } from './battery/battery.component';
-import { WeatherComponent } from './weather/weather.component';
-import { SecurityComponent } from './security/security.component';
-import { SettingsComponent } from './settings/settings.component';
+import {DashboardComponent} from './dashboard/dashboard.component';
+import {BatteryComponent} from './battery/battery.component';
+import {WeatherComponent} from './weather/weather.component';
+import {SecurityComponent} from './security/security.component';
 import {HttpClientModule} from '@angular/common/http';
-import { LoginComponent } from './login/login.component';
+import {LoginComponent} from './login/login.component';
 import {environment} from '../environments/environment';
 import * as firebase from 'firebase/app';
-import { ServiceWorkerModule } from '@angular/service-worker';
+import {ServiceWorkerModule} from '@angular/service-worker';
 import {LineChartModule, NgxChartsModule} from '@swimlane/ngx-charts';
-import { RoundPipe } from './round.pipe';
+import {RoundPipe} from './round.pipe';
 
 export const firebaseApp = firebase.initializeApp(environment.firebase);
 
@@ -36,7 +35,6 @@ export const firebaseApp = firebase.initializeApp(environment.firebase);
         BatteryComponent,
         WeatherComponent,
         SecurityComponent,
-        SettingsComponent,
         LoginComponent,
         RoundPipe
     ],
@@ -59,7 +57,7 @@ export const firebaseApp = firebase.initializeApp(environment.firebase);
         MatSidenavModule,
         MatToolbarModule,
         NgxChartsModule,
-        ServiceWorkerModule.register('ngsw-worker.js', { enabled: false }),
+        ServiceWorkerModule.register('ngsw-worker.js', {enabled: false}),
     ],
     providers: [],
     bootstrap: [AppComponent]
diff --git a/src/app/settings/settings.component.html b/src/app/settings/settings.component.html
deleted file mode 100644
index 14742dc..0000000
--- a/src/app/settings/settings.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<h3 class="mt-3 text-center">Coming Soon</h3>
diff --git a/src/app/settings/settings.component.ts b/src/app/settings/settings.component.ts
deleted file mode 100644
index 33af4f7..0000000
--- a/src/app/settings/settings.component.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'app-settings',
-  templateUrl: './settings.component.html'
-})
-export class SettingsComponent implements OnInit {
-
-  constructor() { }
-
-  ngOnInit() {
-  }
-
-}