diff --git a/Caddyfile b/Caddyfile
index 6f590053..24233ac6 100644
--- a/Caddyfile
+++ b/Caddyfile
@@ -1,11 +1,16 @@
osucad.com {
- reverse_proxy http://localhost:3000
+ reverse_proxy http://localhost:3000
@frontend {
not {
path /api*
- path /auth*
+ path /auth*
+ path /metrics*
+ path /editor*
+ path /socket.io*
}
}
+
+ reverse_proxy @frontend http://localhost:5173
}
\ No newline at end of file
diff --git a/packages/client/android/app/capacitor.build.gradle b/packages/client/android/app/capacitor.build.gradle
index fdb4970c..151fee42 100644
--- a/packages/client/android/app/capacitor.build.gradle
+++ b/packages/client/android/app/capacitor.build.gradle
@@ -9,7 +9,7 @@ android {
apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
dependencies {
-
+ implementation project(':capacitor-app')
}
diff --git a/packages/client/android/app/src/main/AndroidManifest.xml b/packages/client/android/app/src/main/AndroidManifest.xml
index 9b39f893..b4d28280 100644
--- a/packages/client/android/app/src/main/AndroidManifest.xml
+++ b/packages/client/android/app/src/main/AndroidManifest.xml
@@ -10,20 +10,30 @@
android:theme="@style/AppTheme">
+ android:theme="@style/AppTheme.NoActionBar">
+
+
+
+
+
+
+
+
+
+
+
- #FFFFFF
+ #1A1A20
\ No newline at end of file
diff --git a/packages/client/android/app/src/main/res/values/styles.xml b/packages/client/android/app/src/main/res/values/styles.xml
index be874e54..c362d417 100644
--- a/packages/client/android/app/src/main/res/values/styles.xml
+++ b/packages/client/android/app/src/main/res/values/styles.xml
@@ -12,10 +12,9 @@
-
diff --git a/packages/client/android/capacitor.settings.gradle b/packages/client/android/capacitor.settings.gradle
index a8bab357..6270310f 100644
--- a/packages/client/android/capacitor.settings.gradle
+++ b/packages/client/android/capacitor.settings.gradle
@@ -1,3 +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-app'
+project(':capacitor-app').projectDir = new File('../../../node_modules/@capacitor/app/android')
diff --git a/packages/client/capacitor.config.ts b/packages/client/capacitor.config.ts
index bb04bede..cad721c4 100644
--- a/packages/client/capacitor.config.ts
+++ b/packages/client/capacitor.config.ts
@@ -1,13 +1,12 @@
-import { CapacitorConfig } from '@capacitor/cli';
+import {CapacitorConfig} from '@capacitor/cli';
const config: CapacitorConfig = {
appId: 'com.osucad',
appName: 'osucad',
- webDir: 'dist',
+ webDir: 'mobile-dist',
server: {
androidScheme: 'https',
- url: 'https://osucad.com',
- allowNavigation: ['osucad.com', 'osu.ppy.sh'],
+ allowNavigation: ['dev.osucad.com', 'osu.ppy.sh'],
}
};
diff --git a/packages/client/components.d.ts b/packages/client/components.d.ts
new file mode 100644
index 00000000..6e1961b8
--- /dev/null
+++ b/packages/client/components.d.ts
@@ -0,0 +1,38 @@
+/* eslint-disable */
+/* prettier-ignore */
+// @ts-nocheck
+// Generated by unplugin-vue-components
+// Read more: https://github.com/vuejs/core/pull/3399
+export {}
+
+declare module 'vue' {
+ export interface GlobalComponents {
+ AppNavbar: typeof import('./src/components/AppNavbar.vue')['default']
+ AudioPreferencesForm: typeof import('./src/components/preferences/AudioPreferencesForm.vue')['default']
+ BehaviorPreferencesForm: typeof import('./src/components/preferences/BehaviorPreferencesForm.vue')['default']
+ Button: typeof import('./src/components/Button.vue')['default']
+ ButtonGroup: typeof import('./src/components/ButtonGroup.vue')['default']
+ Card: typeof import('./src/components/card/Card.vue')['default']
+ Checkbox: typeof import('./src/components/Checkbox.vue')['default']
+ Dropzone: typeof import('./src/components/Dropzone.vue')['default']
+ FormField: typeof import('./src/components/FormField.vue')['default']
+ GraphicsPreferencesForm: typeof import('./src/components/preferences/GraphicsPreferencesForm.vue')['default']
+ HelloWorld: typeof import('./src/components/HelloWorld.vue')['default']
+ ImportOszCard: typeof import('./src/components/beatmap/ImportOszCard.vue')['default']
+ MapsetCard: typeof import('./src/components/beatmap/MapsetCard.vue')['default']
+ OperatorBox: typeof import('./src/components/operator/OperatorBox.vue')['default']
+ PreferencesForm: typeof import('./src/components/preferences/PreferencesForm.vue')['default']
+ ProgressBar: typeof import('./src/components/ProgressBar.vue')['default']
+ QColor: typeof import('quasar')['QColor']
+ QLinearProgress: typeof import('quasar')['QLinearProgress']
+ QSlider: typeof import('quasar')['QSlider']
+ RouterLink: typeof import('vue-router')['RouterLink']
+ RouterView: typeof import('vue-router')['RouterView']
+ Switch: typeof import('./src/components/Switch.vue')['default']
+ TabList: typeof import('./src/components/tabList/TabList.vue')['default']
+ UserAvatar: typeof import('./src/components/UserAvatar.vue')['default']
+ Vec2ParameterControl: typeof import('./src/components/operator/Vec2ParameterControl.vue')['default']
+ ViewportPreferencesForm: typeof import('./src/components/preferences/ViewportPreferencesForm.vue')['default']
+ VNodes: typeof import('./src/components/VNodes.vue')['default']
+ }
+}
diff --git a/packages/client/index.html b/packages/client/index.html
index 19925cf8..1917beca 100644
--- a/packages/client/index.html
+++ b/packages/client/index.html
@@ -9,6 +9,5 @@
-