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

start pages styles

Browse Source
This commit is contained in:
CHIEFSOFT\ameye
2024-01-12 18:17:32 -05:00
parent bf3d991f69
commit 7e07013143
11 changed files with 109 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/components/add-relatives/add-relatives.component.html
+43 -88
View File
@@ -3,98 +3,53 @@
<ion-button size="small" shape="round" (click)="addStart()">Invite</ion-button>
</div>
<div *ngIf="isModalOpenBackdrop==true">
<div style="background-color: aliceblue; border-radius: 10px; padding: 10px; margin-top: 10px;">
<ion-item lines="none">
<div class="head-title">Invite a Family</div>
</ion-item>
<ion-item lines="none">
<ion-input type="text"
maxlength="15"
placeholder="Firstname"
class="input-item"
(ionChange)="verifyEntry()"
[(ngModel)]='firstname' ></ion-input>
</ion-item>
<div style="background-color: aliceblue; border-radius: 10px; padding: 10px 10px 20px 10px; margin-top: 10px;">
<div style=" padding: 5px 5px 10px 5px; background-color: #3dc2ff">
<ion-item lines="none">
<div class="head-title">Invite a Family</div>
</ion-item>
<ion-item lines="none">
<ion-input type="text"
maxlength="15"
placeholder="Firstname"
class="input-item"
(ionChange)="verifyEntry()"
[(ngModel)]='firstname' ></ion-input>
</ion-item>
<ion-item lines="none">
<ion-input type="text"
maxlength="15"
placeholder="Lastname"
class="input-item"
(ionChange)="verifyEntry()"
[(ngModel)]='lastname' ></ion-input>
</ion-item>
<ion-item lines="none">
<ion-input type="text"
maxlength="15"
placeholder="Lastname"
class="input-item"
(ionChange)="verifyEntry()"
[(ngModel)]='lastname' ></ion-input>
</ion-item>
<ion-item lines="none">
<ion-input type="text"
maxlength="55"
placeholder="Email"
class="input-item"
(ionChange)="verifyEntry()"
[(ngModel)]='email' ></ion-input>
</ion-item>
<!-- <ion-item lines="none">-->
<!-- <ion-label>Birthday(Year/Month)</ion-label>-->
<!-- </ion-item>-->
<ion-item lines="none">
<ion-input type="text"
maxlength="55"
placeholder="Email"
class="input-item"
(ionChange)="verifyEntry()"
[(ngModel)]='email' ></ion-input>
</ion-item>
<ion-item>
<!-- <ion-item lines="none">-->
<ion-select
(ionChange)="verifyEntry()"
class="input-item"
style="width: 100%;"
label="Select Type"
placeholder="Select Type"
[(ngModel)]='family_type'>
<ion-select-option *ngFor="let item of familyTypeData"
value="{{item.id}}">{{item.ty}}</ion-select-option>
</ion-select>
</ion-item>
</div>
<!-- <ion-grid>-->
<!-- <ion-row style="margin: 0px; padding: 0px;">-->
<!-- <ion-col style="margin: 0px; padding: 4px;">-->
<!-- <div style="width: 100%; background-color: #8b198e;">-->
<!-- <div style="width: 30%; float: left;">-->
<!-- Year-->
<!-- </div>-->
<!-- <div style="width: 70%; float: right;">-->
<!-- <ion-select aria-label="Year"-->
<!-- (ionChange)="verifyEntry()"-->
<!-- [(ngModel)]='year'-->
<!-- style="background-color: aliceblue; border-radius: 10px; font-size: 12px; width:100%;">-->
<!-- <ion-select-option *ngFor="let item1 of regYear" value="{{item1}}">{{item1}}</ion-select-option>-->
<!-- </ion-select>-->
<!-- </div>-->
<!-- </div>-->
<!-- </ion-col>-->
<!-- </ion-row>-->
<!-- <ion-row style="margin: 0px; padding: 0px;">-->
<!-- <ion-col style="margin: 0px; padding: 4px; ">-->
<!-- <div style="width: 100%; background-color: #8b198e;">-->
<!-- <div style="width: 30%; float: left;">-->
<!-- Month-->
<!-- </div>-->
<!-- <div style="width: 70%; float: right;">-->
<!-- <ion-select aria-label="Month"-->
<!-- (ionChange)="verifyEntry()"-->
<!-- [(ngModel)]='month'-->
<!-- expand="block"-->
<!-- style="background-color: aliceblue; border-radius: 10px; width: 100%; font-size: 12px;">-->
<!-- <ion-select-option *ngFor="let item of regMonth;" value="{{item[0]}}">{{item[1]}}</ion-select-option>-->
<!-- </ion-select>-->
<!-- </div>-->
<!-- </div>-->
<!-- </ion-col>-->
<!-- </ion-row>-->
<!-- </ion-grid>-->
<!-- </ion-item>-->
<ion-grid>
<ion-grid style="margin-top: 10px;">
<ion-row>
<ion-col style="text-align: left">
<ion-button (click)="setCloseModal()" size="small" shape="round" color="danger">
src/app/components/add-relatives/add-relatives.component.ts
+20 -13
View File
@@ -16,18 +16,19 @@ export class AddRelativesComponent implements OnInit {
@ViewChild('firstname') firstname;
@ViewChild('lastname') lastname;
@ViewChild('email') email;
@ViewChild('family_type') family_type;
// @ViewChild('year') year;
@ViewChild('month') month;
@ViewChild('year') year;
addFamilyResult:string='';
familyTypeData:any;
constructor(
public sessionDataProviderService: SessionDataProviderService,
private wrenchService: WrenchService,
private loadingCtrl: LoadingController,
private commonfuncService: CommonfuncService
) { }
) {
this.familyTypeData= this.sessionDataProviderService.family_types;
}
regMonth:any;
regYear:any;
@@ -55,7 +56,10 @@ export class AddRelativesComponent implements OnInit {
isDisabled:boolean= true;
verifyEntry(){
this.isDisabled= true;
if ( this.firstname.length> 1 && this.lastname.length> 1 && this.commonfuncService.validateEmail(this.email)== true ){
if ( this.firstname.length> 1
&& this.lastname.length> 1
&& this.family_type.length > 2
&& this.commonfuncService.validateEmail(this.email)== true ){
this.isDisabled= false;
}
}
@@ -77,9 +81,11 @@ export class AddRelativesComponent implements OnInit {
firstname:string,
lastname: string,
email: number,
family_type: string
};
createFamilyResult:any;
addFamilyResult:any;
addFamilyResultText:string='';
async inviteFamily(){
const loading = await this.loadingCtrl.create({
@@ -95,20 +101,21 @@ export class AddRelativesComponent implements OnInit {
firstname: this.firstname,
lastname: this.lastname,
email: this.email,
family_type: this.family_type
}
loading.present();
this.wrenchService.familyInvite(this.reqData).subscribe(
createFamilyResult => {
addFamilyResult => {
loading.dismiss();
this.createFamilyResult = createFamilyResult;
console.log("this.wrenchService.createFamilyResult RETURN DATA->", this.createFamilyResult);
if (this.createFamilyResult.internal_return> 0){
this.addFamilyResult = addFamilyResult;
console.log("this.wrenchService.createFamilyResult RETURN DATA->", this.addFamilyResult);
if (this.addFamilyResult.internal_return> 0){
this.firstname='';
this.lastname='';
this.email='';
this.createFamilyResult = "Invite Sent.";
this.addFamilyResultText = "Invite Sent.";
setTimeout(()=>{
this.createFamilyResult="";
this.addFamilyResultText="";
this.setCloseModal();
},3000);
}
src/app/pages/forgot/forgot.page.scss
+12
View File
@@ -68,4 +68,16 @@ ion-content {
width: 100px;
}
}
.last_lbl {
text-align: center;
margin-top: 16px;
font-size: 16px;
color: #be2e7e;
span {
color: var(--ion-color-primary);
font-family: "bold";
}
}
}
src/app/pages/forgot/forgot.page.ts
+16 -4
View File
@@ -3,7 +3,7 @@ import {Component, OnInit, ViewChild} from '@angular/core';
import { WrenchService } from 'src/app/services/wrench.service';
import { SessionDataProviderService } from 'src/app/store/session-data-provider.service';
import { BlogDataService } from 'src/app/store/blog-data.service';
import {AlertController} from "@ionic/angular";
import {AlertController, LoadingController} from "@ionic/angular";
@Component({
selector: 'app-forgot',
@@ -14,7 +14,7 @@ export class ForgotPage implements OnInit {
@ViewChild('username') username;
@ViewChild('password') password;
@ViewChild('reset_pin') reset_pin;
tab = 1
tab = 2; // 1
reset_uid:string = '';
m_uid:string = '';
password_reset_id:number = 0;
@@ -22,6 +22,7 @@ export class ForgotPage implements OnInit {
constructor(
private router: Router,
private wrenchService: WrenchService,
private loadingCtrl: LoadingController,
public sessionDataProviderService:SessionDataProviderService,
public blogDataService:BlogDataService,
public alertController: AlertController
@@ -30,14 +31,23 @@ export class ForgotPage implements OnInit {
}
ngOnInit() {
//this.tab=2;
}
ionViewWillEnter(){
//debugger;
this.tab=2;
}
reqData: {
'action':11013, email: string, sessionid: string, channel:'MOBILE'
};
resetResult:any;
onEnterEmail(){
async onEnterEmail(){
const loading = await this.loadingCtrl.create({
message: 'Please wait...',
duration: 6500,
});
this.reset_uid = '';
this.m_uid = '';
if (this.username == null || this.username == '' || this.validateEmail(this.username) == false) {
@@ -45,9 +55,11 @@ export class ForgotPage implements OnInit {
return;
}
loading.present();
this.reqData = { 'action':11013,email: this.username, sessionid: 'DUMMY-APP-SESSION', channel:'MOBILE' }
this.wrenchService.startPassReset(this.reqData).subscribe(
resetResult => {
loading.dismiss();
this.resetResult = resetResult;
console.log("INTERNAL RETURN->" + this.resetResult);
/*
src/app/pages/login/login.page.html
+1 -1
View File
@@ -1,4 +1,4 @@
<ion-content>
<ion-content class="ion-padding no-scroll">
<div class="start-pages">
<div class="page_logo">
<img alt="WrenchBoard" src="/assets/images/wrenchboard-line.png" />
src/app/pages/login/login.page.scss
+1 -1
View File
@@ -101,7 +101,7 @@ ion-content {
text-align: center;
margin-top: 16px;
font-size: 16px;
color: #c2c2cb;
color: #be2e7e;
span {
color: var(--ion-color-primary);
src/app/pages/logout/logout.page.html
+1 -1
View File
@@ -1,4 +1,4 @@
<ion-content class="full-page">
<ion-content class="full-page no-scroll">
<div class="page_logo">
<img alt="WrenchBoard" src="/assets/images/wrenchboard-line.png" />
</div>
src/app/pages/register/register.page.scss
+7 -6
View File
@@ -5,10 +5,10 @@ ion-content {
// background-color: red;
}
.simp_lbl {
margin-top: 10px;
margin-top: 5px;
font-size: 20px;
letter-spacing: 1.2px;
margin-bottom: 20px;
margin-bottom: 10px;
font-family: 'semi-bold';
}
@@ -56,9 +56,10 @@ ion-content {
.or {
display: flex;
justify-content: center;
margin-top: 25px;
color: grey;
margin-top: 10px;
//color: grey;
font-size: 14px;
color: #be2e7e;
}
.button {
@@ -83,9 +84,9 @@ ion-content {
.last_lbl {
text-align: center;
margin-top: 16px;
margin-top: 10px;
font-size: 16px;
color: #c2c2cb;
color: #be2e7e;
span {
color: var(--ion-color-primary);
src/app/pages/slider/slider.page.html
+1 -1
View File
@@ -1,4 +1,4 @@
<ion-content class="ion-padding">
<ion-content class="ion-padding no-scroll">
<div class="main-content">
<ion-slides pager="ios">
src/app/store/session-data-provider.service.ts
+3
View File
@@ -80,6 +80,7 @@ export class SessionDataProviderService {
tracking:number = 0;
session_image_server: string='';
family_uid:string='';
family_types:any=[];
session_contructed:boolean = false;
@@ -144,6 +145,8 @@ export class SessionDataProviderService {
this.tracking = loginResult.tracking;
this.session_image_server = loginResult.session_image_server;
this.refresh = loginResult.refresh;
this.family_types= loginResult.family_types;
//this.pushNotificationProvider.tagUser(this.session);
this.session_contructed = true;
src/global.scss
+4
View File
@@ -49,6 +49,10 @@
font-family: 'regular';
}
.no-scroll .scroll-content{
overflow: hidden;
}
ion-label {
display: block;
}