From 38f545c1760748285c87242e5bc3d8299e2569f5 Mon Sep 17 00:00:00 2001
From: "CHIEFSOFT\\ameye" <ameye@chiefsfot.com>
Date: Sun, 31 Dec 2023 15:43:56 -0500
Subject: [PATCH] regisyer page

---
 src/app/pages/register/register.page.html |  7 +++--
 src/app/pages/register/register.page.ts   | 37 ++++++++++++++++-------
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/src/app/pages/register/register.page.html b/src/app/pages/register/register.page.html
index cff9d00..00f1458 100644
--- a/src/app/pages/register/register.page.html
+++ b/src/app/pages/register/register.page.html
@@ -34,7 +34,7 @@
 
               <ion-item lines="none">
                 <ion-icon slot="start" name="mail-outline"></ion-icon>
-                <ion-input (ionChange)="verReg()" type="username"  maxlength="35" placeholder="Email (your username)" [(ngModel)]='username'></ion-input>
+                <ion-input (ionChange)="verReg()" type="username"  maxlength="35" placeholder="Email (Your Username)" [(ngModel)]='username'></ion-input>
               </ion-item>
 
               <ion-item lines="none">
@@ -91,8 +91,9 @@
                 <ion-col size-md="9">{{signup_username}}</ion-col>
               </ion-row>
             </ion-grid>
-            <ion-label class="or" style="width: 100%; background-color: lightseagreen; color: white; font-weight: bolder; height: 25px; margin: 5px;">Enter Confirmation Received In Email</ion-label>
-
+            <ion-label class="or" style="width: 100%;
+            background-color: #b220a2;
+            color: white; font-weight: bolder; height: 45px; margin: 5px; padding: 10px; border-radius: 10px;">Enter Confirmation Received In Email</ion-label>
             <ion-item lines="none">
               <ion-icon slot="start" name="mail-outline"></ion-icon>
               <ion-input type="text"
diff --git a/src/app/pages/register/register.page.ts b/src/app/pages/register/register.page.ts
index 4afd6ac..e6b30a7 100644
--- a/src/app/pages/register/register.page.ts
+++ b/src/app/pages/register/register.page.ts
@@ -1,6 +1,6 @@
 import { Router } from '@angular/router';
 import {Component, OnInit, ViewChild} from '@angular/core';
-import {LoadingController, ToastController} from "@ionic/angular";
+import {AlertController, LoadingController, ToastController} from "@ionic/angular";
 import {NavController} from "@ionic/angular";
 import { WrenchService } from 'src/app/services/wrench.service';
 import {SessionDataProviderService} from "../../store/session-data-provider.service";
@@ -57,6 +57,7 @@ export class RegisterPage implements OnInit {
       private router: Router,
       private toastController: ToastController,
       private navctr: NavController,
+      private alertController: AlertController,
       private loadingCtrl: LoadingController,
       public sessionDataProviderService: SessionDataProviderService,
       private wrenchService: WrenchService
@@ -168,7 +169,7 @@ export class RegisterPage implements OnInit {
     );
   }
 
-  completeSignupData: {
+   completeSignupData: {
     action:11010,
     username: string,
     random_text: string,
@@ -178,7 +179,11 @@ export class RegisterPage implements OnInit {
     sessionid: string
   };
 
-  onCompleteProfile(){
+  async onCompleteProfile(){
+    const loading = await this.loadingCtrl.create({
+      message: 'Verifying...',
+      duration: 7500,
+    });
     this.completeSignupData = {
       action:11010,
           username: this.signup_username,
@@ -188,30 +193,40 @@ export class RegisterPage implements OnInit {
           mobile: "MOBILE",
           sessionid: "ABOUT-TO_START"
     };
-    console.log("COMPLETE SIGNUP ",this.completeSignupData);
-
+    loading.present();
     this.wrenchService.completeMobileSignup(this.completeSignupData).subscribe(
         signUpResult => {
+          loading.dismiss();
           this.signUpResult =  signUpResult;
-          if (signUpResult != null && signUpResult.internal_return == 100 && this.sessionDataProviderService.ConstructGlobalSessionData(this.signUpResult) == true) {
-           // this.getBlogData();
-            this.router.navigate(['tabs/tab1']);
+          if (signUpResult != null
+              && signUpResult.internal_return == 100
+              && this.sessionDataProviderService.ConstructGlobalSessionData(this.signUpResult) == true) {
+              this.router.navigate(['tabs/tab1']);
           }
           else{
+            this.signup_state  =2; // maintain this
             this.showAlert("Sign up error","Unable to complete the sign up, please try again");
           }
         }
-
     );
   }
-  showAlert(mtitle: string, amessage: string) {
+  async showAlert(mtitle: string, amessage: string) {
     /* let alert = this.alertCtrl.create({
        title: mtitle,
        subTitle: amessage,
        buttons: ['OK']
      });
      alert.present();*/
-    alert(amessage);
+   // alert(amessage);
+    const alert = await this.alertController.create({
+      header: 'WrenchBoard',
+      subHeader: mtitle,
+      message: amessage,
+      buttons: ['OK'],
+    });
+
+    await alert.present();
+
   }
   validateEmail(email) {
     var re = /\S+@\S+\.\S+/;