diff --git a/README.md b/README.md index 9e24e1d..509957d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# chatapp frontend +# Frangpiane client `yarn` diff --git a/index.html b/index.html index 9b7dd0a..b23440c 100644 --- a/index.html +++ b/index.html @@ -7,7 +7,7 @@ href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css" /> - chatapp + Frangipane diff --git a/package.json b/package.json index 593871b..0db8143 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "chatapp", + "name": "frangipane-client", "private": true, - "version": "1.0.3", + "version": "0.1.0", "type": "module", "scripts": { "dev": "vite", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 20aad69..59da5d0 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -435,23 +435,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" -[[package]] -name = "chatapp" -version = "1.0.0" -dependencies = [ - "serde", - "serde_json", - "tauri", - "tauri-build", - "tauri-plugin-dialog", - "tauri-plugin-fs", - "tauri-plugin-http", - "tauri-plugin-opener", - "tauri-plugin-store", - "tauri-plugin-upload", - "tauri-plugin-websocket", -] - [[package]] name = "chrono" version = "0.4.42" @@ -1033,6 +1016,23 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "frangipane" +version = "0.1.0" +dependencies = [ + "serde", + "serde_json", + "tauri", + "tauri-build", + "tauri-plugin-dialog", + "tauri-plugin-fs", + "tauri-plugin-http", + "tauri-plugin-opener", + "tauri-plugin-store", + "tauri-plugin-upload", + "tauri-plugin-websocket", +] + [[package]] name = "futf" version = "0.1.5" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index a74432d..da263e6 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "chatapp" -version = "1.0.0" -description = "A Tauri App" -authors = ["you"] +name = "frangipane" +version = "0.1.0" +description = "Frangipane messaging app" +authors = ["eiiko6"] edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -11,7 +11,7 @@ edition = "2021" # The `_lib` suffix may seem redundant but it is necessary # to make the lib name unique and wouldn't conflict with the bin name. # This seems to be only an issue on Windows, see https://github.com/rust-lang/cargo/issues/8519 -name = "chatapp_lib" +name = "frangipane_lib" crate-type = ["staticlib", "cdylib", "rlib"] [build-dependencies] diff --git a/src-tauri/capabilities/default.json b/src-tauri/capabilities/default.json index e0ab2e4..89710eb 100644 --- a/src-tauri/capabilities/default.json +++ b/src-tauri/capabilities/default.json @@ -19,7 +19,7 @@ "url": "http://192.168.1.183:*" }, { - "url": "https://alatreon.org/chatapp/*" + "url": "https://alatreon.org/frangipane/*" } ], "deny": [] @@ -34,7 +34,7 @@ "url": "http://192.168.1.183:*" }, { - "url": "wss://alatreon.org/chatapp/*" + "url": "wss://alatreon.org/frangipane/*" } ] }, diff --git a/src-tauri/gen/android/app/.gitignore b/src-tauri/gen/android/app/.gitignore index ed6bace..d77e966 100644 --- a/src-tauri/gen/android/app/.gitignore +++ b/src-tauri/gen/android/app/.gitignore @@ -1,4 +1,4 @@ -/src/main/java/com/strawberries/chatapp/generated +/src/main/java/com/strawberries/frangipane/generated /src/main/jniLibs/**/*.so /src/main/assets/tauri.conf.json /tauri.build.gradle.kts diff --git a/src-tauri/gen/android/app/build.gradle.kts b/src-tauri/gen/android/app/build.gradle.kts index a47b1b9..2a37115 100644 --- a/src-tauri/gen/android/app/build.gradle.kts +++ b/src-tauri/gen/android/app/build.gradle.kts @@ -16,10 +16,10 @@ val tauriProperties = Properties().apply { android { compileSdk = 36 - namespace = "com.strawberries.chatapp" + namespace = "com.strawberries.frangipane" defaultConfig { manifestPlaceholders["usesCleartextTraffic"] = "false" - applicationId = "com.strawberries.chatapp" + applicationId = "com.strawberries.frangipane" minSdk = 24 targetSdk = 36 versionCode = tauriProperties.getProperty("tauri.android.versionCode", "1").toInt() diff --git a/src-tauri/gen/android/app/src/main/AndroidManifest.xml b/src-tauri/gen/android/app/src/main/AndroidManifest.xml index afb38fa..087a6dd 100644 --- a/src-tauri/gen/android/app/src/main/AndroidManifest.xml +++ b/src-tauri/gen/android/app/src/main/AndroidManifest.xml @@ -9,7 +9,7 @@ - diff --git a/src-tauri/gen/android/app/src/main/res/values/strings.xml b/src-tauri/gen/android/app/src/main/res/values/strings.xml index b499b47..27ae2d4 100644 --- a/src-tauri/gen/android/app/src/main/res/values/strings.xml +++ b/src-tauri/gen/android/app/src/main/res/values/strings.xml @@ -1,4 +1,4 @@ - chatapp - chatapp + frangipane + frangipane \ No newline at end of file diff --git a/src-tauri/gen/android/app/src/main/res/values/themes.xml b/src-tauri/gen/android/app/src/main/res/values/themes.xml index a012e5c..a4e048c 100644 --- a/src-tauri/gen/android/app/src/main/res/values/themes.xml +++ b/src-tauri/gen/android/app/src/main/res/values/themes.xml @@ -1,6 +1,6 @@ - diff --git a/src-tauri/gen/android/buildSrc/src/main/java/com/strawberries/chatapp/kotlin/BuildTask.kt b/src-tauri/gen/android/buildSrc/src/main/java/com/strawberries/frangipane/kotlin/BuildTask.kt similarity index 100% rename from src-tauri/gen/android/buildSrc/src/main/java/com/strawberries/chatapp/kotlin/BuildTask.kt rename to src-tauri/gen/android/buildSrc/src/main/java/com/strawberries/frangipane/kotlin/BuildTask.kt diff --git a/src-tauri/gen/android/buildSrc/src/main/java/com/strawberries/chatapp/kotlin/RustPlugin.kt b/src-tauri/gen/android/buildSrc/src/main/java/com/strawberries/frangipane/kotlin/RustPlugin.kt similarity index 100% rename from src-tauri/gen/android/buildSrc/src/main/java/com/strawberries/chatapp/kotlin/RustPlugin.kt rename to src-tauri/gen/android/buildSrc/src/main/java/com/strawberries/frangipane/kotlin/RustPlugin.kt diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 7de824a..bda76cc 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -2,5 +2,5 @@ #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] fn main() { - chatapp_lib::run() + frangipane_lib::run() } diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index d3b8714..6c3c727 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,8 +1,8 @@ { "$schema": "https://schema.tauri.app/config/2", - "productName": "chatapp", - "version": "1.0.3", - "identifier": "com.strawberries.chatapp", + "productName": "frangipane", + "version": "0.1.0", + "identifier": "com.strawberries.frangipane", "build": { "beforeDevCommand": "yarn dev", "devUrl": "http://localhost:1420", @@ -12,7 +12,7 @@ "app": { "windows": [ { - "title": "chatapp", + "title": "frangipane", "width": 800, "height": 600, "decorations": true, diff --git a/src/main.ts b/src/main.ts index 522c935..2c2bd77 100644 --- a/src/main.ts +++ b/src/main.ts @@ -30,7 +30,7 @@ init() // export const API = 'http://127.0.0.1:8080' export const API = 'http://192.168.1.183:8080' -// export const API = 'https://alatreon.org/chatapp' +// export const API = 'https://alatreon.org/frangipane' // export const API_WS = 'ws://127.0.0.1:8080/ws' export const API_WS = 'ws://192.168.1.183:8080/ws' -// export const API_WS = 'wss://alatreon.org/chatapp/ws' +// export const API_WS = 'wss://alatreon.org/frangipane/ws'