Merge pull request #39 from GoogolApp/fix-compilation-errors-on-master

fix compilation errors on dev
GoogolApp · Jun 29, 2018 · 044b6db · 044b6db
2 parents 9285467 + 07bf97b
commit 044b6db
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/src/_config/url.config.ts b/src/_config/url.config.ts
@@ -1,4 +1,4 @@
 export const AppUrl = {
     root: 'https://googol-api.herokuapp.com/api'
     //root: 'http://localhost:4040/api'
-};
+};
diff --git a/src/_services/bar.ts b/src/_services/bar.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { Observable } from 'rxjs/observable';
+import { Observable } from 'rxjs/Observable';
 import 'rxjs/add/operator/map';
 
 import { AppUrl } from '../_config/url.config';
@@ -16,7 +16,7 @@ export class BarService {
 
     /**
      * Create a new bar
-     * @param bar 
+     * @param bar
      */
     create(bar: Bar): Observable<Bar> {
 
@@ -35,7 +35,7 @@ export class BarService {
 
     /**
      * Get one bar with a given id
-     * @param id 
+     * @param id
      */
     getOne(id: string) : Observable<Bar> {
         return this.http.get<Bar>(this.url + '/' + id, this.httpOptions)
@@ -72,4 +72,4 @@ export class BarService {
         });
     }
 
-}
+}
diff --git a/src/_services/owner.ts b/src/_services/owner.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { Observable } from 'rxjs/observable';
+import { Observable } from 'rxjs/Observable';
 import 'rxjs/add/operator/map';
 
 import { AppUrl } from '../_config/url.config';
@@ -17,7 +17,7 @@ export class OwnerService {
 
     /**
      * Create a new owner
-     * @param owner 
+     * @param owner
      */
     create(owner: Owner): Observable<Owner> {
 
@@ -34,7 +34,7 @@ export class OwnerService {
 
     /**
      * Get a single owner by a given id
-     * @param id 
+     * @param id
      */
     getOne(id: string) : Observable<Owner> {
         return this.http.get<Owner>(this.url + '/' + id, this.httpOptions)
@@ -46,10 +46,10 @@ export class OwnerService {
     putBar(id: string, bar: Bar){
         return this.http.put<Owner>(this.url + '/' + id + '/mybar', bar, this.httpOptions)
             .map(
-                owner => { 
+                owner => {
                     return owner;
                 }
             )
     }
 
-}
+}
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -31,7 +31,7 @@ import { SignInPage } from '../pages/Public/signin/signin';
 import { SignUpPage } from '../pages/Public/signup/signup';
 
 //Common
-import { LocationModal } from '../pages/Common/location-modal/location-modal'; 
+import { LocationModal } from '../pages/Common/location-modal/location-modal';
 
 //User
 import { HomePage } from '../pages/User/home/home';
@@ -91,8 +91,7 @@ import { ClaimBarPage } from '../pages/Enterprise/claim-bar/claim-bar';
     MyBarPage,
     PromotionsPage,
     AddPromotionModal,
-    refineEnterprise
-    ClaimBarPage
+    ClaimBarPage,
     FilterMatchesModal
   ],
   imports: [
@@ -134,7 +133,7 @@ import { ClaimBarPage } from '../pages/Enterprise/claim-bar/claim-bar';
     MyBarPage,
     PromotionsPage,
     AddPromotionModal,
-    ClaimBarPage
+    ClaimBarPage,
     FilterMatchesModal
   ],
   providers: [