diff --git a/.env.example b/.env.example index a4db6cf..413dbc9 100644 --- a/.env.example +++ b/.env.example @@ -8,7 +8,8 @@ POSTGRES_DB=chromacase API_URL=http://localhost:80/api SCORO_URL=ws://localhost:6543 MINIO_ROOT_PASSWORD=12345678 - +EXPO_PUBLIC_API_URL=http://localhost:80/api +EXPO_PUBLIC_SCORO_URL=ws://localhost:6543 GOOGLE_CLIENT_ID=toto GOOGLE_SECRET=tata GOOGLE_CALLBACK_URL=http://localhost:19006/logged/google diff --git a/front/.gitignore b/front/.gitignore index 300084a..05647d5 100644 --- a/front/.gitignore +++ b/front/.gitignore @@ -1,20 +1,35 @@ +# Learn more https://docs.github.com/en/get-started/getting-started-with-git/ignoring-files + +# dependencies node_modules/ + +# Expo .expo/ dist/ -npm-debug.* +web-build/ + +# Native +*.orig.* *.jks *.p8 *.p12 *.key *.mobileprovision -*.orig.* -web-build/ -*.apk -yarn.error* + +# Metro +.metro-health-check* + +# debug +npm-debug.* +yarn-debug.* +yarn-error.* + # macOS .DS_Store +*.pem -yarn-error.log +# local env files +.env*.local -.idea/ -.expo \ No newline at end of file +# typescript +*.tsbuildinfo diff --git a/front/API.ts b/front/API.ts index 802f0d0..d4cb899 100644 --- a/front/API.ts +++ b/front/API.ts @@ -23,7 +23,6 @@ import { AccessTokenResponseHandler } from './models/AccessTokenResponse'; import * as yup from 'yup'; import { base64ToBlob } from './utils/base64ToBlob'; import { ImagePickerAsset } from 'expo-image-picker'; -import Constant from 'expo-constants'; type AuthenticationInput = { username: string; password: string }; type RegistrationInput = AuthenticationInput & { email: string }; @@ -69,7 +68,7 @@ export default class API { public static readonly baseUrl = process.env.NODE_ENV != 'development' && Platform.OS === 'web' ? '/api' - : Constant.manifest?.extra?.apiUrl; + : process.env.EXPO_PUBLIC_API_URL!; public static async fetch( params: FetchParams, handle: Pick, 'raw'> diff --git a/front/Dockerfile b/front/Dockerfile index 6195c23..34e1c92 100644 --- a/front/Dockerfile +++ b/front/Dockerfile @@ -4,18 +4,18 @@ FROM node:16-alpine as build WORKDIR /app # install expo cli -RUN yarn global add expo-cli@6.0.5 +RUN yarn global add expo-cli # add sharp-cli (^2.1.0) for faster image processing -RUN yarn global add sharp-cli@^2.1.0 +RUN yarn global add sharp-cli COPY package.json yarn.lock ./ -RUN yarn install +RUN expo install COPY . . ARG API_URL -ENV API_URL=$API_URL +ENV EXPO_PUBLIC_API_URL=$API_URL ARG SCORO_URL -ENV SCORO_URL=$SCORO_URL +ENV EXPO_PUBLIC_API_URL=$SCORO_URL RUN yarn tsc && expo build:web diff --git a/front/Navigation.tsx b/front/Navigation.tsx index 37da679..b40b398 100644 --- a/front/Navigation.tsx +++ b/front/Navigation.tsx @@ -96,7 +96,7 @@ const protectedRoutes = () => options: { title: 'Verify email', headerShown: false }, link: '/verify', }, - } as const); + }) as const; const publicRoutes = () => ({ @@ -135,7 +135,7 @@ const publicRoutes = () => options: { title: 'Password reset form', headerShown: false }, link: '/forgot_password', }, - } as const); + }) as const; // eslint-disable-next-line @typescript-eslint/no-explicit-any type Route = { @@ -161,14 +161,13 @@ const Stack = createNativeStackNavigator(); const RouteToScreen = (component: Route['component']) => // eslint-disable-next-line react/display-name - (props: NativeStackScreenProps) => - ( - <> - {component({ ...props.route.params, route: props.route } as Parameters< - Route['component'] - >[0])} - - ); + (props: NativeStackScreenProps) => ( + <> + {component({ ...props.route.params, route: props.route } as Parameters< + Route['component'] + >[0])} + + ); const routesToScreens = (routes: Partial>) => Object.entries(routes).map(([name, route], routeIndex) => ( diff --git a/front/android/.gitignore b/front/android/.gitignore new file mode 100644 index 0000000..877b87e --- /dev/null +++ b/front/android/.gitignore @@ -0,0 +1,15 @@ +# OSX +# +.DS_Store + +# Android/IntelliJ +# +build/ +.idea +.gradle +local.properties +*.iml +*.hprof + +# Bundle artifacts +*.jsbundle diff --git a/front/android/app/build.gradle b/front/android/app/build.gradle new file mode 100644 index 0000000..6dfe5ac --- /dev/null +++ b/front/android/app/build.gradle @@ -0,0 +1,180 @@ +apply plugin: "com.android.application" +apply plugin: "com.facebook.react" + +def projectRoot = rootDir.getAbsoluteFile().getParentFile().getAbsolutePath() + +/** + * This is the configuration block to customize your React Native Android app. + * By default you don't need to apply any configuration, just uncomment the lines you need. + */ +react { + entryFile = file(["node", "-e", "require('expo/scripts/resolveAppEntry')", projectRoot, "android", "absolute"].execute(null, rootDir).text.trim()) + reactNativeDir = new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim()).getParentFile().getAbsoluteFile() + hermesCommand = new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim()).getParentFile().getAbsolutePath() + "/sdks/hermesc/%OS-BIN%/hermesc" + codegenDir = new File(["node", "--print", "require.resolve('@react-native/codegen/package.json')"].execute(null, rootDir).text.trim()).getParentFile().getAbsoluteFile() + + // Use Expo CLI to bundle the app, this ensures the Metro config + // works correctly with Expo projects. + cliFile = new File(["node", "--print", "require.resolve('@expo/cli')"].execute(null, rootDir).text.trim()) + bundleCommand = "export:embed" + + /* Folders */ + // The root of your project, i.e. where "package.json" lives. Default is '..' + // root = file("../") + // The folder where the react-native NPM package is. Default is ../node_modules/react-native + // reactNativeDir = file("../node_modules/react-native") + // The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen + // codegenDir = file("../node_modules/@react-native/codegen") + + /* Variants */ + // The list of variants to that are debuggable. For those we're going to + // skip the bundling of the JS bundle and the assets. By default is just 'debug'. + // If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants. + // debuggableVariants = ["liteDebug", "prodDebug"] + + /* Bundling */ + // A list containing the node command and its flags. Default is just 'node'. + // nodeExecutableAndArgs = ["node"] + + // + // The path to the CLI configuration file. Default is empty. + // bundleConfig = file(../rn-cli.config.js) + // + // The name of the generated asset file containing your JS bundle + // bundleAssetName = "MyApplication.android.bundle" + // + // The entry file for bundle generation. Default is 'index.android.js' or 'index.js' + // entryFile = file("../js/MyApplication.android.js") + // + // A list of extra flags to pass to the 'bundle' commands. + // See https://github.com/react-native-community/cli/blob/main/docs/commands.md#bundle + // extraPackagerArgs = [] + + /* Hermes Commands */ + // The hermes compiler command to run. By default it is 'hermesc' + // hermesCommand = "$rootDir/my-custom-hermesc/bin/hermesc" + // + // The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map" + // hermesFlags = ["-O", "-output-source-map"] +} + +/** + * Set this to true to Run Proguard on Release builds to minify the Java bytecode. + */ +def enableProguardInReleaseBuilds = (findProperty('android.enableProguardInReleaseBuilds') ?: false).toBoolean() + +/** + * The preferred build flavor of JavaScriptCore (JSC) + * + * For example, to use the international variant, you can use: + * `def jscFlavor = 'org.webkit:android-jsc-intl:+'` + * + * The international variant includes ICU i18n library and necessary data + * allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that + * give correct results when using with locales other than en-US. Note that + * this variant is about 6MiB larger per architecture than default. + */ +def jscFlavor = 'org.webkit:android-jsc:+' + +android { + ndkVersion rootProject.ext.ndkVersion + + compileSdkVersion rootProject.ext.compileSdkVersion + + namespace 'build.apk' + defaultConfig { + applicationId 'build.apk' + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion + versionCode 1 + versionName "1.0.0" + + buildConfigField("boolean", "REACT_NATIVE_UNSTABLE_USE_RUNTIME_SCHEDULER_ALWAYS", (findProperty("reactNative.unstable_useRuntimeSchedulerAlways") ?: true).toString()) + } + signingConfigs { + debug { + storeFile file('debug.keystore') + storePassword 'android' + keyAlias 'androiddebugkey' + keyPassword 'android' + } + } + buildTypes { + debug { + signingConfig signingConfigs.debug + } + release { + // Caution! In production, you need to generate your own keystore file. + // see https://reactnative.dev/docs/signed-apk-android. + signingConfig signingConfigs.debug + shrinkResources (findProperty('android.enableShrinkResourcesInReleaseBuilds')?.toBoolean() ?: false) + minifyEnabled enableProguardInReleaseBuilds + proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" + } + } +} + +// Apply static values from `gradle.properties` to the `android.packagingOptions` +// Accepts values in comma delimited lists, example: +// android.packagingOptions.pickFirsts=/LICENSE,**/picasa.ini +["pickFirsts", "excludes", "merges", "doNotStrip"].each { prop -> + // Split option: 'foo,bar' -> ['foo', 'bar'] + def options = (findProperty("android.packagingOptions.$prop") ?: "").split(","); + // Trim all elements in place. + for (i in 0.. 0) { + println "android.packagingOptions.$prop += $options ($options.length)" + // Ex: android.packagingOptions.pickFirsts += '**/SCCS/**' + options.each { + android.packagingOptions[prop] += it + } + } +} + +dependencies { + // The version of react-native is set by the React Native Gradle Plugin + implementation("com.facebook.react:react-android") + + def isGifEnabled = (findProperty('expo.gif.enabled') ?: "") == "true"; + def isWebpEnabled = (findProperty('expo.webp.enabled') ?: "") == "true"; + def isWebpAnimatedEnabled = (findProperty('expo.webp.animated') ?: "") == "true"; + def frescoVersion = rootProject.ext.frescoVersion + + // If your app supports Android versions before Ice Cream Sandwich (API level 14) + if (isGifEnabled || isWebpEnabled) { + implementation("com.facebook.fresco:fresco:${frescoVersion}") + implementation("com.facebook.fresco:imagepipeline-okhttp3:${frescoVersion}") + } + + if (isGifEnabled) { + // For animated gif support + implementation("com.facebook.fresco:animated-gif:${frescoVersion}") + } + + if (isWebpEnabled) { + // For webp support + implementation("com.facebook.fresco:webpsupport:${frescoVersion}") + if (isWebpAnimatedEnabled) { + // Animated webp support + implementation("com.facebook.fresco:animated-webp:${frescoVersion}") + } + } + + debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") + debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") { + exclude group:'com.squareup.okhttp3', module:'okhttp' + } + debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") + + if (hermesEnabled.toBoolean()) { + implementation("com.facebook.react:hermes-android") + } else { + implementation jscFlavor + } +} + +apply from: new File(["node", "--print", "require.resolve('@react-native-community/cli-platform-android/package.json')"].execute(null, rootDir).text.trim(), "../native_modules.gradle"); +applyNativeModulesAppBuildGradle(project) diff --git a/front/android/app/debug.keystore b/front/android/app/debug.keystore new file mode 100644 index 0000000..364e105 Binary files /dev/null and b/front/android/app/debug.keystore differ diff --git a/front/android/app/proguard-rules.pro b/front/android/app/proguard-rules.pro new file mode 100644 index 0000000..551eb41 --- /dev/null +++ b/front/android/app/proguard-rules.pro @@ -0,0 +1,14 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /usr/local/Cellar/android-sdk/24.3.3/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# react-native-reanimated +-keep class com.swmansion.reanimated.** { *; } +-keep class com.facebook.react.turbomodule.** { *; } + +# Add any project specific keep options here: diff --git a/front/android/app/src/debug/AndroidManifest.xml b/front/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 0000000..3ec2507 --- /dev/null +++ b/front/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/front/android/app/src/main/AndroidManifest.xml b/front/android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..6c31972 --- /dev/null +++ b/front/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/front/android/app/src/main/res/drawable-hdpi/splashscreen_image.png b/front/android/app/src/main/res/drawable-hdpi/splashscreen_image.png new file mode 100644 index 0000000..382d6f4 Binary files /dev/null and b/front/android/app/src/main/res/drawable-hdpi/splashscreen_image.png differ diff --git a/front/android/app/src/main/res/drawable-mdpi/splashscreen_image.png b/front/android/app/src/main/res/drawable-mdpi/splashscreen_image.png new file mode 100644 index 0000000..382d6f4 Binary files /dev/null and b/front/android/app/src/main/res/drawable-mdpi/splashscreen_image.png differ diff --git a/front/android/app/src/main/res/drawable-xhdpi/splashscreen_image.png b/front/android/app/src/main/res/drawable-xhdpi/splashscreen_image.png new file mode 100644 index 0000000..382d6f4 Binary files /dev/null and b/front/android/app/src/main/res/drawable-xhdpi/splashscreen_image.png differ diff --git a/front/android/app/src/main/res/drawable-xxhdpi/splashscreen_image.png b/front/android/app/src/main/res/drawable-xxhdpi/splashscreen_image.png new file mode 100644 index 0000000..382d6f4 Binary files /dev/null and b/front/android/app/src/main/res/drawable-xxhdpi/splashscreen_image.png differ diff --git a/front/android/app/src/main/res/drawable-xxxhdpi/splashscreen_image.png b/front/android/app/src/main/res/drawable-xxxhdpi/splashscreen_image.png new file mode 100644 index 0000000..382d6f4 Binary files /dev/null and b/front/android/app/src/main/res/drawable-xxxhdpi/splashscreen_image.png differ diff --git a/front/android/app/src/main/res/drawable/rn_edit_text_material.xml b/front/android/app/src/main/res/drawable/rn_edit_text_material.xml new file mode 100644 index 0000000..73b37e4 --- /dev/null +++ b/front/android/app/src/main/res/drawable/rn_edit_text_material.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + diff --git a/front/android/app/src/main/res/drawable/splashscreen.xml b/front/android/app/src/main/res/drawable/splashscreen.xml new file mode 100644 index 0000000..c8568e1 --- /dev/null +++ b/front/android/app/src/main/res/drawable/splashscreen.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/front/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/front/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..80609f5 Binary files /dev/null and b/front/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/front/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/front/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..80609f5 Binary files /dev/null and b/front/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/front/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/front/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..d63b675 Binary files /dev/null and b/front/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/front/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/front/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..d63b675 Binary files /dev/null and b/front/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/front/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/front/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..c1d947b Binary files /dev/null and b/front/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/front/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/front/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..c1d947b Binary files /dev/null and b/front/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/front/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/front/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..0825fd9 Binary files /dev/null and b/front/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/front/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/front/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..0825fd9 Binary files /dev/null and b/front/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/front/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/front/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..193a9e5 Binary files /dev/null and b/front/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/front/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/front/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..193a9e5 Binary files /dev/null and b/front/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/front/android/app/src/main/res/values-night/colors.xml b/front/android/app/src/main/res/values-night/colors.xml new file mode 100644 index 0000000..3c05de5 --- /dev/null +++ b/front/android/app/src/main/res/values-night/colors.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/android/app/src/main/res/values/colors.xml b/front/android/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..bb2087f --- /dev/null +++ b/front/android/app/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ + + #ffffff + #FFFFFF + #023c69 + #ffffff + \ No newline at end of file diff --git a/front/android/app/src/main/res/values/strings.xml b/front/android/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..c15ba10 --- /dev/null +++ b/front/android/app/src/main/res/values/strings.xml @@ -0,0 +1,5 @@ + + Chromacase + contain + false + \ No newline at end of file diff --git a/front/android/app/src/main/res/values/styles.xml b/front/android/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..f03e23f --- /dev/null +++ b/front/android/app/src/main/res/values/styles.xml @@ -0,0 +1,17 @@ + + + + + \ No newline at end of file diff --git a/front/android/build.gradle b/front/android/build.gradle new file mode 100644 index 0000000..bf861db --- /dev/null +++ b/front/android/build.gradle @@ -0,0 +1,40 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + ext { + buildToolsVersion = findProperty('android.buildToolsVersion') ?: '33.0.0' + minSdkVersion = Integer.parseInt(findProperty('android.minSdkVersion') ?: '21') + compileSdkVersion = Integer.parseInt(findProperty('android.compileSdkVersion') ?: '33') + targetSdkVersion = Integer.parseInt(findProperty('android.targetSdkVersion') ?: '33') + kotlinVersion = findProperty('android.kotlinVersion') ?: '1.8.10' + frescoVersion = findProperty('expo.frescoVersion') ?: '2.5.0' + + // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP. + ndkVersion = "23.1.7779620" + } + repositories { + google() + mavenCentral() + } + dependencies { + classpath('com.android.tools.build:gradle:7.4.2') + classpath('com.facebook.react:react-native-gradle-plugin') + } +} + +allprojects { + repositories { + maven { + // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm + url(new File(['node', '--print', "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim(), '../android')) + } + maven { + // Android JSC is installed from npm + url(new File(['node', '--print', "require.resolve('jsc-android/package.json')"].execute(null, rootDir).text.trim(), '../dist')) + } + + google() + mavenCentral() + maven { url 'https://www.jitpack.io' } + } +} diff --git a/front/android/gradle.properties b/front/android/gradle.properties new file mode 100644 index 0000000..240ca06 --- /dev/null +++ b/front/android/gradle.properties @@ -0,0 +1,56 @@ +# 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. +# Default value: -Xmx512m -XX:MaxMetaspaceSize=256m +org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m + +# 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 + +# Version of flipper SDK to use with React Native +FLIPPER_VERSION=0.182.0 + +# Use this property to specify which architecture you want to build. +# You can also override it from the CLI using +# ./gradlew -PreactNativeArchitectures=x86_64 +reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64 + +# Use this property to enable support to the new architecture. +# This will allow you to use TurboModules and the Fabric render in +# your application. You should enable this flag either if you want +# to write custom TurboModules/Fabric components OR use libraries that +# are providing them. +newArchEnabled=false + +# Use this property to enable or disable the Hermes JS engine. +# If set to false, you will be using JSC instead. +hermesEnabled=true + +# Enable GIF support in React Native images (~200 B increase) +expo.gif.enabled=true +# Enable webp support in React Native images (~85 KB increase) +expo.webp.enabled=true +# Enable animated webp support (~3.4 MB increase) +# Disabled by default because iOS doesn't support animated webp +expo.webp.animated=false + +# Enable network inspector +EX_DEV_CLIENT_NETWORK_INSPECTOR=true diff --git a/front/android/gradle/wrapper/gradle-wrapper.jar b/front/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..249e583 Binary files /dev/null and b/front/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/front/android/gradle/wrapper/gradle-wrapper.properties b/front/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..6ec1567 --- /dev/null +++ b/front/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip +networkTimeout=10000 +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/front/android/gradlew b/front/android/gradlew new file mode 100755 index 0000000..a69d9cb --- /dev/null +++ b/front/android/gradlew @@ -0,0 +1,240 @@ +#!/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 \ + "$@" + +# 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/front/android/gradlew.bat b/front/android/gradlew.bat new file mode 100644 index 0000000..53a6b23 --- /dev/null +++ b/front/android/gradlew.bat @@ -0,0 +1,91 @@ +@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% equ 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% 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/front/android/settings.gradle b/front/android/settings.gradle new file mode 100644 index 0000000..3213fdd --- /dev/null +++ b/front/android/settings.gradle @@ -0,0 +1,10 @@ +rootProject.name = 'Chromacase' + +apply from: new File(["node", "--print", "require.resolve('expo/package.json')"].execute(null, rootDir).text.trim(), "../scripts/autolinking.gradle"); +useExpoModules() + +apply from: new File(["node", "--print", "require.resolve('@react-native-community/cli-platform-android/package.json')"].execute(null, rootDir).text.trim(), "../native_modules.gradle"); +applyNativeModulesSettingsGradle(settings) + +include ':app' +includeBuild(new File(["node", "--print", "require.resolve('@react-native/gradle-plugin/package.json')"].execute(null, rootDir).text.trim()).getParentFile()) diff --git a/front/app.config.ts b/front/app.config.ts deleted file mode 100644 index a556143..0000000 --- a/front/app.config.ts +++ /dev/null @@ -1,33 +0,0 @@ -module.exports = { - name: 'Chromacase', - slug: 'Chromacase', - version: '1.0.0', - orientation: 'portrait', - icon: './assets/icon.png', - userInterfaceStyle: 'light', - splash: { - image: './assets/splash.png', - resizeMode: 'contain', - backgroundColor: '#ffffff', - }, - updates: { - fallbackToCacheTimeout: 0, - }, - assetBundlePatterns: ['**/*'], - ios: { - supportsTablet: true, - }, - android: { - package: 'build.apk', - }, - web: { - favicon: './assets/favicon.png', - }, - extra: { - apiUrl: process.env.API_URL, - scoroUrl: process.env.SCORO_URL, - eas: { - projectId: 'dade8e5e-3e2c-49f7-98c5-cf8834c7ebb2', - }, - }, -}; diff --git a/front/app.json b/front/app.json index 2045f9a..5496cd8 100644 --- a/front/app.json +++ b/front/app.json @@ -11,15 +11,15 @@ "resizeMode": "cover", "backgroundColor": "#ffffff" }, - "updates": { - "fallbackToCacheTimeout": 0 - }, "assetBundlePatterns": ["**/*"], "ios": { "supportsTablet": true }, "android": { - "package": "build.apk" + "adaptiveIcon": { + "foregroundImage": "./assets/icon.png", + "backgroundColor": "#ffffff" + } }, "web": { "favicon": "./assets/favicon.png" diff --git a/front/assets/icon.png b/front/assets/icon.png index 32cf37b..8da4260 100644 Binary files a/front/assets/icon.png and b/front/assets/icon.png differ diff --git a/front/babel.config.js b/front/babel.config.js index 2825b93..68dbd39 100644 --- a/front/babel.config.js +++ b/front/babel.config.js @@ -2,11 +2,24 @@ module.exports = function (api) { api.cache(true); return { presets: ['babel-preset-expo'], - plugins: ['@babel/plugin-proposal-export-namespace-from', 'react-native-reanimated/plugin'], - env: { - production: { - plugins: ['react-native-paper/babel'], - }, - }, + plugins: [ + [ + 'module:react-native-dotenv', + { + moduleName: '@env', + path: '.env', + blacklist: null, + whitelist: null, + safe: false, + allowUndefined: true, + }, + ], + ], + // plugins: ['@babel/plugin-proposal-export-namespace-from', 'react-native-reanimated/plugin'], + // env: { + // production: { + // plugins: ['react-native-paper/babel'], + // }, + // }, }; }; diff --git a/front/components/BigActionButton.tsx b/front/components/BigActionButton.tsx index b268972..ad98b10 100644 --- a/front/components/BigActionButton.tsx +++ b/front/components/BigActionButton.tsx @@ -91,11 +91,11 @@ const BigActionButton = ({ diff --git a/front/components/GtkUI/RawElement.tsx b/front/components/GtkUI/RawElement.tsx index 8dc43cf..8bd2fd9 100644 --- a/front/components/GtkUI/RawElement.tsx +++ b/front/components/GtkUI/RawElement.tsx @@ -9,6 +9,7 @@ import { getElementRangeNode, } from './ElementTypes'; import { ArrowDown2 } from 'iconsax-react-native'; +import { useWindowDimensions } from 'react-native'; type RawElementProps = { element: ElementProps; @@ -18,6 +19,7 @@ export const RawElement = ({ element }: RawElementProps) => { const { title, icon, type, helperText, description, disabled, data } = element; const screenSize = useBreakpointValue({ base: 'small', md: 'big' }); const isSmallScreen = screenSize === 'small'; + const { width: screenWidth } = useWindowDimensions(); return ( { diff --git a/front/components/Loading.stories.tsx b/front/components/Loading.stories.tsx index 7addaa2..78e799c 100644 --- a/front/components/Loading.stories.tsx +++ b/front/components/Loading.stories.tsx @@ -1,3 +1,4 @@ +// @ts-expect-error Who does tests anyway? import { ComponentStory, ComponentMeta } from '@storybook/react'; import Loading from './Loading'; diff --git a/front/components/V2/SongCardInfo.tsx b/front/components/V2/SongCardInfo.tsx index 8057815..f02143e 100644 --- a/front/components/V2/SongCardInfo.tsx +++ b/front/components/V2/SongCardInfo.tsx @@ -92,7 +92,6 @@ const SongCardInfo = (props: SongCardInfoProps) => { display: 'flex', flexDirection: 'row', alignItems: 'center', - // @ts-expect-error gap isn't yet supported by react native gap: 5, paddingHorizontal: 10, }} diff --git a/front/components/V2/TabNavigation.tsx b/front/components/V2/TabNavigation.tsx index 3cdb6bc..3935545 100644 --- a/front/components/V2/TabNavigation.tsx +++ b/front/components/V2/TabNavigation.tsx @@ -96,13 +96,13 @@ const TabNavigation = () => { setActiveTabID={setActiveTab} > { setIsCollapsed={setIsDesktopCollapsed} > { borderRadius: 12, marginVertical: 10, marginRight: 10, - // @ts-expect-error backDropFilter isn't yet supported by react native backDropFilter: 'blur(2px)', padding: 20, }} diff --git a/front/components/V2/TabNavigationButton.tsx b/front/components/V2/TabNavigationButton.tsx index dcb217c..d074553 100644 --- a/front/components/V2/TabNavigationButton.tsx +++ b/front/components/V2/TabNavigationButton.tsx @@ -20,57 +20,57 @@ const TabNavigationButton = (props: TabNavigationButtonProps) => { width: '100%', }} > - {({ isPressed, isHovered }) => ( - { - if (isHovered) { - return '0px 0px 16px 0px rgba(0, 0, 0, 0.25)'; - } else if (props.isActive) { - return '0px 0px 8px 0px rgba(0, 0, 0, 0.25)'; - } else { - return undefined; - } - })(), - backdropFilter: 'blur(2px)', - backgroundColor: (() => { - if (isPressed) { - return 'rgba(0, 0, 0, 0.1)'; - } else if (isHovered) { - return 'rgba(231, 231, 232, 0.2)'; - } else if (props.isActive) { - return 'rgba(16, 16, 20, 0.5)'; - } else { - return 'transparent'; - } - })(), - }} - > - {props.icon && ( - - {props.icon} - - )} - {!props.isCollapsed && ( - - {props.label} - - )} - - )} + {({ isPressed, isHovered }) => { + let boxShadow: string | undefined = undefined; + if (isHovered) { + boxShadow = '0px 0px 16px 0px rgba(0, 0, 0, 0.25)'; + } else if (props.isActive) { + boxShadow = '0px 0px 8px 0px rgba(0, 0, 0, 0.25)'; + } + return ( + { + if (isPressed) { + return 'rgba(0, 0, 0, 0.1)'; + } else if (isHovered) { + return 'rgba(231, 231, 232, 0.2)'; + } else if (props.isActive) { + return 'rgba(16, 16, 20, 0.5)'; + } else { + return 'transparent'; + } + })(), + }} + > + {props.icon && ( + + {props.icon} + + )} + {!props.isCollapsed && ( + + {props.label} + + )} + + ); + }} ); }; diff --git a/front/components/V2/TabNavigationDesktop.tsx b/front/components/V2/TabNavigationDesktop.tsx index c211a5f..3fc055a 100644 --- a/front/components/V2/TabNavigationDesktop.tsx +++ b/front/components/V2/TabNavigationDesktop.tsx @@ -50,16 +50,16 @@ const TabNavigationDesktop = (props: TabNavigationDesktopProps) => { alignItems: 'center', justifyContent: 'flex-start', flexShrink: 0, - padding: '10px', + padding: 10, }} > @@ -70,9 +70,9 @@ const TabNavigationDesktop = (props: TabNavigationDesktopProps) => { { {buttons.map((button, index) => ( @@ -104,8 +103,8 @@ const TabNavigationDesktop = (props: TabNavigationDesktopProps) => { @@ -114,8 +113,8 @@ const TabNavigationDesktop = (props: TabNavigationDesktopProps) => { {songHistory.length === 0 && ( No songs played yet @@ -133,8 +132,8 @@ const TabNavigationDesktop = (props: TabNavigationDesktopProps) => { {histoItem.name} @@ -144,8 +143,7 @@ const TabNavigationDesktop = (props: TabNavigationDesktopProps) => { {([props.tabs.find((t) => t.id === 'settings')] as NaviTab[]).map( @@ -166,6 +164,7 @@ const TabNavigationDesktop = (props: TabNavigationDesktopProps) => { { alignItems: 'flex-start', alignSelf: 'stretch', flexDirection: 'column', - // @ts-expect-error gap is not in the types because we have an old version of react-native - gap: '8px', + gap: 8, }, props.style, ]} diff --git a/front/components/V2/TabNavigationPhone.tsx b/front/components/V2/TabNavigationPhone.tsx index 85f2161..852ad34 100644 --- a/front/components/V2/TabNavigationPhone.tsx +++ b/front/components/V2/TabNavigationPhone.tsx @@ -22,8 +22,8 @@ const TabNavigationPhone = (props: TabNavigationPhoneProps) => { > @@ -31,7 +31,7 @@ const TabNavigationPhone = (props: TabNavigationPhoneProps) => { { { bgHovered={isHighlighted ? highlightColor : whiteKeyBgHovered} onKeyDown={() => onNoteDown(key)} onKeyUp={() => onNoteUp(key)} + // @ts-expect-error Raw CSS style={{ width: whiteKeyWidthExpr, height: whiteKeyHeightExpr, @@ -100,6 +101,7 @@ const Octave = (props: OctaveProps) => { bgHovered={isHighlighted ? highlightColor : blackKeyBgHovered} onKeyDown={() => onNoteDown(key)} onKeyUp={() => onNoteUp(key)} + // @ts-expect-error Raw CSS style={{ width: blackKeyWidthExpr, height: blackKeyHeightExpr, @@ -107,7 +109,7 @@ const Octave = (props: OctaveProps) => { left: `calc(calc(${whiteKeyWidthExpr} * ${ i + ((i > 1) as unknown as number) + 1 }) - calc(${blackKeyWidthExpr} / 2))`, - top: '0px', + top: 0, }} text={{ color: 'white', diff --git a/front/components/VirtualPiano/VirtualPiano.tsx b/front/components/VirtualPiano/VirtualPiano.tsx index 3552f4f..e5e45a1 100644 --- a/front/components/VirtualPiano/VirtualPiano.tsx +++ b/front/components/VirtualPiano/VirtualPiano.tsx @@ -43,6 +43,7 @@ const VirtualPiano = ({ {octaveList.map((octaveNum) => { return ( )} {(!isMobileView || !isPanelView) && ( - + {isMobileView && (