diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 01fa5dc..150052f 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -202,6 +202,10 @@ const routes: Routes = [ path: 'pendingoffers', loadChildren: () => import('./pages/pendingoffers/pendingoffers.module').then(m => m.PendingoffersPageModule) }, + { + path: 'redeem', + loadChildren: () => import('./pages/redeem/redeem.module').then(m => m.RedeemPageModule) + }, ]; @NgModule({ diff --git a/src/app/pages/new-password/new-password.page.html b/src/app/pages/new-password/new-password.page.html index 33c0ef4..39489fb 100644 --- a/src/app/pages/new-password/new-password.page.html +++ b/src/app/pages/new-password/new-password.page.html @@ -29,6 +29,13 @@ + + + + Reset Password + + + diff --git a/src/app/pages/new-password/new-password.page.ts b/src/app/pages/new-password/new-password.page.ts index a9a369d..3e34093 100644 --- a/src/app/pages/new-password/new-password.page.ts +++ b/src/app/pages/new-password/new-password.page.ts @@ -33,4 +33,8 @@ export class NewPasswordPage implements OnInit { this.router.navigate(['login']); } + onCompleteNewReset(){ + + } + } diff --git a/src/app/pages/redeem/redeem-routing.module.ts b/src/app/pages/redeem/redeem-routing.module.ts new file mode 100644 index 0000000..e1d8b75 --- /dev/null +++ b/src/app/pages/redeem/redeem-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { RedeemPage } from './redeem.page'; + +const routes: Routes = [ + { + path: '', + component: RedeemPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class RedeemPageRoutingModule {} diff --git a/src/app/pages/redeem/redeem.module.ts b/src/app/pages/redeem/redeem.module.ts new file mode 100644 index 0000000..233da9f --- /dev/null +++ b/src/app/pages/redeem/redeem.module.ts @@ -0,0 +1,20 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { RedeemPageRoutingModule } from './redeem-routing.module'; + +import { RedeemPage } from './redeem.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + RedeemPageRoutingModule + ], + declarations: [RedeemPage] +}) +export class RedeemPageModule {} diff --git a/src/app/pages/redeem/redeem.page.html b/src/app/pages/redeem/redeem.page.html new file mode 100644 index 0000000..2b14d39 --- /dev/null +++ b/src/app/pages/redeem/redeem.page.html @@ -0,0 +1,204 @@ + + +
+
+ +
+
+ +
+
+ Redeem + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +
+ Return +
+ + diff --git a/src/app/pages/redeem/redeem.page.scss b/src/app/pages/redeem/redeem.page.scss new file mode 100644 index 0000000..1c3cf7a --- /dev/null +++ b/src/app/pages/redeem/redeem.page.scss @@ -0,0 +1,385 @@ + +ion-content { + .back_image { + width: 100%; + height: 230px; + + .back { + font-size: 25px; + color: white; + } + } + + .flex { + display: flex; + justify-content: space-between; + align-items: center; + + ion-icon { + font-size: 22px; + } + } + + .row { + display: flex; + align-items: center; + margin-top: 10px; + + .bg_text { + color: var(--ion-color-primary); + background: #dfe1f3; + font-size: 12px; + padding: 2px 5px; + border-radius: 5px; + margin-right: 10px; + } + + .rate { + display: flex; + align-items: center; + + .review { + margin-left: 5px; + } + } + } + + .color_text { + margin-top: 10px; + font-size: 22px; + font-family: 'semi-bold'; + color: var(--ion-color-primary); + } + + .items { + display: flex; + justify-content: space-between; + margin-top: 10px; + margin-bottom: 20px; + border-bottom: 1px solid lightgrey; + padding-bottom: 10px; + + .stud { + display: flex; + align-items: center; + + ion-icon { + margin-right: 5px; + } + + ion-label { + color: grey; + } + } + } + + .about { + margin-top: 10px; + + .head_text { + font-size: 18px; + font-family: 'semi-bold'; + margin-bottom: 10px; + } + + .mentor { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 20px; + + .left { + display: flex; + + .men_image { + height: 50px; + width: 50px; + border-radius: 100%; + } + + .bold { + font-family: 'semi-bold'; + } + + .grey { + color: grey; + font-size: 14px; + } + } + + ion-icon { + font-size: 25px; + } + } + + .description { + color: grey; + margin-bottom: 5px; + } + } + + .lesson { + margin-top: 20px; + + .bold { + font-family: 'semi-bold'; + } + + .color { + color: var(--ion-color-primary); + } + + .grey { + color: grey; + } + + .sec { + display: flex; + justify-content: space-between; + align-items: center; + margin-top: 10px; + } + + .video { + display: flex; + justify-content: space-between; + align-items: center; + background-color: white; + padding: 15px; + box-shadow: 0px 0px 20px 1px rgba(0, 0, 0, 0.1); + border-radius: 10px; + margin-top: 20px; + + .left { + display: flex; + } + + .men_image { + height: 40px; + width: 40px; + border-radius: 100%; + } + + .text { + margin-left: 10px; + } + + .bold_text { + font-size: 16px; + font-family: 'bold'; + } + + .grey_text { + font-size: 14px; + color: grey; + } + } + } + + .review_tab { + margin-top: 20px; + + .total { + display: flex; + align-items: center; + justify-content: space-between; + + .star-rate { + display: flex; + align-items: center; + + .bold { + font-size: 17px; + font-family: 'semi-bold'; + margin-left: 5px; + } + } + + .color { + color: var(--ion-color-primary); + font-size: 14px; + } + } + + + .story-item { + overflow: scroll; + display: flex; + flex-direction: row; + margin-top: 20px; + + .menu { + width: 100%; + display: flex; + flex-direction: row; + + .item { + padding: 5px; + margin: 5px; + display: flex; + flex-direction: column; + align-items: center; + text-align: center; + + ion-thumbnail { + border-radius: 15px; + width: max-content; + height: 60px; + width: 60px; + --border-radius: 50%; + } + + ion-label { + font-size: 14px; + font-family: "medium"; + color: var(--ion-color-medium); + } + } + + .text { + + display: flex; + align-items: center; + text-align: center; + + .select { + display: flex; + align-items: center; + border: 1px solid var(--ion-color-primary); + border-radius: 20px; + padding: 2px 15px; + margin-right: 10px; + + .rate_num { + margin-left: 5px; + color: var(--ion-color-primary); + } + } + + .show { + background-color: var(--ion-color-primary); + } + + .white { + color: white !important; + } + + .choice { + display: flex; + } + } + } + } + + .reviw_list { + margin-top: 25px; + + .profile { + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 10px; + + .left { + display: flex; + align-items: center; + + .men_image { + height: 40px; + width: 40px; + border-radius: 100%; + } + + + .bold { + font-family: 'semi-bold'; + } + + .grey { + color: grey; + font-size: 14px; + } + } + + .right { + display: flex; + align-items: center; + + .select { + display: flex; + align-items: center; + border: 1px solid var(--ion-color-primary); + border-radius: 20px; + padding: 2px 15px; + margin-right: 10px; + + .rate_num { + margin-left: 5px; + color: var(--ion-color-primary); + } + } + + ion-icon { + font-size: 20px; + } + } + } + + .like { + display: flex; + align-items: center; + margin-top: 10px; + + .heart { + font-size: 25px; + margin-right: 5px; + } + + .count { + margin-right: 10px; + } + + .time { + color: grey; + font-size: 14px; + } + } + } + } + + + + .bold_text { + font-size: 20px; + font-family: 'bold'; + } +} + + +ion-footer { + --background: white; + + ion-toolbar { + --border-width: 0px; + padding: 10px; + align-items: center; + + ion-icon { + color: white; + font-size: 25px; + } + + .button { + background-color: var(--ion-color-primary); + display: flex; + align-items: center; + justify-content: space-around; + border-radius: 30px; + padding: 12px 0; + + .text { + color: white; + } + } + } +} diff --git a/src/app/pages/redeem/redeem.page.spec.ts b/src/app/pages/redeem/redeem.page.spec.ts new file mode 100644 index 0000000..7ff8afb --- /dev/null +++ b/src/app/pages/redeem/redeem.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { RedeemPage } from './redeem.page'; + +describe('RedeemPage', () => { + let component: RedeemPage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ RedeemPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(RedeemPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/redeem/redeem.page.ts b/src/app/pages/redeem/redeem.page.ts new file mode 100644 index 0000000..f481142 --- /dev/null +++ b/src/app/pages/redeem/redeem.page.ts @@ -0,0 +1,36 @@ +import { Component, OnInit } from '@angular/core'; +import {NavController} from "@ionic/angular"; +import {Router} from "@angular/router"; + +@Component({ + selector: 'app-redeem', + templateUrl: './redeem.page.html', + styleUrls: ['./redeem.page.scss'], +}) +export class RedeemPage implements OnInit { + + + tabs = 'about'; + + constructor( + private navctr: NavController, + private router: Router + ) { } + + ngOnInit() { + } + + onBack() { + this.navctr.back(); + } + + onMentor() { + this.router.navigate(['mentor']); + } + + onEnroll() { + this.router.navigate(['enroll']); + } + + +} diff --git a/src/app/pages/transaction/transaction.page.html b/src/app/pages/transaction/transaction.page.html index 8a31c98..c3c22b9 100644 --- a/src/app/pages/transaction/transaction.page.html +++ b/src/app/pages/transaction/transaction.page.html @@ -16,7 +16,7 @@ - Redeem + Redeem diff --git a/src/app/pages/transaction/transaction.page.ts b/src/app/pages/transaction/transaction.page.ts index 7819c07..1d94ffd 100644 --- a/src/app/pages/transaction/transaction.page.ts +++ b/src/app/pages/transaction/transaction.page.ts @@ -67,6 +67,9 @@ export class TransactionPage implements OnInit { } + startRedeem(item){ + this.router.navigate(['redeem']); + } } /* 'limit' => int 20 diff --git a/src/app/services/wrench.service.ts b/src/app/services/wrench.service.ts index 122f74e..cc45588 100644 --- a/src/app/services/wrench.service.ts +++ b/src/app/services/wrench.service.ts @@ -22,7 +22,7 @@ export class WrenchService { } getPostData(reqPath:string, reqData): Observable { - if (reqPath != 'userlogin'&& reqPath != 'createuser'){ + if (reqPath != 'userlogin'&& reqPath != 'createuser' && reqPath !='stepresetpass'){ const sessionId = this.sessionDataProviderService.session; if (sessionId.length==0){ //debugger;