production enviroment and console logs removed

Author: mariosp

json-server/db.json

@@ -1,40 +1,4 @@
 {
   "todos": [
-    {
-      "userId": 1,
-      "title": "Maria",
-      "completed": false,
-      "id": 1
-    },
-    {
-      "userId": 1,
-      "title": "Marios",
-      "completed": false,
-      "id": 2
-    },
-    {
-      "userId": 1,
-      "title": "Marios Patsis 3",
-      "completed": false,
-      "id": 3
-    },
-    {
-      "userId": 1,
-      "title": "T",
-      "completed": false,
-      "id": 7
-    },
-    {
-      "userId": 1,
-      "title": "faaf",
-      "completed": false,
-      "id": 8
-    },
-    {
-      "userId": "KkiEUwCAj7PrGnNBOlhoAMNBlEd2",
-      "title": "Test 1",
-      "completed": false,
-      "id": 9
-    }
   ]
-}
+}

src/app/app.module.ts

@@ -19,7 +19,7 @@ const Routes: Routes = [
   {
     path: 'sign-in',
     loadChildren: () => import('./pages/sign-in/sign-in.module').then(m => m.SignInModule),
-    // canActivate: [AuthGuard]
+    canActivate: [AuthGuard]
   },
   { path: '',
     redirectTo: '/',

src/app/components/new-task/new-task.component.ts

@@ -1,8 +1,8 @@
-import { Component, OnInit } from '@angular/core';
-import {Task} from '../../models/task';
-import {ApiService} from '../../services/api.service';
+import {Component, OnInit} from '@angular/core';
+import { Task } from '../../models/task';
+import { ApiService } from '../../services/api.service';
 import { MatSnackBar } from '@angular/material/snack-bar';
-import {AuthService} from '../../services/auth.service';
+import { AuthService } from '../../services/auth.service';
 
 @Component({
   selector: 'app-new-task',
@@ -45,5 +45,4 @@ export class NewTaskComponent implements OnInit {
   openSnackBar(msg: string): void {
     this.snackBar.open(msg, 'Dismiss', {duration: 5000});
   }
-
 }

src/app/components/task-item/task-item.component.ts

@@ -22,14 +22,12 @@ export class TaskItemComponent implements OnInit {
   ) { }
 
   ngOnInit(): void {
-    console.log(this.task);
     this.inputValue = this.task.title;
     this.inputLineThroughClassName = this.task.completed ? 'line' : '';
   }
 
   handleDelete(): void {
     this.apiService.deleteTask(this.task.id).subscribe(res => {
-      console.log(res);
       this.apiService.removeTask(this.task.id);
     }, error => {
       this.openSnackBar('Error saving your data');
@@ -41,7 +39,6 @@ export class TaskItemComponent implements OnInit {
     this.inputLineThroughClassName = this.task.completed ? 'line' : '';
 
     this.apiService.updateTask(this.task.id, {completed: this.task.completed}).subscribe(res => {
-      console.log(res);
       this.apiService.editTask(res);
     }, error => {
       this.task.completed = !this.task.completed;
@@ -61,7 +58,6 @@ export class TaskItemComponent implements OnInit {
       this.inputValue = title;
     } else if (inputValue !== title) {
       this.apiService.updateTask(this.task.id, { title: inputValue } ).subscribe(res => {
-        console.log(res);
         this.apiService.editTask(res);
       }, error => {
         this.openSnackBar('Error saving your data');

src/app/components/task-list/task-list.component.ts

@@ -21,11 +21,9 @@ export class TaskListComponent implements OnInit {
     this.getUserTasks();
   }
 
-  getUserTasks() {
+  getUserTasks(): void {
     this.apiService.getUserTasks().subscribe(res => {
-      console.log(res)
       this.loading = false;
-      // this.tasks = res;
       this.apiService.setTasks(res);
     }, error => {
       this.loading = false;
@@ -34,7 +32,6 @@ export class TaskListComponent implements OnInit {
 
     this.apiService.userTasks$.subscribe((tasks: Task[])  => {
         this.tasks = tasks;
-        console.log(this.tasks)
     });
   }
 

src/app/pages/sign-in/sign-in.component.ts

@@ -13,10 +13,9 @@ export class SignInComponent implements OnInit {
   ) { }
 
   ngOnInit(): void {
-    console.log('SIGN IN COMPONENT');
   }
 
-  handleGoogleButton() {
+  handleGoogleButton(): void {
     this.authService.loginWithGoogle();
   }
 

src/app/services/api.service.ts

@@ -15,7 +15,8 @@ export class ApiService {
 
   constructor(
     private http: HttpClient,
-    private authService: AuthService) { }
+    private authService: AuthService
+  ) { }
 
   getUserTasks(): Observable<any> {
     return this.http.get(`${environment.serverUrl}/todos`,  {params: {userId: this.authService.user.uid}});

src/app/services/auth.guard.ts

@@ -12,15 +12,16 @@ export class AuthGuard implements CanActivate {
   constructor(
     private authService: AuthService,
     private router: Router
-  ) {}
+  ) {
+  }
+
   canActivate(
     next: ActivatedRouteSnapshot,
     state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
-
-    if (this.authService.isLoggedIn) {
-      return true;
+    if (state.url === '/sign-in') {
+      return this.authService.isLoggedIn ? this.router.navigate(['']) : true;
+    } else {
+      return this.authService.isLoggedIn;
     }
-    return false;
   }
-
 }

src/app/services/auth.service.ts

@@ -15,7 +15,6 @@ export class AuthService {
   ) {
     this.user = JSON.parse(localStorage.getItem('user')) || null;
     this.fireAuth.authState.subscribe(user => {
-      console.log(user);
       this.user = user;
       if (this.user){
         localStorage.setItem('user', JSON.stringify(this.user));
@@ -29,7 +28,6 @@ export class AuthService {
   loginWithGoogle(): Promise<any> {
     return this.fireAuth.signInWithPopup(new auth.GoogleAuthProvider())
       .then( success => {
-        console.log(success)
         this.user = success.user;
         this.router.navigate(['']);
       })

src/assets/icons/github-logo.png

@@ -1,3 +1,13 @@
 export const environment = {
-  production: true
+  production: true,
+  serverUrl: 'https://arr-todo.herokuapp.com',
+  firebase: {
+    apiKey: 'AIzaSyBx-clRxjAtjniw1bxBG_p7-4DtnhKQX6g',
+    authDomain: 'todos-angular-app.firebaseapp.com',
+    databaseURL: 'https://todos-angular-app.firebaseio.com',
+    projectId: 'todos-angular-app',
+    storageBucket: 'todos-angular-app.appspot.com',
+    messagingSenderId: '676540201517',
+    appId: '1:676540201517:web:5792196cf1eb157b98d6a4'
+  }
 };