diff --git a/.dprint.json b/.dprint.json index 4b5ffa433..9ce4cfd2b 100644 --- a/.dprint.json +++ b/.dprint.json @@ -16,7 +16,8 @@ "**/*-lock.json", "translations/*.json", "dist", - "mockServiceWorker.js" + "mockServiceWorker.js", + "src-tauri" ], "plugins": [ "https://plugins.dprint.dev/typescript-0.88.7.wasm" diff --git a/.github/workflows/electron-build.yml b/.github/workflows/electron-build.yml new file mode 100644 index 000000000..23a034cba --- /dev/null +++ b/.github/workflows/electron-build.yml @@ -0,0 +1,69 @@ +name: Electron Build + +on: + push: + paths-ignore: + - '*.md' + workflow_dispatch: + +jobs: + build: + runs-on: ${{ matrix.os }} + + strategy: + fail-fast: false + matrix: + include: + - os: windows-latest + platform: win + - os: macos-latest + platform: mac + - os: ubuntu-latest + platform: linux + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: 22 + + - name: Install dependencies + run: npm i + + - name: Build Electron app + run: npm run electron:build:${{ matrix.platform }} + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Upload Windows artifacts + if: matrix.platform == 'win' + uses: actions/upload-artifact@v4 + with: + name: synergism-windows + path: | + release/*.exe + if-no-files-found: error + + - name: Upload macOS artifacts + if: matrix.platform == 'mac' + uses: actions/upload-artifact@v4 + with: + name: synergism-macos + path: | + release/*.dmg + release/*.zip + if-no-files-found: error + + - name: Upload Linux artifacts + if: matrix.platform == 'linux' + uses: actions/upload-artifact@v4 + with: + name: synergism-linux + path: | + release/*.AppImage + release/*.deb + release/*.tar.gz + if-no-files-found: error diff --git a/.gitignore b/.gitignore index 3c9056d15..f9bf4003b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ node_modules/ *.js !scripts/*.js dist +dist-cap !.eslintrc.js .idea package-lock.json @@ -13,3 +14,5 @@ Pictures/Splash/Thumbs.db Pictures/TransparentPics/Thumbs.db **/.DS_Store +release +!electron/**/*.js diff --git a/.vscode/settings.json b/.vscode/settings.json index 00ad71fba..44aeb4060 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,3 @@ { - "typescript.tsdk": "node_modules\\typescript\\lib" -} \ No newline at end of file + "typescript.tsdk": "node_modules\\typescript\\lib" +} diff --git a/Pictures/electron-logo.ico b/Pictures/electron-logo.ico new file mode 100644 index 000000000..19f68625a Binary files /dev/null and b/Pictures/electron-logo.ico differ diff --git a/android/.gitignore b/android/.gitignore new file mode 100644 index 000000000..48354a3df --- /dev/null +++ b/android/.gitignore @@ -0,0 +1,101 @@ +# 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 diff --git a/android/app/.gitignore b/android/app/.gitignore new file mode 100644 index 000000000..043df802a --- /dev/null +++ b/android/app/.gitignore @@ -0,0 +1,2 @@ +/build/* +!/build/.npmkeep diff --git a/android/app/build.gradle b/android/app/build.gradle new file mode 100644 index 000000000..b25695c52 --- /dev/null +++ b/android/app/build.gradle @@ -0,0 +1,54 @@ +apply plugin: 'com.android.application' + +android { + namespace "com.pseudocorp.synergism" + compileSdk rootProject.ext.compileSdkVersion + defaultConfig { + applicationId "com.pseudocorp.synergism" + 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/android/app/capacitor.build.gradle b/android/app/capacitor.build.gradle new file mode 100644 index 000000000..dd6cd293f --- /dev/null +++ b/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_21 + targetCompatibility JavaVersion.VERSION_21 + } +} + +apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle" +dependencies { + implementation project(':capacitor-community-apple-sign-in') + +} + + +if (hasProperty('postBuildExtras')) { + postBuildExtras() +} diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro new file mode 100644 index 000000000..f1b424510 --- /dev/null +++ b/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/android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java b/android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java new file mode 100644 index 000000000..f2c2217ef --- /dev/null +++ b/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/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml new file mode 100644 index 000000000..d4e806049 --- /dev/null +++ b/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + diff --git a/android/app/src/main/java/com/pseudocorp/synergism/MainActivity.java b/android/app/src/main/java/com/pseudocorp/synergism/MainActivity.java new file mode 100644 index 000000000..0f68c1bd6 --- /dev/null +++ b/android/app/src/main/java/com/pseudocorp/synergism/MainActivity.java @@ -0,0 +1,5 @@ +package com.pseudocorp.synergism; + +import com.getcapacitor.BridgeActivity; + +public class MainActivity extends BridgeActivity {} diff --git a/android/app/src/main/res/drawable-land-hdpi/splash.png b/android/app/src/main/res/drawable-land-hdpi/splash.png new file mode 100644 index 000000000..2ffee72a2 Binary files /dev/null and b/android/app/src/main/res/drawable-land-hdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-land-ldpi/splash.png b/android/app/src/main/res/drawable-land-ldpi/splash.png new file mode 100644 index 000000000..cad9056af Binary files /dev/null and b/android/app/src/main/res/drawable-land-ldpi/splash.png differ diff --git a/android/app/src/main/res/drawable-land-mdpi/splash.png b/android/app/src/main/res/drawable-land-mdpi/splash.png new file mode 100644 index 000000000..2c610a635 Binary files /dev/null and b/android/app/src/main/res/drawable-land-mdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-land-night-hdpi/splash.png b/android/app/src/main/res/drawable-land-night-hdpi/splash.png new file mode 100644 index 000000000..da6feab54 Binary files /dev/null and b/android/app/src/main/res/drawable-land-night-hdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-land-night-ldpi/splash.png b/android/app/src/main/res/drawable-land-night-ldpi/splash.png new file mode 100644 index 000000000..b22138f96 Binary files /dev/null and b/android/app/src/main/res/drawable-land-night-ldpi/splash.png differ diff --git a/android/app/src/main/res/drawable-land-night-mdpi/splash.png b/android/app/src/main/res/drawable-land-night-mdpi/splash.png new file mode 100644 index 000000000..7e4f0aec2 Binary files /dev/null and b/android/app/src/main/res/drawable-land-night-mdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-land-night-xhdpi/splash.png b/android/app/src/main/res/drawable-land-night-xhdpi/splash.png new file mode 100644 index 000000000..682b3bf8b Binary files /dev/null and b/android/app/src/main/res/drawable-land-night-xhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-land-night-xxhdpi/splash.png b/android/app/src/main/res/drawable-land-night-xxhdpi/splash.png new file mode 100644 index 000000000..6233d3935 Binary files /dev/null and b/android/app/src/main/res/drawable-land-night-xxhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-land-night-xxxhdpi/splash.png b/android/app/src/main/res/drawable-land-night-xxxhdpi/splash.png new file mode 100644 index 000000000..a1dba3ef7 Binary files /dev/null and b/android/app/src/main/res/drawable-land-night-xxxhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-land-xhdpi/splash.png b/android/app/src/main/res/drawable-land-xhdpi/splash.png new file mode 100644 index 000000000..5f6f7f754 Binary files /dev/null and b/android/app/src/main/res/drawable-land-xhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-land-xxhdpi/splash.png b/android/app/src/main/res/drawable-land-xxhdpi/splash.png new file mode 100644 index 000000000..a10cae450 Binary files /dev/null and b/android/app/src/main/res/drawable-land-xxhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-land-xxxhdpi/splash.png b/android/app/src/main/res/drawable-land-xxxhdpi/splash.png new file mode 100644 index 000000000..6a619094a Binary files /dev/null and b/android/app/src/main/res/drawable-land-xxxhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-night/splash.png b/android/app/src/main/res/drawable-night/splash.png new file mode 100644 index 000000000..b22138f96 Binary files /dev/null and b/android/app/src/main/res/drawable-night/splash.png differ diff --git a/android/app/src/main/res/drawable-port-hdpi/splash.png b/android/app/src/main/res/drawable-port-hdpi/splash.png new file mode 100644 index 000000000..b5f92e1e6 Binary files /dev/null and b/android/app/src/main/res/drawable-port-hdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-port-ldpi/splash.png b/android/app/src/main/res/drawable-port-ldpi/splash.png new file mode 100644 index 000000000..8cb38e6cf Binary files /dev/null and b/android/app/src/main/res/drawable-port-ldpi/splash.png differ diff --git a/android/app/src/main/res/drawable-port-mdpi/splash.png b/android/app/src/main/res/drawable-port-mdpi/splash.png new file mode 100644 index 000000000..6b697e14f Binary files /dev/null and b/android/app/src/main/res/drawable-port-mdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-port-night-hdpi/splash.png b/android/app/src/main/res/drawable-port-night-hdpi/splash.png new file mode 100644 index 000000000..e01e0af3e Binary files /dev/null and b/android/app/src/main/res/drawable-port-night-hdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-port-night-ldpi/splash.png b/android/app/src/main/res/drawable-port-night-ldpi/splash.png new file mode 100644 index 000000000..a39dede44 Binary files /dev/null and b/android/app/src/main/res/drawable-port-night-ldpi/splash.png differ diff --git a/android/app/src/main/res/drawable-port-night-mdpi/splash.png b/android/app/src/main/res/drawable-port-night-mdpi/splash.png new file mode 100644 index 000000000..5165daeca Binary files /dev/null and b/android/app/src/main/res/drawable-port-night-mdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-port-night-xhdpi/splash.png b/android/app/src/main/res/drawable-port-night-xhdpi/splash.png new file mode 100644 index 000000000..3b609b9c4 Binary files /dev/null and b/android/app/src/main/res/drawable-port-night-xhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-port-night-xxhdpi/splash.png b/android/app/src/main/res/drawable-port-night-xxhdpi/splash.png new file mode 100644 index 000000000..008406481 Binary files /dev/null and b/android/app/src/main/res/drawable-port-night-xxhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-port-night-xxxhdpi/splash.png b/android/app/src/main/res/drawable-port-night-xxxhdpi/splash.png new file mode 100644 index 000000000..d5f470a98 Binary files /dev/null and b/android/app/src/main/res/drawable-port-night-xxxhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-port-xhdpi/splash.png b/android/app/src/main/res/drawable-port-xhdpi/splash.png new file mode 100644 index 000000000..7f31ed9dc Binary files /dev/null and b/android/app/src/main/res/drawable-port-xhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-port-xxhdpi/splash.png b/android/app/src/main/res/drawable-port-xxhdpi/splash.png new file mode 100644 index 000000000..0aa462d47 Binary files /dev/null and b/android/app/src/main/res/drawable-port-xxhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-port-xxxhdpi/splash.png b/android/app/src/main/res/drawable-port-xxxhdpi/splash.png new file mode 100644 index 000000000..82e55422e Binary files /dev/null and b/android/app/src/main/res/drawable-port-xxxhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 000000000..c7bd21dbd --- /dev/null +++ b/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/android/app/src/main/res/drawable/ic_launcher_background.xml b/android/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 000000000..d5fccc538 --- /dev/null +++ b/android/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/app/src/main/res/drawable/splash.png b/android/app/src/main/res/drawable/splash.png new file mode 100644 index 000000000..6b697e14f Binary files /dev/null and b/android/app/src/main/res/drawable/splash.png differ diff --git a/android/app/src/main/res/layout/activity_main.xml b/android/app/src/main/res/layout/activity_main.xml new file mode 100644 index 000000000..b5ad13870 --- /dev/null +++ b/android/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 000000000..0aa82aa1b --- /dev/null +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 000000000..0aa82aa1b --- /dev/null +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..f670a9387 Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png new file mode 100644 index 000000000..0feb4c7dd Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..b3aef4962 Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 000000000..e9bffca91 Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-ldpi/ic_launcher.png b/android/app/src/main/res/mipmap-ldpi/ic_launcher.png new file mode 100644 index 000000000..2c58bae35 Binary files /dev/null and b/android/app/src/main/res/mipmap-ldpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-ldpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-ldpi/ic_launcher_background.png new file mode 100644 index 000000000..b999324d4 Binary files /dev/null and b/android/app/src/main/res/mipmap-ldpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/mipmap-ldpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-ldpi/ic_launcher_foreground.png new file mode 100644 index 000000000..5edf5d1e5 Binary files /dev/null and b/android/app/src/main/res/mipmap-ldpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-ldpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-ldpi/ic_launcher_round.png new file mode 100644 index 000000000..49456fa5b Binary files /dev/null and b/android/app/src/main/res/mipmap-ldpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..b4982bb4e Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png new file mode 100644 index 000000000..5b990d7b5 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..316285583 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 000000000..217711d81 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..4a5179e0b Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png new file mode 100644 index 000000000..adf064785 Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..63c5c5362 Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 000000000..bd6711925 Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..56c5186a2 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png new file mode 100644 index 000000000..5da73954f Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..153ffa07e Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..5f2babe3f Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..80d3a9822 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png new file mode 100644 index 000000000..62d0494ea Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..0de876996 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..ae85ef0ef Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/values/ic_launcher_background.xml b/android/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 000000000..c5d5899fd --- /dev/null +++ b/android/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml new file mode 100644 index 000000000..1d9f92eee --- /dev/null +++ b/android/app/src/main/res/values/strings.xml @@ -0,0 +1,7 @@ + + + Synergism + Synergism + com.pseudocorp.synergism + com.pseudocorp.synergism + diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml new file mode 100644 index 000000000..be874e54a --- /dev/null +++ b/android/app/src/main/res/values/styles.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/xml/file_paths.xml b/android/app/src/main/res/xml/file_paths.xml new file mode 100644 index 000000000..bd0c4d80d --- /dev/null +++ b/android/app/src/main/res/xml/file_paths.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/android/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java b/android/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java new file mode 100644 index 000000000..029732784 --- /dev/null +++ b/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/android/build.gradle b/android/build.gradle new file mode 100644 index 000000000..f1b3b0e51 --- /dev/null +++ b/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:8.7.2' + classpath 'com.google.gms:google-services:4.4.2' + + // 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/android/capacitor.settings.gradle b/android/capacitor.settings.gradle new file mode 100644 index 000000000..b276a14dc --- /dev/null +++ b/android/capacitor.settings.gradle @@ -0,0 +1,6 @@ +// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN +include ':capacitor-android' +project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor') + +include ':capacitor-community-apple-sign-in' +project(':capacitor-community-apple-sign-in').projectDir = new File('../node_modules/@capacitor-community/apple-sign-in/android') diff --git a/android/gradle.properties b/android/gradle.properties new file mode 100644 index 000000000..2e87c52f8 --- /dev/null +++ b/android/gradle.properties @@ -0,0 +1,22 @@ +# 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 diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..a4b76b953 Binary files /dev/null and b/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..c1d5e0185 --- /dev/null +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/android/gradlew b/android/gradlew new file mode 100755 index 000000000..f5feea6d6 --- /dev/null +++ b/android/gradlew @@ -0,0 +1,252 @@ +#!/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. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# 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/HEAD/platforms/jvm/plugins-application/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 + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# 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 + if ! command -v java >/dev/null 2>&1 + then + 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 +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + 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 + + +# 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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# 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/android/gradlew.bat b/android/gradlew.bat new file mode 100644 index 000000000..9b42019c7 --- /dev/null +++ b/android/gradlew.bat @@ -0,0 +1,94 @@ +@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 +@rem SPDX-License-Identifier: Apache-2.0 +@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=. +@rem This is normally unused +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% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +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% equ 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! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/android/settings.gradle b/android/settings.gradle new file mode 100644 index 000000000..3b4431d77 --- /dev/null +++ b/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/android/variables.gradle b/android/variables.gradle new file mode 100644 index 000000000..2c8e4083f --- /dev/null +++ b/android/variables.gradle @@ -0,0 +1,16 @@ +ext { + minSdkVersion = 23 + compileSdkVersion = 35 + targetSdkVersion = 35 + androidxActivityVersion = '1.9.2' + androidxAppCompatVersion = '1.7.0' + androidxCoordinatorLayoutVersion = '1.2.0' + androidxCoreVersion = '1.15.0' + androidxFragmentVersion = '1.8.4' + coreSplashScreenVersion = '1.0.1' + androidxWebkitVersion = '1.12.1' + junitVersion = '4.13.2' + androidxJunitVersion = '1.2.1' + androidxEspressoCoreVersion = '3.6.1' + cordovaAndroidVersion = '10.1.1' +} \ No newline at end of file diff --git a/assets/logo-dark.png b/assets/logo-dark.png new file mode 100644 index 000000000..9578ea0c1 Binary files /dev/null and b/assets/logo-dark.png differ diff --git a/assets/logo.png b/assets/logo.png new file mode 100644 index 000000000..0833de9b4 Binary files /dev/null and b/assets/logo.png differ diff --git a/biome.json b/biome.json index aa75c358b..b216fe491 100644 --- a/biome.json +++ b/biome.json @@ -26,8 +26,7 @@ "correctness": { "noUndeclaredVariables": "error" } - }, - "ignore": ["./dist/*", "**/node_modules/*", "mockServiceWorker.js"] + } }, "formatter": { "enabled": false @@ -39,5 +38,8 @@ "parser": { "allowComments": true } + }, + "files": { + "ignore": ["./dist/*", "**/node_modules/*", "mockServiceWorker.js", "./src-tauri/*"] } } diff --git a/capacitor.config.ts b/capacitor.config.ts new file mode 100644 index 000000000..0cb13bc45 --- /dev/null +++ b/capacitor.config.ts @@ -0,0 +1,9 @@ +import type { CapacitorConfig } from '@capacitor/cli'; + +const config: CapacitorConfig = { + appId: 'com.pseudocorp.synergism', + appName: 'Synergism', + webDir: 'dist-cap' +}; + +export default config; diff --git a/claude.md b/claude.md index 19b05877d..20060dc54 100644 --- a/claude.md +++ b/claude.md @@ -18,17 +18,11 @@ 2. **Check back with user** after writing significant code 3. **Ask questions** when task requirements are unclear -### Quality Assurance Commands -Run these after making changes: -```bash -node --run format # Format code -npx -p typescript tsc # TypeScript check -``` - ## File Structure Rules ``` src/ # Core game logic ├── mock/ # Mock API responses +├── steam/ # Steam (Electron) features ├── Purchases/ # Purchase-related logic ├── saves/ # Save system logic ├── types/ # TypeScript definitions @@ -57,7 +51,7 @@ translations/en.json # Required for all new text strings ### Save System Variables **CRITICAL**: Before adding to `player` object: 1. Get explicit permission from user -2. Add to `src/types/Synergism.d.ts` +2. Add to `src/types/Synergism.ts` 3. Add to `src/saves/PlayerSchema.ts` 4. Variable location: `player` in `src/Synergism.ts` @@ -67,9 +61,6 @@ translations/en.json # Required for all new text strings - **DOM Access**: ALWAYS use `DOMCacheGetOrSet('elementId')` instead of `document.getElementById` - Import: `import { DOMCacheGetOrSet } from './Cache/DOM'` - Reason: Performance optimization through caching -- **Import Style**: Top-level imports ONLY - never use dynamic imports like `import().then()` - - Correct: `import { functionName } from './ModuleName'` at top of file - - Wrong: `import('./Module').then(({ functionName }) => ...)` - **Import Organization**: Alphabetical ordering within import groups - **Destructured Imports**: Use for specific functions/variables from modules @@ -79,9 +70,26 @@ translations/en.json # Required for all new text strings - Match existing naming conventions - Maintain consistency with current architecture +### Steam +- There is a Steam version of the app that uses Electron. +- Steam features MUST be gated by checking the `platform` variable from Config.ts +- When using a feature only available to the Electron app, you MUST use dynamic imports. Example: +```ts +import { platform } from './Config' +async function myFunction () { + if (platform === 'steam') { + const { steamOnlyFeature } = await import('./steam/steam') + await steamOnlyFeature() + } else { + // browser version + browserOnlyFeature() + } +} +``` - - +- The platform variable comes from esbuild define hooks. These act as macros essentially, which removes the + `else` block on Steam and vice-versa on browser builds. +- **Wrong**: `import { steamOnlyFeature } from './steam/steam'` diff --git a/electron-builder.json b/electron-builder.json new file mode 100644 index 000000000..c7109ae24 --- /dev/null +++ b/electron-builder.json @@ -0,0 +1,85 @@ +{ + "$schema": "https://raw.githubusercontent.com/electron-userland/electron-builder/master/packages/app-builder-lib/scheme.json", + "appId": "cc.synergism.app", + "productName": "Synergism", + "directories": { + "output": "release", + "buildResources": "build" + }, + "files": [ + "dist/**/*", + "electron/**/*" + ], + "extraMetadata": { + "main": "electron/main.ts" + }, + "win": { + "target": [ + { + "target": "nsis", + "arch": ["x64"] + }, + { + "target": "portable", + "arch": ["x64"] + } + ], + "icon": "dist/Pictures/electron-logo.ico", + "artifactName": "${productName}-${os}-${arch}.${ext}", + "extraFiles": [ + { "from": "node_modules/steamworks.js/dist/win64/steam_api64.dll", "to": "." } + ] + }, + "nsis": { + "oneClick": false, + "allowToChangeInstallationDirectory": true, + "installerIcon": "dist/Pictures/electron-logo.ico", + "uninstallerIcon": "dist/Pictures/electron-logo.ico", + "installerHeaderIcon": "dist/Pictures/electron-logo.ico", + "createDesktopShortcut": true, + "createStartMenuShortcut": true, + "shortcutName": "Synergism" + }, + "mac": { + "target": [ + { + "target": "dmg", + "arch": ["universal"] + }, + { + "target": "zip", + "arch": ["universal"] + } + ], + "icon": "build/icon.icns", + "category": "public.app-category.games", + "artifactName": "${productName}-${os}-${arch}.${ext}", + "extraFiles": [ + { "from": "node_modules/steamworks.js/dist/osx/libsteam_api.dylib", "to": "." } + ], + "x64ArchFiles": "**/steamworksjs.darwin-*.node" + }, + "linux": { + "maintainer": "Khafra ", + "target": [ + { + "target": "AppImage", + "arch": ["x64"] + }, + { + "target": "deb", + "arch": ["x64"] + }, + { + "target": "tar.gz", + "arch": ["x64"] + } + ], + "icon": "build/icons", + "category": "Game", + "artifactName": "${productName}-${os}-${arch}.${ext}", + "extraFiles": [ + { "from": "node_modules/steamworks.js/dist/linux64/libsteam_api.so", "to": "." } + ] + } +} diff --git a/electron/lib/discord.ts b/electron/lib/discord.ts new file mode 100644 index 000000000..5a7f7889b --- /dev/null +++ b/electron/lib/discord.ts @@ -0,0 +1,51 @@ +import { Client, type Presence } from 'discord-rpc' +import { ipcMain } from 'electron' + +export type PresenceOptions = Omit + +const clientId = '1289263890445631581' + +const rpc = new Client({ transport: 'ipc' }) +const startTimestamp = new Date() + +let options: PresenceOptions | undefined + +// biome-ignore lint/complexity/noUselessLoneBlockStatements: organization +{ + ipcMain.handle('discord:setRichPresence', (_, presence: PresenceOptions) => { + options = presence + }) +} + +async function setActivity () { + if (!options) return + + await rpc.setActivity({ + startTimestamp, + ...options, + // largeImageKey: 'snek_large', + // largeImageText: 'This is large image text', + // smallImageKey: 'snek_small', + // smallImageText: 'This is small image text', + instance: false, + buttons: [ + { + label: 'Play Synergism!', + url: 'https://synergism.cc' + } + ] + }) + + options = undefined +} + +rpc.once('ready', () => { + setActivity() + + // activity can only be set every 15 seconds + setInterval(() => { + setActivity() + }, 15e3) +}) + +rpc.login({ clientId }) diff --git a/electron/lib/steam-ipc.ts b/electron/lib/steam-ipc.ts new file mode 100644 index 000000000..9da7b1bf6 --- /dev/null +++ b/electron/lib/steam-ipc.ts @@ -0,0 +1,99 @@ +import { BrowserWindow, ipcMain } from 'electron' +import log from 'electron-log/main.js' +import steamworks from 'steamworks.js' + +log.initialize() + +const STEAM_APP_ID = 3552310 + +let steamClient: ReturnType | null = null + +export function initializeSteam (): boolean { + try { + steamClient = steamworks.init(STEAM_APP_ID) + + // Register callback for MicroTxnAuthorizationResponse_t + // https://partner.steamgames.com/doc/features/microtransactions/implementation#5 + steamClient.callback.register( + steamworks.SteamCallback.MicroTxnAuthorizationResponse, + (response) => { + log.info('MicroTxnAuthorizationResponse received:', response) + BrowserWindow.getAllWindows()[0]?.webContents.send('steam:microTxnAuthorizationResponse', response) + } + ) + + return true + } catch (error) { + log.error('Failed to initialize Steam:', error) + return false + } +} + +{ + ipcMain.handle('steam:getSteamId', () => { + if (!steamClient) return null + return steamClient.localplayer.getSteamId().steamId64.toString() + }) + + ipcMain.handle('steam:getUsername', () => { + if (!steamClient) return null + return steamClient.localplayer.getName() + }) + + ipcMain.handle('steam:getCurrentGameLanguage', () => { + return steamClient?.apps.currentGameLanguage() ?? null + }) + + ipcMain.handle('steam:setRichPresence', (_, key: string, value?: string) => { + steamClient?.localplayer.setRichPresence(key, value) + }) + + ipcMain.handle('steam:getSessionTicket', async () => { + if (!steamClient) return null + + const ticket = await steamClient.auth.getAuthTicketForWebApi('synergism-backend', 60 * 3) + return ticket.getBytes().toString('hex') + }) + + // Steam Cloud Storage + const isCloudEnabled = () => steamClient?.cloud.isEnabledForAccount() && steamClient?.cloud.isEnabledForApp() + + ipcMain.handle('steam:cloudFileExists', (_, name: string) => { + if (!steamClient || !isCloudEnabled()) return false + return steamClient.cloud.fileExists(name) + }) + + ipcMain.handle('steam:cloudReadFile', (_, name: string) => { + if (!steamClient || !isCloudEnabled()) return null + try { + return steamClient.cloud.readFile(name) + } catch (error) { + log.error('Failed to read Steam Cloud file:', error) + return null + } + }) + + ipcMain.handle('steam:cloudWriteFile', (_, name: string, content: string) => { + if (!steamClient || !isCloudEnabled()) return false + try { + return steamClient.cloud.writeFile(name, content) + } catch (error) { + log.error('Failed to write Steam Cloud file:', error) + return false + } + }) + + ipcMain.handle('steam:cloudDeleteFile', (_, name: string) => { + if (!steamClient || !isCloudEnabled()) return false + try { + return steamClient.cloud.deleteFile(name) + } catch (error) { + log.error('Failed to delete Steam Cloud file:', error) + return false + } + }) +} + +export function enableSteamOverlay () { + steamworks.electronEnableSteamOverlay() +} diff --git a/electron/main.ts b/electron/main.ts new file mode 100644 index 000000000..2c89cd4e6 --- /dev/null +++ b/electron/main.ts @@ -0,0 +1,130 @@ +import cookie from 'cookie' +import { app, BrowserWindow, session } from 'electron' +import mimeTypes from 'mime-types' +import fs from 'node:fs' +import path from 'node:path' +import { enableSteamOverlay, initializeSteam } from './lib/steam-ipc.ts' +import './lib/discord.ts' // Discord RPC + +app.commandLine.appendSwitch('disable-http-cache') + +let mainWindow: BrowserWindow | null = null + +function createWindow (): void { + mainWindow = new BrowserWindow({ + maximizable: true, + webPreferences: { + nodeIntegration: false, + contextIsolation: true, + preload: path.join(app.getAppPath(), 'electron', 'preload.js') + }, + icon: path.join(app.getAppPath(), 'dist', 'favicon.ico'), + title: 'Synergism', + autoHideMenuBar: true + }) + + if (mainWindow.maximizable) { + mainWindow.maximize() + } + + mainWindow.loadURL('https://synergism.cc/', { extraHeaders: 'pragma: no-cache\n' }) + + if (!app.isPackaged) { + mainWindow.webContents.openDevTools() + } + + mainWindow.on('closed', () => { + mainWindow = null + }) +} + +app.whenReady().then(async () => { + const distPath = path.join(app.getAppPath(), 'dist') + + // Intercept requests to synergism.cc and serve local files + session.defaultSession.protocol.handle('https', async (request) => { + const url = new URL(request.url) + + if (url.hostname === 'synergism.cc') { + let filePath = url.pathname === '/' ? 'index.html' : url.pathname.replace(/^\//, '') + filePath = path.join(distPath, filePath) + + try { + const data = fs.readFileSync(filePath) + const ext = path.extname(filePath) + + return new Response(data, { + headers: { 'Content-Type': mimeTypes.contentType(ext) || 'application/octet-stream' } + }) + } catch { + } + } + + // Pass through to network - attach cookies from Electron's cookie jar + const cookies = await session.defaultSession.cookies.get({ url: request.url }) + const cookieHeader = cookies.reduce((prev, curr) => { + prev[curr.name] = curr.value + return prev + }, {} as Record) + + const headers = new Headers(request.headers) + if (cookies.length > 0) { + headers.set('Cookie', cookie.stringifyCookie(cookieHeader)) + } + + const response = await fetch(request.url, { + method: request.method, + headers, + body: ['GET', 'HEAD'].includes(request.method) ? undefined : request.clone().body, + redirect: 'manual', // Handle redirects manually to preserve cookies + // @ts-expect-error Who needs types when you have ts-expect-error? + duplex: 'half' + }) + + // Manually apply Set-Cookie headers to Chrome's cookie jar + const setCookieHeaders = response.headers.getSetCookie() + for (const cookieValue of setCookieHeaders) { + const c = cookie.parseSetCookie(cookieValue) + // https://stackoverflow.com/a/39136448 + // Cookies require an expirationDate to be persistent, for some reason + const expires = c.maxAge + ? Date.now() + (c.maxAge * 1000) + : c.expires?.getTime() + + await session.defaultSession.cookies.set({ + url: request.url, + domain: c.domain, + expirationDate: expires, + httpOnly: c.httpOnly, + name: c.name, + path: c.path, + sameSite: c.sameSite === true + ? 'strict' + : c.sameSite === 'none' || c.sameSite === false + ? 'no_restriction' + : c.sameSite, + secure: c.secure, + value: c.value + }) + } + + return response + }) + + createWindow() + + app.on('activate', () => { + if (BrowserWindow.getAllWindows().length === 0) { + createWindow() + } + }) +}) + +app.on('window-all-closed', () => { + if (process.platform !== 'darwin') { + app.quit() + } +}) + +initializeSteam() +enableSteamOverlay() diff --git a/electron/preload.js b/electron/preload.js new file mode 100644 index 000000000..9a8b1f27c --- /dev/null +++ b/electron/preload.js @@ -0,0 +1,43 @@ +// @ts-check +// Yes, it has to be CommonJS + +const { contextBridge, ipcRenderer } = require('electron') + +contextBridge.exposeInMainWorld('steam', { + getSteamId: () => ipcRenderer.invoke('steam:getSteamId'), + getUsername: () => ipcRenderer.invoke('steam:getUsername'), + getCurrentGameLanguage: () => ipcRenderer.invoke('steam:getCurrentGameLanguage'), + /** + * @param {string} key + * @param {string} [value] + */ + setRichPresence: (key, value) => ipcRenderer.invoke('steam:setRichPresence', key, value), + getSessionTicket: () => ipcRenderer.invoke('steam:getSessionTicket'), + /** + * @param {(response: import('steamworks.js/callbacks').CallbackReturns[ + * import('steamworks.js/client').callback.SteamCallback.MicroTxnAuthorizationResponse + * ]) => void} callback + */ + onMicroTxnAuthorizationResponse: (callback) => { + ipcRenderer.once('steam:microTxnAuthorizationResponse', (_, response) => callback(response)) + }, + // Steam Cloud Storage + /** @param {string} name */ + cloudFileExists: (name) => ipcRenderer.invoke('steam:cloudFileExists', name), + /** @param {string} name */ + cloudReadFile: (name) => ipcRenderer.invoke('steam:cloudReadFile', name), + /** + * @param {string} name + * @param {string} content + */ + cloudWriteFile: (name, content) => ipcRenderer.invoke('steam:cloudWriteFile', name, content), + /** @param {string} name */ + cloudDeleteFile: (name) => ipcRenderer.invoke('steam:cloudDeleteFile', name) +}) + +contextBridge.exposeInMainWorld('discord', { + /** + * @param {import('./lib/discord').PresenceOptions} options + */ + setRichPresence: (options) => ipcRenderer.invoke('discord:setRichPresence', options) +}) diff --git a/index.html b/index.html index a3f1a76eb..dd8a190e6 100644 --- a/index.html +++ b/index.html @@ -1,7 +1,7 @@ - + @@ -3233,7 +3233,7 @@

Artists

-
+ @@ -3245,7 +3245,7 @@

Artists

-
+ @@ -3270,8 +3270,12 @@

Artists

>Login with Discord Login with Patreon +