diff --git a/Cargo.lock b/Cargo.lock index acbad91..9a15428 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3262,7 +3262,7 @@ checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" [[package]] name = "jarvis-app" -version = "0.4.1" +version = "0.1.0" dependencies = [ "glib 0.21.5", "gtk", @@ -3282,7 +3282,7 @@ dependencies = [ [[package]] name = "jarvis-cli" -version = "0.4.1" +version = "0.1.0" dependencies = [ "env_logger", "jarvis-core", @@ -3293,7 +3293,7 @@ dependencies = [ [[package]] name = "jarvis-core" -version = "0.4.1" +version = "0.1.0" dependencies = [ "chrono", "fastembed", @@ -3337,7 +3337,7 @@ dependencies = [ [[package]] name = "jarvis-gui" -version = "0.4.1" +version = "0.1.0" dependencies = [ "jarvis-core", "lazy_static", diff --git a/Cargo.toml b/Cargo.toml index 41326a7..d3ea1d2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,10 +8,10 @@ members = [ resolver = "2" [workspace.package] -version = "0.4.1" +version = "0.1.0" authors = ["Abraham Tugalov (original)", "Bossiara13 (fork)"] license = "GPL-3.0-only" -repository = "https://github.com/DmitryBykov-ISPO/J.A.R.V.I.S-rust" +repository = "https://github.com/Priler/jarvis" edition = "2021" [workspace.dependencies] diff --git a/crates/jarvis-core/src/config.rs b/crates/jarvis-core/src/config.rs index d28f856..f7b55a4 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-og"; +pub const DEFAULT_VOICE: &str = "jarvis-remaster"; 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 479f1ca..dd63b0d 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(config::DEFAULT_VOICE), + voice: String::from(""), wake_word_engine: config::DEFAULT_WAKE_WORD_ENGINE, diff --git a/crates/jarvis-core/src/i18n/locales/en.ftl b/crates/jarvis-core/src/i18n/locales/en.ftl index 5d43086..49161b3 100644 --- a/crates/jarvis-core/src/i18n/locales/en.ftl +++ b/crates/jarvis-core/src/i18n/locales/en.ftl @@ -42,8 +42,10 @@ stats-not-selected = Not selected stats-loading = Loading... # ### FOOTER -footer-attribution = Fork by Bossiara13. Original: Priler/jarvis (CC BY-NC-SA 4.0). -footer-github = Fork Github repository +footer-author = Project author +footer-telegram = Our Telegram channel +footer-github = Github repository +footer-support = Support the project on # ### SETTINGS settings-title = Settings @@ -110,9 +112,10 @@ settings-openai-not-supported = ChatGPT is not currently supported. It will be a commands-title = Commands commands-search = Search commands... commands-count = { $count } commands -commands-heading = Jarvis commands -commands-desc = Voice commands are configured via commands.yaml (Python fork) or resources/commands/ (Rust). A GUI command builder is available in the Python version of the fork. -commands-builder-link = Open Command Builder (Python fork) +commands-wip-title = [404] This section is under development! +commands-wip-desc = Here will be a list of commands + full-featured command editor. +commands-wip-follow = Follow updates in +commands-wip-channel = our Telegram channel # ### ERRORS error-generic = An error occurred diff --git a/crates/jarvis-core/src/i18n/locales/ru.ftl b/crates/jarvis-core/src/i18n/locales/ru.ftl index a68f08d..82f55bc 100644 --- a/crates/jarvis-core/src/i18n/locales/ru.ftl +++ b/crates/jarvis-core/src/i18n/locales/ru.ftl @@ -42,8 +42,10 @@ stats-not-selected = Не выбран stats-loading = Загрузка... # FOOTER -footer-attribution = Автор форка: Bossiara13. Оригинал: Priler/jarvis (CC BY-NC-SA 4.0). -footer-github = Github репозиторий форка +footer-author = Автор проекта +footer-telegram = Наш телеграм канал +footer-github = Github репозиторий проекта +footer-support = Поддержать проект на # SETTINGS settings-title = Настройки @@ -110,9 +112,10 @@ settings-openai-not-supported = В данный момент ChatGPT не под commands-title = Команды commands-search = Поиск команд... commands-count = { $count } команд -commands-heading = Команды Jarvis -commands-desc = Голосовые команды настраиваются через файл commands.yaml (Python-форк) или resources/commands/ (Rust). GUI-конструктор команд доступен в Python-версии форка. -commands-builder-link = Открыть Command Builder (Python-форк) +commands-wip-title = [404] Этот раздел еще находится в разработке! +commands-wip-desc = Тут будет список команд + полноценный редактор команд. +commands-wip-follow = Следите за обновлениями в +commands-wip-channel = нашем телеграм канале # ERRORS error-generic = Произошла ошибка diff --git a/crates/jarvis-core/src/i18n/locales/ua.ftl b/crates/jarvis-core/src/i18n/locales/ua.ftl index c805a20..dcafc8a 100644 --- a/crates/jarvis-core/src/i18n/locales/ua.ftl +++ b/crates/jarvis-core/src/i18n/locales/ua.ftl @@ -42,8 +42,10 @@ stats-not-selected = Не вибрано stats-loading = Завантаження... # ### FOOTER -footer-attribution = Автор форка: Bossiara13. Оригінал: Priler/jarvis (CC BY-NC-SA 4.0). -footer-github = Github репозиторій форка +footer-author = Автор проєкту +footer-telegram = Наш телеграм канал +footer-github = Github репозиторій проєкту +footer-support = Підтримати проєкт на # ### SETTINGS settings-title = Налаштування @@ -110,9 +112,10 @@ settings-openai-not-supported = Наразі ChatGPT не підтримуєть commands-title = Команди commands-search = Пошук команд... commands-count = { $count } команд -commands-heading = Команди Jarvis -commands-desc = Голосові команди налаштовуються через файл commands.yaml (Python-форк) або resources/commands/ (Rust). GUI-конструктор команд доступний у Python-версії форка. -commands-builder-link = Відкрити Command Builder (Python-форк) +commands-wip-title = [404] Цей розділ ще в розробці! +commands-wip-desc = Тут буде список команд + повноцінний редактор команд. +commands-wip-follow = Слідкуйте за оновленнями в +commands-wip-channel = нашому телеграм каналі # ### ERRORS error-generic = Сталася помилка diff --git a/crates/jarvis-gui/tauri.conf.json b/crates/jarvis-gui/tauri.conf.json index 4a799b2..d962ab3 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.4.1", + "version": "0.0.3", "identifier": "com.priler.jarvis", "build": { "beforeDevCommand": "npm run dev", diff --git a/frontend/package.json b/frontend/package.json index f37b367..53ee59f 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,7 +1,7 @@ { "name": "jarvis-app", "private": true, - "version": "0.4.1", + "version": "0.1.0", "type": "module", "scripts": { "dev": "vite", diff --git a/frontend/src/components/Footer.svelte b/frontend/src/components/Footer.svelte index b94e85d..2241d54 100644 --- a/frontend/src/components/Footer.svelte +++ b/frontend/src/components/Footer.svelte @@ -1,25 +1,63 @@ + \ No newline at end of file diff --git a/frontend/src/routes/settings/index.svelte b/frontend/src/routes/settings/index.svelte index 82f35a9..ab8af45 100644 --- a/frontend/src/routes/settings/index.svelte +++ b/frontend/src/routes/settings/index.svelte @@ -272,6 +272,9 @@ >
{voice.name} + {#if voice.author} + by {voice.author} + {/if}
{#each voice.languages as lang} diff --git a/frontend/src/stores.ts b/frontend/src/stores.ts index 53a2903..51603ed 100644 --- a/frontend/src/stores.ts +++ b/frontend/src/stores.ts @@ -40,8 +40,11 @@ export const assistantVoice = writable("") // ### APP INFO export const appInfo = writable({ + tgOfficialLink: "", feedbackLink: "", repositoryLink: "", + boostySupportLink: "", + patreonSupportLink: "", logFilePath: "" }) @@ -57,15 +60,21 @@ export async function loadVoiceSetting() { export async function loadAppInfo() { try { - const [feedback, repo, logPath] = await Promise.all([ + const [tg, feedback, repo, boosty, patreon, logPath] = await Promise.all([ + invoke("get_tg_official_link"), 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) {