Fix linting issue

clarkmalmgren · Dec 6, 2017 · e2a4581 · e2a4581
1 parent 62672f0
commit e2a4581
Show file tree

Hide file tree

Showing 2 changed files with 91 additions and 90 deletions.
diff --git a/src/app/services/firebase.browser.ts b/src/app/services/firebase.browser.ts
@@ -9,6 +9,67 @@ import {
   FirebaseUtils
 }                                   from './firebase.service';
 
+export class FirebaseBrowserStorage implements FirebaseStorage {
+
+  constructor(private storage: firebase.storage.Storage) {}
+
+  getUrl(path: string): Observable<string> {
+    if (!path || path.length < 1) {
+      return Observable.of(undefined);
+    }
+
+    return observe(this.storage.ref(path).getDownloadURL());
+  }
+
+  upload(path: string, file: File): Observable<any> {
+    if (!path || path.length < 1) {
+      return Observable.throw(new Error('No uploading to root!'));
+    }
+
+    return observe(this.storage.ref(path).put(file));
+  }
+
+  delete(path: string): Observable<any> {
+    return observe(this.storage.ref(path).delete());
+  }
+}
+
+export class FirebaseBrowserDatabase implements FirebaseDatabase {
+
+  constructor(private database: firebase.database.Database) {}
+
+  exists(path: string): Observable<Boolean> {
+    return observe(this.database.ref(path).once('value'))
+      .map((snap: firebase.database.DataSnapshot) => snap.exists());
+  }
+
+  getOnce(path: string): Observable<any> {
+    return observe(this.database.ref(path).once('value'))
+      .map((snap: firebase.database.DataSnapshot) => snap.val());
+  }
+
+  watch(path: string): Observable<any> {
+    return Observable
+      .create((observer: Observer<any>) => {
+        this.database.ref(path).on('value', (snap) => {
+          observer.next(snap.val());
+        });
+      });
+  }
+
+  put(path: string, value: any): Observable<any> {
+    return observe(this.database.ref(path).set(value));
+  }
+
+  push(path: string, value: any): Observable<any> {
+    return observe(this.database.ref(path).push(value));
+  }
+
+  delete(path: string): Observable<any> {
+    return observe(this.database.ref(path).remove());
+  }
+}
+
 @Injectable()
 export class FirebaseBrowserService extends FirebaseService {
 
@@ -72,67 +133,6 @@ export class FirebaseBrowserService extends FirebaseService {
   }
 }
 
-export class FirebaseBrowserStorage implements FirebaseStorage {
-
-  constructor(private storage: firebase.storage.Storage) {}
-
-  getUrl(path: string): Observable<string> {
-    if (!path || path.length < 1) {
-      return Observable.of(undefined);
-    }
-
-    return observe(this.storage.ref(path).getDownloadURL());
-  }
-
-  upload(path: string, file: File): Observable<any> {
-    if (!path || path.length < 1) {
-      return Observable.throw(new Error('No uploading to root!'));
-    }
-
-    return observe(this.storage.ref(path).put(file));
-  }
-
-  delete(path: string): Observable<any> {
-    return observe(this.storage.ref(path).delete());
-  }
-}
-
-export class FirebaseBrowserDatabase implements FirebaseDatabase {
-
-  constructor(private database: firebase.database.Database) {}
-
-  exists(path: string): Observable<Boolean> {
-    return observe(this.database.ref(path).once('value'))
-      .map((snap: firebase.database.DataSnapshot) => snap.exists());
-  }
-
-  getOnce(path: string): Observable<any> {
-    return observe(this.database.ref(path).once('value'))
-      .map((snap: firebase.database.DataSnapshot) => snap.val());
-  }
-
-  watch(path: string): Observable<any> {
-    return Observable
-      .create((observer: Observer<any>) => {
-        this.database.ref(path).on('value', (snap) => {
-          observer.next(snap.val());
-        });
-      });
-  }
-
-  put(path: string, value: any): Observable<any> {
-    return observe(this.database.ref(path).set(value));
-  }
-
-  push(path: string, value: any): Observable<any> {
-    return observe(this.database.ref(path).push(value));
-  }
-
-  delete(path: string): Observable<any> {
-    return observe(this.database.ref(path).remove());
-  }
-}
-
 function observe<T>(promise: PromiseLike<any>): Observable<any> {
   return Observable.create((observer: Observer<any>) => {
     promise

diff --git a/src/app/services/firebase.server.ts b/src/app/services/firebase.server.ts
@@ -9,35 +9,6 @@ import {
   FirebaseUtils
 }                                   from './firebase.service';
 
-@Injectable()
-export class FirebaseServerService extends FirebaseService {
-
-  private static initialized: boolean = false;
-  private _storage: FirebaseServerStorage;
-  private _database: FirebaseServerDatabase;
-
-  constructor(private env: Env, private http: HttpClient) {
-    super();
-    this._storage = new FirebaseServerStorage();
-    this._database = new FirebaseServerDatabase(env, http);
-  }
-
-  public auth(): Observable<any> {
-    return Observable.throw('No custom authentication allowed on ');
-  }
-
-  authenticated(): Observable<boolean> {
-    return Observable.of(false);
-  }
-
-  storage(): Observable<FirebaseStorage> {
-    return Observable.of(this._storage);
-  }
-
-  database(): Observable<FirebaseDatabase> {
-    return Observable.of(this._database);
-  }
-}
 
 export class FirebaseServerStorage implements FirebaseStorage {
 
@@ -91,3 +62,33 @@ export class FirebaseServerDatabase implements FirebaseDatabase {
   }
 }
 
+@Injectable()
+export class FirebaseServerService extends FirebaseService {
+
+  private static initialized: boolean = false;
+  private _storage: FirebaseServerStorage;
+  private _database: FirebaseServerDatabase;
+
+  constructor(private env: Env, private http: HttpClient) {
+    super();
+
+    this._storage = new FirebaseServerStorage();
+    this._database = new FirebaseServerDatabase(env, http);
+  }
+
+  public auth(): Observable<any> {
+    return Observable.throw('No custom authentication allowed on ');
+  }
+
+  authenticated(): Observable<boolean> {
+    return Observable.of(false);
+  }
+
+  storage(): Observable<FirebaseStorage> {
+    return Observable.of(this._storage);
+  }
+
+  database(): Observable<FirebaseDatabase> {
+    return Observable.of(this._database);
+  }
+}