diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 2dfb3ad..5662f5e 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -27,6 +27,7 @@ import { MoreComponent } from './more/more.component'; import { AuthService } from './services/auth.service'; import { OrderService } from './services/order.service'; import { ItemService } from './services/item.service'; +import { FaqService } from './services/faq.service'; @NgModule({ declarations: [ @@ -53,7 +54,8 @@ import { ItemService } from './services/item.service'; providers: [ AuthService, OrderService, - ItemService + ItemService, + FaqService ], bootstrap: [AppComponent] }) diff --git a/src/app/faq/faq.component.ts b/src/app/faq/faq.component.ts index a2f58ef..0b922a8 100644 --- a/src/app/faq/faq.component.ts +++ b/src/app/faq/faq.component.ts @@ -1,4 +1,5 @@ import { Component, OnInit } from '@angular/core'; +import { FaqService } from '../services/faq.service'; @Component({ selector: 'app-faq', @@ -9,10 +10,13 @@ export class FaqComponent implements OnInit { showDetails: boolean = true; selectedCard: number = null; - constructor() { } + constructor(private faqService: FaqService) { } ngOnInit() { window.innerWidth <= 1023? this.selectedCard = null: this.selectedCard = 1; + + + this.faqService.getFaqContent().then(data => console.log(data)); } } diff --git a/src/app/login/login.component.ts b/src/app/login/login.component.ts index 28f93ef..2e8f727 100644 --- a/src/app/login/login.component.ts +++ b/src/app/login/login.component.ts @@ -30,6 +30,9 @@ export class LoginComponent implements OnInit { requestAuthentication() { this.authService.authenticateUser(this.credentials).then((data: any) => { + + console.log(data); + localStorage.current_login_type = this.credentials.login_type; localStorage.token = data.access_Token; localStorage.user_info = JSON.stringify(data['User Info']); diff --git a/src/app/menu-items/menu-items.component.ts b/src/app/menu-items/menu-items.component.ts index 444d8e6..6bc493d 100644 --- a/src/app/menu-items/menu-items.component.ts +++ b/src/app/menu-items/menu-items.component.ts @@ -13,7 +13,7 @@ export class MenuItemsComponent implements OnInit { searchTerm: string = ''; menuItems: any = []; - showAddItemModal: boolean = true; + showAddItemModal: boolean = false; newItem: { image_url: string, @@ -100,7 +100,7 @@ export class MenuItemsComponent implements OnInit { } addNewItem() { - this.itemService.addMenuItem(this.newItem).then((data) => { + this.itemService.addMenuItem(this.newItem, this.profile_info.outlet_id).then((data) => { console.log(data); }, (err) => { alert("Failed to create item"); diff --git a/src/app/services/faq.service.spec.ts b/src/app/services/faq.service.spec.ts new file mode 100644 index 0000000..febecf7 --- /dev/null +++ b/src/app/services/faq.service.spec.ts @@ -0,0 +1,12 @@ +import { TestBed } from '@angular/core/testing'; + +import { FaqService } from './faq.service'; + +describe('FaqService', () => { + beforeEach(() => TestBed.configureTestingModule({})); + + it('should be created', () => { + const service: FaqService = TestBed.get(FaqService); + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/services/faq.service.ts b/src/app/services/faq.service.ts new file mode 100644 index 0000000..e6fa5e9 --- /dev/null +++ b/src/app/services/faq.service.ts @@ -0,0 +1,25 @@ +import { Injectable } from '@angular/core'; +import { URL } from '../data/url'; +import { HttpClient, HttpHeaders } from '@angular/common/http'; + +@Injectable({ + providedIn: 'root' +}) +export class FaqService { + + constructor( + private http: HttpClient + ) { } + + getFaqContent() { + const httpOptions = { + headers: new HttpHeaders({ + 'Access-Control-Allow-Origin': '*', + 'Content-Type': 'application/json', + 'Authorization': 'Bearer ' + localStorage.token + }) + }; + return this.http.get(URL + '/api/maioraservice/faq/getall/', httpOptions).toPromise(); + } + +} diff --git a/src/app/services/item.service.ts b/src/app/services/item.service.ts index 0da0935..b7ac178 100644 --- a/src/app/services/item.service.ts +++ b/src/app/services/item.service.ts @@ -25,7 +25,14 @@ export class ItemService { return this.http.put(URL + '/api/maioraservice/menuitems/v1/update/', menuItem, httpOptions).toPromise(); } - addMenuItem(menuItem: any) { + addMenuItem(menuItem: any, outlet_id: number) { + + menuItem.outlet = { + outlet_id: outlet_id + }; + + console.log(menuItem); + const httpOptions = { headers: new HttpHeaders({ 'Access-Control-Allow-Origin': '*', diff --git a/src/app/widgets-holder/widgets-holder.component.html b/src/app/widgets-holder/widgets-holder.component.html index dd81093..48b2b47 100644 --- a/src/app/widgets-holder/widgets-holder.component.html +++ b/src/app/widgets-holder/widgets-holder.component.html @@ -41,15 +41,15 @@