From a458e0b5bc3ab2ef4444f46f5ec674efbd843733 Mon Sep 17 00:00:00 2001
From: Matt Hill <matthewonthemoon@gmail.com>
Date: Tue, 29 Jun 2021 17:55:11 -0600
Subject: [PATCH] quick cleanup

---
 setup-wizard/src/app/app.component.ts         |  2 +-
 .../src/app/pages/home/home.page.html         |  4 +--
 .../src/app/pages/home/home.page.scss         | 28 -----------------
 setup-wizard/src/app/pages/home/home.page.ts  |  9 +++---
 .../src/app/pages/password/password.page.html |  4 +--
 .../src/app/pages/password/password.page.scss | 31 -------------------
 .../src/app/pages/password/password.page.ts   |  6 ++--
 .../src/app/pages/recover/recover.page.html   |  4 +--
 .../src/app/pages/recover/recover.page.scss   | 28 -----------------
 .../src/app/pages/recover/recover.page.ts     |  6 ++--
 .../src/app/services/api/mock-api.service.ts  |  4 +--
 .../{state.sevice.ts => state.service.ts}     |  0
 12 files changed, 18 insertions(+), 108 deletions(-)
 rename setup-wizard/src/app/services/{state.sevice.ts => state.service.ts} (100%)

diff --git a/setup-wizard/src/app/app.component.ts b/setup-wizard/src/app/app.component.ts
index 09dbd0573..f9fdd1fe7 100644
--- a/setup-wizard/src/app/app.component.ts
+++ b/setup-wizard/src/app/app.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { NavController, ToastController } from '@ionic/angular';
 import { ApiService } from './services/api/api.service';
-import { StateService } from './services/state.sevice';
+import { StateService } from './services/state.service';
 
 @Component({
   selector: 'app-root',
diff --git a/setup-wizard/src/app/pages/home/home.page.html b/setup-wizard/src/app/pages/home/home.page.html
index 31a272278..e43a6d3d6 100644
--- a/setup-wizard/src/app/pages/home/home.page.html
+++ b/setup-wizard/src/app/pages/home/home.page.html
@@ -1,11 +1,11 @@
-<ion-header [translucent]="true">
+<ion-header>
   <ion-toolbar>
     <ion-title>
       Setup Wizard
     </ion-title>
   </ion-toolbar>
 </ion-header>
-<ion-content [fullscreen]="true">
+<ion-content>
   <div *ngIf="!stateService.selectedDataDrive">
     <h2 color="light">Select Data Drive</h2>
     <ion-card 
diff --git a/setup-wizard/src/app/pages/home/home.page.scss b/setup-wizard/src/app/pages/home/home.page.scss
index 1a6c0e370..c596bc370 100644
--- a/setup-wizard/src/app/pages/home/home.page.scss
+++ b/setup-wizard/src/app/pages/home/home.page.scss
@@ -1,31 +1,3 @@
-#container {
-  text-align: center;
-
-  position: absolute;
-  left: 0;
-  right: 0;
-  top: 50%;
-  transform: translateY(-50%);
-}
-
-#container strong {
-  font-size: 20px;
-  line-height: 26px;
-}
-
-#container p {
-  font-size: 16px;
-  line-height: 22px;
-
-  color: #8c8c8c;
-
-  margin: 0;
-}
-
-#container a {
-  text-decoration: none;
-}
-
 .selected {
   border: 1px solid white;
 }
\ No newline at end of file
diff --git a/setup-wizard/src/app/pages/home/home.page.ts b/setup-wizard/src/app/pages/home/home.page.ts
index db8f2f748..ac00b8be0 100644
--- a/setup-wizard/src/app/pages/home/home.page.ts
+++ b/setup-wizard/src/app/pages/home/home.page.ts
@@ -1,10 +1,10 @@
 import { Component } from '@angular/core'
-import { AlertController, NavController } from '@ionic/angular'
+import { AlertController } from '@ionic/angular'
 import { ApiService } from 'src/app/services/api/api.service'
-import { StateService } from 'src/app/services/state.sevice'
+import { StateService } from 'src/app/services/state.service'
 
 @Component({
-  selector: 'app-home',
+  selector: 'home',
   templateUrl: 'home.page.html',
   styleUrls: ['home.page.scss'],
 })
@@ -15,8 +15,7 @@ export class HomePage {
   constructor(
     private readonly apiService: ApiService,
     private readonly stateService: StateService,
-    public alertController: AlertController,
-    private readonly navCtrl: NavController,
+    private readonly alertController: AlertController,
   ) {}
 
   async ngOnInit() {
diff --git a/setup-wizard/src/app/pages/password/password.page.html b/setup-wizard/src/app/pages/password/password.page.html
index e25a008a2..417b719d2 100644
--- a/setup-wizard/src/app/pages/password/password.page.html
+++ b/setup-wizard/src/app/pages/password/password.page.html
@@ -1,11 +1,11 @@
-<ion-header [translucent]="true">
+<ion-header>
   <ion-toolbar>
     <ion-title>
       Setup Wizard
     </ion-title>
   </ion-toolbar>
 </ion-header>
-<ion-content [fullscreen]="true" color="light">
+<ion-content>
   <div *ngIf="stateService.recoveryDrive">
     <h2>Enter Password</h2>
     <ion-input type="password" [(ngModel)]="password">Password:</ion-input>
diff --git a/setup-wizard/src/app/pages/password/password.page.scss b/setup-wizard/src/app/pages/password/password.page.scss
index 1a6c0e370..e69de29bb 100644
--- a/setup-wizard/src/app/pages/password/password.page.scss
+++ b/setup-wizard/src/app/pages/password/password.page.scss
@@ -1,31 +0,0 @@
-#container {
-  text-align: center;
-
-  position: absolute;
-  left: 0;
-  right: 0;
-  top: 50%;
-  transform: translateY(-50%);
-}
-
-#container strong {
-  font-size: 20px;
-  line-height: 26px;
-}
-
-#container p {
-  font-size: 16px;
-  line-height: 22px;
-
-  color: #8c8c8c;
-
-  margin: 0;
-}
-
-#container a {
-  text-decoration: none;
-}
-
-.selected {
-  border: 1px solid white;
-}
\ No newline at end of file
diff --git a/setup-wizard/src/app/pages/password/password.page.ts b/setup-wizard/src/app/pages/password/password.page.ts
index f1d01f6e4..484d111f0 100644
--- a/setup-wizard/src/app/pages/password/password.page.ts
+++ b/setup-wizard/src/app/pages/password/password.page.ts
@@ -1,10 +1,9 @@
 import { Component } from '@angular/core'
-import { AlertController, NavController } from '@ionic/angular'
 import { ApiService } from 'src/app/services/api/api.service'
-import { StateService } from 'src/app/services/state.sevice'
+import { StateService } from 'src/app/services/state.service'
 
 @Component({
-  selector: 'password-page',
+  selector: 'password',
   templateUrl: 'password.page.html',
   styleUrls: ['password.page.scss'],
 })
@@ -16,7 +15,6 @@ export class PasswordPage {
   constructor(
     private readonly apiService: ApiService,
     private readonly stateService: StateService,
-    public alertController: AlertController,
   ) {}
 
   async submitPassword () {
diff --git a/setup-wizard/src/app/pages/recover/recover.page.html b/setup-wizard/src/app/pages/recover/recover.page.html
index d880a6c5e..8680113ce 100644
--- a/setup-wizard/src/app/pages/recover/recover.page.html
+++ b/setup-wizard/src/app/pages/recover/recover.page.html
@@ -1,11 +1,11 @@
-<ion-header [translucent]="true">
+<ion-header>
   <ion-toolbar>
     <ion-title>
       Setup Wizard
     </ion-title>
   </ion-toolbar>
 </ion-header>
-<ion-content [fullscreen]="true">
+<ion-content>
   <div *ngIf="!stateService.recoveryDrive">
     <h2 color="light">Select Data Drive</h2>
     <ion-card 
diff --git a/setup-wizard/src/app/pages/recover/recover.page.scss b/setup-wizard/src/app/pages/recover/recover.page.scss
index 1a6c0e370..c596bc370 100644
--- a/setup-wizard/src/app/pages/recover/recover.page.scss
+++ b/setup-wizard/src/app/pages/recover/recover.page.scss
@@ -1,31 +1,3 @@
-#container {
-  text-align: center;
-
-  position: absolute;
-  left: 0;
-  right: 0;
-  top: 50%;
-  transform: translateY(-50%);
-}
-
-#container strong {
-  font-size: 20px;
-  line-height: 26px;
-}
-
-#container p {
-  font-size: 16px;
-  line-height: 22px;
-
-  color: #8c8c8c;
-
-  margin: 0;
-}
-
-#container a {
-  text-decoration: none;
-}
-
 .selected {
   border: 1px solid white;
 }
\ No newline at end of file
diff --git a/setup-wizard/src/app/pages/recover/recover.page.ts b/setup-wizard/src/app/pages/recover/recover.page.ts
index 4c9c69f9d..f1a76f6af 100644
--- a/setup-wizard/src/app/pages/recover/recover.page.ts
+++ b/setup-wizard/src/app/pages/recover/recover.page.ts
@@ -1,10 +1,10 @@
 import { Component } from '@angular/core'
-import { AlertController, NavController } from '@ionic/angular'
+import { AlertController } from '@ionic/angular'
 import { ApiService } from 'src/app/services/api/api.service'
-import { StateService } from 'src/app/services/state.sevice'
+import { StateService } from 'src/app/services/state.service'
 
 @Component({
-  selector: 'recover-page',
+  selector: 'recover',
   templateUrl: 'recover.page.html',
   styleUrls: ['recover.page.scss'],
 })
diff --git a/setup-wizard/src/app/services/api/mock-api.service.ts b/setup-wizard/src/app/services/api/mock-api.service.ts
index 0b5a5dc0c..3177945f9 100644
--- a/setup-wizard/src/app/services/api/mock-api.service.ts
+++ b/setup-wizard/src/app/services/api/mock-api.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from "@angular/core";
-import { pauseFor } from "../state.sevice";
+import { pauseFor } from "../state.service";
 import { ApiService } from "./api.service"
 
 @Injectable({
@@ -14,7 +14,7 @@ export class MockApiService extends ApiService {
   async getState () {
     await pauseFor(2000)
     return {
-      'selected-data-drive': 'name1',
+      'selected-data-drive': null,
       'recovery-drive': null,
       'has-password': false,
       'data-transfer-progress': null
diff --git a/setup-wizard/src/app/services/state.sevice.ts b/setup-wizard/src/app/services/state.service.ts
similarity index 100%
rename from setup-wizard/src/app/services/state.sevice.ts
rename to setup-wizard/src/app/services/state.service.ts