Replaced pages and components

Author: jeroenouw

src/app/app.component.ts

@@ -9,9 +9,9 @@ import * as firebase from 'firebase';
 
 export class AppComponent implements OnInit {
 
-  ngOnInit() {
+  public ngOnInit(): void {
     firebase.initializeApp({
-      // For other projects use different keys
+      // For your own projects use different keys
       apiKey: 'AIzaSyBUYZcc_HKi1TckbZPpSjSkxyFvml3Is0A',
       authDomain: 'angular4materialdesign.firebaseapp.com',
       databaseURL: 'https://angular4materialdesign.firebaseio.com',
@@ -20,16 +20,12 @@ export class AppComponent implements OnInit {
       messagingSenderId: '136985605193'
     });
 
-    // See users, messages and keep in touch in console log
+    // See users 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()));
 
-    // const preMessages = document.getElementById('messages');
-    // const dbRefMessages = firebase.database().ref().child('messages');
-    // dbRefMessages.on('value', snap => console.log(snap.val()));
-
     // const preTouch = document.getElementById('touch');
     // const dbRefTouch = firebase.database().ref().child('touch');
     // dbRefTouch.on('value', snap => console.log(snap.val()));

src/app/app.module.ts

@@ -9,11 +9,10 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { HttpClientModule } from '@angular/common/http';
 
 // Modules
-import { MessagesModule } from './components/messages/messages.module';
 import { BlocksModule } from './components/blocks/blocks.module';
-import { AuthModule } from './components/auth/auth.module';
+import { AuthModule } from './pages/auth/auth.module';
 import { BackgroundsModule } from './components/backgrounds/backgrounds.module';
-import { ProfileModule } from './components/profile/profile.module';
+import { ProfileModule } from './pages/profile/profile.module';
 import { MiscModule } from './components/misc/misc.module';
 import { PipesModule } from '@shared/pipes/pipes.module';
 
@@ -30,15 +29,15 @@ import {
 
 // Main
 import { AppComponent } from './app.component';
-import { AppRoutingModule,
-         // routingComponents
-         } from './app.routing';
+import { AppRoutingModule } from './app.routing';
 
-// Other components
-import { HomeComponent } from './components/home/home.component';
-import { AboutMeComponent } from './components/about-me/about-me.component';
-import { ContactComponent } from './components/contact/contact.component';
-import { PageNotFoundComponent } from './components/not-found/not-found.component';
+// Pages
+import { HomeComponent } from './pages/home/home.component';
+import { AboutMeComponent } from './pages/about-me/about-me.component';
+import { ContactComponent } from './pages/contact/contact.component';
+import { PageNotFoundComponent } from './pages/not-found/not-found.component';
+
+// Components
 import { EmailMeComponent } from './components/email-me/email-me.component';
 
 @NgModule({
@@ -51,7 +50,6 @@ import { EmailMeComponent } from './components/email-me/email-me.component';
     FooterComponent,
     PageNotFoundComponent,
     EmailMeComponent
-    // routingComponents
   ],
   imports: [
     BrowserModule,
@@ -63,7 +61,6 @@ import { EmailMeComponent } from './components/email-me/email-me.component';
     ReactiveFormsModule,
     HttpClientModule,
     AppRoutingModule,
-    MessagesModule,
     PipesModule,
     BlocksModule,
     AuthModule,

src/app/app.routing.ts

@@ -3,20 +3,19 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
 // 404 page
-import { PageNotFoundComponent } from './components/not-found/not-found.component';
+import { PageNotFoundComponent } from './pages/not-found/not-found.component';
 
 // Pages
-import { HomeComponent } from './components/home/home.component';
-import { AboutMeComponent } from './components/about-me/about-me.component';
-import { ContactComponent } from './components/contact/contact.component';
-import { MiscComponent } from './components/misc/misc.component';
+import { HomeComponent } from './pages/home/home.component';
+import { AboutMeComponent } from './pages/about-me/about-me.component';
+import { ContactComponent } from './pages/contact/contact.component';
+import { SignupComponent } from './pages/auth/signup.component';
+import { SigninComponent } from './pages/auth/signin.component';
+import { ProfileComponent } from './pages/profile/profile.component';
+import { ProfileSettingsComponent } from './pages/profile/profile-settings.component';
 
 // Components
-import { SignupComponent } from './components/auth/signup.component';
-import { SigninComponent } from './components/auth/signin.component';
-import { ProfileComponent } from './components/profile/profile.component';
-import { ProfileSettingsComponent } from './components/profile/profile-settings.component';
-import { MessagesComponent } from './components/messages/messages.component';
+import { MiscComponent } from './components/misc/misc.component';
 
 // Protected
 import { AuthGuardService } from '@shared';
@@ -30,15 +29,13 @@ const appRoutes: Routes = [
   { path: 'about', component: AboutMeComponent },
   { path: 'contact', component: ContactComponent },
   { path: 'misc', component: MiscComponent },
-  // { path: 'misc', loadChildren: './components/misc/misc.module#MiscModule' },
   { path: 'signup', component: SignupComponent },
   { path: 'login', component: SigninComponent },
 
   // Protected pages
   // { path: 'profile/:uid/:name', component: ProfileComponent, canActivate: [AuthGuardService] },
   { path: 'profile', component: ProfileComponent, canActivate: [AuthGuardService] },
   { path: 'profile-settings', component: ProfileSettingsComponent, canActivate: [AuthGuardService] },
-  { path: 'messages', component: MessagesComponent, canActivate: [AuthGuardService] },
   { path: '**', component: PageNotFoundComponent }
 ];
 

src/app/components/auth/signin.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component } from '@angular/core';
 import { NgForm, FormBuilder, Validators, FormGroup  } from '@angular/forms';
 
 import { UserService, EmailValidator } from '@shared';
@@ -8,22 +8,19 @@ import { UserService, EmailValidator } from '@shared';
   templateUrl: './email-me.component.html',
   styleUrls: ['./email-me.component.scss']
 })
-export class EmailMeComponent implements OnInit {
+export class EmailMeComponent {
   public form: FormGroup;
 
   constructor(
     private userService: UserService,
-    private formBuilder: FormBuilder) {
+    public formBuilder: FormBuilder) {
     this.form = formBuilder.group({
       email: ['', Validators.compose([Validators.required, EmailValidator.isValid])]
     });
   }
 
-  ngOnInit() {
-  }
-
-  onSubmit(form: NgForm) {
-   const email = form.value.email;
-   this.userService.keepInTouch(email);
+  public onSubmit(form: NgForm) {
+    const email = form.value.email;
+    return this.userService.keepInTouch(email);
   }
 }