From a889f5b10cf0dcd08371e48f4e870b80a704c1de Mon Sep 17 00:00:00 2001
From: Olu Amey <ameye@chiefsoft.com>
Date: Sat, 28 Nov 2020 20:47:34 -0500
Subject: [PATCH] fix

---
 src/app/merms-dash/merms-dash.page.ts         |   4 +-
 .../merms-settings/merms-settings.page.html   |   2 +-
 src/app/merms-settings/merms-settings.page.ts |   4 +
 src/app/merms-wallet/merms-wallet.page.html   |  34 ++++-
 src/app/merms-wallet/merms-wallet.page.scss   | 143 ++++++++++++++++++
 src/app/merms-wallet/merms-wallet.page.ts     |  14 +-
 6 files changed, 188 insertions(+), 13 deletions(-)

diff --git a/src/app/merms-dash/merms-dash.page.ts b/src/app/merms-dash/merms-dash.page.ts
index 3a89ebd..2e24546 100644
--- a/src/app/merms-dash/merms-dash.page.ts
+++ b/src/app/merms-dash/merms-dash.page.ts
@@ -79,9 +79,7 @@ export class MermsDashPage implements OnInit {
   goSettings() {
     this.router.navigateByUrl('/merms-settings')
   }
-  goPractice() {
-    this.router.navigateByUrl('/merms-practice')
-  }
+
 
   goPatient() {
     this.router.navigateByUrl('/merms-patient')
diff --git a/src/app/merms-settings/merms-settings.page.html b/src/app/merms-settings/merms-settings.page.html
index 5837e00..29cc41b 100644
--- a/src/app/merms-settings/merms-settings.page.html
+++ b/src/app/merms-settings/merms-settings.page.html
@@ -30,7 +30,7 @@
         </ion-label>
       </ion-item-divider>
     
-      <ion-item><ion-label>Add Practice</ion-label></ion-item>
+      <ion-item (click)="goPractice()"><ion-label>Practice</ion-label></ion-item>
       <ion-item><ion-label>B3</ion-label></ion-item>
       <ion-item><ion-label>B4</ion-label></ion-item>
       <ion-item><ion-label>B5</ion-label></ion-item>
diff --git a/src/app/merms-settings/merms-settings.page.ts b/src/app/merms-settings/merms-settings.page.ts
index ac59d83..40d1559 100644
--- a/src/app/merms-settings/merms-settings.page.ts
+++ b/src/app/merms-settings/merms-settings.page.ts
@@ -29,4 +29,8 @@ export class MermsSettingsPage implements OnInit {
     // /home
     this.router.navigateByUrl('/home')
   }
+
+  goPractice() {
+    this.router.navigateByUrl('/merms-practice')
+  }
 }
diff --git a/src/app/merms-wallet/merms-wallet.page.html b/src/app/merms-wallet/merms-wallet.page.html
index 1820ccd..138247f 100644
--- a/src/app/merms-wallet/merms-wallet.page.html
+++ b/src/app/merms-wallet/merms-wallet.page.html
@@ -1,9 +1,29 @@
-<ion-header>
-  <ion-toolbar>
-    <ion-title>merms-wallet</ion-title>
-  </ion-toolbar>
-</ion-header>
+<ion-content class="merms-wallet-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">My Wallet</ion-col>
+      </ion-row>
+    </ion-grid>
+    
 
-<ion-content>
+    
+    <!-- Item Dividers in a List -->
+    <ion-list>
 
-</ion-content>
+      <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>
\ No newline at end of file
diff --git a/src/app/merms-wallet/merms-wallet.page.scss b/src/app/merms-wallet/merms-wallet.page.scss
index e69de29..fad8948 100644
--- a/src/app/merms-wallet/merms-wallet.page.scss
+++ b/src/app/merms-wallet/merms-wallet.page.scss
@@ -0,0 +1,143 @@
+.merms-wallet-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-wallet/merms-wallet.page.ts b/src/app/merms-wallet/merms-wallet.page.ts
index 88aa3d5..96fe19a 100644
--- a/src/app/merms-wallet/merms-wallet.page.ts
+++ b/src/app/merms-wallet/merms-wallet.page.ts
@@ -1,4 +1,11 @@
 import { Component, OnInit } from '@angular/core';
+import { Router, NavigationExtras } from '@angular/router'
+import {
+  NavController,
+  AlertController,
+  LoadingController,
+} from '@ionic/angular'
+
 
 @Component({
   selector: 'app-merms-wallet',
@@ -7,9 +14,12 @@ import { Component, OnInit } from '@angular/core';
 })
 export class MermsWalletPage implements OnInit {
 
-  constructor() { }
+  constructor(public navCtrl: NavController,private router: Router) { }
 
   ngOnInit() {
   }
-
+  goBack() {
+    console.log('MERMSLoginPage::goBack()')
+    this.navCtrl.pop()
+  }
 }