diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index e7b0d5a..4a5e78f 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -11,6 +11,14 @@ const routes: Routes = [ redirectTo: 'home', pathMatch: 'full' }, + { + path: 'merms-login', + loadChildren: () => import('./merms-login/merms-login.module').then( m => m.MermsLoginPageModule) + }, + { + path: 'merms-signup', + loadChildren: () => import('./merms-signup/merms-signup.module').then( m => m.MermsSignupPageModule) + }, ]; @NgModule({ diff --git a/src/app/home/home.page.scss b/src/app/home/home.page.scss index a8c193b..783a130 100644 --- a/src/app/home/home.page.scss +++ b/src/app/home/home.page.scss @@ -46,7 +46,7 @@ button { align-self: center; padding: 15px 54px; - background: #6063ea; + background: #0b7493; border-radius: 26.9817px; font-weight: 600; font-size: 14.3902px; diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 32dd47c..d689336 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -13,11 +13,11 @@ export class HomePage { startMerms() { - this.router.navigateByUrl('/why-float') + this.router.navigateByUrl('/merms-signup') } goToLogin() { - this.router.navigateByUrl('/float-login') + this.router.navigateByUrl('/merms-login') } diff --git a/src/app/merms-login/merms-login-routing.module.ts b/src/app/merms-login/merms-login-routing.module.ts new file mode 100644 index 0000000..9401ed8 --- /dev/null +++ b/src/app/merms-login/merms-login-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { MermsLoginPage } from './merms-login.page'; + +const routes: Routes = [ + { + path: '', + component: MermsLoginPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class MermsLoginPageRoutingModule {} diff --git a/src/app/merms-login/merms-login.module.ts b/src/app/merms-login/merms-login.module.ts new file mode 100644 index 0000000..2e60803 --- /dev/null +++ b/src/app/merms-login/merms-login.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 { MermsLoginPageRoutingModule } from './merms-login-routing.module'; + +import { MermsLoginPage } from './merms-login.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + MermsLoginPageRoutingModule + ], + declarations: [MermsLoginPage] +}) +export class MermsLoginPageModule {} diff --git a/src/app/merms-login/merms-login.page.html b/src/app/merms-login/merms-login.page.html new file mode 100644 index 0000000..ac79ffe --- /dev/null +++ b/src/app/merms-login/merms-login.page.html @@ -0,0 +1,9 @@ + + + merms-login + + + + + + diff --git a/src/app/merms-login/merms-login.page.scss b/src/app/merms-login/merms-login.page.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/merms-login/merms-login.page.spec.ts b/src/app/merms-login/merms-login.page.spec.ts new file mode 100644 index 0000000..0c6e12a --- /dev/null +++ b/src/app/merms-login/merms-login.page.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { MermsLoginPage } from './merms-login.page'; + +describe('MermsLoginPage', () => { + let component: MermsLoginPage; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ MermsLoginPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(MermsLoginPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/merms-login/merms-login.page.ts b/src/app/merms-login/merms-login.page.ts new file mode 100644 index 0000000..d3e084a --- /dev/null +++ b/src/app/merms-login/merms-login.page.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-merms-login', + templateUrl: './merms-login.page.html', + styleUrls: ['./merms-login.page.scss'], +}) +export class MermsLoginPage implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/merms-signup/merms-signup-routing.module.ts b/src/app/merms-signup/merms-signup-routing.module.ts new file mode 100644 index 0000000..ca50565 --- /dev/null +++ b/src/app/merms-signup/merms-signup-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { MermsSignupPage } from './merms-signup.page'; + +const routes: Routes = [ + { + path: '', + component: MermsSignupPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class MermsSignupPageRoutingModule {} diff --git a/src/app/merms-signup/merms-signup.module.ts b/src/app/merms-signup/merms-signup.module.ts new file mode 100644 index 0000000..acf3501 --- /dev/null +++ b/src/app/merms-signup/merms-signup.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 { MermsSignupPageRoutingModule } from './merms-signup-routing.module'; + +import { MermsSignupPage } from './merms-signup.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + MermsSignupPageRoutingModule + ], + declarations: [MermsSignupPage] +}) +export class MermsSignupPageModule {} diff --git a/src/app/merms-signup/merms-signup.page.html b/src/app/merms-signup/merms-signup.page.html new file mode 100644 index 0000000..514f311 --- /dev/null +++ b/src/app/merms-signup/merms-signup.page.html @@ -0,0 +1,9 @@ + + + merms-signup + + + + + + diff --git a/src/app/merms-signup/merms-signup.page.scss b/src/app/merms-signup/merms-signup.page.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/merms-signup/merms-signup.page.spec.ts b/src/app/merms-signup/merms-signup.page.spec.ts new file mode 100644 index 0000000..a45ef15 --- /dev/null +++ b/src/app/merms-signup/merms-signup.page.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { MermsSignupPage } from './merms-signup.page'; + +describe('MermsSignupPage', () => { + let component: MermsSignupPage; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ MermsSignupPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(MermsSignupPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/merms-signup/merms-signup.page.ts b/src/app/merms-signup/merms-signup.page.ts new file mode 100644 index 0000000..1d8b511 --- /dev/null +++ b/src/app/merms-signup/merms-signup.page.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-merms-signup', + templateUrl: './merms-signup.page.html', + styleUrls: ['./merms-signup.page.scss'], +}) +export class MermsSignupPage implements OnInit { + + constructor() { } + + ngOnInit() { + } + +}