diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index e63d009..da1f3ad 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -298,6 +298,11 @@ const routes: Routes = [ path: 'familyconnectaction', loadChildren: () => import('./pages/familyconnectaction/familyconnectaction.module').then(m => m.FamilyconnectactionPageModule) }, + { + path: 'startlogin', + loadChildren: () => import('./pages/startlogin/startlogin.module').then(m => m.StartloginPageModule) + }, + diff --git a/src/app/pages/register/register.page.ts b/src/app/pages/register/register.page.ts index 2f288af..7699207 100644 --- a/src/app/pages/register/register.page.ts +++ b/src/app/pages/register/register.page.ts @@ -187,7 +187,7 @@ export class RegisterPage implements OnInit { this.signup_state =2; } else { - this.presentToast('Unable to continue with this parameters', 'middle'); + this.presentToast('Unable to continue with this username. Please try to login or another username', 'middle', 4500); } } ); @@ -238,7 +238,9 @@ export class RegisterPage implements OnInit { } else{ this.signup_state =2; // maintain this - this.showAlert("Sign up error","Unable to complete the sign up, please try again"); + // this.showAlert("Sign up error","Unable to complete the sign up, please try again"); + this.presentToast('Unable to complete the sign up, please try again', 'middle', 4500); + } } ); @@ -265,10 +267,10 @@ export class RegisterPage implements OnInit { var re = /\S+@\S+\.\S+/; return re.test(email); } - async presentToast(amessage, position: 'top' | 'middle' | 'bottom') { + async presentToast(amessage, position: 'top' | 'middle' | 'bottom', duration: number= 2500) { const toast = await this.toastController.create({ message: amessage, - duration: 1500, + duration: duration, position: position, }); diff --git a/src/app/pages/slider/slider.page.ts b/src/app/pages/slider/slider.page.ts index 7edeeef..1708b3c 100644 --- a/src/app/pages/slider/slider.page.ts +++ b/src/app/pages/slider/slider.page.ts @@ -18,7 +18,7 @@ export class SliderPage implements OnInit { } onRegister() { - this.router.navigate(['login']); + this.router.navigate(['startlogin']); } signupCountry:any; diff --git a/src/app/pages/startlogin/startlogin-routing.module.ts b/src/app/pages/startlogin/startlogin-routing.module.ts new file mode 100644 index 0000000..6c83476 --- /dev/null +++ b/src/app/pages/startlogin/startlogin-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { StartloginPage } from './startlogin.page'; + +const routes: Routes = [ + { + path: '', + component: StartloginPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class StartloginPageRoutingModule {} diff --git a/src/app/pages/startlogin/startlogin.module.ts b/src/app/pages/startlogin/startlogin.module.ts new file mode 100644 index 0000000..593c6b9 --- /dev/null +++ b/src/app/pages/startlogin/startlogin.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 { StartloginPageRoutingModule } from './startlogin-routing.module'; + +import { StartloginPage } from './startlogin.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + StartloginPageRoutingModule + ], + declarations: [StartloginPage] +}) +export class StartloginPageModule {} diff --git a/src/app/pages/startlogin/startlogin.page.html b/src/app/pages/startlogin/startlogin.page.html new file mode 100644 index 0000000..df964a4 --- /dev/null +++ b/src/app/pages/startlogin/startlogin.page.html @@ -0,0 +1,41 @@ + +
+ + + + + + + + . + + + . + + + + +
+
diff --git a/src/app/pages/startlogin/startlogin.page.scss b/src/app/pages/startlogin/startlogin.page.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/pages/startlogin/startlogin.page.spec.ts b/src/app/pages/startlogin/startlogin.page.spec.ts new file mode 100644 index 0000000..eae7dd0 --- /dev/null +++ b/src/app/pages/startlogin/startlogin.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { StartloginPage } from './startlogin.page'; + +describe('StartloginPage', () => { + let component: StartloginPage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ StartloginPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(StartloginPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/startlogin/startlogin.page.ts b/src/app/pages/startlogin/startlogin.page.ts new file mode 100644 index 0000000..c630cdf --- /dev/null +++ b/src/app/pages/startlogin/startlogin.page.ts @@ -0,0 +1,25 @@ +import { Component, OnInit } from '@angular/core'; +import {WrenchService} from "../../services/wrench.service"; +import {Router} from "@angular/router"; + +@Component({ + selector: 'app-startlogin', + templateUrl: './startlogin.page.html', + styleUrls: ['./startlogin.page.scss'], +}) +export class StartloginPage implements OnInit { + + constructor( private wrenchService: WrenchService, + private router: Router) { } + + ngOnInit() { + } + + familyLogin(){ + this.router.navigate(['familylogin']); + } + startLogin() + { + this.router.navigate(['login']); + } +}