diff --git a/package.json b/package.json index 3fe277aea9..812ca0a191 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "scripts": { "rebuild": "pnpm run clean && pnpm -r run build && pnpm run gulp", "build": "pnpm -r run build && pnpm run gulp", + "mobilebuild": "pnpm run --filter client mobilebuild", "start": "pnpm --filter backend run start", "start:test": "pnpm --filter backend run start:test", "init": "pnpm run migrate", diff --git a/packages/client/.env.mobile b/packages/client/.env.mobile new file mode 100644 index 0000000000..d3a35d5742 --- /dev/null +++ b/packages/client/.env.mobile @@ -0,0 +1 @@ +VITE_CAPACITOR=true diff --git a/packages/client/android/.gitignore b/packages/client/android/.gitignore new file mode 100644 index 0000000000..0c4db1e22f --- /dev/null +++ b/packages/client/android/.gitignore @@ -0,0 +1,103 @@ +# Using Android gitignore template: https://github.com/github/gitignore/blob/HEAD/Android.gitignore + +# Built application files +*.apk +*.aar +*.ap_ +*.aab + +# Files for the ART/Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +bin/ +gen/ +out/ +# Uncomment the following line in case you need and you don't have the release build type files in your app +# 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 +.cxx/ + +# Google Services (e.g. APIs or Firebase) +# google-services.json + +# 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/ + +# Android Profiling +*.hprof + +# Cordova plugins for Capacitor +capacitor-cordova-android-plugins + +# Copied web assets +app/src/main/assets/public + +# Generated Config files +app/src/main/assets/capacitor.config.json +app/src/main/assets/capacitor.plugins.json +app/src/main/res/xml/config.xml + +google-services.json diff --git a/packages/client/android/app/.gitignore b/packages/client/android/app/.gitignore new file mode 100644 index 0000000000..58bba4af59 --- /dev/null +++ b/packages/client/android/app/.gitignore @@ -0,0 +1,4 @@ +/build/* +!/build/.npmkeep + +google-services.json diff --git a/packages/client/android/app/build.gradle b/packages/client/android/app/build.gradle new file mode 100644 index 0000000000..2fa5660d61 --- /dev/null +++ b/packages/client/android/app/build.gradle @@ -0,0 +1,53 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion rootProject.ext.compileSdkVersion + defaultConfig { + applicationId "org.calckey.app" + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion + versionCode 1 + versionName "1.0" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + aaptOptions { + // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. + // Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61 + ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~' + } + } + 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 "androidx.coordinatorlayout:coordinatorlayout:$androidxCoordinatorLayoutVersion" + implementation "androidx.core:core-splashscreen:$coreSplashScreenVersion" + 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.info("google-services.json not found, google-services plugin not applied. Push Notifications won't work") +} diff --git a/packages/client/android/app/capacitor.build.gradle b/packages/client/android/app/capacitor.build.gradle new file mode 100644 index 0000000000..f7b6b917ee --- /dev/null +++ b/packages/client/android/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_11 + targetCompatibility JavaVersion.VERSION_11 + } +} + +apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle" +dependencies { + + +} + + +if (hasProperty('postBuildExtras')) { + postBuildExtras() +} diff --git a/packages/client/android/app/proguard-rules.pro b/packages/client/android/app/proguard-rules.pro new file mode 100644 index 0000000000..f1b424510d --- /dev/null +++ b/packages/client/android/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/packages/client/android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java b/packages/client/android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java new file mode 100644 index 0000000000..f2c2217efa --- /dev/null +++ b/packages/client/android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package com.getcapacitor.myapp; + +import static org.junit.Assert.*; + +import android.content.Context; +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** + * 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/packages/client/android/app/src/main/AndroidManifest.xml b/packages/client/android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..9ea73f21e3 --- /dev/null +++ b/packages/client/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/client/android/app/src/main/java/org/calckey/app/MainActivity.java b/packages/client/android/app/src/main/java/org/calckey/app/MainActivity.java new file mode 100644 index 0000000000..80ff2dc2a0 --- /dev/null +++ b/packages/client/android/app/src/main/java/org/calckey/app/MainActivity.java @@ -0,0 +1,48 @@ +package org.calckey.app; + +import com.getcapacitor.BridgeActivity; + +public class MainActivity extends BridgeActivity { + void setDarkMode() { + // Android "fix" for enabling dark mode + // @see: https://github.com/ionic-team/capacitor/discussions/1978 + int nightModeFlags = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK; + WebSettings webSettings = this.bridge.getWebView().getSettings(); + if (nightModeFlags == Configuration.UI_MODE_NIGHT_YES) { + if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) { + // As of Android 10, you can simply force the dark mode + webSettings.setForceDark(WebSettings.FORCE_DARK_ON); + } + // Before Android 10, we need to use a CSS class based fallback + this.bridge.getWebView().evaluateJavascript("document.body.classList.toggle('dark', true);", null); + } else { + if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) { + webSettings.setForceDark(WebSettings.FORCE_DARK_OFF); + } + this.bridge.getWebView().evaluateJavascript("document.body.classList.toggle('dark', false);", null); + } + } + + @Override + public void onStart() { + super.onStart(); + setDarkMode(); + } + + @Override + public void onResume() { + super.onResume(); + setDarkMode(); + } + + @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/packages/client/android/app/src/main/res/drawable-land-hdpi/splash.png b/packages/client/android/app/src/main/res/drawable-land-hdpi/splash.png new file mode 100644 index 0000000000..e31573b4fc Binary files /dev/null and b/packages/client/android/app/src/main/res/drawable-land-hdpi/splash.png differ diff --git a/packages/client/android/app/src/main/res/drawable-land-mdpi/splash.png b/packages/client/android/app/src/main/res/drawable-land-mdpi/splash.png new file mode 100644 index 0000000000..f7a64923ea Binary files /dev/null and b/packages/client/android/app/src/main/res/drawable-land-mdpi/splash.png differ diff --git a/packages/client/android/app/src/main/res/drawable-land-xhdpi/splash.png b/packages/client/android/app/src/main/res/drawable-land-xhdpi/splash.png new file mode 100644 index 0000000000..807725501b Binary files /dev/null and b/packages/client/android/app/src/main/res/drawable-land-xhdpi/splash.png differ diff --git a/packages/client/android/app/src/main/res/drawable-land-xxhdpi/splash.png b/packages/client/android/app/src/main/res/drawable-land-xxhdpi/splash.png new file mode 100644 index 0000000000..14c6c8fe39 Binary files /dev/null and b/packages/client/android/app/src/main/res/drawable-land-xxhdpi/splash.png differ diff --git a/packages/client/android/app/src/main/res/drawable-land-xxxhdpi/splash.png b/packages/client/android/app/src/main/res/drawable-land-xxxhdpi/splash.png new file mode 100644 index 0000000000..244ca2506d Binary files /dev/null and b/packages/client/android/app/src/main/res/drawable-land-xxxhdpi/splash.png differ diff --git a/packages/client/android/app/src/main/res/drawable-port-hdpi/splash.png b/packages/client/android/app/src/main/res/drawable-port-hdpi/splash.png new file mode 100644 index 0000000000..74faaa583c Binary files /dev/null and b/packages/client/android/app/src/main/res/drawable-port-hdpi/splash.png differ diff --git a/packages/client/android/app/src/main/res/drawable-port-mdpi/splash.png b/packages/client/android/app/src/main/res/drawable-port-mdpi/splash.png new file mode 100644 index 0000000000..e944f4ad4e Binary files /dev/null and b/packages/client/android/app/src/main/res/drawable-port-mdpi/splash.png differ diff --git a/packages/client/android/app/src/main/res/drawable-port-xhdpi/splash.png b/packages/client/android/app/src/main/res/drawable-port-xhdpi/splash.png new file mode 100644 index 0000000000..564a82ff95 Binary files /dev/null and b/packages/client/android/app/src/main/res/drawable-port-xhdpi/splash.png differ diff --git a/packages/client/android/app/src/main/res/drawable-port-xxhdpi/splash.png b/packages/client/android/app/src/main/res/drawable-port-xxhdpi/splash.png new file mode 100644 index 0000000000..bfabe6871a Binary files /dev/null and b/packages/client/android/app/src/main/res/drawable-port-xxhdpi/splash.png differ diff --git a/packages/client/android/app/src/main/res/drawable-port-xxxhdpi/splash.png b/packages/client/android/app/src/main/res/drawable-port-xxxhdpi/splash.png new file mode 100644 index 0000000000..6929071268 Binary files /dev/null and b/packages/client/android/app/src/main/res/drawable-port-xxxhdpi/splash.png differ diff --git a/packages/client/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/packages/client/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000000..c7bd21dbd8 --- /dev/null +++ b/packages/client/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/packages/client/android/app/src/main/res/drawable/ic_launcher_background.xml b/packages/client/android/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000000..d5fccc538c --- /dev/null +++ b/packages/client/android/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/client/android/app/src/main/res/drawable/splash.png b/packages/client/android/app/src/main/res/drawable/splash.png new file mode 100644 index 0000000000..f7a64923ea Binary files /dev/null and b/packages/client/android/app/src/main/res/drawable/splash.png differ diff --git a/packages/client/android/app/src/main/res/layout/activity_main.xml b/packages/client/android/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000000..b5ad138701 --- /dev/null +++ b/packages/client/android/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/packages/client/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/packages/client/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000000..036d09bc5f --- /dev/null +++ b/packages/client/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/packages/client/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/packages/client/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000000..036d09bc5f --- /dev/null +++ b/packages/client/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/packages/client/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/packages/client/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000000..c023e50595 Binary files /dev/null and b/packages/client/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/packages/client/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/packages/client/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000000..2127973b2d Binary files /dev/null and b/packages/client/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/packages/client/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/packages/client/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000000..b441f37d6a Binary files /dev/null and b/packages/client/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/packages/client/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/packages/client/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000000..72905b854c Binary files /dev/null and b/packages/client/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/packages/client/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/packages/client/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000000..8ed0605c27 Binary files /dev/null and b/packages/client/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/packages/client/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/packages/client/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000000..9502e47a2c Binary files /dev/null and b/packages/client/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/packages/client/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/packages/client/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000000..4d1e077104 Binary files /dev/null and b/packages/client/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/packages/client/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/packages/client/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000000..df0f15880b Binary files /dev/null and b/packages/client/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/packages/client/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/packages/client/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000000..853db043d8 Binary files /dev/null and b/packages/client/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/packages/client/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/packages/client/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000000..6cdf97c119 Binary files /dev/null and b/packages/client/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/packages/client/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/packages/client/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000000..2960cbb610 Binary files /dev/null and b/packages/client/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/packages/client/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/packages/client/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000000..8e3093a86f Binary files /dev/null and b/packages/client/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/packages/client/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/packages/client/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000000..46de6e255a Binary files /dev/null and b/packages/client/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/packages/client/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/packages/client/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000000..d2ea9abed3 Binary files /dev/null and b/packages/client/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/packages/client/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/packages/client/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000000..a40d73e9c6 Binary files /dev/null and b/packages/client/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/packages/client/android/app/src/main/res/values/ic_launcher_background.xml b/packages/client/android/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 0000000000..c5d5899fdf --- /dev/null +++ b/packages/client/android/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file diff --git a/packages/client/android/app/src/main/res/values/strings.xml b/packages/client/android/app/src/main/res/values/strings.xml new file mode 100644 index 0000000000..117f6e4d03 --- /dev/null +++ b/packages/client/android/app/src/main/res/values/strings.xml @@ -0,0 +1,7 @@ + + + Calckey + Calckey + org.calckey.app + org.calckey.app + diff --git a/packages/client/android/app/src/main/res/values/styles.xml b/packages/client/android/app/src/main/res/values/styles.xml new file mode 100644 index 0000000000..be874e54a4 --- /dev/null +++ b/packages/client/android/app/src/main/res/values/styles.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/packages/client/android/app/src/main/res/xml/file_paths.xml b/packages/client/android/app/src/main/res/xml/file_paths.xml new file mode 100644 index 0000000000..bd0c4d80d0 --- /dev/null +++ b/packages/client/android/app/src/main/res/xml/file_paths.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/packages/client/android/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java b/packages/client/android/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java new file mode 100644 index 0000000000..0297327842 --- /dev/null +++ b/packages/client/android/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java @@ -0,0 +1,18 @@ +package com.getcapacitor.myapp; + +import static org.junit.Assert.*; + +import org.junit.Test; + +/** + * 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/packages/client/android/build.gradle b/packages/client/android/build.gradle new file mode 100644 index 0000000000..fe3625ecaa --- /dev/null +++ b/packages/client/android/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() + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:7.2.1' + classpath 'com.google.gms:google-services:4.3.13' + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +apply from: "variables.gradle" + +allprojects { + repositories { + google() + mavenCentral() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/packages/client/android/capacitor.settings.gradle b/packages/client/android/capacitor.settings.gradle new file mode 100644 index 0000000000..fc4d32baf8 --- /dev/null +++ b/packages/client/android/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/.pnpm/@capacitor+android@4.7.3_@capacitor+core@4.7.3/node_modules/@capacitor/android/capacitor') diff --git a/packages/client/android/gradle.properties b/packages/client/android/gradle.properties new file mode 100644 index 0000000000..0566c221d2 --- /dev/null +++ b/packages/client/android/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/packages/client/android/gradle/wrapper/gradle-wrapper.jar b/packages/client/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000..41d9927a4d Binary files /dev/null and b/packages/client/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/packages/client/android/gradle/wrapper/gradle-wrapper.properties b/packages/client/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..92f06b50fd --- /dev/null +++ b/packages/client/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/packages/client/android/gradlew b/packages/client/android/gradlew new file mode 100755 index 0000000000..1b6c787337 --- /dev/null +++ b/packages/client/android/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original 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 POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${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 "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# 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 ;; #( + MSYS* | 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" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/packages/client/android/gradlew.bat b/packages/client/android/gradlew.bat new file mode 100644 index 0000000000..ac1b06f938 --- /dev/null +++ b/packages/client/android/gradlew.bat @@ -0,0 +1,89 @@ +@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 Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@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 execute + +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 execute + +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 + +: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 %* + +: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/packages/client/android/settings.gradle b/packages/client/android/settings.gradle new file mode 100644 index 0000000000..3b4431d772 --- /dev/null +++ b/packages/client/android/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/packages/client/android/variables.gradle b/packages/client/android/variables.gradle new file mode 100644 index 0000000000..777bd7e879 --- /dev/null +++ b/packages/client/android/variables.gradle @@ -0,0 +1,16 @@ +ext { + minSdkVersion = 22 + compileSdkVersion = 32 + targetSdkVersion = 32 + androidxActivityVersion = '1.4.0' + androidxAppCompatVersion = '1.4.2' + androidxCoordinatorLayoutVersion = '1.2.0' + androidxCoreVersion = '1.8.0' + androidxFragmentVersion = '1.4.1' + coreSplashScreenVersion = '1.0.0-rc01' + androidxWebkitVersion = '1.4.0' + junitVersion = '4.13.2' + androidxJunitVersion = '1.1.3' + androidxEspressoCoreVersion = '3.4.0' + cordovaAndroidVersion = '10.1.1' +} \ No newline at end of file diff --git a/packages/client/capacitor.config.ts b/packages/client/capacitor.config.ts new file mode 100644 index 0000000000..27b89fbb2b --- /dev/null +++ b/packages/client/capacitor.config.ts @@ -0,0 +1,15 @@ +import { CapacitorConfig } from '@capacitor/cli'; + +const config: CapacitorConfig = { + appId: 'org.calckey.app', + appName: 'Calckey', + webDir: '../../built/_client_dist_', + bundledWebRuntime: false, + plugins: { + PushNotifications: { + presentationOptions: ["badge", "sound", "alert"] + } + } +}; + +export default config; diff --git a/packages/client/index.html b/packages/client/index.html new file mode 100644 index 0000000000..52b3cc6c79 --- /dev/null +++ b/packages/client/index.html @@ -0,0 +1,59 @@ + + + + + + + Vite + Vue + TS + + + + +
+ + + diff --git a/packages/client/ios/.gitignore b/packages/client/ios/.gitignore new file mode 100644 index 0000000000..9ddf659030 --- /dev/null +++ b/packages/client/ios/.gitignore @@ -0,0 +1,13 @@ +App/build +App/Pods +App/Podfile.lock +App/App/public +DerivedData +xcuserdata + +# Cordova plugins for Capacitor +capacitor-cordova-ios-plugins + +# Generated Config files +App/App/capacitor.config.json +App/App/config.xml diff --git a/packages/client/ios/App/App.xcodeproj/project.pbxproj b/packages/client/ios/App/App.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..7a10e0a1b1 --- /dev/null +++ b/packages/client/ios/App/App.xcodeproj/project.pbxproj @@ -0,0 +1,406 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 48; + objects = { + +/* Begin PBXBuildFile section */ + 2FAD9763203C412B000D30F8 /* config.xml in Resources */ = {isa = PBXBuildFile; fileRef = 2FAD9762203C412B000D30F8 /* config.xml */; }; + 50379B232058CBB4000EE86E /* capacitor.config.json in Resources */ = {isa = PBXBuildFile; fileRef = 50379B222058CBB4000EE86E /* capacitor.config.json */; }; + 504EC3081FED79650016851F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 504EC3071FED79650016851F /* AppDelegate.swift */; }; + 504EC30D1FED79650016851F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC30B1FED79650016851F /* Main.storyboard */; }; + 504EC30F1FED79650016851F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 504EC30E1FED79650016851F /* Assets.xcassets */; }; + 504EC3121FED79650016851F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC3101FED79650016851F /* LaunchScreen.storyboard */; }; + 50B271D11FEDC1A000F3C39B /* public in Resources */ = {isa = PBXBuildFile; fileRef = 50B271D01FEDC1A000F3C39B /* public */; }; + A084ECDBA7D38E1E42DFC39D /* Pods_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 2FAD9762203C412B000D30F8 /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = config.xml; sourceTree = ""; }; + 50379B222058CBB4000EE86E /* capacitor.config.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = capacitor.config.json; sourceTree = ""; }; + 504EC3041FED79650016851F /* App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = App.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 504EC3071FED79650016851F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 504EC30C1FED79650016851F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 504EC30E1FED79650016851F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 504EC3111FED79650016851F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 504EC3131FED79650016851F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 50B271D01FEDC1A000F3C39B /* public */ = {isa = PBXFileReference; lastKnownFileType = folder; path = public; sourceTree = ""; }; + AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_App.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.release.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.release.xcconfig"; sourceTree = ""; }; + FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.debug.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.debug.xcconfig"; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 504EC3011FED79650016851F /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + A084ECDBA7D38E1E42DFC39D /* Pods_App.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 27E2DDA53C4D2A4D1A88CE4A /* Frameworks */ = { + isa = PBXGroup; + children = ( + AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + 504EC2FB1FED79650016851F = { + isa = PBXGroup; + children = ( + 504EC3061FED79650016851F /* App */, + 504EC3051FED79650016851F /* Products */, + 7F8756D8B27F46E3366F6CEA /* Pods */, + 27E2DDA53C4D2A4D1A88CE4A /* Frameworks */, + ); + sourceTree = ""; + }; + 504EC3051FED79650016851F /* Products */ = { + isa = PBXGroup; + children = ( + 504EC3041FED79650016851F /* App.app */, + ); + name = Products; + sourceTree = ""; + }; + 504EC3061FED79650016851F /* App */ = { + isa = PBXGroup; + children = ( + 50379B222058CBB4000EE86E /* capacitor.config.json */, + 504EC3071FED79650016851F /* AppDelegate.swift */, + 504EC30B1FED79650016851F /* Main.storyboard */, + 504EC30E1FED79650016851F /* Assets.xcassets */, + 504EC3101FED79650016851F /* LaunchScreen.storyboard */, + 504EC3131FED79650016851F /* Info.plist */, + 2FAD9762203C412B000D30F8 /* config.xml */, + 50B271D01FEDC1A000F3C39B /* public */, + ); + path = App; + sourceTree = ""; + }; + 7F8756D8B27F46E3366F6CEA /* Pods */ = { + isa = PBXGroup; + children = ( + FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */, + AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */, + ); + name = Pods; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 504EC3031FED79650016851F /* App */ = { + isa = PBXNativeTarget; + buildConfigurationList = 504EC3161FED79650016851F /* Build configuration list for PBXNativeTarget "App" */; + buildPhases = ( + 6634F4EFEBD30273BCE97C65 /* [CP] Check Pods Manifest.lock */, + 504EC3001FED79650016851F /* Sources */, + 504EC3011FED79650016851F /* Frameworks */, + 504EC3021FED79650016851F /* Resources */, + 9592DBEFFC6D2A0C8D5DEB22 /* [CP] Embed Pods Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = App; + productName = App; + productReference = 504EC3041FED79650016851F /* App.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 504EC2FC1FED79650016851F /* Project object */ = { + isa = PBXProject; + attributes = { + LastSwiftUpdateCheck = 0920; + LastUpgradeCheck = 0920; + TargetAttributes = { + 504EC3031FED79650016851F = { + CreatedOnToolsVersion = 9.2; + LastSwiftMigration = 1100; + ProvisioningStyle = Automatic; + }; + }; + }; + buildConfigurationList = 504EC2FF1FED79650016851F /* Build configuration list for PBXProject "App" */; + compatibilityVersion = "Xcode 8.0"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 504EC2FB1FED79650016851F; + productRefGroup = 504EC3051FED79650016851F /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 504EC3031FED79650016851F /* App */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 504EC3021FED79650016851F /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 504EC3121FED79650016851F /* LaunchScreen.storyboard in Resources */, + 50B271D11FEDC1A000F3C39B /* public in Resources */, + 504EC30F1FED79650016851F /* Assets.xcassets in Resources */, + 50379B232058CBB4000EE86E /* capacitor.config.json in Resources */, + 504EC30D1FED79650016851F /* Main.storyboard in Resources */, + 2FAD9763203C412B000D30F8 /* config.xml in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 6634F4EFEBD30273BCE97C65 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-App-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + 9592DBEFFC6D2A0C8D5DEB22 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "[CP] Embed Pods Frameworks"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-App/Pods-App-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 504EC3001FED79650016851F /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 504EC3081FED79650016851F /* AppDelegate.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXVariantGroup section */ + 504EC30B1FED79650016851F /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 504EC30C1FED79650016851F /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 504EC3101FED79650016851F /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 504EC3111FED79650016851F /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 504EC3141FED79650016851F /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + 504EC3151FED79650016851F /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 504EC3171FED79650016851F /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + INFOPLIST_FILE = App/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + MARKETING_VERSION = 1.0; + OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; + PRODUCT_BUNDLE_IDENTIFIER = org.calckey.app; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 504EC3181FED79650016851F /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + INFOPLIST_FILE = App/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = org.calckey.app; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = ""; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 504EC2FF1FED79650016851F /* Build configuration list for PBXProject "App" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 504EC3141FED79650016851F /* Debug */, + 504EC3151FED79650016851F /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 504EC3161FED79650016851F /* Build configuration list for PBXNativeTarget "App" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 504EC3171FED79650016851F /* Debug */, + 504EC3181FED79650016851F /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 504EC2FC1FED79650016851F /* Project object */; +} diff --git a/packages/client/ios/App/App.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/packages/client/ios/App/App.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000000..42daef8a10 --- /dev/null +++ b/packages/client/ios/App/App.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/packages/client/ios/App/App.xcworkspace/contents.xcworkspacedata b/packages/client/ios/App/App.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000000..b301e824b3 --- /dev/null +++ b/packages/client/ios/App/App.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/packages/client/ios/App/App.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/client/ios/App/App.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000000..18d981003d --- /dev/null +++ b/packages/client/ios/App/App.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/packages/client/ios/App/App/AppDelegate.swift b/packages/client/ios/App/App/AppDelegate.swift new file mode 100644 index 0000000000..c3cd83b5c0 --- /dev/null +++ b/packages/client/ios/App/App/AppDelegate.swift @@ -0,0 +1,49 @@ +import UIKit +import Capacitor + +@UIApplicationMain +class AppDelegate: UIResponder, UIApplicationDelegate { + + var window: UIWindow? + + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { + // Override point for customization after application launch. + return true + } + + func applicationWillResignActive(_ application: UIApplication) { + // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. + // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game. + } + + func applicationDidEnterBackground(_ application: UIApplication) { + // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. + // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits. + } + + func applicationWillEnterForeground(_ application: UIApplication) { + // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background. + } + + func applicationDidBecomeActive(_ application: UIApplication) { + // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. + } + + func applicationWillTerminate(_ application: UIApplication) { + // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. + } + + func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey: Any] = [:]) -> Bool { + // Called when the app was launched with a url. Feel free to add additional processing here, + // but if you want the App API to support tracking app url opens, make sure to keep this call + return ApplicationDelegateProxy.shared.application(app, open: url, options: options) + } + + func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool { + // Called when the app was launched with an activity, including Universal Links. + // Feel free to add additional processing here, but if you want the App API to support + // tracking app url opens, make sure to keep this call + return ApplicationDelegateProxy.shared.application(application, continue: userActivity, restorationHandler: restorationHandler) + } + +} diff --git a/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@1x.png b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@1x.png new file mode 100644 index 0000000000..2f503741c2 Binary files /dev/null and b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@1x.png differ diff --git a/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@2x-1.png b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@2x-1.png new file mode 100644 index 0000000000..dd72c1ce85 Binary files /dev/null and b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@2x-1.png differ diff --git a/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@2x.png b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@2x.png new file mode 100644 index 0000000000..dd72c1ce85 Binary files /dev/null and b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@2x.png differ diff --git a/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@3x.png b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@3x.png new file mode 100644 index 0000000000..7fbf0a84a6 Binary files /dev/null and b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@3x.png differ diff --git a/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@1x.png b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@1x.png new file mode 100644 index 0000000000..f996ea18f4 Binary files /dev/null and b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@1x.png differ diff --git a/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@2x-1.png b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@2x-1.png new file mode 100644 index 0000000000..bb2935fb73 Binary files /dev/null and b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@2x-1.png differ diff --git a/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@2x.png b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@2x.png new file mode 100644 index 0000000000..bb2935fb73 Binary files /dev/null and b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@2x.png differ diff --git a/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@3x.png b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@3x.png new file mode 100644 index 0000000000..21d16e5b10 Binary files /dev/null and b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@3x.png differ diff --git a/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@1x.png b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@1x.png new file mode 100644 index 0000000000..dd72c1ce85 Binary files /dev/null and b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@1x.png differ diff --git a/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@2x-1.png b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@2x-1.png new file mode 100644 index 0000000000..ff07545198 Binary files /dev/null and b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@2x-1.png differ diff --git a/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@2x.png b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@2x.png new file mode 100644 index 0000000000..ff07545198 Binary files /dev/null and b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@2x.png differ diff --git a/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@3x.png b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@3x.png new file mode 100644 index 0000000000..3401fa887e Binary files /dev/null and b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@3x.png differ diff --git a/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png new file mode 100644 index 0000000000..adf6ba01db Binary files /dev/null and b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png differ diff --git a/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-60x60@2x.png b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-60x60@2x.png new file mode 100644 index 0000000000..ffd0da7819 Binary files /dev/null and b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-60x60@2x.png differ diff --git a/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-60x60@3x.png b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-60x60@3x.png new file mode 100644 index 0000000000..90aea7cd2e Binary files /dev/null and b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-60x60@3x.png differ diff --git a/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-76x76@1x.png b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-76x76@1x.png new file mode 100644 index 0000000000..2f5eafb6b3 Binary files /dev/null and b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-76x76@1x.png differ diff --git a/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-76x76@2x.png b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-76x76@2x.png new file mode 100644 index 0000000000..89c8d0448c Binary files /dev/null and b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-76x76@2x.png differ diff --git a/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-83.5x83.5@2x.png b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-83.5x83.5@2x.png new file mode 100644 index 0000000000..ef541c90ad Binary files /dev/null and b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-83.5x83.5@2x.png differ diff --git a/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/Contents.json b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000000..90eea7ec7e --- /dev/null +++ b/packages/client/ios/App/App/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,116 @@ +{ + "images" : [ + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "AppIcon-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "AppIcon-20x20@3x.png", + "scale" : "3x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "AppIcon-29x29@2x-1.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "AppIcon-29x29@3x.png", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "AppIcon-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "AppIcon-40x40@3x.png", + "scale" : "3x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "AppIcon-60x60@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "AppIcon-60x60@3x.png", + "scale" : "3x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "AppIcon-20x20@1x.png", + "scale" : "1x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "AppIcon-20x20@2x-1.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "AppIcon-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "AppIcon-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "AppIcon-40x40@1x.png", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "AppIcon-40x40@2x-1.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "AppIcon-76x76@1x.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "AppIcon-76x76@2x.png", + "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "AppIcon-83.5x83.5@2x.png", + "scale" : "2x" + }, + { + "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "AppIcon-512@2x.png", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/packages/client/ios/App/App/Assets.xcassets/Contents.json b/packages/client/ios/App/App/Assets.xcassets/Contents.json new file mode 100644 index 0000000000..da4a164c91 --- /dev/null +++ b/packages/client/ios/App/App/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/packages/client/ios/App/App/Assets.xcassets/Splash.imageset/Contents.json b/packages/client/ios/App/App/Assets.xcassets/Splash.imageset/Contents.json new file mode 100644 index 0000000000..d7d96a67c0 --- /dev/null +++ b/packages/client/ios/App/App/Assets.xcassets/Splash.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "splash-2732x2732-2.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "splash-2732x2732-1.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "splash-2732x2732.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/packages/client/ios/App/App/Assets.xcassets/Splash.imageset/splash-2732x2732-1.png b/packages/client/ios/App/App/Assets.xcassets/Splash.imageset/splash-2732x2732-1.png new file mode 100644 index 0000000000..33ea6c970f Binary files /dev/null and b/packages/client/ios/App/App/Assets.xcassets/Splash.imageset/splash-2732x2732-1.png differ diff --git a/packages/client/ios/App/App/Assets.xcassets/Splash.imageset/splash-2732x2732-2.png b/packages/client/ios/App/App/Assets.xcassets/Splash.imageset/splash-2732x2732-2.png new file mode 100644 index 0000000000..33ea6c970f Binary files /dev/null and b/packages/client/ios/App/App/Assets.xcassets/Splash.imageset/splash-2732x2732-2.png differ diff --git a/packages/client/ios/App/App/Assets.xcassets/Splash.imageset/splash-2732x2732.png b/packages/client/ios/App/App/Assets.xcassets/Splash.imageset/splash-2732x2732.png new file mode 100644 index 0000000000..33ea6c970f Binary files /dev/null and b/packages/client/ios/App/App/Assets.xcassets/Splash.imageset/splash-2732x2732.png differ diff --git a/packages/client/ios/App/App/Base.lproj/LaunchScreen.storyboard b/packages/client/ios/App/App/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 0000000000..e7ae5d7802 --- /dev/null +++ b/packages/client/ios/App/App/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/client/ios/App/App/Base.lproj/Main.storyboard b/packages/client/ios/App/App/Base.lproj/Main.storyboard new file mode 100644 index 0000000000..b44df7be8f --- /dev/null +++ b/packages/client/ios/App/App/Base.lproj/Main.storyboard @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/packages/client/ios/App/App/Info.plist b/packages/client/ios/App/App/Info.plist new file mode 100644 index 0000000000..833cbf1137 --- /dev/null +++ b/packages/client/ios/App/App/Info.plist @@ -0,0 +1,49 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleDisplayName + Calckey + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + $(MARKETING_VERSION) + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UIRequiredDeviceCapabilities + + armv7 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UIViewControllerBasedStatusBarAppearance + + + diff --git a/packages/client/ios/App/Podfile b/packages/client/ios/App/Podfile new file mode 100644 index 0000000000..99ddee0773 --- /dev/null +++ b/packages/client/ios/App/Podfile @@ -0,0 +1,24 @@ +require_relative '../../node_modules/@capacitor/ios/scripts/pods_helpers' + +platform :ios, '13.0' +use_frameworks! + +# workaround to avoid Xcode caching of Pods that requires +# Product -> Clean Build Folder after new Cordova plugins installed +# Requires CocoaPods 1.6 or newer +install! 'cocoapods', :disable_input_output_paths => true + +def capacitor_pods + pod 'Capacitor', :path => '../../../../node_modules/.pnpm/@capacitor+ios@4.7.3_@capacitor+core@4.7.3/node_modules/@capacitor/ios' + pod 'CapacitorCordova', :path => '../../../../node_modules/.pnpm/@capacitor+ios@4.7.3_@capacitor+core@4.7.3/node_modules/@capacitor/ios' + +end + +target 'App' do + capacitor_pods + # Add your Pods here +end + +post_install do |installer| + assertDeploymentTarget(installer) +end diff --git a/packages/client/package.json b/packages/client/package.json index be7538542f..c22f74c2b0 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -4,9 +4,14 @@ "scripts": { "watch": "pnpm vite build --watch --mode development", "build": "pnpm vite build", - "lint": "pnpm rome check \"src/**/*.{ts,vue}\"" + "mobilebuild": "pnpm vite build --mode mobile && pnpm run mobilecopy && npx cap sync", + "mobilecopy": "pnpm node ../../scripts/mobilebuild.js", + "lint": "pnpm rome check \"src/**/*.{ts,vue}\"", + "ios": "npx cap open ios", + "android": "studio android" }, "devDependencies": { + "@capacitor/cli": "^4.7.3", "@discordapp/twemoji": "14.0.2", "@khmyznikov/pwa-install": "^0.2.0", "@phosphor-icons/web": "^2.0.3", @@ -79,10 +84,23 @@ "vanilla-tilt": "1.8.0", "vite": "^4.1.1", "vite-plugin-compression": "^0.5.1", + "vite-plugin-conditional-compiler": "^0.1.1", + "vite-tsconfig-paths": "^4.0.7", "vue": "3.2.45", "vue-isyourpasswordsafe": "^2.0.0", "vue-plyr": "^7.0.0", "vue-prism-editor": "2.0.0-alpha.2", "vuedraggable": "4.1.0" + }, + "dependencies": { + "@capacitor/android": "^4.7.3", + "@capacitor/app": "^4.1.1", + "@capacitor/core": "^4.7.3", + "@capacitor/device": "^4.1.0", + "@capacitor/ios": "^4.7.3", + "@capacitor/preferences": "^4.0.2", + "@capacitor/push-notifications": "^4.1.2", + "@capacitor/status-bar": "^4.1.1", + "onesignal-cordova-plugin": "^3.3.1" } } diff --git a/packages/client/src/account.ts b/packages/client/src/account.ts index fd9bf48e68..9a423b4cb6 100644 --- a/packages/client/src/account.ts +++ b/packages/client/src/account.ts @@ -3,20 +3,35 @@ import * as misskey from "calckey-js"; import { showSuspendedDialog } from "./scripts/show-suspended-dialog"; import { i18n } from "./i18n"; import { del, get, set } from "@/scripts/idb-proxy"; +// #v-ifdef VITE_CAPACITOR +// #v-else import { apiUrl } from "@/config"; +// #v-endif import { waiting, api, popup, popupMenu, success, alert } from "@/os"; import { unisonReload, reloadChannel } from "@/scripts/unison-reload"; // TODO: 他のタブと永続化されたstateを同期 type Account = misskey.entities.MeDetailed; - +// #v-ifdef VITE_CAPACITOR +let accountData = null; +try { + accountData = JSON.parse(localStorage.getItem("account")); +} catch (e) { + localStorage.removeItem("account"); + window.location.reload(); +} +// #v-else const accountData = localStorage.getItem("account"); - +// #v-endif // TODO: 外部からはreadonlyに +// #v-ifdef VITE_CAPACITOR +export const $i = accountData ? reactive(accountData as Account) : null; +// #v-else export const $i = accountData ? reactive(JSON.parse(accountData) as Account) : null; +// #v-endif export const iAmModerator = $i != null && ($i.isAdmin || $i.isModerator); export const iAmAdmin = $i?.isAdmin; @@ -28,7 +43,8 @@ export async function signout() { await removeAccount($i.id); const accounts = await getAccounts(); - +// #v-ifdef VITE_CAPACITOR +// #v-else //#region Remove service worker registration try { if (navigator.serviceWorker.controller) { @@ -54,23 +70,40 @@ export async function signout() { } } catch (err) {} //#endregion +// #v-endif document.cookie = "igi=; path=/"; + // #v-ifdef VITE_CAPACITOR + if (accounts.length > 0) login(accounts[0].token, accounts[0].instanceUrl); + // #v-else if (accounts.length > 0) login(accounts[0].token); + // #v-endif else unisonReload("/"); } export async function getAccounts(): Promise< + // #v-ifdef VITE_CAPACITOR + { id: Account["id"]; token: Account["token"]; instanceUrl: string }[] + // #v-else { id: Account["id"]; token: Account["token"] }[] + // #v-endif > { return (await get("accounts")) || []; } +// #v-ifdef VITE_CAPACITOR +export async function addAccount(id: Account["id"], token: Account["token"], instanceUrl: string) { +// #v-else export async function addAccount(id: Account["id"], token: Account["token"]) { +// #v-endif const accounts = await getAccounts(); if (!accounts.some((x) => x.id === id)) { + // #v-ifdef VITE_CAPACITOR + await set("accounts", accounts.concat([{ id, token, instanceUrl }])); + // #v-else await set("accounts", accounts.concat([{ id, token }])); + // #v-endif } } @@ -117,7 +150,32 @@ function fetchAccount(token: string): Promise { }); } -export function updateAccount(accountData) { +function fetchAccount( + token: string, + instanceUrl: string +): Promise { + return new misskey.api.APIClient({ origin: instanceUrl, credential: token }) + .request("i") + .then((res) => { + return { ...(res as Account), token, instanceUrl }; + }) + .catch((res) => { + if (res.error.id === "a8c724b3-6e9c-4b46-b1a8-bc3ed6258370") { + showSuspendedDialog().then(() => { + signout(); + }); + } else { + alert({ + type: "error", + title: i18n.ts.failedToFetchAccountInformation, + text: JSON.stringify(res.error), + }); + } + return Promise.reject(res); + }); +} + +export function updateAccount(accountData: Object) { for (const [key, value] of Object.entries(accountData)) { $i[key] = value; } @@ -125,16 +183,44 @@ export function updateAccount(accountData) { } export function refreshAccount() { + // #v-ifdef VITE_CAPACITOR + return fetchAccount($i.token, $i.instanceUrl).then(updateAccount); + // #v-else return fetchAccount($i.token).then(updateAccount); + // #v-endif } +// #v-ifdef VITE_CAPACITOR +export async function login(token: Account["token"], instanceUrl: string, redirect?: string) { +// #v-else export async function login(token: Account["token"], redirect?: string) { +// #v-endif waiting(); + // #v-ifdef VITE_CAPACITOR + if (_DEV_) console.log("logging as token ", token, instanceUrl); + const me = await fetchAccount(token, instanceUrl); + // #v-else if (_DEV_) console.log("logging as token ", token); const me = await fetchAccount(token); + // #v-endif localStorage.setItem("account", JSON.stringify(me)); + // #v-ifdef VITE_CAPACITOR + localStorage.setItem( + "instance", + JSON.stringify( + await new misskey.api.APIClient({ + origin: instanceUrl, + credential: token, + }).request("meta") + ) + ); + // #v-endif document.cookie = `token=${token}; path=/; max-age=31536000`; // bull dashboardの認証とかで使う + // #v-ifdef VITE_CAPACITOR + await addAccount(me.id, token, instanceUrl); + // #v-else await addAccount(me.id, token); + // #v-endif if (redirect) { // 他のタブは再読み込みするだけ @@ -162,7 +248,11 @@ export async function openAccountMenu( {}, { done: (res) => { + // #v-ifdef VITE_CAPACITOR + addAccount(res.id, res.i, res.instanceUrl); + // #v-else addAccount(res.id, res.i); + // #v-endif success(); }, }, @@ -176,8 +266,13 @@ export async function openAccountMenu( {}, { done: (res) => { + // #v-ifdef VITE_CAPACITOR + addAccount(res.id, res.i, res.instanceUrl); + switchAccountWithToken(res.i, res.instanceUrl); + // #v-else addAccount(res.id, res.i); switchAccountWithToken(res.i); + // #v-endif }, }, "closed", @@ -186,12 +281,23 @@ export async function openAccountMenu( async function switchAccount(account: misskey.entities.UserDetailed) { const storedAccounts = await getAccounts(); + // #v-ifdef VITE_CAPACITOR + const acc = storedAccounts.find((x) => x.id === account.id); + localStorage.removeItem("lastEmojisFetchedAt"); + switchAccountWithToken(acc.token, acc.instanceUrl); + // #v-else const token = storedAccounts.find((x) => x.id === account.id).token; switchAccountWithToken(token); + // #v-endif } + // #v-ifdef VITE_CAPACITOR + function switchAccountWithToken(token: string, instanceUrl: string) { + login(token, instanceUrl); + // #v-else function switchAccountWithToken(token: string) { login(token); + // #v-endif } const storedAccounts = await getAccounts().then((accounts) => diff --git a/packages/client/src/i18n.ts b/packages/client/src/i18n.ts index 5b0a7f9ed8..c45cfee59c 100644 --- a/packages/client/src/i18n.ts +++ b/packages/client/src/i18n.ts @@ -11,3 +11,4 @@ declare module "@vue/runtime-core" { $ts: typeof i18n["locale"]; } } + diff --git a/packages/client/src/init.ts b/packages/client/src/init.ts index 34cdc16efa..5c5dd9d5a0 100644 --- a/packages/client/src/init.ts +++ b/packages/client/src/init.ts @@ -50,8 +50,24 @@ import { reloadChannel } from "@/scripts/unison-reload"; import { reactionPicker } from "@/scripts/reaction-picker"; import { getUrlWithoutLoginId } from "@/scripts/login-id"; import { getAccountFromId } from "@/scripts/get-account-from-id"; - +import { Device } from "@capacitor/device"; +import { App } from "@capacitor/app"; +import lightTheme from "@/themes/_light.json5"; +export let storedDeviceInfo: Object; +// #v-ifdef VITE_CAPACITOR +const onesignal_app_id = "efe09597-0778-4156-97b7-0bf8f52c21a7"; +// #v-endif (async () => { + // #v-ifdef VITE_CAPACITOR + const res = await Device.getInfo(); + console.log(res); + storedDeviceInfo = res; + if (!localStorage.getItem("lang")) { + localStorage.setItem("lang", (await Device.getLanguageCode()).value || + "en-US"); + window.location.reload(); + } + // #v-endif console.info(`Calckey v${version}`); if (_DEV_) { @@ -104,8 +120,13 @@ import { getAccountFromId } from "@/scripts/get-account-from-id"; }); //#endregion + let isMobileApp = false; + // #v-ifdef VITE_CAPACITOR + isMobileApp = false; + // #v-endif + // If mobile, insert the viewport meta tag - if (["smartphone", "tablet"].includes(deviceKind)) { + if (isMobileApp || ["smartphone", "tablet"].includes(deviceKind)) { const viewport = document.getElementsByName("viewport").item(0); viewport.setAttribute( "content", @@ -118,6 +139,22 @@ import { getAccountFromId } from "@/scripts/get-account-from-id"; //#region Set lang attr const html = document.documentElement; html.setAttribute("lang", lang); + // #v-ifdef VITE_CAPACITOR + html.setAttribute("class", res.platform); + const css = localStorage.getItem("customCss") || ""; + if (css) { + const cssNode = document.createElement("style"); + const cssTextNode = document.createTextNode(css); + cssNode.appendChild(cssTextNode); + document.body.appendChild(cssNode); + } + + if (defaultStore.reactiveState.darkMode.value) { + const style = document.createElement("style"); + style.innerText = " --bg: rgb(12, 18, 16);"; + document.head.appendChild(style); + } + // #v-endif //#endregion //#region loginId @@ -131,6 +168,9 @@ import { getAccountFromId } from "@/scripts/get-account-from-id"; const account = await getAccountFromId(loginId); if (account) { await login(account.token, target); + // #v-ifdef VITE_CAPACITOR + await afterLoginSetup(); + // #v-endif } } @@ -145,7 +185,10 @@ import { getAccountFromId } from "@/scripts/get-account-from-id"; console.log("account cache found. refreshing..."); } - refreshAccount(); + await refreshAccount(); + // #v-ifdef VITE_CAPACITOR + await afterLoginSetup(); + // #v-endif } else { if (_DEV_) { console.log("no account cache found."); @@ -171,6 +214,7 @@ import { getAccountFromId } from "@/scripts/get-account-from-id"; if (_DEV_) { console.log("not signed in"); } + applyTheme(lightTheme); } } //#endregion diff --git a/packages/client/vite.config.ts b/packages/client/vite.config.ts index f4d04e5ecd..5cfe236508 100644 --- a/packages/client/vite.config.ts +++ b/packages/client/vite.config.ts @@ -6,21 +6,25 @@ import locales from '../../locales'; import meta from '../../package.json'; import pluginJson5 from './vite.json5'; import viteCompression from 'vite-plugin-compression'; +import ConditionalCompile from "vite-plugin-conditional-compiler"; +import tsconfigPaths from 'vite-tsconfig-paths' const extensions = ['.ts', '.tsx', '.js', '.jsx', '.mjs', '.json', '.json5', '.svg', '.sass', '.scss', '.css', '.vue']; export default defineConfig(({ command, mode }) => { - fs.mkdirSync(__dirname + '/../../built', { recursive: true }); - fs.writeFileSync(__dirname + '/../../built/meta.json', JSON.stringify({ version: meta.version }), 'utf-8'); + fs.mkdirSync(`${__dirname}/../../built`, { recursive: true }); + fs.writeFileSync(`${__dirname}/../../built/meta.json`, JSON.stringify({ version: meta.version }), 'utf-8'); return { base: '/assets/', plugins: [ + ConditionalCompile(), pluginVue({ reactivityTransform: true, }), pluginJson5(), + tsconfigPaths(), viteCompression({ algorithm: 'brotliCompress' }), @@ -29,9 +33,9 @@ export default defineConfig(({ command, mode }) => { resolve: { extensions, alias: { - '@/': __dirname + '/src/', - '/client-assets/': __dirname + '/assets/', - '/static-assets/': __dirname + '/../backend/assets/', + '@/': `${__dirname}/src/`, + '/client-assets/': `${__dirname}/assets/`, + '/static-assets/': `${__dirname}/../backend/assets/`, }, }, @@ -58,6 +62,7 @@ export default defineConfig(({ command, mode }) => { manifest: 'manifest.json', rollupOptions: { input: { + index: 'index.html', app: './src/init.ts', }, output: { @@ -68,7 +73,7 @@ export default defineConfig(({ command, mode }) => { }, cssCodeSplit: true, assetsInlineLimit: 0, - outDir: __dirname + '/../../built/_client_dist_', + outDir: `${__dirname}/../../built/_client_dist_`, assetsDir: '.', emptyOutDir: false, sourcemap: process.env.NODE_ENV === 'development', diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1446d8df68..8d3dbf9940 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -591,7 +591,38 @@ importers: version: 8.11.0 packages/client: + dependencies: + '@capacitor/android': + specifier: ^4.7.3 + version: 4.7.3(@capacitor/core@4.7.3) + '@capacitor/app': + specifier: ^4.1.1 + version: 4.1.1(@capacitor/core@4.7.3) + '@capacitor/core': + specifier: ^4.7.3 + version: 4.7.3 + '@capacitor/device': + specifier: ^4.1.0 + version: 4.1.0(@capacitor/core@4.7.3) + '@capacitor/ios': + specifier: ^4.7.3 + version: 4.7.3(@capacitor/core@4.7.3) + '@capacitor/preferences': + specifier: ^4.0.2 + version: 4.0.2(@capacitor/core@4.7.3) + '@capacitor/push-notifications': + specifier: ^4.1.2 + version: 4.1.2(@capacitor/core@4.7.3) + '@capacitor/status-bar': + specifier: ^4.1.1 + version: 4.1.1(@capacitor/core@4.7.3) + onesignal-cordova-plugin: + specifier: ^3.3.1 + version: 3.3.1 devDependencies: + '@capacitor/cli': + specifier: ^4.7.3 + version: 4.7.3 '@discordapp/twemoji': specifier: 14.0.2 version: 14.0.2 @@ -808,6 +839,12 @@ importers: vite-plugin-compression: specifier: ^0.5.1 version: 0.5.1(vite@4.1.1) + vite-plugin-conditional-compiler: + specifier: ^0.1.1 + version: 0.1.1 + vite-tsconfig-paths: + specifier: ^4.0.7 + version: 4.0.7(typescript@4.9.4)(vite@4.1.1) vue: specifier: 3.2.45 version: 3.2.45 @@ -1066,6 +1103,94 @@ packages: - utf-8-validate dev: false + /@capacitor/android@4.7.3(@capacitor/core@4.7.3): + resolution: {integrity: sha512-TmVg7vbAt6Iw0FWc51dLlW1gRMtSeIQ6qVLFJ1/sl2SYLXpgCHh8v/LfhqQ93NurgM+6SKFxOycGgg1FIBaLGw==} + peerDependencies: + '@capacitor/core': ^4.7.0 + dependencies: + '@capacitor/core': 4.7.3 + dev: false + + /@capacitor/app@4.1.1(@capacitor/core@4.7.3): + resolution: {integrity: sha512-SJcJA1rhFQyeH6eLfUEbdKkHzAwzahJNVPNXmU88fdmXpMgM2dJGzZj1vrm6e21aQq+Z4aBVLJ2RCdj92zD7wg==} + peerDependencies: + '@capacitor/core': ^4.0.0 + dependencies: + '@capacitor/core': 4.7.3 + dev: false + + /@capacitor/cli@4.7.3: + resolution: {integrity: sha512-/9Vjl0A91UjRA0b8a5YCqHfHcM50vQ3Fh0typ3ScwYZhg3shkFtB03e8liAD/u0rhr/MerN8VGgN75QNEXN0Lg==} + engines: {node: '>=12.4.0'} + hasBin: true + dependencies: + '@ionic/cli-framework-output': 2.2.6 + '@ionic/utils-fs': 3.1.7 + '@ionic/utils-subprocess': 2.1.12 + '@ionic/utils-terminal': 2.3.4 + commander: 9.5.0 + debug: 4.3.4(supports-color@8.1.1) + env-paths: 2.2.1 + kleur: 4.1.5 + native-run: 1.7.2 + open: 8.4.2 + plist: 3.0.6 + prompts: 2.4.2 + rimraf: 3.0.2 + semver: 7.3.8 + tar: 6.1.13 + tslib: 2.4.1 + xml2js: 0.4.23 + transitivePeerDependencies: + - supports-color + dev: true + + /@capacitor/core@4.7.3: + resolution: {integrity: sha512-IDhJapHqfJNpSlq89M0quOZGb08uOUZhVhyRDdrGUrwa4ttFoWeX/Vi9F+b9bffsDRKkSLF0BhzA9TH7ko5c3A==} + dependencies: + tslib: 2.4.1 + dev: false + + /@capacitor/device@4.1.0(@capacitor/core@4.7.3): + resolution: {integrity: sha512-BlcYb6e6m+vC1SxeyUDIUGfuNXdKEcpFPDCs/kxk2SByFc/BkvXeoy4NjY4qmTderGELofX9bta5Iy9JV7rGUg==} + peerDependencies: + '@capacitor/core': ^4.0.0 + dependencies: + '@capacitor/core': 4.7.3 + dev: false + + /@capacitor/ios@4.7.3(@capacitor/core@4.7.3): + resolution: {integrity: sha512-CXVvEzg9WWyhGdLSZsWfa69RyNlKH03g4OKpWh9OW0A7uL4aYA8Z7m4jE4mCu/2TTWDEgUPp0BrWEDPaj73eow==} + peerDependencies: + '@capacitor/core': ^4.7.0 + dependencies: + '@capacitor/core': 4.7.3 + dev: false + + /@capacitor/preferences@4.0.2(@capacitor/core@4.7.3): + resolution: {integrity: sha512-HgcRkMdVHSIV3TeQLZFmCaCeMWQ25wLyZZ7dA2f8Rw81Q1Nroxsi7HxTEGNqrWKSN9PNKBJD8vChr6eB2GNtZg==} + peerDependencies: + '@capacitor/core': ^4.0.0 + dependencies: + '@capacitor/core': 4.7.3 + dev: false + + /@capacitor/push-notifications@4.1.2(@capacitor/core@4.7.3): + resolution: {integrity: sha512-ok6CGvedwK1azmf8VWhrNlg6jhi4PFz3HoyS0GNE2ew7+JGnxN77sgK5q1TVzdkge+vkqipO6uu5bD1xfj/pWQ==} + peerDependencies: + '@capacitor/core': ^4.0.0 + dependencies: + '@capacitor/core': 4.7.3 + dev: false + + /@capacitor/status-bar@4.1.1(@capacitor/core@4.7.3): + resolution: {integrity: sha512-3wosxMD1XuIFz88+c2GdVEHSJV6u7suOeKQjyWf3zf9eFr622Sg+udZqDbC0dtTWXw97BWyCjv3r1EYJw7XnIA==} + peerDependencies: + '@capacitor/core': ^4.0.0 + dependencies: + '@capacitor/core': 4.7.3 + dev: false + /@colors/colors@1.5.0: resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==} engines: {node: '>=0.1.90'} @@ -1481,6 +1606,106 @@ packages: /@humanwhocodes/object-schema@1.2.1: resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==} + /@ionic/cli-framework-output@2.2.6: + resolution: {integrity: sha512-YLPRwnk5Lw0XQ9pKWG+p2KoR5HjMBigZ6yv+/XtL3TGOnCS1+oAz56ABbAORCjTWhSJQisr8APNFiELAecY6QA==} + engines: {node: '>=16.0.0'} + dependencies: + '@ionic/utils-terminal': 2.3.4 + debug: 4.3.4(supports-color@8.1.1) + tslib: 2.4.1 + transitivePeerDependencies: + - supports-color + dev: true + + /@ionic/utils-array@2.1.6: + resolution: {integrity: sha512-0JZ1Zkp3wURnv8oq6Qt7fMPo5MpjbLoUoa9Bu2Q4PJuSDWM8H8gwF3dQO7VTeUj3/0o1IB1wGkFWZZYgUXZMUg==} + engines: {node: '>=16.0.0'} + dependencies: + debug: 4.3.4(supports-color@8.1.1) + tslib: 2.4.1 + transitivePeerDependencies: + - supports-color + dev: true + + /@ionic/utils-fs@3.1.7: + resolution: {integrity: sha512-2EknRvMVfhnyhL1VhFkSLa5gOcycK91VnjfrTB0kbqkTFCOXyXgVLI5whzq7SLrgD9t1aqos3lMMQyVzaQ5gVA==} + engines: {node: '>=16.0.0'} + dependencies: + '@types/fs-extra': 8.1.2 + debug: 4.3.4(supports-color@8.1.1) + fs-extra: 9.1.0 + tslib: 2.4.1 + transitivePeerDependencies: + - supports-color + dev: true + + /@ionic/utils-object@2.1.6: + resolution: {integrity: sha512-vCl7sl6JjBHFw99CuAqHljYJpcE88YaH2ZW4ELiC/Zwxl5tiwn4kbdP/gxi2OT3MQb1vOtgAmSNRtusvgxI8ww==} + engines: {node: '>=16.0.0'} + dependencies: + debug: 4.3.4(supports-color@8.1.1) + tslib: 2.4.1 + transitivePeerDependencies: + - supports-color + dev: true + + /@ionic/utils-process@2.1.11: + resolution: {integrity: sha512-Uavxn+x8j3rDlZEk1X7YnaN6wCgbCwYQOeIjv/m94i1dzslqWhqIHEqxEyeE8HsT5Negboagg7GtQiABy+BLbA==} + engines: {node: '>=16.0.0'} + dependencies: + '@ionic/utils-object': 2.1.6 + '@ionic/utils-terminal': 2.3.4 + debug: 4.3.4(supports-color@8.1.1) + signal-exit: 3.0.7 + tree-kill: 1.2.2 + tslib: 2.4.1 + transitivePeerDependencies: + - supports-color + dev: true + + /@ionic/utils-stream@3.1.6: + resolution: {integrity: sha512-4+Kitey1lTA1yGtnigeYNhV/0tggI3lWBMjC7tBs1K9GXa/q7q4CtOISppdh8QgtOhrhAXS2Igp8rbko/Cj+lA==} + engines: {node: '>=16.0.0'} + dependencies: + debug: 4.3.4(supports-color@8.1.1) + tslib: 2.4.1 + transitivePeerDependencies: + - supports-color + dev: true + + /@ionic/utils-subprocess@2.1.12: + resolution: {integrity: sha512-N05Y+dIXBHofKWJTheCMzVqmgY9wFmZcRv/LdNnfXaaA/mxLTyGxQYeig8fvQXTtDafb/siZXcrTkmQ+y6n3Yg==} + engines: {node: '>=16.0.0'} + dependencies: + '@ionic/utils-array': 2.1.6 + '@ionic/utils-fs': 3.1.7 + '@ionic/utils-process': 2.1.11 + '@ionic/utils-stream': 3.1.6 + '@ionic/utils-terminal': 2.3.4 + cross-spawn: 7.0.3 + debug: 4.3.4(supports-color@8.1.1) + tslib: 2.4.1 + transitivePeerDependencies: + - supports-color + dev: true + + /@ionic/utils-terminal@2.3.4: + resolution: {integrity: sha512-cEiMFl3jklE0sW60r8JHH3ijFTwh/jkdEKWbylSyExQwZ8pPuwoXz7gpkWoJRLuoRHHSvg+wzNYyPJazIHfoJA==} + engines: {node: '>=16.0.0'} + dependencies: + '@types/slice-ansi': 4.0.0 + debug: 4.3.4(supports-color@8.1.1) + signal-exit: 3.0.7 + slice-ansi: 4.0.0 + string-width: 4.2.3 + strip-ansi: 6.0.1 + tslib: 2.4.1 + untildify: 4.0.0 + wrap-ansi: 7.0.0 + transitivePeerDependencies: + - supports-color + dev: true + /@ioredis/commands@1.2.0: resolution: {integrity: sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==} @@ -2452,6 +2677,12 @@ packages: '@types/node': 18.11.18 dev: false + /@types/fs-extra@8.1.2: + resolution: {integrity: sha512-SvSrYXfWSc7R4eqnOzbQF4TZmfpNSM9FrSWLU3EUnWBuyZqNBOrv1B1JA3byUDPUl9z4Ab3jeZG2eDdySlgNMg==} + dependencies: + '@types/node': 18.11.18 + dev: true + /@types/glob-stream@6.1.1: resolution: {integrity: sha512-AGOUTsTdbPkRS0qDeyeS+6KypmfVpbT5j23SN8UPG63qjKXNKjXn6V9wZUr8Fin0m9l8oGYaPK8b2WUMF8xI1A==} dependencies: @@ -2820,6 +3051,10 @@ packages: resolution: {integrity: sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==} dev: true + /@types/slice-ansi@4.0.0: + resolution: {integrity: sha512-+OpjSaq85gvlZAYINyzKpLeiFkSC4EsC6IIiT6v6TLSU5k5U83fHGj9Lel8oKEXM0HqgrMVCjXPDPVICtxF7EQ==} + dev: true + /@types/speakeasy@2.0.7: resolution: {integrity: sha512-JEcOhN2SQCoX86ZfiZEe8px84sVJtivBXMZfOVyARTYEj0hrwwbj1nF0FwEL3nJSoEV6uTbcdLllMKBgAYHWCQ==} dependencies: @@ -3809,7 +4044,6 @@ packages: /big-integer@1.6.51: resolution: {integrity: sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==} engines: {node: '>=0.6'} - dev: false /big.js@5.2.2: resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==} @@ -3909,6 +4143,13 @@ packages: resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==} dev: false + /bplist-parser@0.3.2: + resolution: {integrity: sha512-apC2+fspHGI3mMKj+dGevkGo/tCqVB8jMb6i+OX+E29p0Iposz07fABkRIfVUPNd5A5VbuOz1bZbnmkKLYF+wQ==} + engines: {node: '>= 5.10.0'} + dependencies: + big-integer: 1.6.51 + dev: true + /brace-expansion@1.1.11: resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==} dependencies: @@ -4409,7 +4650,6 @@ packages: /chownr@2.0.0: resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==} engines: {node: '>=10'} - dev: false /chrome-trace-event@1.0.3: resolution: {integrity: sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==} @@ -5440,6 +5680,11 @@ packages: engines: {node: '>=10'} dev: false + /define-lazy-prop@2.0.0: + resolution: {integrity: sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==} + engines: {node: '>=8'} + dev: true + /define-properties@1.1.4: resolution: {integrity: sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==} engines: {node: '>= 0.4'} @@ -5706,6 +5951,13 @@ packages: resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==} dev: true + /elementtree@0.1.7: + resolution: {integrity: sha512-wkgGT6kugeQk/P6VZ/f4T+4HB41BVgNBq5CDIZVbQ02nvTVqAiVTbskxxu3eA/X96lMlfYOwnLQpN2v5E1zDEg==} + engines: {node: '>= 0.4.0'} + dependencies: + sax: 1.1.4 + dev: true + /emoji-regex@8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} @@ -5766,7 +6018,6 @@ packages: /env-paths@2.2.1: resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==} engines: {node: '>=6'} - dev: false /envinfo@7.8.1: resolution: {integrity: sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==} @@ -6651,7 +6902,6 @@ packages: engines: {node: '>= 8'} dependencies: minipass: 3.3.6 - dev: false /fs-mkdirp-stream@1.0.0: resolution: {integrity: sha512-+vSd9frUnapVC2RZYfL3FCB2p3g4TBhaUmrsWlSudsGdnxIuUvBB2QM1VZeBtc49QFwrp+wQLrDs3+xxDgI5gQ==} @@ -6964,6 +7214,10 @@ packages: slash: 3.0.0 dev: true + /globrex@0.1.2: + resolution: {integrity: sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==} + dev: true + /glogg@1.0.2: resolution: {integrity: sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==} engines: {node: '>= 0.10'} @@ -7549,6 +7803,11 @@ packages: engines: {node: '>=10'} dev: true + /ini@3.0.1: + resolution: {integrity: sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==} + engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} + dev: true + /insert-text-at-cursor@0.3.0: resolution: {integrity: sha512-/nPtyeX9xPUvxZf+r0518B7uqNKlP+LqNJqSiXFEaa2T71rWIwTVXGH7hB9xO/EVdwa5/pWlFCPwShOW81XIxQ==} dev: true @@ -7739,6 +7998,12 @@ packages: kind-of: 6.0.3 dev: true + /is-docker@2.2.1: + resolution: {integrity: sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==} + engines: {node: '>=8'} + hasBin: true + dev: true + /is-electron@2.2.1: resolution: {integrity: sha512-r8EEQQsqT+Gn0aXFx7lTFygYQhILLCB+wn0WCDL5LZRINeLH/Rvw1j2oKodELLXYNImQ3CRlVsY8wW4cGOsyuw==} dev: false @@ -7971,6 +8236,13 @@ packages: engines: {node: '>=0.10.0'} dev: true + /is-wsl@2.2.0: + resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==} + engines: {node: '>=8'} + dependencies: + is-docker: 2.2.1 + dev: true + /isarray@0.0.1: resolution: {integrity: sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==} dev: false @@ -8332,6 +8604,16 @@ packages: engines: {node: '>=0.10.0'} dev: true + /kleur@3.0.3: + resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==} + engines: {node: '>=6'} + dev: true + + /kleur@4.1.5: + resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==} + engines: {node: '>=6'} + dev: true + /koa-body@6.0.1: resolution: {integrity: sha512-M8ZvMD8r+kPHy28aWP9VxL7kY8oPWA+C7ZgCljrCMeaU7uX6wsIQgDHskyrAr9sw+jqnIXyv4Mlxri5R4InIJg==} dependencies: @@ -8868,6 +9150,13 @@ packages: sourcemap-codec: 1.4.8 dev: true + /magic-string@0.30.0: + resolution: {integrity: sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==} + engines: {node: '>=12'} + dependencies: + '@jridgewell/sourcemap-codec': 1.4.14 + dev: true + /mailcheck@1.1.1: resolution: {integrity: sha512-3WjL8+ZDouZwKlyJBMp/4LeziLFXgleOdsYu87piGcMLqhBzCsy2QFdbtAwv757TFC/rtqd738fgJw1tFQCSgA==} dev: false @@ -9121,14 +9410,12 @@ packages: engines: {node: '>=8'} dependencies: yallist: 4.0.0 - dev: false /minipass@4.0.0: resolution: {integrity: sha512-g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw==} engines: {node: '>=8'} dependencies: yallist: 4.0.0 - dev: false /minizlib@1.3.3: resolution: {integrity: sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==} @@ -9143,7 +9430,6 @@ packages: dependencies: minipass: 3.3.6 yallist: 4.0.0 - dev: false /mixin-deep@1.3.2: resolution: {integrity: sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==} @@ -9174,7 +9460,6 @@ packages: resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==} engines: {node: '>=10'} hasBin: true - dev: false /mocha@10.2.0: resolution: {integrity: sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==} @@ -9311,6 +9596,26 @@ packages: resolution: {integrity: sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==} dev: false + /native-run@1.7.2: + resolution: {integrity: sha512-2aahC8iXIO8BcvEukVMrYwL5sXurkuIGyQgfSGBto832W6ejV+cB5Ww+2/CRxmyozhbxARJ2OMpEGPV8sTqsrQ==} + engines: {node: '>=12.13.0'} + hasBin: true + dependencies: + '@ionic/utils-fs': 3.1.7 + '@ionic/utils-terminal': 2.3.4 + bplist-parser: 0.3.2 + debug: 4.3.4(supports-color@8.1.1) + elementtree: 0.1.7 + ini: 3.0.1 + plist: 3.0.6 + split2: 4.1.0 + through2: 4.0.2 + tslib: 2.4.1 + yauzl: 2.10.0 + transitivePeerDependencies: + - supports-color + dev: true + /natural-compare@1.4.0: resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} @@ -9722,6 +10027,11 @@ packages: dependencies: wrappy: 1.0.2 + /onesignal-cordova-plugin@3.3.1: + resolution: {integrity: sha512-MAAZA1QALwHdVIw3ASVTUsna7XEKVZ5y7QEitJ0oFX7246l7nQhZIvyHyG9l7A6CQdcdW48H6nLT6izCNROB4g==} + engines: {'0': {name: cordova-android, version: '>=4.0.0'}, '1': {name: apple-xcode, version: '>=8.0.0'}, '2': {name: apple-ios, version: '>=7.0.0'}, '3': {name: cordova, version: '>=6.4.0'}, '4': {name: cordova-ios, version: '>=4.3.0'}} + dev: false + /onetime@5.1.2: resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==} engines: {node: '>=6'} @@ -9740,6 +10050,15 @@ packages: resolution: {integrity: sha512-Fvw+Jemq5fjjyWz6CpKx6w9s7xxqo3+JCyM0WXWeCSOboZ8ABkyvP8ID4CZuChA/wxSx+XSJmdOm8rGVyJ1hdQ==} dev: false + /open@8.4.2: + resolution: {integrity: sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==} + engines: {node: '>=12'} + dependencies: + define-lazy-prop: 2.0.0 + is-docker: 2.2.1 + is-wsl: 2.2.0 + dev: true + /opencollective-postinstall@2.0.3: resolution: {integrity: sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==} hasBin: true @@ -10163,6 +10482,14 @@ packages: queue-lit: 1.5.0 dev: true + /plist@3.0.6: + resolution: {integrity: sha512-WiIVYyrp8TD4w8yCvyeIr+lkmrGRd5u0VbRnU+tP/aRLxP/YadJUYOMZJ/6hIa3oUyVCsycXvtNRgd5XBJIbiA==} + engines: {node: '>=6'} + dependencies: + base64-js: 1.5.1 + xmlbuilder: 15.1.1 + dev: true + /plugin-error@1.0.1: resolution: {integrity: sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==} engines: {node: '>= 0.10'} @@ -10563,6 +10890,14 @@ packages: dependencies: asap: 2.0.6 + /prompts@2.4.2: + resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==} + engines: {node: '>= 6'} + dependencies: + kleur: 3.0.3 + sisteransi: 1.0.5 + dev: true + /proto-list@1.2.4: resolution: {integrity: sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==} @@ -11338,6 +11673,10 @@ packages: source-map-js: 1.0.2 dev: true + /sax@1.1.4: + resolution: {integrity: sha512-5f3k2PbGGp+YtKJjOItpg3P99IMD84E4HOvcfleTb5joCHNXYLsR9yWFPOYGgaeMPDubQILTCMdsFb2OMeOjtg==} + dev: true + /sax@1.2.1: resolution: {integrity: sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA==} dev: false @@ -11532,6 +11871,10 @@ packages: is-arrayish: 0.3.2 dev: false + /sisteransi@1.0.5: + resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==} + dev: true + /slash@3.0.0: resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==} engines: {node: '>=8'} @@ -11731,7 +12074,6 @@ packages: /split2@4.1.0: resolution: {integrity: sha512-VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ==} engines: {node: '>= 10.x'} - dev: false /split@0.3.3: resolution: {integrity: sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA==} @@ -12137,7 +12479,6 @@ packages: minizlib: 2.1.2 mkdirp: 1.0.4 yallist: 4.0.0 - dev: false /terser-webpack-plugin@5.3.6(@swc/core@1.3.26)(webpack@5.75.0): resolution: {integrity: sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==} @@ -12389,6 +12730,11 @@ packages: resolution: {integrity: sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ==} dev: false + /tree-kill@1.2.2: + resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==} + hasBin: true + dev: true + /trim-repeated@1.0.0: resolution: {integrity: sha512-pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg==} engines: {node: '>=0.10.0'} @@ -12454,6 +12800,19 @@ packages: plimit-lit: 1.5.0 dev: true + /tsconfck@2.1.1(typescript@4.9.4): + resolution: {integrity: sha512-ZPCkJBKASZBmBUNqGHmRhdhM8pJYDdOXp4nRgj/O0JwUwsMq50lCDRQP/M5GBNAA0elPrq4gAeu4dkaVCuKWww==} + engines: {node: ^14.13.1 || ^16 || >=18} + hasBin: true + peerDependencies: + typescript: ^4.3.5 || ^5.0.0 + peerDependenciesMeta: + typescript: + optional: true + dependencies: + typescript: 4.9.4 + dev: true + /tsconfig-paths@4.1.2: resolution: {integrity: sha512-uhxiMgnXQp1IR622dUXI+9Ehnws7i/y6xvpZB9IbUVOPy0muvdvgXeZOn88UcGPiT98Vp3rJPTa8bFoalZ3Qhw==} engines: {node: '>=6'} @@ -12967,6 +13326,29 @@ packages: - supports-color dev: true + /vite-plugin-conditional-compiler@0.1.1: + resolution: {integrity: sha512-1QKTJ9/kWuqwWxtIEhtxENUQlfRfgjDyeAtic91ArQFjzI71necB7Sp9F5IGR/L1zIQXkkXBvidLLJkTJcp/OQ==} + dependencies: + magic-string: 0.30.0 + dev: true + + /vite-tsconfig-paths@4.0.7(typescript@4.9.4)(vite@4.1.1): + resolution: {integrity: sha512-MwIYaby6kcbQGZqMH+gAK6h0UYQGOkjsuAgw4q6bP/5vWkn8VKvnmLuCQHA2+IzHAJHnE8OFTO4lnJLFMf9+7Q==} + peerDependencies: + vite: '*' + peerDependenciesMeta: + vite: + optional: true + dependencies: + debug: 4.3.4(supports-color@8.1.1) + globrex: 0.1.2 + tsconfck: 2.1.1(typescript@4.9.4) + vite: 4.1.1(sass@1.57.1) + transitivePeerDependencies: + - supports-color + - typescript + dev: true + /vite@4.1.1(sass@1.57.1): resolution: {integrity: sha512-LM9WWea8vsxhr782r9ntg+bhSFS06FJgCvvB0+8hf8UWtvaiDagKYWXndjfX6kGl74keHJUcpzrQliDXZlF5yg==} engines: {node: ^14.18.0 || >=16.0.0} @@ -13388,12 +13770,15 @@ packages: dependencies: sax: 1.2.4 xmlbuilder: 11.0.1 - dev: false /xmlbuilder@11.0.1: resolution: {integrity: sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==} engines: {node: '>=4.0'} - dev: false + + /xmlbuilder@15.1.1: + resolution: {integrity: sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==} + engines: {node: '>=8.0'} + dev: true /xmlbuilder@9.0.7: resolution: {integrity: sha512-7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ==} diff --git a/scripts/clean-all.js b/scripts/clean-all.js index e347ee6a9f..480d0e8f5a 100644 --- a/scripts/clean-all.js +++ b/scripts/clean-all.js @@ -2,20 +2,20 @@ const fs = require('fs'); const execa = require('execa'); (async () => { - fs.rmSync(__dirname + '/../packages/backend/built', { recursive: true, force: true }); - fs.rmSync(__dirname + '/../packages/backend/node_modules', { recursive: true, force: true }); + fs.rmSync(`${__dirname}/../packages/backend/built`, { recursive: true, force: true }); + fs.rmSync(`${__dirname}/../packages/backend/node_modules`, { recursive: true, force: true }); - fs.rmSync(__dirname + '/../packages/client/built', { recursive: true, force: true }); - fs.rmSync(__dirname + '/../packages/client/node_modules', { recursive: true, force: true }); + fs.rmSync(`${__dirname}/../packages/client/built`, { recursive: true, force: true }); + fs.rmSync(`${__dirname}/../packages/client/node_modules`, { recursive: true, force: true }); - fs.rmSync(__dirname + '/../packages/sw/built', { recursive: true, force: true }); - fs.rmSync(__dirname + '/../packages/sw/node_modules', { recursive: true, force: true }); + fs.rmSync(`${__dirname}/../packages/sw/built`, { recursive: true, force: true }); + fs.rmSync(`${__dirname}/../packages/sw/node_modules`, { recursive: true, force: true }); - fs.rmSync(__dirname + '/../built', { recursive: true, force: true }); - fs.rmSync(__dirname + '/../node_modules', { recursive: true, force: true }); + fs.rmSync(`${__dirname}/../built`, { recursive: true, force: true }); + fs.rmSync(`${__dirname}/../node_modules`, { recursive: true, force: true }); execa('pnpm', ['store', 'prune'], { - cwd: __dirname + '/../', + cwd: `${__dirname}/../`, stdio: 'inherit' }); })(); diff --git a/scripts/clean.js b/scripts/clean.js index 70b9d882b5..047de5ae81 100644 --- a/scripts/clean.js +++ b/scripts/clean.js @@ -1,8 +1,8 @@ const fs = require('fs'); (async () => { - fs.rmSync(__dirname + '/../packages/backend/built', { recursive: true, force: true }); - fs.rmSync(__dirname + '/../packages/client/built', { recursive: true, force: true }); - fs.rmSync(__dirname + '/../packages/sw/built', { recursive: true, force: true }); - fs.rmSync(__dirname + '/../built', { recursive: true, force: true }); + fs.rmSync(`${__dirname}/../packages/backend/built`, { recursive: true, force: true }); + fs.rmSync(`${__dirname}/../packages/client/built`, { recursive: true, force: true }); + fs.rmSync(`${__dirname}/../packages/sw/built`, { recursive: true, force: true }); + fs.rmSync(`${__dirname}/../built`, { recursive: true, force: true }); })(); diff --git a/scripts/dev.js b/scripts/dev.js index 7a61070f5c..f472043dea 100644 --- a/scripts/dev.js +++ b/scripts/dev.js @@ -2,31 +2,31 @@ const execa = require('execa'); (async () => { await execa('pnpm', ['clean'], { - cwd: __dirname + '/../', + cwd: `${__dirname}/../`, stdout: process.stdout, stderr: process.stderr, }); execa('pnpm', ['dlx', 'gulp', 'watch'], { - cwd: __dirname + '/../', + cwd: `${__dirname}/../`, stdout: process.stdout, stderr: process.stderr, }); execa('pnpm', ['--filter', 'backend', 'watch'], { - cwd: __dirname + '/../', + cwd: `${__dirname}/../`, stdout: process.stdout, stderr: process.stderr, }); execa('pnpm', ['--filter', 'client', 'watch'], { - cwd: __dirname + '/../', + cwd: `${__dirname}/../`, stdout: process.stdout, stderr: process.stderr, }); execa('pnpm', ['--filter', 'sw', 'watch'], { - cwd: __dirname + '/../', + cwd: `${__dirname}/../`, stdout: process.stdout, stderr: process.stderr, }); @@ -34,7 +34,7 @@ const execa = require('execa'); const start = async () => { try { await execa('pnpm', ['start'], { - cwd: __dirname + '/../', + cwd: `${__dirname}/../`, stdout: process.stdout, stderr: process.stderr, }); diff --git a/scripts/mobilebuild.js b/scripts/mobilebuild.js new file mode 100644 index 0000000000..ac6076d0c7 --- /dev/null +++ b/scripts/mobilebuild.js @@ -0,0 +1,24 @@ +const fs = require('fs'); +const path = require("path") + +async function copyDir(source, destination) { + fs.mkdirSync(destination, { recursive: true }); + + fs.readdirSync(source, { withFileTypes: true }).forEach((entry) => { + const sourcePath = path.join(source, entry.name); + const destinationPath = path.join(destination, entry.name); + + if (sourcePath.endsWith('assets')) return; + + entry.isDirectory() + ? copyDir(sourcePath, destinationPath) + : fs.copyFileSync(sourcePath, destinationPath); + }); +} + +(async () => { + + fs.mkdirSync(`${__dirname}/../built/_client_dist_/assets`, { recursive: true }); + copyDir(`${__dirname}/../built/_client_dist_`, `${__dirname}/../built/_client_dist_/assets`) + +})();