fix

android-DEL/.gitignore

@@ -0,0 +1,91 @@
+# NPM renames .gitignore to .npmignore
+# In order to prevent that, we remove the initial "."
+# And the CLI then renames it
+
+# Using Android gitignore template: https://github.com/github/gitignore/blob/master/Android.gitignore
+
+# Built application files
+*.apk
+*.ap_
+*.aab
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+release/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# IntelliJ
+*.iml
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/assetWizardSettings.xml
+.idea/dictionaries
+.idea/libraries
+# Android Studio 3 in .gitignore file.
+.idea/caches
+.idea/modules.xml
+# Comment next line if keeping position of elements in Navigation Editor is relevant for you
+.idea/navEditor.xml
+
+# Keystore files
+# Uncomment the following lines if you do not want to check your keystore files in.
+#*.jks
+#*.keystore
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md
+
+# Version control
+vcs.xml
+
+# lint
+lint/intermediates/
+lint/generated/
+lint/outputs/
+lint/tmp/
+# lint/reports/
+
+# Cordova plugins for Capacitor
+capacitor-cordova-android-plugins
+
+# Copied web assets
+app/src/main/assets/public

android-DEL/.idea/.gitignore

@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml

android-DEL/.idea/compiler.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="1.8" />
+  </component>
+</project>

android-DEL/.idea/jarRepositories.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
+  </component>
+</project>

android-DEL/.idea/misc.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+</project>

android-DEL/app/.npmignore

@@ -0,0 +1,2 @@
+/build/*
+!/build/.npmkeep

android-DEL/app/build.gradle

@@ -0,0 +1,46 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    defaultConfig {
+        applicationId "com.mermsemr.providers"
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode 1015
+        versionName "1.0.15"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+repositories {
+    flatDir{
+        dirs '../capacitor-cordova-android-plugins/src/main/libs', 'libs'
+    }
+}
+
+dependencies {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
+    implementation project(':capacitor-android')
+    testImplementation "junit:junit:$junitVersion"
+    androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
+    implementation project(':capacitor-cordova-android-plugins')
+}
+
+apply from: 'capacitor.build.gradle'
+
+try {
+    def servicesJSON = file('google-services.json')
+    if (servicesJSON.text) {
+        apply plugin: 'com.google.gms.google-services'
+    }
+} catch(Exception e) {
+    logger.warn("google-services.json not found, google-services plugin not applied. Push Notifications won't work")
+}

android-DEL/app/capacitor.build.gradle

@@ -0,0 +1,19 @@
+// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
+
+android {
+  compileOptions {
+      sourceCompatibility JavaVersion.VERSION_1_8
+      targetCompatibility JavaVersion.VERSION_1_8
+  }
+}
+
+apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
+dependencies {
+
+
+}
+
+
+if (hasProperty('postBuildExtras')) {
+  postBuildExtras()
+}

android-DEL/app/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

android-DEL/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java

@@ -0,0 +1,27 @@
+package com.getcapacitor.myapp;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+  @Test
+  public void useAppContext() throws Exception {
+    // Context of the app under test.
+    Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+
+    assertEquals("com.getcapacitor.app", appContext.getPackageName());
+  }
+}

android-DEL/app/src/main/AndroidManifest.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.mermsemr.providers">
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+
+        <activity
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
+            android:name="com.mermsemr.providers.MainActivity"
+            android:label="@string/title_activity_main"
+            android:theme="@style/AppTheme.NoActionBarLaunch"
+            android:launchMode="singleTask">
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="@string/custom_url_scheme" />
+            </intent-filter>
+
+        </activity>
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths"></meta-data>
+        </provider>
+    </application>
+
+    <!-- Permissions -->
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <!-- Camera, Photos, input file -->
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <!-- Geolocation API -->
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-feature android:name="android.hardware.location.gps" />
+    <!-- Network API -->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <!-- Navigator.getUserMedia -->
+    <!-- Video -->
+    <uses-permission android:name="android.permission.CAMERA" />
+    <!-- Audio -->
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
+</manifest>

android-DEL/app/src/main/assets/capacitor.config.json

@@ -0,0 +1,13 @@
+{
+  "appId": "com.mermsemr.providers",
+  "appName": "MERMS Providers",
+  "bundledWebRuntime": false,
+  "npmClient": "npm",
+  "webDir": "www",
+  "plugins": {
+    "SplashScreen": {
+      "launchShowDuration": 0
+    }
+  },
+  "cordova": {}
+}

android-DEL/app/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108">
+    <path
+        android:fillType="evenOdd"
+        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="78.5885"
+                android:endY="90.9159"
+                android:startX="48.7653"
+                android:startY="61.0927"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+</vector>

android-DEL/app/src/main/res/drawable/ic_launcher_background.xml

@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108">
+    <path
+        android:fillColor="#26A69A"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+</vector>

android-DEL/app/src/main/res/layout/activity_main.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MainActivity">
+
+    <WebView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

android-DEL/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

android-DEL/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

android-DEL/app/src/main/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>

android-DEL/app/src/main/res/values/strings.xml

@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+    <string name="app_name">MermsProviders</string>
+    <string name="title_activity_main">MermsProviders</string>
+    <string name="package_name">io.ionic.starter</string>
+    <string name="custom_url_scheme">io.ionic.starter</string>
+</resources>

android-DEL/app/src/main/res/values/styles.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+    <style name="AppTheme.NoActionBar" parent="Theme.AppCompat.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:background">@null</item>
+    </style>
+
+
+    <style name="AppTheme.NoActionBarLaunch" parent="AppTheme.NoActionBar">
+        <item name="android:background">@drawable/splash</item>
+    </style>
+</resources>

android-DEL/app/src/main/res/xml/config.xml

@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='utf-8'?>
+<widget version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+  <access origin="*" />
+  
+  <feature name="CordovaHttpPlugin">
+    <param name="android-package" value="com.silkimen.cordovahttp.CordovaHttpPlugin"/>
+  </feature>
+
+  <feature name="Device">
+    <param name="android-package" value="org.apache.cordova.device.Device"/>
+  </feature>
+
+  <feature name="File">
+    <param name="android-package" value="org.apache.cordova.file.FileUtils"/>
+    <param name="onload" value="true"/>
+  </feature>
+
+  
+</widget>

android-DEL/app/src/main/res/xml/file_paths.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <external-path name="my_images" path="." />
+    <cache-path name="my_cache_images" path="." />
+</paths>

android-DEL/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java

@@ -0,0 +1,17 @@
+package com.getcapacitor.myapp;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+  @Test
+  public void addition_isCorrect() throws Exception {
+    assertEquals(4, 2 + 2);
+  }
+}

android-DEL/build.gradle

@@ -0,0 +1,29 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    
+    repositories {
+        google()
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.google.gms:google-services:4.3.3'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+apply from: "variables.gradle"
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}

android-DEL/capacitor.settings.gradle

@@ -0,0 +1,3 @@
+// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
+include ':capacitor-android'
+project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')

android-DEL/gradle.properties

@@ -0,0 +1,24 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1536m
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Automatically convert third-party libraries to use AndroidX
+android.enableJetifier=true

android-DEL/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Sat Nov 14 23:58:54 EST 2020
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip

android-DEL/gradlew

@@ -0,0 +1,188 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

android-DEL/gradlew.bat

@@ -0,0 +1,100 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

android-DEL/settings.gradle

@@ -0,0 +1,5 @@
+include ':app'
+include ':capacitor-cordova-android-plugins'
+project(':capacitor-cordova-android-plugins').projectDir = new File('./capacitor-cordova-android-plugins/')
+
+apply from: 'capacitor.settings.gradle'

android-DEL/variables.gradle

@@ -0,0 +1,17 @@
+ext {
+    minSdkVersion = 21
+    compileSdkVersion = 29
+    targetSdkVersion = 29
+    androidxAppCompatVersion = '1.1.0'
+    androidxCoreVersion =  '1.2.0'
+    androidxMaterialVersion =  '1.1.0-rc02'
+    androidxBrowserVersion =  '1.2.0'
+    androidxLocalbroadcastmanagerVersion =  '1.0.0'
+    androidxExifInterfaceVersion = '1.2.0'
+    firebaseMessagingVersion =  '20.1.2'
+    playServicesLocationVersion =  '17.0.0'
+    junitVersion =  '4.12'
+    androidxJunitVersion =  '1.1.1'
+    androidxEspressoCoreVersion =  '3.2.0'
+    cordovaAndroidVersion =  '7.0.0'
+}

android/.idea/compiler.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="1.8" />
+  </component>
+</project>

android/.idea/jarRepositories.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
+  </component>
+</project>

android/.idea/misc.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+</project>

android/app/build.gradle

@@ -3,11 +3,11 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     defaultConfig {
-        applicationId "io.ionic.starter"
+        applicationId "com.mermsemr.providers"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
+        versionCode 1034
-        versionName "1.0"
+        versionName "1.0.34"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

android/app/capacitor.build.gradle

@@ -12,7 +12,7 @@ dependencies {
 
 
 }
-
+apply from: "../../node_modules/cordova-plugin-qrscanner/src/android/qrscanner.gradle"
 
 if (hasProperty('postBuildExtras')) {
   postBuildExtras()

android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.ionic.starter">
+    package="com.mermsemr.providers">
 
     <application
         android:allowBackup="true"
@@ -12,7 +12,7 @@
 
         <activity
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
-            android:name="io.ionic.starter.MainActivity"
+            android:name="com.mermsemr.providers.MainActivity"
             android:label="@string/title_activity_main"
             android:theme="@style/AppTheme.NoActionBarLaunch"
             android:launchMode="singleTask">

android/app/src/main/assets/capacitor.config.json

@@ -1,6 +1,6 @@
 {
-  "appId": "io.ionic.starter",
+  "appId": "com.mermsemr.providers",
-  "appName": "MermsProviders",
+  "appName": "MERMS Providers",
   "bundledWebRuntime": false,
   "npmClient": "npm",
   "webDir": "www",

android/app/src/main/java/com/mermsemr/providers/MainActivity.java

@@ -0,0 +1,21 @@
+package com.mermsemr.providers;
+
+import android.os.Bundle;
+
+import com.getcapacitor.BridgeActivity;
+import com.getcapacitor.Plugin;
+
+import java.util.ArrayList;
+
+public class MainActivity extends BridgeActivity {
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+
+    // Initializes the Bridge
+    this.init(savedInstanceState, new ArrayList<Class<? extends Plugin>>() {{
+      // Additional plugins you've installed go here
+      // Ex: add(TotallyAwesomePlugin.class);
+    }});
+  }
+}

android/app/src/main/res/values/strings.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="app_name">MermsProviders</string>
+    <string name="app_name">MERMS Providers</string>
-    <string name="title_activity_main">MermsProviders</string>
+    <string name="title_activity_main">MERMS Providers</string>
-    <string name="package_name">io.ionic.starter</string>
+    <string name="package_name">com.mermsemr.providers</string>
-    <string name="custom_url_scheme">io.ionic.starter</string>
+    <string name="custom_url_scheme">com.mermsemr.providers</string>
 </resources>

android/app/src/main/res/xml/config.xml

@@ -2,5 +2,26 @@
 <widget version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
   <access origin="*" />
   
+  <feature name="CordovaHttpPlugin">
+    <param name="android-package" value="com.silkimen.cordovahttp.CordovaHttpPlugin"/>
+  </feature>
+
+  <feature name="Calendar">
+    <param name="android-package" value="nl.xservices.plugins.Calendar"/>
+  </feature>
+
+  <feature name="Device">
+    <param name="android-package" value="org.apache.cordova.device.Device"/>
+  </feature>
+
+  <feature name="File">
+    <param name="android-package" value="org.apache.cordova.file.FileUtils"/>
+    <param name="onload" value="true"/>
+  </feature>
+
+  <feature name="QRScanner">
+    <param name="android-package" value="com.bitpay.cordova.qrscanner.QRScanner"/>
+  </feature>
+
   
 </widget>

android/build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.1'
+        classpath 'com.android.tools.build:gradle:4.1.1'
         classpath 'com.google.gms:google-services:4.3.3'
 
         // NOTE: Do not place your application dependencies here; they belong

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Sun Nov 15 00:26:23 EST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip

ionic.config.json

@@ -1,5 +1,5 @@
 {
-  "name": "MermsProviders",
+  "name": "Merms Providers",
   "integrations": {
     "capacitor": {}
   },

package.json

@@ -1,8 +1,8 @@
 {
   "name": "mermsproviders",
-  "version": "10.0.1",
+  "version": "10.0.11",
   "author": "Fluxtra LLC",
-  "homepage": "https://ionicframework.com/",
+  "homepage": "https://www.mermsemr.com/",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -19,24 +19,35 @@
     "@angular/platform-browser": "~10.0.0",
     "@angular/platform-browser-dynamic": "~10.0.0",
     "@angular/router": "~10.0.0",
+    "@babel/polyfill": "^7.12.1",
     "@capacitor/android": "^2.4.2",
     "@capacitor/core": "2.4.2",
+    "@ionic-native/calendar": "^5.30.0",
     "@ionic-native/core": "^5.0.0",
+    "@ionic-native/device": "^5.29.0",
+    "@ionic-native/http": "^5.29.0",
+    "@ionic-native/qr-scanner": "^5.30.0",
     "@ionic-native/splash-screen": "^5.0.0",
     "@ionic-native/status-bar": "^5.0.0",
-    "@ionic/angular": "^5.0.0",
+    "@ionic/angular": "^5.4.4",
-    "rxjs": "~6.5.5",
+    "cordova-plugin-advanced-http": "^3.1.0",
+    "cordova-plugin-calendar": "^5.1.5",
+    "cordova-plugin-device": "^2.0.3",
+    "cordova-plugin-file": "^6.0.2",
+    "cordova-plugin-qrscanner": "^3.0.1",
+    "ionic2-calendar": "^0.6.6",
+    "rxjs": "^6.5.5",
     "tslib": "^2.0.0",
     "zone.js": "~0.10.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.1000.0",
+    "@angular-devkit/build-angular": "^0.1100.1",
     "@angular/cli": "~10.0.5",
     "@angular/compiler": "~10.0.0",
     "@angular/compiler-cli": "~10.0.0",
     "@angular/language-service": "~10.0.0",
     "@capacitor/cli": "2.4.2",
-    "@ionic/angular-toolkit": "^2.3.0",
+    "@ionic/angular-toolkit": "^2.3.3",
     "@types/jasmine": "~3.5.0",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "^12.11.1",

src/app/app-routing.module.ts

@@ -11,6 +11,62 @@ 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)
+  },
+  {
+    path: 'merms-dash',
+    loadChildren: () => import('./merms-dash/merms-dash.module').then( m => m.MermsDashPageModule)
+  },
+  {
+    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)
+  },
+  {
+    path: 'merms-patient',
+    loadChildren: () => import('./merms-patient/merms-patient.module').then( m => m.MermsPatientPageModule)
+  },
+  {
+    path: 'merms-calendar',
+    loadChildren: () => import('./merms-calendar/merms-calendar.module').then( m => m.MermsCalendarPageModule)
+  },
+  {
+    path: 'merms-wallet',
+    loadChildren: () => import('./merms-wallet/merms-wallet.module').then( m => m.MermsWalletPageModule)
+  },
+  {
+    path: 'merms-mypatients',
+    loadChildren: () => import('./merms-mypatients/merms-mypatients.module').then( m => m.MermsMypatientsPageModule)
+  },
+  {
+    path: 'merms-managepatient',
+    loadChildren: () => import('./merms-managepatient/merms-managepatient.module').then( m => m.MermsManagepatientPageModule)
+  },
+  {
+    path: 'merms-selectedpatient',
+    loadChildren: () => import('./patient/merms-selectedpatient/merms-selectedpatient.module').then( m => m.MermsSelectedpatientPageModule)
+  },
+  {
+    path: 'merms-opencare',
+    loadChildren: () => import('./care/merms-opencare/merms-opencare.module').then( m => m.MermsOpencarePageModule)
+  },
+  {
+    path: 'add-practice',
+    loadChildren: () => import('./modal/add-practice/add-practice.module').then( m => m.AddPracticePageModule)
+  },
+  {
+    path: 'consult-billing',
+    loadChildren: () => import('./modal/consult-billing/consult-billing.module').then( m => m.ConsultBillingPageModule)
+  },
 ];
 
 @NgModule({

src/app/app.module.ts

@@ -6,16 +6,30 @@ import { IonicModule, IonicRouteStrategy } from '@ionic/angular';
 import { SplashScreen } from '@ionic-native/splash-screen/ngx';
 import { StatusBar } from '@ionic-native/status-bar/ngx';
 
+import { Calendar } from '@ionic-native/calendar/ngx';
+
+//import { HttpModule } from '@angular/http'
+import { HTTP } from '@ionic-native/http/ngx';
+import { HttpClientModule } from '@angular/common/http'
+
 import { AppComponent } from './app.component';
 import { AppRoutingModule } from './app-routing.module';
+import { NgCalendarModule  } from 'ionic2-calendar';
+import { QRScanner, QRScannerStatus } from '@ionic-native/qr-scanner/ngx';
+
 
 @NgModule({
   declarations: [AppComponent],
   entryComponents: [],
-  imports: [BrowserModule, IonicModule.forRoot(), AppRoutingModule],
+  imports: [BrowserModule, IonicModule.forRoot(), 
+    HttpClientModule,
+    NgCalendarModule,
+    AppRoutingModule],
   providers: [
     StatusBar,
     SplashScreen,
+    QRScanner,
+    Calendar,
     { provide: RouteReuseStrategy, useClass: IonicRouteStrategy }
   ],
   bootstrap: [AppComponent]

src/app/care/merms-opencare/merms-opencare-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { MermsOpencarePage } from './merms-opencare.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: MermsOpencarePage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class MermsOpencarePageRoutingModule {}

src/app/care/merms-opencare/merms-opencare.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 { MermsOpencarePageRoutingModule } from './merms-opencare-routing.module';
+
+import { MermsOpencarePage } from './merms-opencare.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    MermsOpencarePageRoutingModule
+  ],
+  declarations: [MermsOpencarePage]
+})
+export class MermsOpencarePageModule {}

src/app/care/merms-opencare/merms-opencare.page.html

@@ -0,0 +1,25 @@
+<ion-content class="merms-opencare-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">Pending Care</ion-col>
+      </ion-row>
+    </ion-grid>
+
+
+
+    <!-- Item Dividers in a List -->
+    <ion-list>
+
+      <ion-item>
+        You have 0 pening care item at this time
+      </ion-item>
+     
+
+    </ion-list>
+  </div>
+
+</ion-content>

src/app/care/merms-opencare/merms-opencare.page.scss

@@ -0,0 +1,143 @@
+.merms-opencare-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;
+          }
+        }
+      }
+    }
+
+
+}

src/app/care/merms-opencare/merms-opencare.page.spec.ts

@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { MermsOpencarePage } from './merms-opencare.page';
+
+describe('MermsOpencarePage', () => {
+  let component: MermsOpencarePage;
+  let fixture: ComponentFixture<MermsOpencarePage>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ MermsOpencarePage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(MermsOpencarePage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/care/merms-opencare/merms-opencare.page.ts

@@ -0,0 +1,17 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-merms-opencare',
+  templateUrl: './merms-opencare.page.html',
+  styleUrls: ['./merms-opencare.page.scss'],
+})
+export class MermsOpencarePage implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+goBack(){
+  
+}
+}

src/app/home/home.page.html

@@ -1,16 +1,14 @@
+<ion-content [fullscreen]="true" class="home-page">
+  <div class="inner-content">
+    <div class="container">
+      <span>MERMS Providers</span>
+      <h1>Your patient care app</h1>
+      <small>
+        MERMS Providers is your no one mobility toolbox item to manage your patient care with traditional and telemedicine capabilities.
+      </small>
+      <button (click)="startMerms()">Get Started</button>
 
-
+      <small class="go-to-login" (click)="goToLogin()">Already have an account?</small>
-<ion-content [fullscreen]="true" class="home_style" style="background-color:red; background-image: src='./../../assets/imgs/merms-prov-back.jpg';">
+    </div>
-  <ion-header collapse="condense">
-    <ion-toolbar>
-      <ion-title size="large">MERMS Provider</ion-title>
-    </ion-toolbar>
-  </ion-header>
-
-  <div id="container">
-    <img src="./../../assets/imgs/merms-prov-back.jpg">
-    <strong>Get Started Now?</strong>
-    <p><ion-button color="tertiary">Log in</ion-button></p>
-   
   </div>
-</ion-content>
+</ion-content>

src/app/home/home.page.scss

@@ -1,3 +1,66 @@
+
+.home-page {
+
+  .inner-content {
+    background: url('./../../assets/imgs/merms-prov-back.jpg') no-repeat;
+    background-size: cover;
+    display: flex;
+    height: 100%;
+    padding: 24px 24px 40px;
+    position: relative;
+  }
+
+  .container {
+    display: flex;
+    justify-content: flex-end;
+    flex-direction: column;
+    height: 100%;
+    color: #242931;
+    span {
+      font-size: 12px;
+      line-height: 16px;
+      font-weight: bold;
+      letter-spacing: 0.1em;
+      text-transform: uppercase;
+      margin-bottom: 12px;
+    }
+    h1 {
+      margin-top: 0;
+      font-weight: 600;
+      font-size: 25.5px;
+      line-height: 135%;
+      margin-bottom: 16px;
+    }
+    small {
+      font-weight: normal;
+      font-size: 16px;
+      line-height: 154%;
+      letter-spacing: -0.2px;
+      margin-bottom: 32px;
+      &.go-to-login {
+        margin-bottom: 0;
+        margin-top: 20px;
+        text-align: center;
+      }
+    }
+    button {
+      align-self: center;
+      padding: 15px 54px;
+      background: #0b7493;
+      border-radius: 26.9817px;
+      font-weight: 600;
+      font-size: 14.3902px;
+      line-height: 20px;
+      display: flex;
+      align-items: center;
+      text-align: center;
+      color: #fff;
+    }
+  }
+}
+
+/*
+
 #container {
   text-align: center;
 
@@ -6,10 +69,11 @@
   right: 0;
   top: 50%;
   transform: translateY(-50%);
+  background-image: url('../../assets/imgs/merms-prov-back.jpg');
 
 }
 .home_style{
-  background-image: url('./../../assets/imgs//merms-prov-back.jpg');
+  background-image: url('../../assets/imgs/merms-prov-back.jpg');
 }
 
 #container strong {
@@ -28,4 +92,5 @@
 
 #container a {
   text-decoration: none;
-}
+}
+*/

src/app/home/home.page.ts

@@ -1,4 +1,6 @@
 import { Component } from '@angular/core';
+import { Router } from '@angular/router'
+
 
 @Component({
   selector: 'app-home',
@@ -7,6 +9,17 @@ import { Component } from '@angular/core';
 })
 export class HomePage {
 
-  constructor() {}
+  constructor(private router: Router) {}
+
+
+  startMerms() {
+    this.router.navigateByUrl('/merms-signup')
+  }
+
+  goToLogin() {
+   // alert(0);
+    this.router.navigateByUrl('/merms-login')
+  }
+
 
 }

src/app/merms-calendar/merms-calendar-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { MermsCalendarPage } from './merms-calendar.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: MermsCalendarPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class MermsCalendarPageRoutingModule {}

src/app/merms-calendar/merms-calendar.module.ts

@@ -0,0 +1,22 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { MermsCalendarPageRoutingModule } from './merms-calendar-routing.module';
+
+import { MermsCalendarPage } from './merms-calendar.page';
+import { NgCalendarModule  } from 'ionic2-calendar';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    MermsCalendarPageRoutingModule,
+    NgCalendarModule
+  ],
+  declarations: [MermsCalendarPage]
+})
+export class MermsCalendarPageModule {}

src/app/merms-calendar/merms-calendar.page.html

@@ -0,0 +1,40 @@
+<ion-content class="merms-calendar-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">Calendar</ion-col>
+      </ion-row>
+    </ion-grid>
+
+    <calendar [eventSource]="eventSource" [calendarMode]="calendar.mode" [currentDate]="calendar.currentDate"
+      (onEventSelected)="onEventSelected($event)" (onTitleChanged)="onViewTitleChanged($event)" startHour="6"
+      endHour="20" step="30" startingDayWeek="1">
+    </calendar>
+
+
+    <ion-list>
+      <ion-list-header>
+        <hr size="1">
+      </ion-list-header>
+
+      <ion-item *ngFor="let type of calendarData" (click)="goPatient(type)">
+        <ion-avatar slot="start">
+          <img src="./../../assets/imgs/avatar.svg">
+        </ion-avatar>
+        <ion-label>
+          <h2>{{type.firstname}} {{type.lastname}}</h2>
+          <h3>{{type.reason}}</h3>
+          <p>{{type.appt}} {{type.gender}} , {{type.age}} yrs</p>
+        </ion-label>
+      </ion-item>
+
+
+    </ion-list>
+
+  </div>
+
+
+</ion-content>

src/app/merms-calendar/merms-calendar.page.scss

@@ -0,0 +1,237 @@
+.merms-calendar-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;
+      }
+    }
+  
+    //=====================
+    #v-cal .vcal-header__label {
+        text-align: center;
+        width: 100%;
+        margin-left: 5%;
+        font-size: 18px;
+        margin-bottom: 7px;
+    }
+
+    #v-cal {
+        .vcal-body {
+            div.vcal-date.vcal-date--active.vcal-date--today {
+                span {
+                    /* border-radius: 0; */
+                    /* box-shadow: 0 0 0 2px rgba(96, 99, 224, 0.1); */
+                    background: rgba(96, 99, 224, 0.1) !important;
+                }
+            }
+        }
+    }
+
+    .vcal-btn {
+        -moz-user-select: none;
+        -ms-user-select: none;
+        -webkit-appearance: button;
+        background: none;
+        border: 0;
+        color: inherit;
+        cursor: pointer;
+        font: inherit;
+        line-height: normal;
+        width: 20px;
+        height: 20px;
+        outline: none;
+        overflow: visible;
+        padding: 0;
+        text-align: center;
+        &:active {
+            border-radius: var(--vcal-border-radius);
+            box-shadow: 0 0 0 2px rgba(var(--vcal-today-bg-color), 0.1);
+        }
+       
+    }
+    
+    .vcal-header {
+        align-items: center;
+        display: flex;
+        padding: 1.2rem 1.4rem 1rem;
+    }
+
+    
+.vcal-header svg {
+    fill: #89969f;
+}
+
+.vcal-header__label {
+    text-align: center;
+    width: 100%;
+}
+
+.vcal-week {
+    display: flex;
+    flex-wrap: wrap;
+    padding: 0 2.8rem;
+    border-bottom: 1px solid rgba(137, 150, 159, 0.3);
+}
+
+.vcal-week span {
+    flex-direction: column;
+    flex: 0 0 14.28%;
+    font-size: 1.2rem;
+    max-width: 14.28%;
+    padding: 1.2rem 1.4rem;
+    text-align: center;
+    text-transform: uppercase;
+    color: #89969f;
+}
+
+:host>>>.vcal-date {
+    background-color: green;
+}
+
+body ::ng-deep .vcal-date--active {
+    background-color: green;
+}
+
+.vcal-date--active {
+    cursor: pointer;
+}
+
+.vcal-date--today {
+    color: #6063ea;
+}
+//===========================
+    .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;
+          }
+        }
+      }
+    }
+
+
+}

src/app/merms-calendar/merms-calendar.page.spec.ts

@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { MermsCalendarPage } from './merms-calendar.page';
+
+describe('MermsCalendarPage', () => {
+  let component: MermsCalendarPage;
+  let fixture: ComponentFixture<MermsCalendarPage>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ MermsCalendarPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(MermsCalendarPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/merms-calendar/merms-calendar.page.ts

@@ -0,0 +1,77 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+//import { Calendar } from '@ionic-native/calendar/ngx';
+
+
+@Component({
+  selector: 'app-merms-calendar',
+  templateUrl: './merms-calendar.page.html',
+  styleUrls: ['./merms-calendar.page.scss'],
+})
+export class MermsCalendarPage implements OnInit {
+
+  eventSource = [];
+  viewTitle: string;
+
+  calendar = {
+    mode: 'month',
+    currentDate: new Date(),
+  };
+
+  selectedDate: Date;
+
+
+
+  //https://www.npmjs.com/package/ionic2-calendar
+
+  MyCalendar: any;
+  calendarData: any;
+
+  constructor() {
+
+    // this.MyCalendar=calendar;
+    /*
+    this.calendar.createCalendar('MyCalendar').then(
+      (msg) => { console.log(msg); },
+      (err) => { console.log(err); }
+    );
+  */
+    //this.addCalendarToPage();
+  }
+  // Change current month/week/day
+
+
+  onEventSelected(eEvent: any) {
+    console.log('onEventSelected');
+  }
+
+  onViewTitleChanged(eEvent: any) {
+    console.log('onViewTitleChanged');
+  }
+
+  onCurrentDateChanged(event: Date) {
+    var today = new Date();
+    today.setHours(0, 0, 0, 0);
+    event.setHours(0, 0, 0, 0);
+    console.log('onCurrentDateChanged');
+    if (this.calendar.mode === 'month') {
+      if (event.getFullYear() < today.getFullYear() || (event.getFullYear() === today.getFullYear() && event.getMonth() <= today.getMonth())) {
+        //   this.lockSwipeToPrev = true;
+      } else {
+        //    this.lockSwipeToPrev = false;
+      }
+    }
+  }
+
+  goPatient() {
+
+  }
+
+
+  goBack() {
+
+  }
+
+  ngOnInit() {
+  }
+
+}

src/app/merms-dash/merms-dash-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { MermsDashPage } from './merms-dash.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: MermsDashPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class MermsDashPageRoutingModule {}

src/app/merms-dash/merms-dash.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 { MermsDashPageRoutingModule } from './merms-dash-routing.module';
+
+import { MermsDashPage } from './merms-dash.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    MermsDashPageRoutingModule
+  ],
+  declarations: [MermsDashPage]
+})
+export class MermsDashPageModule {}

src/app/merms-dash/merms-dash.page.html

@@ -0,0 +1,107 @@
+<ion-content fullscreen>
+  <ion-grid style="scroll-padding-bottom: 0px;">
+    <ion-row>
+      <ion-col>
+        <div>
+          <h4 style="font-weight: bold;">{{ welcomeName }}</h4>
+        </div>
+      </ion-col>
+      <ion-col>
+        <div style="text-align: right;">
+          <h4>{{ currentDateFormated }}</h4>
+        </div>
+      </ion-col>
+    </ion-row>
+    <ion-row style="height: 60px; padding-top: 0px; font-size: 40px; text-align: center; background-color: white; ">
+      <ion-col >
+        <ion-icon  name="people-outline" (click)="goPracticepatients()" ></ion-icon>
+      </ion-col>
+      <ion-col>
+        <ion-icon name="medkit-outline" (click)="goOpenCare()"></ion-icon>
+      </ion-col>
+      <ion-col>
+       
+        <ion-icon name="card-outline"  (click)="goWallet()"></ion-icon>
+      </ion-col>
+    </ion-row>
+  </ion-grid>
+
+
+  <ion-list>
+    <ion-list-header>
+      <h3 style="font-weight: bold;">Pending Consult(s)</h3>
+    </ion-list-header>
+
+    <ion-item *ngFor="let type of pendingEncounterData"  (click)="goPatient(type)">
+      <ion-avatar slot="start">
+        <img src="./../../assets/imgs/avatar{{type.gender}}.png">
+      </ion-avatar>
+      <ion-label>
+        <h3 style="font-weight: bold;color: #8e54e9;">{{type.appt}} </h3>
+        <h3>{{type.firstname}} {{type.lastname}} -{{type.gender}} {{type.age}} yrs</h3>
+        <h3>{{type.reason}}</h3>
+      </ion-label>
+    </ion-item>
+
+   
+  </ion-list>
+
+  <ion-list>
+    <ion-list-header>
+      <h3 style="font-weight: bold;">Recent Consult(s)</h3>
+    </ion-list-header>
+
+    <ion-item *ngFor="let type of cardData"  (click)="goSelectPatient(type)">
+      <ion-label>
+        <h3 style="font-weight: bold;color: #8e54e9;">{{type.appt}} {{type.gender}} , {{type.age}} yrs</h3>
+        <h2>{{type.firstname}} {{type.lastname}}</h2>
+      </ion-label>
+    </ion-item>
+
+   
+  </ion-list>
+
+
+
+
+
+
+
+
+
+
+
+
+</ion-content>
+
+<!-- Footer without a border -->
+<ion-footer class="ion-no-border">
+  <ion-toolbar>
+    <ion-grid style="font-size: 25px; text-align: center;">
+      <ion-row>
+        <ion-col>
+          <div>
+            <ion-icon name="home"></ion-icon>
+          </div>
+        </ion-col>
+        <ion-col>
+          <div>
+            <ion-icon name="calendar" style="color:#8e54e9;" (click)="goCalendar()"></ion-icon>
+          </div>
+        </ion-col>
+        <ion-col>
+          <div>
+            <ion-icon name="wallet" style="color:#8e54e9;" (click)="goWallet()"></ion-icon>
+          </div>
+        </ion-col>
+
+        <ion-col>
+          <div>
+            <ion-icon name="settings" style="color:#8e54e9;" (click)="goSettings()"></ion-icon>
+          </div>
+        </ion-col>
+      </ion-row>
+    </ion-grid>
+
+  </ion-toolbar>
+</ion-footer>

src/app/merms-dash/merms-dash.page.spec.ts

@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { MermsDashPage } from './merms-dash.page';
+
+describe('MermsDashPage', () => {
+  let component: MermsDashPage;
+  let fixture: ComponentFixture<MermsDashPage>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ MermsDashPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(MermsDashPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/merms-dash/merms-dash.page.ts

@@ -0,0 +1,126 @@
+import { Component, OnInit } from '@angular/core';
+import { Router, NavigationExtras } from '@angular/router'
+import { MermsServiceProviderService } from './../providers/merms-service-provider.service';
+import { MermsSessionService } from './../merms-session.service';
+
+
+@Component({
+  selector: 'app-merms-dash',
+  templateUrl: './merms-dash.page.html',
+  styleUrls: ['./merms-dash.page.scss'],
+})
+export class MermsDashPage implements OnInit {
+
+  currentDateFormated: string = '10/10/2020';
+  welcomeName: string = '';
+
+  dashData: any;
+
+  constructor(
+    private router: Router,
+    private mermsServiceProviderService: MermsServiceProviderService,
+    private mermsSessionService: MermsSessionService
+  ) {
+    this.welcomeName = this.mermsSessionService.getUserFormatedName();
+    this.currentDateFormated = this.mermsSessionService.getThisData();
+  }
+
+  ngOnInit() {
+    this.getDashData();
+  }
+
+  currentProviderData: {
+    sessionid: string,
+    member_id: number,
+    card_count: number
+    card_type: number
+  };
+
+  cardData: any;
+  pendingEncounterData: any;
+
+  getDashData() {
+    console.log('MermsServiceProviderService::getDashData() ########  @@@@  ########');
+    this.currentProviderData = {
+      sessionid: this.mermsSessionService.session,
+      member_id: this.mermsSessionService.member_id,
+      card_count: 100,
+      card_type: 22000
+    };
+
+    try {
+      this.mermsServiceProviderService.genericGetService('provider/recentencounter', this.currentProviderData).subscribe(cardData => {
+        console.log("card data result 22k: ", cardData[0]['payload']);
+        this.cardData = cardData[0]['payload'];
+        if (cardData.hasOwnProperty('payload') && Array.isArray(cardData['payload'])) {
+          this.cardData = cardData['payload'];
+          console.log("card data result 22k: ", this.cardData);
+        }
+      });
+    } catch (e) {
+      console.log(e);
+    }
+
+    try {
+      this.mermsServiceProviderService.genericGetService('provider/pendingencounter', this.currentProviderData).subscribe(pendingEncounterData => {
+        console.log("card data result 22k: ", pendingEncounterData[0]['payload']);
+        this.pendingEncounterData = pendingEncounterData[0]['payload'];
+
+      });
+    } catch (e) {
+      console.log(e);
+    }
+
+    //
+
+
+  }
+
+  goSettings() {
+    this.router.navigateByUrl('/merms-settings');
+  }
+
+goPracticepatients(){
+  this.router.navigateByUrl('/merms-mypatients');
+}
+
+  goPatient(selPatData: any) {
+    // Set our navigation extras object
+    // that passes on our global query params and fragment
+    console.log(selPatData);
+    let navigationExtras2: NavigationExtras = {
+      queryParams: selPatData,
+      state: [0]
+    };
+
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+        special: JSON.stringify(selPatData)
+      }
+    };
+
+    this.router.navigateByUrl('/merms-patient', navigationExtras);
+  }
+  goHome() {
+
+  }
+  goCalendar() {
+    this.router.navigateByUrl('/merms-calendar');
+  }
+  goWallet() {
+    this.router.navigateByUrl('/merms-wallet');
+  }
+
+  goOpenCare() {
+    this.router.navigateByUrl('/merms-opencare');
+  }
+  goSelectPatient(patientData: any) {
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+        special: JSON.stringify(patientData)
+      }
+    };
+    this.router.navigateByUrl('/merms-selectedpatient',navigationExtras);
+  }
+
+}

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 {}

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 {}

src/app/merms-login/merms-login.page.html

@@ -0,0 +1,63 @@
+<ion-content class="merms-login-page">
+  <div class="container">
+    <ion-grid class="top-container">
+      <ion-row>
+        <ion-col size="2" class="navigation">
+          <ion-back-button text=""></ion-back-button>
+        </ion-col>
+        <ion-col size="8" class="page-title">MERMS Providers</ion-col>
+      </ion-row>
+    </ion-grid>
+    <h1>Log In</h1>
+    <div class="bottom-container">
+      <button class="google-sign-up" (click)="googleSignup()">
+        <img src="assets/imgs/sign-up/google-icon.svg" />
+        <span>Log in with Google</span>
+      </button>
+      <button
+        class="apple-sign-up"
+        *ngIf="platform_is_ios"
+        (click)="appleSignup()"
+      >
+        <img src="assets/imgs/sign-up/apple-icon.svg" />
+        <span>Sign in with Apple</span>
+      </button>
+      <span style="width: 100%;">
+        Or Log in with Email
+      </span>
+       <form (ngSubmit)="loginAccount()">
+        <div class="form">
+          <div class="item-inner">
+            <ion-input
+              type="email"
+              [(ngModel)]="username"
+              [ngModelOptions]="{standalone: true}"
+              maxlenght="20"
+              placeHolder="Username/Email"
+            ></ion-input>
+          </div>
+          <div class="item-inner">
+            <ion-input
+              type="password"
+              [(ngModel)]="password"
+              [ngModelOptions]="{standalone: true}"
+              maxlenght="15"
+              placeholder="Password"
+            ></ion-input>
+          </div>
+          <span class="forgot-password" (click)="lostPassword()">
+            Forgot your password ?
+          </span>
+
+          <button
+            [ngClass]="{'signin-btn': true, 'active-button': username && password}"
+            type="submit"
+          >
+            <strong>Log</strong> in
+          </button>
+        </div>
+      </form>
+    </div>
+  </div>
+</ion-content>
+