fix
This commit is contained in:
@@ -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({
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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')
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -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 {}
|
||||
@@ -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 {}
|
||||
@@ -0,0 +1,9 @@
|
||||
<ion-header>
|
||||
<ion-toolbar>
|
||||
<ion-title>merms-login</ion-title>
|
||||
</ion-toolbar>
|
||||
</ion-header>
|
||||
|
||||
<ion-content>
|
||||
|
||||
</ion-content>
|
||||
@@ -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<MermsLoginPage>;
|
||||
|
||||
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();
|
||||
});
|
||||
});
|
||||
@@ -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() {
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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 {}
|
||||
@@ -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 {}
|
||||
@@ -0,0 +1,9 @@
|
||||
<ion-header>
|
||||
<ion-toolbar>
|
||||
<ion-title>merms-signup</ion-title>
|
||||
</ion-toolbar>
|
||||
</ion-header>
|
||||
|
||||
<ion-content>
|
||||
|
||||
</ion-content>
|
||||
@@ -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<MermsSignupPage>;
|
||||
|
||||
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();
|
||||
});
|
||||
});
|
||||
@@ -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() {
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user