Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix compilation errors on dev #39

Merged
merged 1 commit into from
Jun 29, 2018
Merged

fix compilation errors on dev #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/_config/url.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export const AppUrl = {
root: 'https://googol-api.herokuapp.com/api'
//root: 'http://localhost:4040/api'
};
};
8 changes: 4 additions & 4 deletions src/_services/bar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -16,7 +16,7 @@ export class BarService {

/**
* Create a new bar
* @param bar
* @param bar
*/
create(bar: Bar): Observable<Bar> {

Expand All @@ -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)
Expand Down Expand Up @@ -72,4 +72,4 @@ export class BarService {
});
}

}
}
10 changes: 5 additions & 5 deletions src/_services/owner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -17,7 +17,7 @@ export class OwnerService {

/**
* Create a new owner
* @param owner
* @param owner
*/
create(owner: Owner): Observable<Owner> {

Expand All @@ -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)
Expand All @@ -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;
}
)
}

}
}
7 changes: 3 additions & 4 deletions src/app/app.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -91,8 +91,7 @@ import { ClaimBarPage } from '../pages/Enterprise/claim-bar/claim-bar';
MyBarPage,
PromotionsPage,
AddPromotionModal,
refineEnterprise
ClaimBarPage
ClaimBarPage,
FilterMatchesModal
],
imports: [
Expand Down Expand Up @@ -134,7 +133,7 @@ import { ClaimBarPage } from '../pages/Enterprise/claim-bar/claim-bar';
MyBarPage,
PromotionsPage,
AddPromotionModal,
ClaimBarPage
ClaimBarPage,
FilterMatchesModal
],
providers: [
Expand Down