This commit is contained in:
Olu Amey
2020-11-14 20:49:45 -05:00
parent 58ed7fdc27
commit 15614fe488
9 changed files with 270 additions and 1 deletions
+4
View File
@@ -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({
+1 -1
View File
@@ -149,7 +149,7 @@
</ion-col>
<ion-col>
<div>
<ion-icon name="grid"></ion-icon>
<ion-icon name="grid" (click)="goPractice()"></ion-icon>
</div>
</ion-col>
<ion-col>
+6
View File
@@ -23,4 +23,10 @@ export class MermsDashPage implements OnInit {
goSettings() {
this.router.navigateByUrl('/merms-settings')
}
goPractice(){
this.router.navigateByUrl('/merms-practice')
}
goHome(){
}
}
@@ -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 {}
@@ -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 {}
@@ -0,0 +1,29 @@
<ion-content class="merms-practice-page">
<div class="container">
<ion-grid class="top-container">
<ion-row>
<ion-col size="2" class="navigation">
<ion-back-button text="" (click)="goBack()"></ion-back-button>
</ion-col>
<ion-col size="8" class="page-title">Practice</ion-col>
</ion-row>
</ion-grid>
<!-- Item Dividers in a List -->
<ion-list>
<ion-item><ion-label>Search patient </ion-label></ion-item>
<ion-item><ion-label>Edit Profile</ion-label></ion-item>
<ion-item><ion-label>A4</ion-label></ion-item>
<ion-item><ion-label>Practice Time</ion-label></ion-item>
</ion-list>
</div>
</ion-content>
@@ -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;
}
}
}
}
}
@@ -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<MermsPracticePage>;
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();
});
});
@@ -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()
}
}