From 15614fe488b3da7e6e0463b45d6ff642eb77ac64 Mon Sep 17 00:00:00 2001 From: Olu Amey Date: Sat, 14 Nov 2020 20:49:45 -0500 Subject: [PATCH] fix --- src/app/app-routing.module.ts | 4 + src/app/merms-dash/merms-dash.page.html | 2 +- src/app/merms-dash/merms-dash.page.ts | 6 + .../merms-practice-routing.module.ts | 17 +++ .../merms-practice/merms-practice.module.ts | 20 +++ .../merms-practice/merms-practice.page.html | 29 ++++ .../merms-practice/merms-practice.page.scss | 143 ++++++++++++++++++ .../merms-practice.page.spec.ts | 24 +++ src/app/merms-practice/merms-practice.page.ts | 26 ++++ 9 files changed, 270 insertions(+), 1 deletion(-) create mode 100644 src/app/merms-practice/merms-practice-routing.module.ts create mode 100644 src/app/merms-practice/merms-practice.module.ts create mode 100644 src/app/merms-practice/merms-practice.page.html create mode 100644 src/app/merms-practice/merms-practice.page.scss create mode 100644 src/app/merms-practice/merms-practice.page.spec.ts create mode 100644 src/app/merms-practice/merms-practice.page.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 81d1c70..1dc9731 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -27,6 +27,10 @@ const routes: Routes = [ path: 'merms-settings', loadChildren: () => import('./merms-settings/merms-settings.module').then( m => m.MermsSettingsPageModule) }, + { + path: 'merms-practice', + loadChildren: () => import('./merms-practice/merms-practice.module').then( m => m.MermsPracticePageModule) + }, ]; @NgModule({ diff --git a/src/app/merms-dash/merms-dash.page.html b/src/app/merms-dash/merms-dash.page.html index 83a1cd6..e521f9d 100644 --- a/src/app/merms-dash/merms-dash.page.html +++ b/src/app/merms-dash/merms-dash.page.html @@ -149,7 +149,7 @@
- +
diff --git a/src/app/merms-dash/merms-dash.page.ts b/src/app/merms-dash/merms-dash.page.ts index 57efc9e..cb53967 100644 --- a/src/app/merms-dash/merms-dash.page.ts +++ b/src/app/merms-dash/merms-dash.page.ts @@ -23,4 +23,10 @@ export class MermsDashPage implements OnInit { goSettings() { this.router.navigateByUrl('/merms-settings') } + goPractice(){ + this.router.navigateByUrl('/merms-practice') + } + goHome(){ + + } } diff --git a/src/app/merms-practice/merms-practice-routing.module.ts b/src/app/merms-practice/merms-practice-routing.module.ts new file mode 100644 index 0000000..ca48098 --- /dev/null +++ b/src/app/merms-practice/merms-practice-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { MermsPracticePage } from './merms-practice.page'; + +const routes: Routes = [ + { + path: '', + component: MermsPracticePage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class MermsPracticePageRoutingModule {} diff --git a/src/app/merms-practice/merms-practice.module.ts b/src/app/merms-practice/merms-practice.module.ts new file mode 100644 index 0000000..e25595e --- /dev/null +++ b/src/app/merms-practice/merms-practice.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 { MermsPracticePageRoutingModule } from './merms-practice-routing.module'; + +import { MermsPracticePage } from './merms-practice.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + MermsPracticePageRoutingModule + ], + declarations: [MermsPracticePage] +}) +export class MermsPracticePageModule {} diff --git a/src/app/merms-practice/merms-practice.page.html b/src/app/merms-practice/merms-practice.page.html new file mode 100644 index 0000000..d9436fa --- /dev/null +++ b/src/app/merms-practice/merms-practice.page.html @@ -0,0 +1,29 @@ + +
+ + + + + + Practice + + + + + + + + + Search patient + Edit Profile + A4 + Practice Time + + + + + +
+ + +
\ No newline at end of file diff --git a/src/app/merms-practice/merms-practice.page.scss b/src/app/merms-practice/merms-practice.page.scss new file mode 100644 index 0000000..95240ba --- /dev/null +++ b/src/app/merms-practice/merms-practice.page.scss @@ -0,0 +1,143 @@ +.merms-practice-page{ + + display: flex; + flex-direction: column; + --padding-top: 0px; + --padding-bottom: 40px; + --padding-start: 24px; + --padding-end: 24px; + .container { + padding-top: 7vh; + display: flex; + flex-direction: column; + height: 100%; + ion-grid.top-container { + flex: 0 0 0; + width: 100%; + } + .navigation { + text-align: left; + padding-left: 2px; + ion-back-button { + --color: #000; + display: inline-block; + --icon-font-size: 30px; + } + } + .page-title { + font-style: normal; + font-weight: bold; + font-size: 12px; + line-height: 106.4%; + letter-spacing: 0.1em; + text-transform: uppercase; + color: #000; + display: flex; + justify-content: center; + align-items: center; + } + h1 { + margin-top: 30px; + font-style: normal; + font-weight: 600; + font-size: 26px; + line-height: 135%; + color: #000; + text-align: center; + } + } + + .bottom-container { + margin-top: 6vh; + display: block; + //flex: 1; + //flex-direction: column; + .google-sign-up, + .apple-sign-up { + display: block; + border: 2px solid #000000; + box-sizing: border-box; + border-radius: 26.98px; + padding: 13px 0; + text-align: center; + background: none; + font-weight: bold; + font-size: 16px; + line-height: 14px; + color: #000000; + margin-bottom: 20px; + position: relative; + height: 55px !important; + width: 100%; + + span { + opacity: 1; + font-size: 16px; + line-height: 24px; + margin: 0; + height: 25px; + display: inline-block; + padding: 0; + vertical-align: top; + } + + img { + height: 24px; + margin-right: 13px; + } + } + span { + font-size: 12px; + line-height: 145%; + letter-spacing: -0.2px; + color: #000000; + opacity: 0.25; + text-align: center; + display: inline-block; + margin-bottom: 20px; + &.forgot-password { + margin-top: 20px; + } + } + .form { + display: flex; + flex: 1; + flex-direction: column; + ion-input { + border: 2px solid #000000; + box-sizing: border-box; + border-radius: 26.98px; + margin-bottom: 16px; + --padding-start: 20px; + font-style: normal; + font-weight: normal; + font-size: 16px; + line-height: 145%; + letter-spacing: -0.2px; + color: #000000; + } + button { + background: #0b7493; + border-radius: 30px; + vertical-align: bottom; + display: flex; + margin: auto auto 0 auto; + width: 168px; + font-weight: 600; + font-size: 16px; + line-height: 22px; + color: #fff; + justify-content: center; + padding: 14px 0; + opacity: 0.5; + height: 50px; + min-height: 50px; + &.active-button { + opacity: 1; + } + } + } + } + + +} \ No newline at end of file diff --git a/src/app/merms-practice/merms-practice.page.spec.ts b/src/app/merms-practice/merms-practice.page.spec.ts new file mode 100644 index 0000000..e4897c4 --- /dev/null +++ b/src/app/merms-practice/merms-practice.page.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { MermsPracticePage } from './merms-practice.page'; + +describe('MermsPracticePage', () => { + let component: MermsPracticePage; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ MermsPracticePage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(MermsPracticePage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/merms-practice/merms-practice.page.ts b/src/app/merms-practice/merms-practice.page.ts new file mode 100644 index 0000000..7eccdde --- /dev/null +++ b/src/app/merms-practice/merms-practice.page.ts @@ -0,0 +1,26 @@ +import { Component, OnInit } from '@angular/core'; +import { Router, NavigationExtras } from '@angular/router' +import { + NavController, + AlertController, + LoadingController, +} from '@ionic/angular' + + + +@Component({ + selector: 'app-merms-practice', + templateUrl: './merms-practice.page.html', + styleUrls: ['./merms-practice.page.scss'], +}) +export class MermsPracticePage implements OnInit { + + constructor(public navCtrl: NavController,private router: Router) { } + + ngOnInit() { + } + goBack() { + console.log('MERMSLoginPage::goBack()') + this.navCtrl.pop() + } +}