Optimizing and removing unnecessary code

jeroenouw · jeroenouw · commit a1f4062efa83 · 2017-08-03T09:39:43.000+02:00
diff --git a/package.json b/package.json
@@ -43,7 +43,6 @@
     "core-js": "^2.4.1",
     "firebase": "^4.2.0",
     "hammerjs": "^2.0.8",
-    "primeng": "^4.1.2",
     "rxjs": "^5.4.2",
     "ts-helpers": "*",
     "zone.js": "^0.8.16"
@@ -54,7 +53,7 @@
     "@types/jasmine": "^2.5.53",
     "@types/node": "^8.0.17",
     "codelyzer": "^3.1.2",
-    "jasmine-core": "^2.6.4",
+    "jasmine-core": "^2.7.0",
     "jasmine-spec-reporter": "^4.1.1",
     "karma": "^1.7.0",
     "karma-chrome-launcher": "^2.2.0",
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -20,7 +20,7 @@ export class AppComponent implements OnInit {
       messagingSenderId: '136985605193'
     });
  
-      // See users and messages in console log
+      // See users, messages and keep in touch in console log
       const preUsers = document.getElementById('users')
       const dbRefUsers = firebase.database().ref().child('users');
       dbRefUsers.on('value', snap => console.log(snap.val()));
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -23,7 +23,6 @@ import {
   FooterComponent,
   HeaderComponent,
   UserService,
-  DataStorageService,
   AlertService,
   AuthGuardService,
   AuthService,
@@ -75,7 +74,6 @@ import { EmailMeComponent } from './components/email-me/email-me.component';
   ],
   providers: [
     UserService,
-    DataStorageService,
     AlertService,
     AuthGuardService,
     AuthService,
diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts
@@ -44,7 +44,6 @@ const appRoutes: Routes = [
   { path: '**', component: PageNotFoundComponent }
 ];
 
-// Don't declare components here
 @NgModule({
   imports: [RouterModule.forRoot(appRoutes)],
   exports: [RouterModule]
diff --git a/src/app/components/about-me/about-me.component.html b/src/app/components/about-me/about-me.component.html
@@ -6,7 +6,8 @@ <h1>About me</h1>
       Maecenas dapibus nisl quis nulla tristique, vitae laoreet tellus convallis. Interdum et malesuada fames ac ante ipsum primis in faucibus. 
       In ultricies mattis rhoncus. Duis vestibulum tristique massa a fringilla. Suspendisse ut purus at massa elementum sollicitudin eu sit amet lacus.
       Nullam sit amet nisi risus. In diam dui, aliquet a lectus eu, suscipit finibus lorem. Interdum et malesuada fames ac ante ipsum primis in faucibus. 
-      Integer vitae facilisis felis, quis cursus velit. Suspendisse nec consectetur mauris, ut placerat ex. Duis eu consectetur eros. Nulla facilisi.</p>
+      Integer vitae facilisis felis, quis cursus velit. Suspendisse nec consectetur mauris, ut placerat ex. Duis eu consectetur eros. Nulla facilisi.
+    </p>
 
    <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi eleifend metus vel imperdiet cursus. 
       Etiam pretium sem a metus tristique, ut luctus quam rutrum. Vivamus commodo venenatis nunc ut placerat.
@@ -15,7 +16,8 @@ <h1>About me</h1>
       Aliquam sem libero, mollis et leo id, semper finibus leo. Sed convallis leo ac tempor luctus. Integer metus arcu,
       imperdiet nec tincidunt at, sodales nec nulla. Nam suscipit urna eu vulputate aliquet. Vestibulum consequat nisl vel erat congue sollicitudin.
       Proin mattis ultrices blandit. Vivamus accumsan vulputate sem vel tincidunt. Etiam imperdiet imperdiet ante, sit amet suscipit tortor finibus maximus.
-      Maecenas euismod pulvinar lorem.</p>
+      Maecenas euismod pulvinar lorem.
+    </p>
   </md-card>
 </div>
     
diff --git a/src/app/components/about-me/about-me.component.ts b/src/app/components/about-me/about-me.component.ts
@@ -7,8 +7,6 @@ import { Component, OnInit } from '@angular/core';
 })
 export class AboutMeComponent implements OnInit {
 
-  answer: string;
-
   constructor() { }
 
   ngOnInit() {
diff --git a/src/app/components/auth/auth.module.ts b/src/app/components/auth/auth.module.ts
@@ -4,8 +4,7 @@ import { CommonModule } from '@angular/common';
 import { BrowserModule } from '@angular/platform-browser';
 import { FormsModule } from '@angular/forms';
 import { HttpModule } from '@angular/http';
-import { MdButtonModule, MdCheckboxModule, MdMenuModule, MdInputModule,
-         MdToolbarModule, MdDialogModule, MdProgressBarModule, MaterialModule } from '@angular/material';
+import { MdButtonModule, MdInputModule, MdProgressBarModule, MaterialModule } from '@angular/material';
 import { UsersRouting } from './users.routing'
 
 // Components
@@ -24,8 +23,7 @@ import { PhoneSigninComponent } from './phone-signin/phone-signin.component';
     BrowserModule,
     FormsModule,
     HttpModule,
-    MdButtonModule, MdCheckboxModule, MdMenuModule, MdInputModule,
-    MdToolbarModule, MdDialogModule, MdProgressBarModule, MaterialModule,
+    MdButtonModule, MdInputModule, MdProgressBarModule, MaterialModule,
     UsersRouting
   ],
   providers: [
diff --git a/src/app/components/auth/signin.component.html b/src/app/components/auth/signin.component.html
@@ -33,11 +33,11 @@ <h3>Login</h3>
   <form (ngSubmit)="onSignin(f)" #f="ngForm">
     <md-input-container class="full-width">
       <!--<label for ="email">Mail</label>-->
-      <input mdInput placeholder="Email" type="email" id="email" name="email" ngModel>
+      <input mdInput placeholder="Email" type="email" id="email" name="email" ngModel required>
     </md-input-container>
     <md-input-container class="form-group">
       <!--<label for ="password">Password</label>-->
-      <input mdInput placeholder="Password" type="password" id="password" name="password" ngModel>
+      <input mdInput placeholder="Password" type="password" id="password" name="password" ngModel required>
     </md-input-container>
     <md-card-actions class="button">
       <button md-raised-button class="primary" type="submit" [disabled]="!f.valid">Login</button>
diff --git a/src/app/components/auth/signin.component.scss b/src/app/components/auth/signin.component.scss
@@ -1,6 +1,8 @@
 md-card {
   width: 400px;
-  height: 660px;
+  height: 540px;
+  // Height with Anonymous login:
+  // height: 660px;
   margin: 100px auto;
 }
 
diff --git a/src/app/components/auth/signup.component.html b/src/app/components/auth/signup.component.html
@@ -32,11 +32,11 @@ <h3>Or sign up with your email</h3>
   <form (ngSubmit)="onSignup(f)" #f="ngForm">
     <md-input-container class="full-width">
       <!--<label for ="email">Mail</label>-->
-      <input mdInput placeholder="Email" type="email" id="email" name="email" ngModel>
+      <input mdInput placeholder="Email" type="email" id="email" name="email" ngModel required>
     </md-input-container>
     <md-input-container class="form-group">
       <!--<label for ="password">Password</label>-->
-      <input mdInput placeholder="Password" type="password" id="password" name="password" ngModel>
+      <input mdInput placeholder="Password" type="password" id="password" name="password" ngModel required>
     </md-input-container>
     <md-card-actions class="button">
       <button md-raised-button class="primary" type="submit" [disabled]="!f.valid">Register</button>
diff --git a/src/app/components/blocks/blocks.module.ts b/src/app/components/blocks/blocks.module.ts
@@ -1,8 +1,7 @@
 // Modules 3rd party
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { MdButtonModule, MdCheckboxModule, MdMenuModule, MdInputModule,
-         MdToolbarModule, MdDialogModule, MaterialModule } from '@angular/material';
+import { MdButtonModule, MaterialModule } from '@angular/material';
 
 // Components
 import { CardBlockComponent } from './card-block/card-block.component';
@@ -19,8 +18,7 @@ import { ThirdBlockComponent } from './third-block/third-block.component';
   ],
   imports: [
     CommonModule,
-    MdButtonModule, MdCheckboxModule, MdMenuModule, MdInputModule,
-    MdToolbarModule, MdDialogModule, MaterialModule,
+    MdButtonModule, MaterialModule
   ],
   exports: [
     CardBlockComponent,
diff --git a/src/app/components/email-me/email-me.component.ts b/src/app/components/email-me/email-me.component.ts
@@ -11,8 +11,9 @@ import { UserService, EmailValidator } from '../shared';
 export class EmailMeComponent implements OnInit {
   public form: FormGroup;
 
-  constructor(private userService: UserService,
-              public formBuilder: FormBuilder) 
+  constructor(
+    private userService: UserService,
+    private formBuilder: FormBuilder) 
   {
     this.form = formBuilder.group({
       email: ['', Validators.compose([Validators.required, EmailValidator.isValid])]
diff --git a/src/app/components/misc/misc.module.ts b/src/app/components/misc/misc.module.ts
@@ -1,8 +1,7 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 
-import { MdButtonModule, MdCheckboxModule, MdMenuModule, MdInputModule,
-         MdToolbarModule, MdDialogModule, MdNativeDateModule, MdSlideToggleModule,
+import { MdButtonModule, MdCheckboxModule, MdInputModule, MdNativeDateModule, MdSlideToggleModule,
          MdTooltipModule, MdSidenavModule, MdTableModule, MaterialModule } from '@angular/material';
 
 import { CdkTableModule } from '@angular/cdk';
@@ -29,8 +28,7 @@ import { TableComponent } from './table/table.component';
   ],
   imports: [
     CommonModule,
-    MdButtonModule, MdCheckboxModule, MdMenuModule, MdInputModule,
-    MdToolbarModule, MdDialogModule, MdNativeDateModule, MdSlideToggleModule,
+    MdButtonModule, MdCheckboxModule, MdInputModule, MdNativeDateModule, MdSlideToggleModule,
     MdTooltipModule, MdSidenavModule, MdTableModule, MaterialModule,
     CdkTableModule,
     FormsModule, ReactiveFormsModule,
diff --git a/src/app/components/profile/profile-settings.component.html b/src/app/components/profile/profile-settings.component.html
@@ -4,21 +4,6 @@ <h3>My profile settings</h3>
 
     <form class="form" (ngSubmit)="onUpdateUserInfo(sv)" #sv="ngForm">
 
-        <!-- <div class="form-group"> -->
-            <!-- <input mdInput placeholder="URL of profile picture" type="text" id="image" name="image" formControlName="image"> -->
-            <!-- Upload files in progress -->
-            <!-- <p-fileUpload md-raised-button name="users[]" id="image" formControlName="image" 
-            url="https://angular4materialdesign.firebaseio.com/users/' + uid + '/image" 
-            (onUpload)="onUpload($event)" accept="image/*" maxFileSize="1000000">
-                <ng-template pTemplate type="content">
-                    <ul *ngIf="uploadedFiles.length">
-                        <li *ngFor="let file of uploadedFiles">{{file.name}} - {{file.size}} bytes</li>
-                    </ul>
-                </ng-template>        
-            </p-fileUpload> -->
-            <!-- Upload files in progress -->
-        <!-- </div> -->
-
         <md-input-container class="form-group">
             <input mdInput placeholder="Username" type="displayName" id="displayName" name="displayName" ngModel>
         </md-input-container>
@@ -35,7 +20,7 @@ <h3>My profile settings</h3>
             <input mdInput placeholder="Password" type="password" id="password" name="password" ngModel>
         </md-input-container> -->
 
-        <hr />
+        <hr>
 
         <md-card-actions class="button">
             <button md-raised-button class="primary" (click)="onSaveData()">Save Settings</button>
diff --git a/src/app/components/profile/profile-settings.component.ts b/src/app/components/profile/profile-settings.component.ts
@@ -22,35 +22,13 @@ export class ProfileSettingsComponent implements OnInit {
 
   constructor(
     private router: Router,
-    // private dataStorageService: DataStorageService,
     private authService: AuthService,
     private alertService: AlertService,
     private userService: UserService,
     private fb: FormBuilder) {
-
-      /*this.settingsForm = this.fb.group({
-          image: '',
-          username: '',
-          bio: '',
-          email: '',
-          password: ''
-      });*/
-
-  }
-
-  uploadedFiles: any[] = [];
-
-  // Upload files in progress
-  onUpload(event) {
-      for (const file of event.files) {
-        const uid = firebase.auth().currentUser.uid;
-        firebase.database().ref().child('users/' + uid + '/image/').push();
-      }
   }
 
   ngOnInit() {
-    /*(<any>Object).assign(this.user, this.dataStorageService.getUser());
-    this.settingsForm.patchValue(this.user);*/
   }
 
   onPasswordReset() {
@@ -63,26 +41,7 @@ export class ProfileSettingsComponent implements OnInit {
     const bio = form.value.bio;
     this.userService.updateUserInfo(firebase.auth().currentUser.uid, displayName, bio);
     this.alertService.showToaster('Your settings are saved');
-    /*
-      this.onUpdateUser(this.settingsForm.value);
-      this.dataStorageService.saveUser()
-        .subscribe(
-          (response: Response) => {
-            console.log(response),
-            err => {
-        this.errors = err;
-      };
-          }
-        );
-    */
-  }
-
-  /*
-  onFetchData() {
-    this.dataStorageService.getUser();
-    this.alertService.showToaster('Data is refreshed');
   }
-  */
 
   onLogout() {
     this.authService.logout();
diff --git a/src/app/components/profile/profile.module.ts b/src/app/components/profile/profile.module.ts
@@ -3,8 +3,7 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { MdButtonModule, MdCheckboxModule, MdMenuModule, MdInputModule,
          MdToolbarModule, MdDialogModule, MaterialModule } from '@angular/material';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { FileUploadModule } from 'primeng/primeng';
+import { FormsModule } from '@angular/forms';
 
 // Components
 import { ProfileComponent } from './profile.component';
@@ -19,8 +18,7 @@ import { ProfileSettingsComponent } from './profile-settings.component';
     CommonModule,
     MdButtonModule, MdCheckboxModule, MdMenuModule, MdInputModule,
     MdToolbarModule, MdDialogModule, MaterialModule,
-    FormsModule, ReactiveFormsModule,
-    FileUploadModule
+    FormsModule
   ],
   exports: [
     ProfileComponent,
diff --git a/src/app/components/shared/interfaces/scene.interface.ts b/src/app/components/shared/interfaces/scene.interface.ts
@@ -1,7 +1,7 @@
 export interface Scene {
 	[key: string]: {
-	image: string;
-	hotspots?: Hotspot
+		image: string;
+		hotspots?: Hotspot
 	}
 }
 
diff --git a/src/app/components/shared/layout/footer/footer.component.html b/src/app/components/shared/layout/footer/footer.component.html
@@ -1,5 +1,4 @@
 <md-toolbar color="primary">
-<!--<md-toolbar color="white">-->
     <h5><app-titlecase-pipe></app-titlecase-pipe> ©<app-year-pipe></app-year-pipe></h5>
     <span class="spacer"></span>
     <a routerLink="/contact"><md-icon class="icon">mail_outline</md-icon></a>
diff --git a/src/app/components/shared/layout/header/header.component.html b/src/app/components/shared/layout/header/header.component.html
@@ -76,7 +76,6 @@
 
     <ng-template #loggedin>
         <h4>(User: {{userEmail()}})</h4>
-        <!-- <md-icon>verified_user</md-icon> -->
        
         <button md-icon-button [mdMenuTriggerFor]="menu">
         <md-icon>more_vert</md-icon>
@@ -121,12 +120,6 @@ <h4>(User: {{userEmail()}})</h4>
 
 <md-tab-group>
   <md-tab label="COMP">
-     <!-- <div id="content">
-        <md-card>
-          <h1>Home</h1>
-          <app-slide></app-slide>
-        </md-card>
-      </div>-->
   </md-tab>
 
   <md-tab label="MISC">
@@ -138,12 +131,9 @@ <h3>Misc</h3>
           <b>
           <a routerLink="/profile">Profile</a> <br/>
           <a routerLink="/profile-settings">Profile settings</a> <br/>
-          <!-- <a routerLink="/messages">Messages</a> <br/><br/> -->
           </b> 
 
           <button md-raised-button (click)="onLogout()">Logout</button>
-          <!-- <button md-button (click)="onFetchData()">Fetch users</button>
-          <button md-button (click)="onSaveData()">Save users</button> -->
         </md-card>
       </div>
   </md-tab>
diff --git a/src/app/components/shared/models/contact.model.ts b/src/app/components/shared/models/contact.model.ts
@@ -6,7 +6,6 @@ export class Contact {
     public address: string,
     public city: string,
     public province: string,
-    public zipcode: string,
-
+    public zipcode: string
   ) {  }
 }
diff --git a/src/app/components/shared/services/alert.service.ts b/src/app/components/shared/services/alert.service.ts
@@ -12,11 +12,4 @@ export class AlertService {
             duration: 3000,
         });
     }
-
-    // In progress
-    /* signUpToaster(msg: string) {
-        this.snackBar.open(msg = 'Your registration is completed', null, {
-            duration: 3000
-        });
-    }*/
 }
diff --git a/src/app/components/shared/services/auth-guard.service.ts b/src/app/components/shared/services/auth-guard.service.ts
@@ -9,7 +9,6 @@ export class AuthGuardService implements CanActivate {
                 private router: Router) {}
 
     public canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
-        /* return this.authService.isAuthenticated();*/
         if (!this.authService.isAuthenticated()) {
             this.router.navigate(['/login']);
             return false;
diff --git a/src/app/components/shared/services/auth.service.ts b/src/app/components/shared/services/auth.service.ts
@@ -8,10 +8,12 @@ import { UserService } from './user.service';
 @Injectable()
 export class AuthService {
     token: string;
-    constructor(private router: Router,
-                private alertService: AlertService,
-                private userService: UserService
-                ) {
+
+    constructor(
+        private router: Router,
+        private alertService: AlertService,
+        private userService: UserService) 
+    {
 
     }
 
diff --git a/src/app/components/shared/services/data-storage.service.ts b/src/app/components/shared/services/data-storage.service.ts
diff --git a/src/app/components/shared/services/index.ts b/src/app/components/shared/services/index.ts
diff --git a/src/index.html b/src/index.html

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`md-card {`
`2`	`2`	`width: 400px;`
`3`		`- height: 660px;`
	`3`	`+ height: 540px;`
	`4`	`+ // Height with Anonymous login:`
	`5`	`+ // height: 660px;`
`4`	`6`	`margin: 100px auto;`
`5`	`7`	`}`
`6`	`8`