+
+
+
+
+
+
Teso Ghana © {{currentYear}} | Developed by Bacware Technology
@@ -47,4 +55,4 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/app/layout/navigation/data.ts b/src/app/layout/navigation/data.ts
index eac7b9b..9b9a48d 100644
--- a/src/app/layout/navigation/data.ts
+++ b/src/app/layout/navigation/data.ts
@@ -2,15 +2,6 @@
import { tesoNavigationItem } from '@teso/components/navigation';
export const defaultNavigation: tesoNavigationItem[] = [
- {
- id: 'example',
- title: 'Example',
- type: 'basic',
- icon: 'heroicons_outline:chart-pie',
- link: '/dashboard'
- }
-];
-export const compactNavigation: tesoNavigationItem[] = [
{
id: 'dashboard',
title: 'Dashboard',
@@ -18,22 +9,59 @@ export const compactNavigation: tesoNavigationItem[] = [
icon: 'heroicons_outline:chart-pie',
link: '/dashboard'
},
-
{
- id: 'adverts',
- title: 'Ads',
+ id: 'coupons',
+ title: 'Coupons',
+ type: 'basic',
+ icon: 'heroicons_outline:credit-card',
+ link: '/coupons'
+ },
+ {
+ id: 'products',
+ title: 'Products',
+ type: 'basic',
+ icon: 'heroicons_outline:shopping-bag',
+ link: '/products'
+ },
+ {
+ id: 'followers',
+ title: 'Followers',
+ type: 'basic',
+ icon: 'heroicons_outline:users',
+ link: '/followers'
+ },
+ {
+ id: 'desire',
+ title: 'Monthly Desires',
type: 'basic',
- icon: 'heroicons_outline:play',
- link: '/adverts'
-
+ icon: 'heroicons_outline:heart',
+ link: '/desires'
},
+];
+export const compactNavigation: tesoNavigationItem[] = [
{
- id: 'campaigns',
- title: 'Campaigns',
+ id: 'dashboard',
+ title: 'Dashboard',
type: 'basic',
- icon: 'mat_outline:ads_click',
- link: '/campaigns'
+ icon: 'heroicons_outline:chart-pie',
+ link: '/dashboard'
},
+
+ // {
+ // id: 'adverts',
+ // title: 'Ads',
+ // type: 'basic',
+ // icon: 'heroicons_outline:play',
+ // link: '/adverts'
+
+ // },
+ // {
+ // id: 'campaigns',
+ // title: 'Campaigns',
+ // type: 'basic',
+ // icon: 'mat_outline:ads_click',
+ // link: '/campaigns'
+ // },
{
id: 'coupons',
title: 'Coupons',
@@ -54,7 +82,7 @@ export const compactNavigation: tesoNavigationItem[] = [
type: 'basic',
icon: 'heroicons_outline:users',
link: '/followers'
- },
+ },
{
id: 'desire',
title: 'Monthly Desires',
diff --git a/src/app/mock-api/common/user/data.ts b/src/app/mock-api/common/user/data.ts
index 416aef9..90d8a73 100644
--- a/src/app/mock-api/common/user/data.ts
+++ b/src/app/mock-api/common/user/data.ts
@@ -3,6 +3,5 @@ export const user = {
id : 'cfaad35d-07a3-4447-a6c3-d8c3d54fd5df',
name : 'Dummy User',
email : 'dummy@bacware.com',
- avatar: 'assets/images/avatars/brian-hughes.jpg',
status: 'online'
};
diff --git a/src/app/models/generalModel.ts b/src/app/models/generalModel.ts
new file mode 100644
index 0000000..d8731a2
--- /dev/null
+++ b/src/app/models/generalModel.ts
@@ -0,0 +1,5 @@
+export interface ProductUpload {
+ highlight: boolean;
+ file: File;
+ imageSRC:string;
+}
\ No newline at end of file
diff --git a/src/app/pages/admin/Adverts/adverts.component.html b/src/app/pages/admin/Adverts/adverts.component.html
deleted file mode 100644
index 819de1a..0000000
--- a/src/app/pages/admin/Adverts/adverts.component.html
+++ /dev/null
@@ -1 +0,0 @@
-
adverts works!
diff --git a/src/app/pages/admin/Adverts/adverts.component.scss b/src/app/pages/admin/Adverts/adverts.component.scss
deleted file mode 100644
index e69de29..0000000
diff --git a/src/app/pages/admin/Adverts/adverts.component.ts b/src/app/pages/admin/Adverts/adverts.component.ts
deleted file mode 100644
index ba71e42..0000000
--- a/src/app/pages/admin/Adverts/adverts.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
- selector: 'app-adverts',
- templateUrl: './adverts.component.html',
- styleUrls: ['./adverts.component.scss']
-})
-export class AdvertsComponent implements OnInit {
-
- constructor() { }
-
- ngOnInit(): void {
- }
-
-}
diff --git a/src/app/pages/admin/Adverts/adverts.module.ts b/src/app/pages/admin/Adverts/adverts.module.ts
deleted file mode 100644
index c70afad..0000000
--- a/src/app/pages/admin/Adverts/adverts.module.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-
-
-
-@NgModule({
- declarations: [],
- imports: [
- CommonModule
- ]
-})
-export class AdvertsModule { }
diff --git a/src/app/pages/admin/Campaigns/campaigns.component.html b/src/app/pages/admin/Campaigns/campaigns.component.html
deleted file mode 100644
index 940c63c..0000000
--- a/src/app/pages/admin/Campaigns/campaigns.component.html
+++ /dev/null
@@ -1 +0,0 @@
-
campaigns works!
diff --git a/src/app/pages/admin/Campaigns/campaigns.component.scss b/src/app/pages/admin/Campaigns/campaigns.component.scss
deleted file mode 100644
index e69de29..0000000
diff --git a/src/app/pages/admin/Campaigns/campaigns.component.ts b/src/app/pages/admin/Campaigns/campaigns.component.ts
deleted file mode 100644
index 6d576dc..0000000
--- a/src/app/pages/admin/Campaigns/campaigns.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
- selector: 'app-campaigns',
- templateUrl: './campaigns.component.html',
- styleUrls: ['./campaigns.component.scss']
-})
-export class CampaignsComponent implements OnInit {
-
- constructor() { }
-
- ngOnInit(): void {
- }
-
-}
diff --git a/src/app/pages/admin/Campaigns/campaigns.module.ts b/src/app/pages/admin/Campaigns/campaigns.module.ts
deleted file mode 100644
index e038d64..0000000
--- a/src/app/pages/admin/Campaigns/campaigns.module.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-
-
-
-@NgModule({
- declarations: [],
- imports: [
- CommonModule
- ]
-})
-export class CampaignsModule { }
diff --git a/src/app/pages/admin/Coupons/Active/active-coupons.component.html b/src/app/pages/admin/Coupons/Active/active-coupons.component.html
new file mode 100644
index 0000000..3d6324f
--- /dev/null
+++ b/src/app/pages/admin/Coupons/Active/active-coupons.component.html
@@ -0,0 +1,115 @@
+
+
+
+
+
+ |
+ Product
+ |
+
+
+ {{transaction.name}}
+
+ |
+
+
+
+
+
+ Quantity Left
+ |
+
+
+ {{transaction.quantity}}
+
+ |
+
+
+
+ Coupon Type
+ |
+
+
+ {{transaction.type}}
+
+ |
+
+
+
+ Condition
+ |
+
+
+ {{transaction.condition}}
+
+ |
+
+
+
+
+ Range
+ |
+
+
+ {{transaction.range}}
+
+ |
+
+
+
+ Number Claimed
+ |
+
+
+ {{transaction.claimed}}
+
+ |
+
+
+
+ Status
+ |
+
+
+ Active
+
+ |
+
+
+
+ Expiration
+ |
+
+
+ {{transaction.expiration | date}}
+
+ |
+
+
+
+
+ Actions
+ |
+
+
+
+
+
+ |
+
+
+
+
+
+ |
+
+
+ |
+ |
+ |
+
+
+
\ No newline at end of file
diff --git a/src/app/pages/admin/Coupons/Active/active-coupons.component.scss b/src/app/pages/admin/Coupons/Active/active-coupons.component.scss
new file mode 100644
index 0000000..3eb56ad
--- /dev/null
+++ b/src/app/pages/admin/Coupons/Active/active-coupons.component.scss
@@ -0,0 +1,6 @@
+.coupons-row{
+ color: #003445 !important;
+}
+.pr-6 {
+ color: #003445;
+}
\ No newline at end of file
diff --git a/src/app/pages/admin/Campaigns/campaigns.component.spec.ts b/src/app/pages/admin/Coupons/Active/active-coupons.component.spec.ts
similarity index 52%
rename from src/app/pages/admin/Campaigns/campaigns.component.spec.ts
rename to src/app/pages/admin/Coupons/Active/active-coupons.component.spec.ts
index 720c6b6..9150b13 100644
--- a/src/app/pages/admin/Campaigns/campaigns.component.spec.ts
+++ b/src/app/pages/admin/Coupons/Active/active-coupons.component.spec.ts
@@ -1,20 +1,20 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { CampaignsComponent } from './campaigns.component';
+import { ActiveCouponsComponent } from './active-coupons.component';
-describe('CampaignsComponent', () => {
- let component: CampaignsComponent;
- let fixture: ComponentFixture
;
+describe('ActiveCouponsComponent', () => {
+ let component: ActiveCouponsComponent;
+ let fixture: ComponentFixture;
beforeEach(async () => {
await TestBed.configureTestingModule({
- declarations: [ CampaignsComponent ]
+ declarations: [ ActiveCouponsComponent ]
})
.compileComponents();
});
beforeEach(() => {
- fixture = TestBed.createComponent(CampaignsComponent);
+ fixture = TestBed.createComponent(ActiveCouponsComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
diff --git a/src/app/pages/admin/Coupons/Active/active-coupons.component.ts b/src/app/pages/admin/Coupons/Active/active-coupons.component.ts
new file mode 100644
index 0000000..82212cd
--- /dev/null
+++ b/src/app/pages/admin/Coupons/Active/active-coupons.component.ts
@@ -0,0 +1,23 @@
+import { ChangeDetectionStrategy, Component, Input, OnInit, ViewChild } from '@angular/core';
+import { MatSort } from '@angular/material/sort';
+import { MatTableDataSource } from '@angular/material/table';
+
+@Component({
+ selector: 'activecoupons',
+ templateUrl: './active-coupons.component.html',
+ styleUrls: ['./active-coupons.component.scss'],
+ changeDetection: ChangeDetectionStrategy.OnPush,
+ exportAs: 'activecoupons'
+})
+export class ActiveCouponsComponent implements OnInit {
+ @Input() couponsDataSource: MatTableDataSource;
+ couponsTableColumns: string[] = ['product', 'quantity', 'type', 'condition', 'range', 'claimed', 'status', 'expiration', 'actions'];
+ @ViewChild('couponsTable', { read: MatSort }) couponsTableMatSort: MatSort;
+ constructor() { }
+
+ ngOnInit(): void {
+ }
+ trackByFn(index: number, item: any): any {
+ return item.id || index;
+ }
+}
diff --git a/src/app/pages/admin/Coupons/AdminNewCoupons/admin-new-coupons.component.html b/src/app/pages/admin/Coupons/AdminNewCoupons/admin-new-coupons.component.html
new file mode 100644
index 0000000..a962e77
--- /dev/null
+++ b/src/app/pages/admin/Coupons/AdminNewCoupons/admin-new-coupons.component.html
@@ -0,0 +1,134 @@
+
+
+
New Coupons
+
+
+
+
+
+
+
+ Target Business
+
+
+
+
+ Target Name
+
+
+
+
+
+
+
+
+ Target Name
+
+
+
+
+
+ Product 1
+ Product 2
+ Product 3
+ Product 4
+
+
+
+
+
+
+
+ Original Price
+
+
+
+
+ GH¢200
+
+
+
+
+
+
+ Coupon Type
+
+
+
+
+
+ Freebie
+ Discount
+ Proximity Freebie
+ Proximity Discount
+
+
+
+
+
+
+
+
+ Coupon Condition
+
+
+
+
+
+
+
+
+
+ Number Of Coupons
+
+
+
+
+
+
+
+
+
+
+
+ Percentage Off
+
+
+ From
+
+ %
+
+
+ To
+
+ %
+
+
+
+
+ Coupon Worth
+
+
+ From GH¢200 To GH¢800
+
+
+
+
+ Date Of Expiration
+
+
+
+
+
+ Time
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ Product
+ |
+
+
+ {{transaction.name}}
+
+ |
+
+
+
+
+
+ Quantity Left
+ |
+
+
+ {{transaction.quantity}}
+
+ |
+
+
+
+ Coupon Type
+ |
+
+
+ {{transaction.type}}
+
+ |
+
+
+
+ Condition
+ |
+
+
+ {{transaction.condition}}
+
+ |
+
+
+
+
+ Range
+ |
+
+
+ {{transaction.range}}
+
+ |
+
+
+
+ Number Claimed
+ |
+
+
+ {{transaction.claimed}}
+
+ |
+
+
+
+ Status
+ |
+
+
+ Expired
+
+ |
+
+
+
+ Expiration
+ |
+
+
+ {{transaction.expiration | date}}
+
+ |
+
+
+
+
+ Actions
+ |
+
+
+
+
+
+ |
+
+
+
+
+
+ |
+
+
+ |
+ |
+ |
+
+
+
+
+
New Coupons
+
+
+
+
+
+
+
+ Target Product
+
+
+
+
+
+ Product 1
+ Product 2
+ Product 3
+ Product 4
+
+
+
+
+
+
+
+ Original Price
+
+
+
+
+ GH¢200
+
+
+
+
+
+
+ Coupon Type
+
+
+
+
+
+ Freebie
+ Discount
+ Proximity Freebie
+ Proximity Discount
+
+
+
+
+
+
+
+
+ Coupon Condition
+
+
+
+
+
+
+
+
+
+ Number Of Coupons
+
+
+
+
+
+
+
+
+
+
+
+ Percentage Off
+
+
+ From
+
+ %
+
+
+ To
+
+ %
+
+
+
+
+ Coupon Worth
+
+
+ From GH¢200 To GH¢800
+
+
+
+
+ Date Of Expiration
+
+
+
+
+
+ Time
+
+
+
+
+
+
+
+
coupons works!
+
+
+
+
+
+
+
+
Coupons
+
Here is a list of all your coupons on Teso (850)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+