diff --git a/src/app/admin/admin.component.html b/src/app/admin/admin.component.html index ee9ea1d..5f2aa8c 100644 --- a/src/app/admin/admin.component.html +++ b/src/app/admin/admin.component.html @@ -20,4 +20,5 @@
+
\ No newline at end of file diff --git a/src/app/admin/malls/malls.component.html b/src/app/admin/malls/malls.component.html index 27c4950..0b75819 100644 --- a/src/app/admin/malls/malls.component.html +++ b/src/app/admin/malls/malls.component.html @@ -13,8 +13,6 @@
{{malls.mall_name}}

{{malls.description}}

- {{showModal}} -
Outlets: {{malls.outlet.length}} Outlets: 0 @@ -26,7 +24,7 @@
-
+

    Mall Details:

    @@ -34,31 +32,31 @@
  • - +
  • - +
  • - +
  • - +
  • - +
  • - +
  • - +
    • @@ -66,19 +64,19 @@
  • - +
  • - +
  • - +
  • - +
    • @@ -86,38 +84,46 @@
  • - +
  • - +
  • - +
  • - +
  • - +
  • - +
  • - +
- +
diff --git a/src/app/admin/malls/malls.component.scss b/src/app/admin/malls/malls.component.scss index 73bb4dd..57c5bf7 100644 --- a/src/app/admin/malls/malls.component.scss +++ b/src/app/admin/malls/malls.component.scss @@ -181,6 +181,11 @@ border: 2px solid var(--brand-blue); color: var(--brand-blue); } + + &.disable { + cursor: not-allowed; + filter: grayscale(1); + } } li { diff --git a/src/app/admin/malls/malls.component.ts b/src/app/admin/malls/malls.component.ts index c13f55d..3ce9df6 100644 --- a/src/app/admin/malls/malls.component.ts +++ b/src/app/admin/malls/malls.component.ts @@ -17,68 +17,75 @@ export class MallsComponent implements OnInit { tempMalls: any = []; showModal: boolean = false; - toggleAdd: boolean = false; newMall: { - advertisement: { - adv_type: true, - createdBy: string, - createdOn: string, - image: string, - soft_delete: true, - type: string, - updatedBy: string, - updatedOn: string, - }, + advertisement: [ + { + adv_type: true, + createdBy: string, + createdOn: string, + image: string, + soft_delete: true, + type: string, + updatedBy: string, + updatedOn: string, + } + ], description: string, image_url: string, is_bookmarked: true, mall_address: string, - mall_distance: number, + mall_distance: 0, mall_name: string, - offers_count: number, - outlet: { - description: string, - image_url: string, - is_bookmarked: true, - outlet_Gst: 0, - outlet_id: 0, - outlet_name: string, - outlet_timing: string, - outlet_type: string, - rating: number, - }, - rating: number, + offers_count: 0, + outlet: [ + { + description: string, + image_url: string, + is_bookmarked: true, + outlet_Gst: number, + outlet_id: number, + outlet_name: string, + outlet_timing: string, + outlet_type: string, + rating: number + } + ], + rating: 0, soft_delete: true } = { - advertisement: { - adv_type: true, - createdBy: '', - createdOn: '', - image: '', - soft_delete: true, - type: '', - updatedBy: '', - updatedOn: '', - }, - description: '', - image_url: '', + advertisement: [ + { + adv_type: true, + createdBy: "", + createdOn: "2021-10-26T12:19:53.071Z", + image: "", + soft_delete: true, + type: "", + updatedBy: "", + updatedOn: "2021-10-26T12:19:53.071Z" + } + ], + description: "", + image_url: "", is_bookmarked: true, - mall_address: '', + mall_address: "", mall_distance: 0, - mall_name: '', + mall_name: "", offers_count: 0, - outlet: { - description: '', - image_url: '', - is_bookmarked: true, - outlet_Gst: 0, - outlet_id: 0, - outlet_name: '', - outlet_timing: '', - outlet_type: '', - rating: 0, - }, + outlet: [ + { + description: "", + image_url: "", + is_bookmarked: true, + outlet_Gst: 0, + outlet_id: 0, + outlet_name: "", + outlet_timing: "2021-10-26T12:19:53.071Z", + outlet_type: "", + rating: 0 + } + ], rating: 0, soft_delete: true } @@ -90,7 +97,6 @@ export class MallsComponent implements OnInit { ngOnInit() { this.getAllMalls() - console.log(this.currentTime) } getAllMalls() { @@ -103,7 +109,6 @@ export class MallsComponent implements OnInit { this.tempMalls = arrayofMalls; localStorage.allMalls = JSON.stringify(arrayofMalls) - console.log(this.allMalls) }, (error) => { console.log("Error getting Malls", error) }) @@ -120,6 +125,15 @@ export class MallsComponent implements OnInit { } addMall() { + + this.mallService.addNewMall(this.newMall).then(response => { + alert("Mall Added Successfully") + this.showModal = false; + console.log(response) + }, () => { + console.log("Error Adding New Mall") + }) + console.log(this.newMall) } } diff --git a/src/app/admin/vendors/vendors.component.html b/src/app/admin/vendors/vendors.component.html new file mode 100644 index 0000000..e69de29 diff --git a/src/app/admin/vendors/vendors.component.scss b/src/app/admin/vendors/vendors.component.scss new file mode 100644 index 0000000..9288ac8 --- /dev/null +++ b/src/app/admin/vendors/vendors.component.scss @@ -0,0 +1 @@ +@import '../commonCard'; diff --git a/src/app/admin/vendors/vendors.component.spec.ts b/src/app/admin/vendors/vendors.component.spec.ts new file mode 100644 index 0000000..1c50cbf --- /dev/null +++ b/src/app/admin/vendors/vendors.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { VendorsComponent } from './vendors.component'; + +describe('VendorsComponent', () => { + let component: VendorsComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ VendorsComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(VendorsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/admin/vendors/vendors.component.ts b/src/app/admin/vendors/vendors.component.ts new file mode 100644 index 0000000..670618e --- /dev/null +++ b/src/app/admin/vendors/vendors.component.ts @@ -0,0 +1,23 @@ +import { Component, OnInit } from '@angular/core'; +import { VendorService } from 'src/app/services/vendor.service'; + +@Component({ + selector: 'app-vendors', + templateUrl: './vendors.component.html', + styleUrls: ['./vendors.component.scss'] +}) +export class VendorsComponent implements OnInit { + + constructor(private vendorService: VendorService) { } + + + vendorInfo: any + ngOnInit() { + this.getVendorInfo() + } + + getVendorInfo(){ + + } + +} diff --git a/src/app/app.module.ts b/src/app/app.module.ts index d7a02fc..fd9e41c 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -34,6 +34,7 @@ import { NotificaitonComponent } from './admin/notificaiton/notificaiton.compone import { SupportTicketsComponent } from './admin/support-tickets/support-tickets.component'; import { QueriesComponent } from './admin/queries/queries.component'; import { MallsComponent } from './admin/malls/malls.component'; +import { VendorsComponent } from './admin/vendors/vendors.component'; @NgModule({ declarations: [ @@ -54,7 +55,8 @@ import { MallsComponent } from './admin/malls/malls.component'; NotificaitonComponent, SupportTicketsComponent, QueriesComponent, - MallsComponent + MallsComponent, + VendorsComponent ], imports: [ BrowserModule, diff --git a/src/app/services/malls.service.ts b/src/app/services/malls.service.ts index 987ed1b..aa88c59 100644 --- a/src/app/services/malls.service.ts +++ b/src/app/services/malls.service.ts @@ -35,4 +35,17 @@ export class MallsService { return await this.http.get(URL + '/api/maioraservice/mall/v1/latitude/' + latitude + '/longitude/' + longitude + '/check/', httpOptions).toPromise(); } + + + async addNewMall(newMall: any) { + const httpOptions = { + headers: new HttpHeaders({ + 'Access-Control-Allow-Origin': '*', + 'Content-Type': 'application/json', + 'Authorization': 'Bearer ' + localStorage.token + }) + }; + + return await this.http.post(URL + '/api/maioraservice/Mall/v1/create/', newMall, httpOptions).toPromise(); + } } diff --git a/src/app/services/vendor.service.spec.ts b/src/app/services/vendor.service.spec.ts new file mode 100644 index 0000000..94efb0d --- /dev/null +++ b/src/app/services/vendor.service.spec.ts @@ -0,0 +1,12 @@ +import { TestBed } from '@angular/core/testing'; + +import { VendorService } from './vendor.service'; + +describe('VendorService', () => { + beforeEach(() => TestBed.configureTestingModule({})); + + it('should be created', () => { + const service: VendorService = TestBed.get(VendorService); + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/services/vendor.service.ts b/src/app/services/vendor.service.ts new file mode 100644 index 0000000..bd4233c --- /dev/null +++ b/src/app/services/vendor.service.ts @@ -0,0 +1,24 @@ +import { HttpClient, HttpHeaders } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { URL } from '../data/url'; + + +@Injectable({ + providedIn: 'root' +}) +export class VendorService { + + constructor(private http: HttpClient) { } + + async getAllVendors() { + const httpOptions = { + headers: new HttpHeaders({ + 'Access-Control-Allow-Origin': '*', + 'Content-Type': 'application/json', + 'Authorization': 'Bearer ' + localStorage.token + }) + }; + + return await this.http.get(URL + "/api/maioraservice/vendor/getallVendorsInfo", httpOptions).toPromise() + } +}