From c2868e445fad2db7ff291553c4e368bf4ab37daf Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Mon, 30 Dec 2024 10:53:47 +0900 Subject: [PATCH 1/7] [Update] Starting Up: Add announcements button to starting up display. temporarily tho --- .../app/splash_component/SplashComponent.jsx | 31 ++++++++++++++++++- .../SplashComponent.module.scss | 30 ++++++++++++++---- src-ui/assets/megaphone.svg | 1 + 3 files changed, 55 insertions(+), 7 deletions(-) create mode 100644 src-ui/assets/megaphone.svg diff --git a/src-ui/app/splash_component/SplashComponent.jsx b/src-ui/app/splash_component/SplashComponent.jsx index 6de17662..44d62233 100644 --- a/src-ui/app/splash_component/SplashComponent.jsx +++ b/src-ui/app/splash_component/SplashComponent.jsx @@ -1,12 +1,41 @@ +import { useState, useEffect } from "react"; import styles from "./SplashComponent.module.scss"; import { StartUpProgressContainer } from "./start_up_progress_container/StartUpProgressContainer/"; import { DownloadModelsContainer } from "./download_models_container/DownloadModelsContainer/"; +import MegaphoneSvg from "@images/megaphone.svg?react"; export const SplashComponent = () => { return (
+
); -}; \ No newline at end of file +}; + +const AnnouncementsContainer = () => { + const labels = ["VRCT Real-Time Announcements", "VRCTからのお知らせ"]; + const [currentLabelIndex, setCurrentLabelIndex] = useState(0); + + + useEffect(() => { + const labelInterval = setInterval(() => { + setCurrentLabelIndex((prevIndex) => (prevIndex + 1) % labels.length); + }, 6000); + return () => clearInterval(labelInterval); + }, [labels.length]); + + return ( + + + + ); +}; diff --git a/src-ui/app/splash_component/SplashComponent.module.scss b/src-ui/app/splash_component/SplashComponent.module.scss index 031853d0..086b8ba6 100644 --- a/src-ui/app/splash_component/SplashComponent.module.scss +++ b/src-ui/app/splash_component/SplashComponent.module.scss @@ -1,8 +1,26 @@ -.progress_container { - position: relative; -} -.progress_label { +.announcements_button { position: absolute; - font-size: 1rem; - color: var(--dark_basic_text_color); + top: 16px; + left: 20px; + border: 1px solid var(--dark_600_color); + display: flex; + justify-content: center; + align-items: center; + gap: 6px; + padding: 6px 8px; + border-radius: 4px; + &:hover { + background-color: var(--dark_750_color); + } + &:active { + background-color: var(--dark_850_color); + } + transition: all 0.1s ease; +} + +.announcements_label { + font-size: 12px; +} +.announcements_link_svg { + width: 20px; } \ No newline at end of file diff --git a/src-ui/assets/megaphone.svg b/src-ui/assets/megaphone.svg new file mode 100644 index 00000000..86b7ebcb --- /dev/null +++ b/src-ui/assets/megaphone.svg @@ -0,0 +1 @@ + \ No newline at end of file From 0283a74bfe30bab97b613600d1cda32b5eead574 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Mon, 30 Dec 2024 13:39:38 +0900 Subject: [PATCH 2/7] [bugfix] Main Page: Message Logs: Fix text-align where sent message. --- .../log_box/message_container/MessageContainer.module.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src-ui/app/main_page/main_section/message_container/log_box/message_container/MessageContainer.module.scss b/src-ui/app/main_page/main_section/message_container/log_box/message_container/MessageContainer.module.scss index 966ed455..309da7f8 100644 --- a/src-ui/app/main_page/main_section/message_container/log_box/message_container/MessageContainer.module.scss +++ b/src-ui/app/main_page/main_section/message_container/log_box/message_container/MessageContainer.module.scss @@ -73,6 +73,7 @@ flex-direction: column; &.sent_message { align-items: end; + text-align: end; } &.received_message { align-items: start; From 97f06c66f397acb2da5d19365dbc21cbc277eeef Mon Sep 17 00:00:00 2001 From: misyaguziya <53165965+misyaguziya@users.noreply.github.com> Date: Mon, 30 Dec 2024 14:41:49 +0900 Subject: [PATCH 3/7] =?UTF-8?q?=F0=9F=90=9B[bugfix]=20Installer=20:=20?= =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=82=B9=E3=83=88=E3=83=BC=E3=83=AB=E5=85=88?= =?UTF-8?q?=E3=81=8C=E3=82=B3=E3=83=B3=E3=83=94=E3=83=A5=E3=83=BC=E3=82=BF?= =?UTF-8?q?=E3=81=AE=E5=A0=B4=E5=90=88=E7=AE=A1=E7=90=86=E8=80=85=E6=A8=A9?= =?UTF-8?q?=E9=99=90=E3=81=8C=E5=BF=85=E8=A6=81=E3=81=AA=E3=81=9F=E3=82=81?= =?UTF-8?q?=E3=80=81=E3=82=A4=E3=83=B3=E3=82=B9=E3=83=88=E3=83=BC=E3=83=AB?= =?UTF-8?q?=E5=85=88=E3=82=92=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC=E3=81=AB?= =?UTF-8?q?=E5=88=B6=E9=99=90=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= =?UTF-8?q?=E5=A4=89=E6=9B=B4=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-tauri/tauri.conf.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index e47c9aef..c14a2d19 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -75,7 +75,7 @@ "nsis": { "template": "nsis/template.nsi", "license": "../LICENSE", - "installMode": "both", + "installMode": "perUser", "displayLanguageSelector": true } } From 24a90007f32fd6653a864b9ae02de806dc2ed2fd Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Mon, 30 Dec 2024 14:44:36 +0900 Subject: [PATCH 4/7] [Update] Starting up: Add close button. --- .../app/splash_component/SplashComponent.jsx | 20 ++++++++- .../SplashComponent.module.scss | 44 +++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletion(-) diff --git a/src-ui/app/splash_component/SplashComponent.jsx b/src-ui/app/splash_component/SplashComponent.jsx index 44d62233..05b2307c 100644 --- a/src-ui/app/splash_component/SplashComponent.jsx +++ b/src-ui/app/splash_component/SplashComponent.jsx @@ -3,13 +3,16 @@ import styles from "./SplashComponent.module.scss"; import { StartUpProgressContainer } from "./start_up_progress_container/StartUpProgressContainer/"; import { DownloadModelsContainer } from "./download_models_container/DownloadModelsContainer/"; import MegaphoneSvg from "@images/megaphone.svg?react"; +import XMarkSvg from "@images/cancel.svg?react"; +import { appWindow } from "@tauri-apps/api/window"; export const SplashComponent = () => { return ( -
+
+
); }; @@ -39,3 +42,18 @@ const AnnouncementsContainer = () => { ); }; + + +const CloseButtonContainer = () => { + const close = () => { + appWindow.close(); + }; + + return ( + + ); +}; \ No newline at end of file diff --git a/src-ui/app/splash_component/SplashComponent.module.scss b/src-ui/app/splash_component/SplashComponent.module.scss index 086b8ba6..6ef953b7 100644 --- a/src-ui/app/splash_component/SplashComponent.module.scss +++ b/src-ui/app/splash_component/SplashComponent.module.scss @@ -1,3 +1,10 @@ +.container { + width: 100%; + height: 100%; + overflow: hidden; + position: relative; +} + .announcements_button { position: absolute; top: 16px; @@ -23,4 +30,41 @@ } .announcements_link_svg { width: 20px; +} + + + +.close_button_wrapper { + position: absolute; + top: 0; + left: 100%; + transform: translate(-50%, -50%) rotate(45deg); + display: flex; + justify-content: center; + align-items: end; + width: 68px; + aspect-ratio: 1 / 1; + &:hover { + background-color: #bb4448; + & .x_mark_svg { + color: var(--dark_200_color); + transform: rotate(45deg); + } + } + &:active { + background-color: #9c3938; + } + transition: all 0.1s ease; +} + +.close_button { + // width: 100%; + // height: 100%; +} + +.x_mark_svg { + width: 24px; + transform: rotate(-45deg); + color: var(--dark_700_color); + transition: transform 0.3s ease; } \ No newline at end of file From a21fd5aa96e26c88aeeb771c168aa541b96c316d Mon Sep 17 00:00:00 2001 From: misyaguziya <53165965+misyaguziya@users.noreply.github.com> Date: Mon, 30 Dec 2024 14:53:56 +0900 Subject: [PATCH 5/7] =?UTF-8?q?=F0=9F=90=9B[bugfix]=20Installer=20:=20?= =?UTF-8?q?=E3=82=A2=E3=83=B3=E3=82=A4=E3=83=B3=E3=82=B9=E3=83=88=E3=83=BC?= =?UTF-8?q?=E3=83=AB=E6=99=82=E3=81=AB=E8=BF=BD=E5=8A=A0=E3=81=A7=E7=94=9F?= =?UTF-8?q?=E6=88=90=E3=81=95=E3=82=8C=E3=81=9F=E3=83=95=E3=82=A1=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E3=82=82=E5=89=8A=E9=99=A4=E3=81=99=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-tauri/nsis/template.nsi | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src-tauri/nsis/template.nsi b/src-tauri/nsis/template.nsi index ad8f4996..88fb5452 100644 --- a/src-tauri/nsis/template.nsi +++ b/src-tauri/nsis/template.nsi @@ -858,6 +858,24 @@ Section Uninstall Delete "$INSTDIR\\{{this}}" {{/each}} + ; Dlete config.json + Delete "$INSTDIR\config.json" + + ; Delete process.log + Delete "$INSTDIR\process.log" + + ; Delete errror.log + Delete "$INSTDIR\error.log" + + ; Delete update.exe + Delete "$INSTDIR\update.exe" + + ; Delete log files + RmDir /r "$INSTDIR\logs" + + ; Delete weights files + RmDir /r "$INSTDIR\weights" + ; Delete uninstaller Delete "$INSTDIR\uninstall.exe" From 9a4911f6d5a4ae97c2110c97928705e9e678f6bb Mon Sep 17 00:00:00 2001 From: misyaguziya <53165965+misyaguziya@users.noreply.github.com> Date: Mon, 30 Dec 2024 15:13:36 +0900 Subject: [PATCH 6/7] =?UTF-8?q?=F0=9F=90=9B[bugfix]=20Installer=20:=20perU?= =?UTF-8?q?ser=20->=20currentUser?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-tauri/tauri.conf.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index c14a2d19..040bce33 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -75,7 +75,7 @@ "nsis": { "template": "nsis/template.nsi", "license": "../LICENSE", - "installMode": "perUser", + "installMode": "currentUser", "displayLanguageSelector": true } } From 02e262484284999fe6f9d2dc434c18772c565508 Mon Sep 17 00:00:00 2001 From: misyaguziya <53165965+misyaguziya@users.noreply.github.com> Date: Mon, 30 Dec 2024 15:18:33 +0900 Subject: [PATCH 7/7] =?UTF-8?q?=F0=9F=90=9B[bugfix]=20Installer=20:=20?= =?UTF-8?q?=E3=82=A2=E3=83=B3=E3=82=A4=E3=83=B3=E3=82=B9=E3=83=88=E3=83=BC?= =?UTF-8?q?=E3=83=AB=E6=99=82=E3=81=AB=5Finternal=E3=83=95=E3=82=A9?= =?UTF-8?q?=E3=83=AB=E3=83=80=E3=82=92=E5=89=8A=E9=99=A4=E3=81=99=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-tauri/nsis/template.nsi | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src-tauri/nsis/template.nsi b/src-tauri/nsis/template.nsi index 88fb5452..e4578d0c 100644 --- a/src-tauri/nsis/template.nsi +++ b/src-tauri/nsis/template.nsi @@ -870,10 +870,13 @@ Section Uninstall ; Delete update.exe Delete "$INSTDIR\update.exe" - ; Delete log files + ; Delete _internal folder + RmDir /r "$INSTDIR\_internal" + + ; Delete log folder RmDir /r "$INSTDIR\logs" - ; Delete weights files + ; Delete weights folder RmDir /r "$INSTDIR\weights" ; Delete uninstaller