WrenchBoard/WrenchBoardIonic2023
2
0
Fork 0
Code Issues Pull Requests Releases Activity

redeem pages

Browse Source
This commit is contained in:
CHIEFSOFT\ameye
2023-08-23 10:30:25 -04:00
parent 44cc2c6ac3
commit cc8f9d37db
12 changed files with 706 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/app-routing.module.ts
+4
View File
@@ -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({
src/app/pages/new-password/new-password.page.html
+7
View File
@@ -29,6 +29,13 @@
<ion-icon slot="start" name="lock-closed-outline"></ion-icon>
<ion-input type="password" placeholder="Confirm Password"></ion-input>
</ion-item>
<ion-item lines="none">
<ion-button (click)="onCompleteNewReset()" expand="block">
Reset Password
</ion-button>
</ion-item>
</ion-content>
<ion-footer>
src/app/pages/new-password/new-password.page.ts
+4
View File
@@ -33,4 +33,8 @@ export class NewPasswordPage implements OnInit {
this.router.navigate(['login']);
}
onCompleteNewReset(){
}
}
src/app/pages/redeem/redeem-routing.module.ts
+17
View File
@@ -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 {}
src/app/pages/redeem/redeem.module.ts
+20
View File
@@ -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 {}
src/app/pages/redeem/redeem.page.html
+204
View File
@@ -0,0 +1,204 @@
<ion-content>
<div class="bg_image back_image" [style.backgroundImage]="'url(assets/images/p4.jpg)'">
<div class="ion-padding">
<ion-icon slot="start" name="arrow-back" class="back" (click)="onBack()"></ion-icon>
</div>
</div>
<div class="ion-padding">
<div class="flex">
<ion-label class="bold_text">Redeem</ion-label>
<!-- <ion-icon slot="end" name="bookmark-outline" color="primary"></ion-icon>-->
</div>
<!-- <ion-segment [(ngModel)]="tabs">-->
<!-- <ion-segment-button value="about">-->
<!-- <ion-label>About</ion-label>-->
<!-- </ion-segment-button>-->
<!-- <ion-segment-button value="lesson">-->
<!-- <ion-label>Lessons</ion-label>-->
<!-- </ion-segment-button>-->
<!-- <ion-segment-button value="review">-->
<!-- <ion-label>Reviews</ion-label>-->
<!-- </ion-segment-button>-->
<!-- </ion-segment>-->
<!-- <div *ngIf="tabs =='about'" class="about">-->
<!-- <ion-label class="head_text">Mentor</ion-label>-->
<!-- <div class="mentor" (click)="onMentor()">-->
<!-- <div class="left">-->
<!-- <div class="bg_image men_image" [style.backgroundImage]="'url(assets/images/p3.jpg)'"></div>-->
<!-- <div style="margin-left: 10px;">-->
<!-- <ion-label class="bold">Jonathon Williams</ion-label>-->
<!-- <ion-label class="grey">Senier UI/UX designer at google</ion-label>-->
<!-- </div>-->
<!-- </div>-->
<!-- <ion-icon name="chatbubble-ellipses-outline" color="primary"></ion-icon>-->
<!-- </div>-->
<!-- <ion-label class="head_text">About Course</ion-label>-->
<!-- <ion-label class="description">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Aperiam, dolor, quasi-->
<!-- commodi-->
<!-- </ion-label>-->
<!-- <ion-label class="description">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Aperiam, dolor, quasi-->
<!-- commodi-->
<!-- </ion-label>-->
<!-- <ion-label class="description">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Aperiam, dolor, quasi-->
<!-- commodi-->
<!-- </ion-label>-->
<!-- <ion-label class="head_text">Tools</ion-label>-->
<!-- <ion-label>Figma</ion-label>-->
<!-- </div>-->
<!-- <div *ngIf="tabs =='lesson'" class="lesson">-->
<!-- <div class="flex">-->
<!-- <ion-label class="bold">Most Popular Courses</ion-label>-->
<!-- <ion-label class="color">See all</ion-label>-->
<!-- </div>-->
<!-- <div class="sec">-->
<!-- <ion-label class="grey">Section 1 - Introduction</ion-label>-->
<!-- <ion-label class="color">15 min</ion-label>-->
<!-- </div>-->
<!-- <div class="video" *ngFor="let item of [1,2]">-->
<!-- <div class="left">-->
<!-- <div class="bg_image men_image" [style.backgroundImage]="'url(assets/images/line.png)'"></div>-->
<!-- <div class="text">-->
<!-- <ion-label class="bold_text">Why Using Figma ?</ion-label>-->
<!-- <ion-label class="grey_text">10 mins</ion-label>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="right">-->
<!-- <ion-icon name="lock-closed-outline"></ion-icon>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="sec">-->
<!-- <ion-label class="grey">Section 2 - Figma Basic</ion-label>-->
<!-- <ion-label class="color">60 min</ion-label>-->
<!-- </div>-->
<!-- <div class="video" *ngFor="let item of [1,2,3,4,5,6]">-->
<!-- <div class="left">-->
<!-- <div class="bg_image men_image" [style.backgroundImage]="'url(assets/images/line.png)'"></div>-->
<!-- <div class="text">-->
<!-- <ion-label class="bold_text">Why Using Figma ?</ion-label>-->
<!-- <ion-label class="grey_text">10 mins</ion-label>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="right">-->
<!-- <ion-icon name="lock-closed-outline"></ion-icon>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="sec">-->
<!-- <ion-label class="grey">Section 3 - Let's Practice</ion-label>-->
<!-- <ion-label class="color">75 min</ion-label>-->
<!-- </div>-->
<!-- <div class="video" *ngFor="let item of [1,2,3,4,5,6]">-->
<!-- <div class="left">-->
<!-- <div class="bg_image men_image" [style.backgroundImage]="'url(assets/images/line.png)'"></div>-->
<!-- <div class="text">-->
<!-- <ion-label class="bold_text">Why Using Figma ?</ion-label>-->
<!-- <ion-label class="grey_text">10 mins</ion-label>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="right">-->
<!-- <ion-icon name="lock-closed-outline"></ion-icon>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div *ngIf="tabs =='review'" class="review_tab">-->
<!-- <div class="total">-->
<!-- <div class="star-rate">-->
<!-- <ion-icon name="star-half-outline" color="warning"></ion-icon>-->
<!-- <ion-label class="bold">4.8 (5456 Reviews)</ion-label>-->
<!-- </div>-->
<!-- <ion-label class="color">See all</ion-label>-->
<!-- </div>-->
<!-- <div class="story-item">-->
<!-- <div class="menu">-->
<!-- <div class="text">-->
<!-- <div class="select show">-->
<!-- <ion-icon slot="start" name="star" color="light" class="star_icon"></ion-icon>-->
<!-- <ion-label class="rate_num white">All</ion-label>-->
<!-- </div>-->
<!-- <div class="select">-->
<!-- <ion-icon slot="start" name="star" color="primary" class="star_icon"></ion-icon>-->
<!-- <ion-label class="rate_num">1</ion-label>-->
<!-- </div>-->
<!-- <div class="select">-->
<!-- <ion-icon slot="start" name="star" color="primary" class="star_icon"></ion-icon>-->
<!-- <ion-label class="rate_num">2</ion-label>-->
<!-- </div>-->
<!-- <div class="select">-->
<!-- <ion-icon slot="start" name="star" color="primary" class="star_icon"></ion-icon>-->
<!-- <ion-label class="rate_num">3</ion-label>-->
<!-- </div>-->
<!-- <div class="select">-->
<!-- <ion-icon slot="start" name="star" color="primary" class="star_icon"></ion-icon>-->
<!-- <ion-label class="rate_num">4</ion-label>-->
<!-- </div>-->
<!-- <div class="select">-->
<!-- <ion-icon slot="start" name="star" color="primary" class="star_icon"></ion-icon>-->
<!-- <ion-label class="rate_num">5</ion-label>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="reviw_list" *ngFor="let item of [1,2,3,4,5]">-->
<!-- <div class="profile">-->
<!-- <div class="left">-->
<!-- <div class="bg_image men_image" [style.backgroundImage]="'url(assets/images/p2.jpg)'"></div>-->
<!-- <div style="margin-left: 10px;">-->
<!-- <ion-label class="bold">Jonathon Williams</ion-label>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="right">-->
<!-- <div class="select">-->
<!-- <ion-icon slot="start" name="star" color="primary" class="star_icon"></ion-icon>-->
<!-- <ion-label class="rate_num">5</ion-label>-->
<!-- </div>-->
<!-- <ion-icon name="ellipsis-horizontal-circle-outline"></ion-icon>-->
<!-- </div>-->
<!-- </div>-->
<!-- <ion-label>The course is very good. the experience of the menter is very clear and easy to understand-->
<!-- </ion-label>-->
<!-- <div class="like">-->
<!-- <ion-icon slot="start" name="heart" color="danger" class="heart"></ion-icon>-->
<!-- <ion-label class="count">330</ion-label>-->
<!-- <ion-label class="time">2 Days ago</ion-label>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
</div>
</ion-content>
<ion-footer>
<ion-toolbar>
<div class="button" (click)="onBack()">
<ion-label class="text">Return</ion-label>
</div>
</ion-toolbar>
</ion-footer>
src/app/pages/redeem/redeem.page.scss
+385
View File
@@ -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;
}
}
}
}
src/app/pages/redeem/redeem.page.spec.ts
+24
View File
@@ -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<RedeemPage>;
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();
});
});
src/app/pages/redeem/redeem.page.ts
+36
View File
@@ -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']);
}
}
src/app/pages/transaction/transaction.page.html
+1 -1
View File
@@ -16,7 +16,7 @@
<ion-card-content>
<ion-grid>
<ion-row>
<ion-col> <ion-button size="small" color="success" expand="block">Redeem</ion-button></ion-col>
<ion-col> <ion-button size="small" color="success" expand="block" (click)="startRedeem(item)">Redeem</ion-button></ion-col>
<ion-col></ion-col>
<ion-col>
<!-- <ion-button size="small" expand="block">Add Credit</ion-button>-->
src/app/pages/transaction/transaction.page.ts
+3
View File
@@ -67,6 +67,9 @@ export class TransactionPage implements OnInit {
}
startRedeem(item){
this.router.navigate(['redeem']);
}
}
/*
'limit' => int 20
src/app/services/wrench.service.ts
+1 -1
View File
@@ -22,7 +22,7 @@ export class WrenchService {
}
getPostData(reqPath:string, reqData): Observable<any> {
if (reqPath != 'userlogin'&& reqPath != 'createuser'){
if (reqPath != 'userlogin'&& reqPath != 'createuser' && reqPath !='stepresetpass'){
const sessionId = this.sessionDataProviderService.session;
if (sessionId.length==0){
//debugger;