From 9fda4a7a4b2079730d8197173d05f5cf255f7c68 Mon Sep 17 00:00:00 2001 From: Bossiara13 <236771060+DmitryBykov-ISPO@users.noreply.github.com> Date: Mon, 27 Apr 2026 20:36:24 +0300 Subject: [PATCH 1/8] chore(gui): rewrite footer as fork attribution, drop telegram/boosty/patreon links --- crates/jarvis-core/src/i18n/locales/en.ftl | 6 ++-- crates/jarvis-core/src/i18n/locales/ru.ftl | 6 ++-- crates/jarvis-core/src/i18n/locales/ua.ftl | 6 ++-- frontend/src/components/Footer.svelte | 42 ++-------------------- 4 files changed, 8 insertions(+), 52 deletions(-) diff --git a/crates/jarvis-core/src/i18n/locales/en.ftl b/crates/jarvis-core/src/i18n/locales/en.ftl index 49161b3..ebb60a0 100644 --- a/crates/jarvis-core/src/i18n/locales/en.ftl +++ b/crates/jarvis-core/src/i18n/locales/en.ftl @@ -42,10 +42,8 @@ stats-not-selected = Not selected stats-loading = Loading... # ### FOOTER -footer-author = Project author -footer-telegram = Our Telegram channel -footer-github = Github repository -footer-support = Support the project on +footer-attribution = Fork by Bossiara13. Original: Priler/jarvis (CC BY-NC-SA 4.0). +footer-github = Fork Github repository # ### SETTINGS settings-title = Settings diff --git a/crates/jarvis-core/src/i18n/locales/ru.ftl b/crates/jarvis-core/src/i18n/locales/ru.ftl index 82f55bc..b208c30 100644 --- a/crates/jarvis-core/src/i18n/locales/ru.ftl +++ b/crates/jarvis-core/src/i18n/locales/ru.ftl @@ -42,10 +42,8 @@ stats-not-selected = Не выбран stats-loading = Загрузка... # FOOTER -footer-author = Автор проекта -footer-telegram = Наш телеграм канал -footer-github = Github репозиторий проекта -footer-support = Поддержать проект на +footer-attribution = Автор форка: Bossiara13. Оригинал: Priler/jarvis (CC BY-NC-SA 4.0). +footer-github = Github репозиторий форка # SETTINGS settings-title = Настройки diff --git a/crates/jarvis-core/src/i18n/locales/ua.ftl b/crates/jarvis-core/src/i18n/locales/ua.ftl index dcafc8a..572fe7f 100644 --- a/crates/jarvis-core/src/i18n/locales/ua.ftl +++ b/crates/jarvis-core/src/i18n/locales/ua.ftl @@ -42,10 +42,8 @@ stats-not-selected = Не вибрано stats-loading = Завантаження... # ### FOOTER -footer-author = Автор проєкту -footer-telegram = Наш телеграм канал -footer-github = Github репозиторій проєкту -footer-support = Підтримати проєкт на +footer-attribution = Автор форка: Bossiara13. Оригінал: Priler/jarvis (CC BY-NC-SA 4.0). +footer-github = Github репозиторій форка # ### SETTINGS settings-title = Налаштування diff --git a/frontend/src/components/Footer.svelte b/frontend/src/components/Footer.svelte index 2241d54..b94e85d 100644 --- a/frontend/src/components/Footer.svelte +++ b/frontend/src/components/Footer.svelte @@ -1,63 +1,25 @@ \ No newline at end of file + + .builder-link { + display: inline-block; + padding: 0.5rem 0.9rem; + background: rgba(82, 254, 254, 0.08); + border: 1px solid rgba(82, 254, 254, 0.4); + border-radius: 6px; + color: #52fefe; + font-size: 0.8rem; + text-decoration: none; + transition: background 0.15s ease, border-color 0.15s ease; + + &:hover { + background: rgba(82, 254, 254, 0.16); + border-color: rgba(82, 254, 254, 0.6); + } + } + From 764320786b765cd6f718989178cc4cb31e50b50c Mon Sep 17 00:00:00 2001 From: Bossiara13 <236771060+DmitryBykov-ISPO@users.noreply.github.com> Date: Mon, 27 Apr 2026 20:37:43 +0300 Subject: [PATCH 4/8] chore(gui): hide voice author line in voice picker --- frontend/src/routes/settings/index.svelte | 3 --- 1 file changed, 3 deletions(-) diff --git a/frontend/src/routes/settings/index.svelte b/frontend/src/routes/settings/index.svelte index ab8af45..82f35a9 100644 --- a/frontend/src/routes/settings/index.svelte +++ b/frontend/src/routes/settings/index.svelte @@ -272,9 +272,6 @@ >
{voice.name} - {#if voice.author} - by {voice.author} - {/if}
{#each voice.languages as lang} From eedf4aad9026dfa72788bacfb505b262e5166b52 Mon Sep 17 00:00:00 2001 From: Bossiara13 <236771060+DmitryBykov-ISPO@users.noreply.github.com> Date: Mon, 27 Apr 2026 20:37:56 +0300 Subject: [PATCH 5/8] chore(core): default voice = jarvis-og --- crates/jarvis-core/src/config.rs | 2 +- crates/jarvis-core/src/db/structs.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/jarvis-core/src/config.rs b/crates/jarvis-core/src/config.rs index f7b55a4..d28f856 100644 --- a/crates/jarvis-core/src/config.rs +++ b/crates/jarvis-core/src/config.rs @@ -72,7 +72,7 @@ pub const DEFAULT_INTENT_BACKEND: &str = "intent-classifier"; pub const DEFAULT_SLOTS_BACKEND: &str = "none"; pub const DEFAULT_VAD_BACKEND: &str = "energy"; -pub const DEFAULT_VOICE: &str = "jarvis-remaster"; +pub const DEFAULT_VOICE: &str = "jarvis-og"; pub const SOUND_PATH: &str = "resources/sound"; // extended from SOUND_DIR (resources/sound) pub const VOICES_PATH: &str = "voices"; // extended from SOUND_PATH (resources/sound) diff --git a/crates/jarvis-core/src/db/structs.rs b/crates/jarvis-core/src/db/structs.rs index dd63b0d..479f1ca 100644 --- a/crates/jarvis-core/src/db/structs.rs +++ b/crates/jarvis-core/src/db/structs.rs @@ -152,7 +152,7 @@ impl Default for Settings { fn default() -> Settings { Settings { microphone: -1, - voice: String::from(""), + voice: String::from(config::DEFAULT_VOICE), wake_word_engine: config::DEFAULT_WAKE_WORD_ENGINE, From 7dff5024c4e9d1050a3e800e87c4c7fa3020e424 Mon Sep 17 00:00:00 2001 From: Bossiara13 <236771060+DmitryBykov-ISPO@users.noreply.github.com> Date: Mon, 27 Apr 2026 20:38:26 +0300 Subject: [PATCH 6/8] chore: bump workspace version to 0.4.1 --- Cargo.toml | 2 +- crates/jarvis-gui/tauri.conf.json | 2 +- frontend/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 74e0658..41326a7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ members = [ resolver = "2" [workspace.package] -version = "0.1.0" +version = "0.4.1" authors = ["Abraham Tugalov (original)", "Bossiara13 (fork)"] license = "GPL-3.0-only" repository = "https://github.com/DmitryBykov-ISPO/J.A.R.V.I.S-rust" diff --git a/crates/jarvis-gui/tauri.conf.json b/crates/jarvis-gui/tauri.conf.json index d962ab3..4a799b2 100644 --- a/crates/jarvis-gui/tauri.conf.json +++ b/crates/jarvis-gui/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "jarvis-app", - "version": "0.0.3", + "version": "0.4.1", "identifier": "com.priler.jarvis", "build": { "beforeDevCommand": "npm run dev", diff --git a/frontend/package.json b/frontend/package.json index 53ee59f..f37b367 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,7 +1,7 @@ { "name": "jarvis-app", "private": true, - "version": "0.1.0", + "version": "0.4.1", "type": "module", "scripts": { "dev": "vite", From 7f167b563bfe1ce09a72a4197d6a9e0db74e538a Mon Sep 17 00:00:00 2001 From: Bossiara13 <236771060+DmitryBykov-ISPO@users.noreply.github.com> Date: Mon, 27 Apr 2026 20:39:42 +0300 Subject: [PATCH 7/8] chore: sync Cargo.lock with 0.4.1 version bump --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9a15428..acbad91 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3262,7 +3262,7 @@ checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" [[package]] name = "jarvis-app" -version = "0.1.0" +version = "0.4.1" dependencies = [ "glib 0.21.5", "gtk", @@ -3282,7 +3282,7 @@ dependencies = [ [[package]] name = "jarvis-cli" -version = "0.1.0" +version = "0.4.1" dependencies = [ "env_logger", "jarvis-core", @@ -3293,7 +3293,7 @@ dependencies = [ [[package]] name = "jarvis-core" -version = "0.1.0" +version = "0.4.1" dependencies = [ "chrono", "fastembed", @@ -3337,7 +3337,7 @@ dependencies = [ [[package]] name = "jarvis-gui" -version = "0.1.0" +version = "0.4.1" dependencies = [ "jarvis-core", "lazy_static", From 5cbd5515d3190e70f4635fbc82a48440cf9a621b Mon Sep 17 00:00:00 2001 From: Bossiara13 <236771060+DmitryBykov-ISPO@users.noreply.github.com> Date: Mon, 27 Apr 2026 20:40:47 +0300 Subject: [PATCH 8/8] chore(gui): drop unused tg/boosty/patreon entries from appInfo store --- frontend/src/stores.ts | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/frontend/src/stores.ts b/frontend/src/stores.ts index 51603ed..53a2903 100644 --- a/frontend/src/stores.ts +++ b/frontend/src/stores.ts @@ -40,11 +40,8 @@ export const assistantVoice = writable("") // ### APP INFO export const appInfo = writable({ - tgOfficialLink: "", feedbackLink: "", repositoryLink: "", - boostySupportLink: "", - patreonSupportLink: "", logFilePath: "" }) @@ -60,21 +57,15 @@ export async function loadVoiceSetting() { export async function loadAppInfo() { try { - const [tg, feedback, repo, boosty, patreon, logPath] = await Promise.all([ - invoke("get_tg_official_link"), + const [feedback, repo, logPath] = await Promise.all([ invoke("get_feedback_link"), invoke("get_repository_link"), - invoke("get_boosty_link"), - invoke("get_patreon_link"), invoke("get_log_file_path") ]) appInfo.set({ - tgOfficialLink: tg, feedbackLink: feedback, repositoryLink: repo, - boostySupportLink: boosty, - patreonSupportLink: patreon, logFilePath: logPath }) } catch (err) {