diff --git a/android-DEL/.gitignore b/android-DEL/.gitignore new file mode 100644 index 0000000..64a88fb --- /dev/null +++ b/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 diff --git a/android/.idea/.gitignore b/android-DEL/.idea/.gitignore similarity index 100% rename from android/.idea/.gitignore rename to android-DEL/.idea/.gitignore diff --git a/android-DEL/.idea/compiler.xml b/android-DEL/.idea/compiler.xml new file mode 100644 index 0000000..61a9130 --- /dev/null +++ b/android-DEL/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/android-DEL/.idea/jarRepositories.xml b/android-DEL/.idea/jarRepositories.xml new file mode 100644 index 0000000..e34606c --- /dev/null +++ b/android-DEL/.idea/jarRepositories.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android-DEL/.idea/misc.xml b/android-DEL/.idea/misc.xml new file mode 100644 index 0000000..d5d35ec --- /dev/null +++ b/android-DEL/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/android-DEL/app/.npmignore b/android-DEL/app/.npmignore new file mode 100644 index 0000000..043df80 --- /dev/null +++ b/android-DEL/app/.npmignore @@ -0,0 +1,2 @@ +/build/* +!/build/.npmkeep diff --git a/android-DEL/app/build.gradle b/android-DEL/app/build.gradle new file mode 100644 index 0000000..8442991 --- /dev/null +++ b/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") +} \ No newline at end of file diff --git a/android-DEL/app/capacitor.build.gradle b/android-DEL/app/capacitor.build.gradle new file mode 100644 index 0000000..837cd45 --- /dev/null +++ b/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() +} diff --git a/android-DEL/app/proguard-rules.pro b/android-DEL/app/proguard-rules.pro new file mode 100644 index 0000000..f1b4245 --- /dev/null +++ b/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 diff --git a/android-DEL/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java b/android-DEL/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java new file mode 100644 index 0000000..8834b0a --- /dev/null +++ b/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 Testing documentation + */ +@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()); + } +} diff --git a/android-DEL/app/src/main/AndroidManifest.xml b/android-DEL/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..8abee23 --- /dev/null +++ b/android-DEL/app/src/main/AndroidManifest.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android-DEL/app/src/main/assets/capacitor.config.json b/android-DEL/app/src/main/assets/capacitor.config.json new file mode 100644 index 0000000..eee9e6a --- /dev/null +++ b/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": {} +} diff --git a/android/app/src/main/java/io/ionic/starter/MainActivity.java b/android-DEL/app/src/main/java/io/ionic/starter/MainActivity.java similarity index 100% rename from android/app/src/main/java/io/ionic/starter/MainActivity.java rename to android-DEL/app/src/main/java/io/ionic/starter/MainActivity.java diff --git a/android-DEL/app/src/main/res/drawable-land-hdpi/splash.png b/android-DEL/app/src/main/res/drawable-land-hdpi/splash.png new file mode 100644 index 0000000..e31573b Binary files /dev/null and b/android-DEL/app/src/main/res/drawable-land-hdpi/splash.png differ diff --git a/android-DEL/app/src/main/res/drawable-land-mdpi/splash.png b/android-DEL/app/src/main/res/drawable-land-mdpi/splash.png new file mode 100644 index 0000000..f7a6492 Binary files /dev/null and b/android-DEL/app/src/main/res/drawable-land-mdpi/splash.png differ diff --git a/android-DEL/app/src/main/res/drawable-land-xhdpi/splash.png b/android-DEL/app/src/main/res/drawable-land-xhdpi/splash.png new file mode 100644 index 0000000..8077255 Binary files /dev/null and b/android-DEL/app/src/main/res/drawable-land-xhdpi/splash.png differ diff --git a/android-DEL/app/src/main/res/drawable-land-xxhdpi/splash.png b/android-DEL/app/src/main/res/drawable-land-xxhdpi/splash.png new file mode 100644 index 0000000..14c6c8f Binary files /dev/null and b/android-DEL/app/src/main/res/drawable-land-xxhdpi/splash.png differ diff --git a/android-DEL/app/src/main/res/drawable-land-xxxhdpi/splash.png b/android-DEL/app/src/main/res/drawable-land-xxxhdpi/splash.png new file mode 100644 index 0000000..244ca25 Binary files /dev/null and b/android-DEL/app/src/main/res/drawable-land-xxxhdpi/splash.png differ diff --git a/android-DEL/app/src/main/res/drawable-port-hdpi/splash.png b/android-DEL/app/src/main/res/drawable-port-hdpi/splash.png new file mode 100644 index 0000000..74faaa5 Binary files /dev/null and b/android-DEL/app/src/main/res/drawable-port-hdpi/splash.png differ diff --git a/android-DEL/app/src/main/res/drawable-port-mdpi/splash.png b/android-DEL/app/src/main/res/drawable-port-mdpi/splash.png new file mode 100644 index 0000000..e944f4a Binary files /dev/null and b/android-DEL/app/src/main/res/drawable-port-mdpi/splash.png differ diff --git a/android-DEL/app/src/main/res/drawable-port-xhdpi/splash.png b/android-DEL/app/src/main/res/drawable-port-xhdpi/splash.png new file mode 100644 index 0000000..564a82f Binary files /dev/null and b/android-DEL/app/src/main/res/drawable-port-xhdpi/splash.png differ diff --git a/android-DEL/app/src/main/res/drawable-port-xxhdpi/splash.png b/android-DEL/app/src/main/res/drawable-port-xxhdpi/splash.png new file mode 100644 index 0000000..bfabe68 Binary files /dev/null and b/android-DEL/app/src/main/res/drawable-port-xxhdpi/splash.png differ diff --git a/android-DEL/app/src/main/res/drawable-port-xxxhdpi/splash.png b/android-DEL/app/src/main/res/drawable-port-xxxhdpi/splash.png new file mode 100644 index 0000000..6929071 Binary files /dev/null and b/android-DEL/app/src/main/res/drawable-port-xxxhdpi/splash.png differ diff --git a/android-DEL/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/android-DEL/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..c7bd21d --- /dev/null +++ b/android-DEL/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/android-DEL/app/src/main/res/drawable/ic_launcher_background.xml b/android-DEL/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..d5fccc5 --- /dev/null +++ b/android-DEL/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android-DEL/app/src/main/res/drawable/splash.png b/android-DEL/app/src/main/res/drawable/splash.png new file mode 100644 index 0000000..f7a6492 Binary files /dev/null and b/android-DEL/app/src/main/res/drawable/splash.png differ diff --git a/android-DEL/app/src/main/res/layout/activity_main.xml b/android-DEL/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..b5ad138 --- /dev/null +++ b/android-DEL/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/android-DEL/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android-DEL/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/android-DEL/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/android-DEL/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android-DEL/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/android-DEL/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/android-DEL/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android-DEL/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..c023e50 Binary files /dev/null and b/android-DEL/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android-DEL/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/android-DEL/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..2127973 Binary files /dev/null and b/android-DEL/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/android-DEL/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android-DEL/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..b441f37 Binary files /dev/null and b/android-DEL/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/android-DEL/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android-DEL/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..72905b8 Binary files /dev/null and b/android-DEL/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android-DEL/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/android-DEL/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..8ed0605 Binary files /dev/null and b/android-DEL/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/android-DEL/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android-DEL/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..9502e47 Binary files /dev/null and b/android-DEL/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/android-DEL/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android-DEL/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..4d1e077 Binary files /dev/null and b/android-DEL/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android-DEL/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/android-DEL/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..df0f158 Binary files /dev/null and b/android-DEL/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/android-DEL/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android-DEL/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..853db04 Binary files /dev/null and b/android-DEL/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/android-DEL/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android-DEL/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..6cdf97c Binary files /dev/null and b/android-DEL/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android-DEL/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android-DEL/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..2960cbb Binary files /dev/null and b/android-DEL/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/android-DEL/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android-DEL/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..8e3093a Binary files /dev/null and b/android-DEL/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/android-DEL/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android-DEL/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..46de6e2 Binary files /dev/null and b/android-DEL/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android-DEL/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android-DEL/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..d2ea9ab Binary files /dev/null and b/android-DEL/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/android-DEL/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android-DEL/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..a40d73e Binary files /dev/null and b/android-DEL/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/android-DEL/app/src/main/res/values/ic_launcher_background.xml b/android-DEL/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 0000000..c5d5899 --- /dev/null +++ b/android-DEL/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file diff --git a/android-DEL/app/src/main/res/values/strings.xml b/android-DEL/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..2eaaecf --- /dev/null +++ b/android-DEL/app/src/main/res/values/strings.xml @@ -0,0 +1,7 @@ + + + MermsProviders + MermsProviders + io.ionic.starter + io.ionic.starter + diff --git a/android-DEL/app/src/main/res/values/styles.xml b/android-DEL/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..bb45498 --- /dev/null +++ b/android-DEL/app/src/main/res/values/styles.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/android-DEL/app/src/main/res/xml/config.xml b/android-DEL/app/src/main/res/xml/config.xml new file mode 100644 index 0000000..41b1b33 --- /dev/null +++ b/android-DEL/app/src/main/res/xml/config.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android-DEL/app/src/main/res/xml/file_paths.xml b/android-DEL/app/src/main/res/xml/file_paths.xml new file mode 100644 index 0000000..bd0c4d8 --- /dev/null +++ b/android-DEL/app/src/main/res/xml/file_paths.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/android-DEL/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java b/android-DEL/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java new file mode 100644 index 0000000..4a45edf --- /dev/null +++ b/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 Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() throws Exception { + assertEquals(4, 2 + 2); + } +} diff --git a/android-DEL/build.gradle b/android-DEL/build.gradle new file mode 100644 index 0000000..49201df --- /dev/null +++ b/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 +} diff --git a/android-DEL/capacitor.settings.gradle b/android-DEL/capacitor.settings.gradle new file mode 100644 index 0000000..9a5fa87 --- /dev/null +++ b/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') diff --git a/android-DEL/gradle.properties b/android-DEL/gradle.properties new file mode 100644 index 0000000..0566c22 --- /dev/null +++ b/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 diff --git a/android-DEL/gradle/wrapper/gradle-wrapper.jar b/android-DEL/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..5c2d1cf Binary files /dev/null and b/android-DEL/gradle/wrapper/gradle-wrapper.jar differ diff --git a/android-DEL/gradle/wrapper/gradle-wrapper.properties b/android-DEL/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..e9751b0 --- /dev/null +++ b/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 diff --git a/android-DEL/gradlew b/android-DEL/gradlew new file mode 100644 index 0000000..83f2acf --- /dev/null +++ b/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" "$@" diff --git a/android-DEL/gradlew.bat b/android-DEL/gradlew.bat new file mode 100644 index 0000000..9618d8d --- /dev/null +++ b/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 diff --git a/android-DEL/settings.gradle b/android-DEL/settings.gradle new file mode 100644 index 0000000..3b4431d --- /dev/null +++ b/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' \ No newline at end of file diff --git a/android-DEL/variables.gradle b/android-DEL/variables.gradle new file mode 100644 index 0000000..42ed435 --- /dev/null +++ b/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' +} \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle index d7f451b..84afc9c 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -6,8 +6,8 @@ android { applicationId "com.mermsemr.providers" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 1013 - versionName "1.0.13" + versionCode 1026 + versionName "1.0.26" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/android/app/src/main/java/com/mermsemr/providers/MainActivity.java b/android/app/src/main/java/com/mermsemr/providers/MainActivity.java new file mode 100644 index 0000000..308f0d0 --- /dev/null +++ b/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>() {{ + // Additional plugins you've installed go here + // Ex: add(TotallyAwesomePlugin.class); + }}); + } +} diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 2eaaecf..86899e6 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -1,7 +1,7 @@ - MermsProviders - MermsProviders - io.ionic.starter - io.ionic.starter + MERMS Providers + MERMS Providers + com.mermsemr.providers + com.mermsemr.providers diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index d03431d..3b5b3db 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,4 @@ -#Sat Nov 14 00:09:57 EST 2020 +#Sun Nov 15 00:26:23 EST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/ionic.config.json b/ionic.config.json index 4db886e..8bdbe2c 100644 --- a/ionic.config.json +++ b/ionic.config.json @@ -1,5 +1,5 @@ { - "name": "MermsProviders", + "name": "Merms Providers", "integrations": { "capacitor": {} }, diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 1dc9731..c36f420 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -31,6 +31,10 @@ const routes: Routes = [ 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) + }, ]; @NgModule({ diff --git a/src/app/merms-dash/merms-dash.page.html b/src/app/merms-dash/merms-dash.page.html index e521f9d..8b1c841 100644 --- a/src/app/merms-dash/merms-dash.page.html +++ b/src/app/merms-dash/merms-dash.page.html @@ -29,7 +29,7 @@ Pending Encounter - + diff --git a/src/app/merms-dash/merms-dash.page.ts b/src/app/merms-dash/merms-dash.page.ts index cb53967..ebe9599 100644 --- a/src/app/merms-dash/merms-dash.page.ts +++ b/src/app/merms-dash/merms-dash.page.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { Router, NavigationExtras } from '@angular/router' +import { MermsServiceProviderService } from './../providers/merms-service-provider.service'; @Component({ @@ -12,21 +13,35 @@ export class MermsDashPage implements OnInit { currentDateFormated: string = '10/10/2020'; welcomeName: string = ''; - constructor(private router: Router) { - + dashData: any; + constructor( + private router: Router, + private mermsServiceProviderService: MermsServiceProviderService + ) { this.welcomeName = "Dr. Something" } ngOnInit() { + alert(100); } + + getDashData() { + + + } + goSettings() { this.router.navigateByUrl('/merms-settings') } - goPractice(){ + goPractice() { this.router.navigateByUrl('/merms-practice') } - goHome(){ + + goPatient() { + this.router.navigateByUrl('/merms-patient') + } + goHome() { } } diff --git a/src/app/merms-patient/merms-patient-routing.module.ts b/src/app/merms-patient/merms-patient-routing.module.ts new file mode 100644 index 0000000..341dab0 --- /dev/null +++ b/src/app/merms-patient/merms-patient-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { MermsPatientPage } from './merms-patient.page'; + +const routes: Routes = [ + { + path: '', + component: MermsPatientPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class MermsPatientPageRoutingModule {} diff --git a/src/app/merms-patient/merms-patient.module.ts b/src/app/merms-patient/merms-patient.module.ts new file mode 100644 index 0000000..13de8de --- /dev/null +++ b/src/app/merms-patient/merms-patient.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 { MermsPatientPageRoutingModule } from './merms-patient-routing.module'; + +import { MermsPatientPage } from './merms-patient.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + MermsPatientPageRoutingModule + ], + declarations: [MermsPatientPage] +}) +export class MermsPatientPageModule {} diff --git a/src/app/merms-patient/merms-patient.page.html b/src/app/merms-patient/merms-patient.page.html new file mode 100644 index 0000000..de7ecaf --- /dev/null +++ b/src/app/merms-patient/merms-patient.page.html @@ -0,0 +1,9 @@ + + + merms-patient + + + + + + diff --git a/src/app/merms-patient/merms-patient.page.scss b/src/app/merms-patient/merms-patient.page.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/merms-patient/merms-patient.page.spec.ts b/src/app/merms-patient/merms-patient.page.spec.ts new file mode 100644 index 0000000..167b5cc --- /dev/null +++ b/src/app/merms-patient/merms-patient.page.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { MermsPatientPage } from './merms-patient.page'; + +describe('MermsPatientPage', () => { + let component: MermsPatientPage; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ MermsPatientPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(MermsPatientPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/merms-patient/merms-patient.page.ts b/src/app/merms-patient/merms-patient.page.ts new file mode 100644 index 0000000..ce69975 --- /dev/null +++ b/src/app/merms-patient/merms-patient.page.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-merms-patient', + templateUrl: './merms-patient.page.html', + styleUrls: ['./merms-patient.page.scss'], +}) +export class MermsPatientPage implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/merms-signup/merms-signup.page.html b/src/app/merms-signup/merms-signup.page.html index 514f311..2d1dfa2 100644 --- a/src/app/merms-signup/merms-signup.page.html +++ b/src/app/merms-signup/merms-signup.page.html @@ -1,9 +1,29 @@ - - - merms-signup - - + \ No newline at end of file diff --git a/src/app/merms-signup/merms-signup.page.scss b/src/app/merms-signup/merms-signup.page.scss index e69de29..9bffe7e 100644 --- a/src/app/merms-signup/merms-signup.page.scss +++ b/src/app/merms-signup/merms-signup.page.scss @@ -0,0 +1,143 @@ +.merms-signup-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-signup/merms-signup.page.ts b/src/app/merms-signup/merms-signup.page.ts index 1d8b511..8927af0 100644 --- a/src/app/merms-signup/merms-signup.page.ts +++ b/src/app/merms-signup/merms-signup.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-signup', @@ -7,9 +14,12 @@ import { Component, OnInit } from '@angular/core'; }) export class MermsSignupPage implements OnInit { - constructor() { } + constructor(public navCtrl: NavController,private router: Router) { } ngOnInit() { } - + goBack() { + console.log('MERMSLoginPage::goBack()') + this.navCtrl.pop() + } }