Merge pull request #17 from iobodianskyi/development

Development

package.json

@@ -1,6 +1,6 @@
 {
   "name": "notes",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -9,29 +9,30 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^7.0.4",
-    "@angular/common": "^7.0.4",
-    "@angular/compiler": "^7.0.4",
-    "@angular/core": "^7.0.4",
-    "@angular/fire": "^5.1.0",
-    "@angular/forms": "^7.0.4",
-    "@angular/http": "^7.0.4",
-    "@angular/platform-browser": "^7.0.4",
-    "@angular/platform-browser-dynamic": "^7.0.4",
-    "@angular/router": "^7.0.4",
-    "@ng-bootstrap/ng-bootstrap": "^4.0.0",
-    "bootstrap": "^4.1.3",
-    "core-js": "^2.5.4",
-    "firebase": "^5.5.9",
+    "@angular/animations": "^7.2.3",
+    "@angular/common": "^7.2.3",
+    "@angular/compiler": "^7.2.3",
+    "@angular/core": "^7.2.3",
+    "@angular/fire": "^5.1.1",
+    "@angular/forms": "^7.2.3",
+    "@angular/http": "^7.2.3",
+    "@angular/platform-browser": "^7.2.3",
+    "@angular/platform-browser-dynamic": "^7.2.3",
+    "@angular/router": "^7.2.3",
+    "@ng-bootstrap/ng-bootstrap": "^4.0.2",
+    "bootstrap": "^4.2.1",
+    "core-js": "^2.6.3",
+    "firebase": "^5.8.2",
+    "ngx-toastr": "^9.1.1",
     "rxjs": "~6.3.3",
-    "zone.js": "~0.8.26"
+    "zone.js": "^0.8.29"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "^0.13.0",
-    "@angular/cli": "^7.0.6",
-    "@angular/compiler-cli": "^7.0.4",
-    "@angular/language-service": "^7.0.4",
-    "@types/node": "^10.12.10",
+    "@angular/cli": "^7.3.0",
+    "@angular/compiler-cli": "^7.2.3",
+    "@angular/language-service": "^7.2.3",
+    "@types/node": "^10.12.21",
     "codelyzer": "^4.5.0",
     "ts-node": "~7.0.0",
     "tslint": "~5.11.0",

src/app/app.module.ts

@@ -1,6 +1,8 @@
 import { BrowserModule } from '@angular/platform-browser';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { NgModule } from '@angular/core';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { ToastrModule } from 'ngx-toastr';
 
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
@@ -37,7 +39,12 @@ import { FooterComponent } from './home/footer/footer.component';
     NgbModule,
     AngularFireModule.initializeApp(environment.firebase),
     AngularFireAuthModule,
-    AngularFirestoreModule
+    AngularFirestoreModule,
+    BrowserAnimationsModule,
+    ToastrModule.forRoot({
+      positionClass: 'toast-bottom-center',
+      preventDuplicates: true
+    })
   ],
   providers: [],
   bootstrap: [AppComponent]

src/app/services/account.service.ts

@@ -6,14 +6,16 @@ import { User } from 'firebase';
 import { AppUser } from '../models/user';
 import { Observable, of } from 'rxjs';
 import { UtilsService } from './utils.service';
+import { ToastrService } from 'ngx-toastr';
 
 @Injectable({ providedIn: 'root' })
 export class AccountService {
   constructor(
     private router: Router,
     private firebaseAuth: AngularFireAuth,
     private firebaseStore: AngularFirestore,
-    private utils: UtilsService) {
+    private utils: UtilsService,
+    private toastr: ToastrService) {
     this.firebaseAuth.authState
       .subscribe((user) => {
         if (!user) { this.router.navigate([this.utils.routes.root]); }
@@ -47,9 +49,8 @@ export class AccountService {
         if (result.user) {
           this.updateAppUser(result.user);
         }
-      }).catch(function (error) {
-        const errorMessage = error.message;
-        console.log(error.message);
+      }).catch((error) => {
+        this.toastr.info(error.message);
       });
   }
 

src/environments/environment.prod.ts

@@ -0,0 +1,11 @@
+export const environment = {
+  production: true,
+  firebase: {
+    apiKey: '',
+    authDomain: '',
+    databaseURL: '',
+    projectId: '',
+    storageBucket: '',
+    messagingSenderId: ''
+  }
+};

src/environments/environment.ts

@@ -0,0 +1,24 @@
+// This file can be replaced during build by using the `fileReplacements` array.
+// `ng build --prod` replaces `environment.ts` with `environment.prod.ts`.
+// The list of file replacements can be found in `angular.json`.
+
+export const environment = {
+  production: false,
+  firebase: {
+    apiKey: '',
+    authDomain: '',
+    databaseURL: '',
+    projectId: '',
+    storageBucket: '',
+    messagingSenderId: ''
+  }
+};
+
+/*
+ * For easier debugging in development mode, you can import the following file
+ * to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeNote`.
+ *
+ * This import should be commented out in production mode because it will have a negative impact
+ * on performance if an error is thrown.
+ */
+// import 'zone.js/dist/zone-error';  // Included with Angular CLI.

src/styles.sass

@@ -1,3 +1,4 @@
+@import '~ngx-toastr/toastr.css';
 // common
 
 $gray: #C6C2C2
@@ -41,7 +42,7 @@ a
 
 .boxed
   background-color: #fff
-  border-radius: $radius 
+  border-radius: $radius
 
 .btn
   border-radius: $radius
@@ -68,7 +69,7 @@ input::placeholder
 
 .animated
   transition: $transition
-  
+
 .pointer
   cursor: pointer
 
@@ -182,9 +183,9 @@ header
     color: #fff
     font-size: 22px
     letter-spacing: 2px
-    
+
     &::placeholder
-      color: #fff !important 
+      color: #fff !important
 
   .color-option
     max-width: 140px
@@ -218,7 +219,7 @@ header
     top: -35px
     font-size: 25px
 
-    &.collapsed 
+    &.collapsed
       transform: translateY(40px)
 
     .nav-content
@@ -256,7 +257,7 @@ header
   height: 25px
   margin-right: 10px
 
-  &:last-child 
+  &:last-child
     margin-right: 0
 
   .color
@@ -300,7 +301,7 @@ header
     border-top: none
     border-radius: 20px
 
-  &:hover 
+  &:hover
     .options-container
       top: 5px
 
@@ -398,10 +399,19 @@ header
 
     &:hover
       opacity: 1
-  
+
   .undo-box
     font-size: 14px
 
+.toast-container
+  .toast
+    width: 400px
+    border-radius: 22px
+    background-color: #7b7b7b
+
+  &.toast-bottom-center
+    bottom: 14px
+
 // media
 
 // Extra small devices (portrait phones, less than 576px)
@@ -483,4 +493,4 @@ header
 // @media (min-width: 992px) and (max-width: 1199.98px)
 
 // // Extra large devices (large desktops, 1200px and up)
-// @media (min-width: 1200px)
+// @media (min-width: 1200px)