Remove console log, update send file function, edit README

Author: finnzeit

README.md

@@ -4,19 +4,14 @@
 [![Build Status](https://travis-ci.org/finnzeit/instant.svg?branch=master)](https://travis-ci.org/finnzeit/instant)
 [![codebeat badge](https://codebeat.co/badges/1b33c26b-9165-454f-b3df-dbe4dfb56c9e)](https://codebeat.co/projects/github.amrom.workers.dev-finnzeit-instant-master)
 
-Try out at [finnzeit.github.io/instant](https://finnzeit.github.io/instant/) or [https://instant-4cf24.firebaseapp.com](https://instant-4cf24.firebaseapp.com) 
+Try out at [zeit.js.org/instant](https://zeit.js.org/instant/) or [https://instant-4cf24.firebaseapp.com](https://instant-4cf24.firebaseapp.com) 
 
 ## Current features
 - Create, login with an account
 - Sign in with Facebook account
 - Send text messages, photos and files in realtime
 - Create channels for multiple topics
 
-## Team members
-- Nguyễn  Vũ Quốc Thiện
-- Dư Cao Tiến
-- Phạm Trọng Vinh
-
 ## Development server
 Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
 

src/app/home/chat/chat.component.ts

@@ -33,11 +33,7 @@ export class ChatComponent implements AfterViewChecked, OnChanges {
     if (event.target && event.target.files && event.target.files.length) {
       const file = event.target.files[0] as File;
       console.log(file);
-      if (file.type.match('image.*')) {
-        this.afService.sendImage(this.channelId, file);
-      } else {
-        this.afService.sendFile(this.channelId, file);
-      }
+      this.afService.sendFile(this.channelId, file)
     }
   }
 

src/app/home/home.component.ts

@@ -29,7 +29,6 @@ export class HomeComponent {
 
     this.channels = afService.channels;
     this.afService.defaultChannelId.subscribe(value => this.channelId = value);
-    console.log(`This: ${this.channelId}`);
   }
 
   logout() {

src/app/shared/services/firebase.ts

@@ -38,7 +38,6 @@ export class AngularFire {
           limitToFirst: 1
       }
     }).subscribe(items => {
-      console.log(items[0].$key);
       this.defaultChannelId.next(items[0].$key);
     });
   }
@@ -90,40 +89,37 @@ export class AngularFire {
     this.db.list('channelMessages/' + channel).push(message);
   }
 
-  sendImage(channel, file: File) {
-    const storageRef = firebase.storage().ref();
-    let uploadTask: firebase.storage.UploadTask;
-    uploadTask = storageRef.child('images/' + this.afAuth.auth.currentUser.uid + '/' + Date.now() + '/' + file.name).put(file);
-
-    uploadTask.on(firebase.storage.TaskEvent.STATE_CHANGED, null, (error) => {
-      console.error('There was an error uploading file to Firebase Storage: ', error);
-    }, () => {
-      const url = uploadTask.snapshot.downloadURL;
-      this.saveFile(channel, {
-        displayName: this.displayName,
-        email: this.email,
-        imageUrl: url,
-        timestamp: Date.now(),
-      });
-    });
-  }
-
   sendFile(channel, file: File) {
+    let propName: String;
     const storageRef = firebase.storage().ref();
     let uploadTask: firebase.storage.UploadTask;
-    uploadTask = storageRef.child('files/' + this.afAuth.auth.currentUser.uid + '/' + Date.now() + '/' + file.name).put(file);
-
+    if (file.type.match('image.*')) {
+      propName = 'imageUrl';
+      uploadTask = storageRef.child('images/' + this.afAuth.auth.currentUser.uid + '/' + Date.now() + '/' + file.name).put(file);
+    } else {
+      propName = 'fileUrl';
+      uploadTask = storageRef.child('files/' + this.afAuth.auth.currentUser.uid + '/' + Date.now() + '/' + file.name).put(file);
+    }
     uploadTask.on(firebase.storage.TaskEvent.STATE_CHANGED, null, (error) => {
       console.error('There was an error uploading file to Firebase Storage: ', error);
     }, () => {
       const url = uploadTask.snapshot.downloadURL;
-      this.saveFile(channel, {
-        displayName: this.displayName,
-        email: this.email,
-        fileName: file.name,
-        fileUrl: url,
-        timestamp: Date.now(),
-      });
+      if (file.type.match('image.*')) {
+        this.saveFile(channel, {
+          displayName: this.displayName,
+          email: this.email,
+          imageUrl: url,
+          timestamp: Date.now(),
+        });
+      } else {
+        this.saveFile(channel, {
+          displayName: this.displayName,
+          email: this.email,
+          fileName: file.name,
+          fileUrl: url,
+          timestamp: Date.now(),
+        });
+      }
     });
   }