Road to 1.0: Commit #1

-Implemented and tested all baseline functionality -Deleted Karma Unit Tests because they were never used -General Cleanup of Source Files Where Applicable -Fixed some header formatting -Added indication in toolbar if user is signed in via Google OAuth
FaceFTW · Aug 19, 2021 · 67ff752 · 67ff752
1 parent 2e9bb2d
commit 67ff752
Show file tree

Hide file tree

Showing 16 changed files with 232 additions and 374 deletions.
diff --git a/angular.json b/angular.json
@@ -1,122 +1,109 @@
 {
-  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
-  "cli": {
-    "analytics": false
-  },
-  "version": 1,
-  "newProjectRoot": "projects",
-  "projects": {
-    "UberUnit-Code": {
-      "projectType": "application",
-      "schematics": {
-        "@schematics/angular:application": {
-          "strict": true
-        },
-        "@schematics/angular:component": {
-          "style": "scss"
-        }
-      },
-      "root": "",
-      "sourceRoot": "src",
-      "prefix": "app",
-      "architect": {
-        "build": {
-          "builder": "@angular-devkit/build-angular:browser",
-          "options": {
-            "outputPath": "dist/UberUnit-Code",
-            "index": "src/index.html",
-            "main": "src/main.ts",
-            "polyfills": "src/polyfills.ts",
-            "tsConfig": "tsconfig.app.json",
-            "assets": [
-              "src/favicon.ico",
-              "src/assets"
-            ],
-            "styles": [
-              "src/custom-theme.scss",
-              "src/styles.scss"
-            ],
-            "scripts": []
-          },
-          "configurations": {
-            "production": {
-              "budgets": [
-                {
-                  "type": "initial",
-                  "maximumWarning": "500kb",
-                  "maximumError": "1mb"
-                },
-                {
-                  "type": "anyComponentStyle",
-                  "maximumWarning": "2kb",
-                  "maximumError": "4kb"
-                }
-              ],
-              "fileReplacements": [
-                {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.prod.ts"
-                }
-              ],
-              "outputHashing": "all"
-            },
-            "development": {
-              "buildOptimizer": false,
-              "optimization": false,
-              "vendorChunk": true,
-              "extractLicenses": false,
-              "sourceMap": true,
-              "namedChunks": true
-            }
-          },
-          "defaultConfiguration": "production"
-        },
-        "serve": {
-          "builder": "@angular-devkit/build-angular:dev-server",
-          "configurations": {
-            "production": {
-              "browserTarget": "UberUnit-Code:build:production"
-            },
-            "development": {
-              "browserTarget": "UberUnit-Code:build:development"
-            }
-          },
-          "defaultConfiguration": "development"
-        },
-        "extract-i18n": {
-          "builder": "@angular-devkit/build-angular:extract-i18n",
-          "options": {
-            "browserTarget": "UberUnit-Code:build"
-          }
-        },
-        "test": {
-          "builder": "@angular-devkit/build-angular:karma",
-          "options": {
-            "main": "src/test.ts",
-            "polyfills": "src/polyfills.ts",
-            "tsConfig": "tsconfig.spec.json",
-            "karmaConfig": "karma.conf.js",
-            "assets": [
-              "src/favicon.ico",
-              "src/assets"
-            ],
-            "styles": [
-              "src/styles.scss"
-            ],
-            "scripts": []
-          }
-        },
-        "deploy": {
-          "builder": "@angular/fire:deploy",
-          "options": {}
-        }
-      }
-    }
-  },
-  "schematics": {
-    "@schematics/angular:component": {
-      "style": "scss"
-    }
-  },
-  "defaultProject": "UberUnit-Code"
-}
+	"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+	"cli": {
+		"analytics": false
+	},
+	"version": 1,
+	"newProjectRoot": "projects",
+	"projects": {
+		"UberUnit-Code": {
+			"projectType": "application",
+			"schematics": {
+				"@schematics/angular:component": {
+					"style": "scss",
+					"skipTests": true
+				},
+				"@schematics/angular:class": {
+					"skipTests": true
+				},
+				"@schematics/angular:directive": {
+					"skipTests": true
+				},
+				"@schematics/angular:guard": {
+					"skipTests": true
+				},
+				"@schematics/angular:module": {
+					"skipTests": true
+				},
+				"@schematics/angular:pipe": {
+					"skipTests": true
+				},
+				"@schematics/angular:service": {
+					"skipTests": true
+				}
+			},
+			"root": "",
+			"sourceRoot": "src",
+			"prefix": "app",
+			"architect": {
+				"build": {
+					"builder": "@angular-devkit/build-angular:browser",
+					"options": {
+						"outputPath": "dist/UberUnit-Code",
+						"index": "src/index.html",
+						"main": "src/main.ts",
+						"polyfills": "src/polyfills.ts",
+						"tsConfig": "tsconfig.app.json",
+						"assets": ["src/favicon.ico", "src/assets"],
+						"styles": ["src/custom-theme.scss", "src/styles.scss"],
+						"scripts": []
+					},
+					"configurations": {
+						"production": {
+							"budgets": [
+								{
+									"type": "initial",
+									"maximumWarning": "500kb",
+									"maximumError": "1mb"
+								},
+								{
+									"type": "anyComponentStyle",
+									"maximumWarning": "2kb",
+									"maximumError": "4kb"
+								}
+							],
+							"fileReplacements": [
+								{
+									"replace": "src/environments/environment.ts",
+									"with": "src/environments/environment.prod.ts"
+								}
+							],
+							"outputHashing": "all"
+						},
+						"development": {
+							"buildOptimizer": false,
+							"optimization": false,
+							"vendorChunk": true,
+							"extractLicenses": false,
+							"sourceMap": true,
+							"namedChunks": true
+						}
+					},
+					"defaultConfiguration": "production"
+				},
+				"serve": {
+					"builder": "@angular-devkit/build-angular:dev-server",
+					"configurations": {
+						"production": {
+							"browserTarget": "UberUnit-Code:build:production"
+						},
+						"development": {
+							"browserTarget": "UberUnit-Code:build:development"
+						}
+					},
+					"defaultConfiguration": "development"
+				},
+				"deploy": {
+					"builder": "@angular/fire:deploy",
+					"options": {}
+				}
+			}
+		}
+	},
+	"schematics": {
+		"@schematics/angular:component": {
+			"style": "scss"
+		}
+	},
+	"defaultProject": "UberUnit-Code"
+}
diff --git a/karma.conf.js b/karma.conf.js
diff --git a/src/app/app.component.html b/src/app/app.component.html
@@ -2,6 +2,7 @@
 <mat-toolbar color="primary">
 	<span>UberUnit</span>
 	<span class="example-spacer"></span>
+	<mat-icon *ngIf="!getIsAnon()">face</mat-icon>
 	<button mat-icon-button class="example-icon" color="" [matMenuTriggerFor]="authMenu"
 		aria-label="Example icon-button with menu icon">
 		<mat-icon>menu</mat-icon>
@@ -13,7 +14,7 @@
 		<mat-icon>login</mat-icon>&nbsp;Sign In with Google
 	</button>
 	<button mat-menu-item (click)="doLogout()">
-		<mat-icon></mat-icon>Sign Out/New Anonymous Account
+		<mat-icon>logout</mat-icon>Sign Out/New Anonymous Account
 	</button>
 </mat-menu>
 

diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -6,39 +6,30 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { BrowserModule } from '@angular/platform-browser';
 
 //External Dependencies
-import { MatSelectModule } from '@angular/material/select';
 import { MatInputModule } from '@angular/material/input';
 import { MatToolbarModule } from '@angular/material/toolbar';
 import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
 import { MatButtonModule } from '@angular/material/button';
 import { KatexModule } from 'ng-katex';
 import { NgSelectModule } from '@ng-select/ng-select';
+
 //Firebase Modules
 import { AngularFireModule } from '@angular/fire';
 import { AngularFireAuthModule } from '@angular/fire/auth';
 import { AngularFirestoreModule } from '@angular/fire/firestore';
 import { environment } from 'src/environments/environment';
 
-//NgModule Config Imports
-import { PERSISTENCE } from '@angular/fire/auth';
-
 //Internal Components
 import { AppComponent } from './app.component';
 import { ConvertFormComponent } from './convert-form/convert-form.component';
 
-//Internal Services
-import { ConverterService } from './services/converter.service';
-import { HistoryService } from './services/history.service';
-import { FavoritesService } from './services/favorites.service';
-
 @NgModule({
 	declarations: [AppComponent, ConvertFormComponent],
 	imports: [
 		BrowserModule,
 		BrowserAnimationsModule,
 		ReactiveFormsModule,
-		MatSelectModule,
 		KatexModule,
 		MatInputModule,
 		FormsModule,