diff --git a/src-tauri/nsis/template.nsi b/src-tauri/nsis/template.nsi index ad8f4996..e4578d0c 100644 --- a/src-tauri/nsis/template.nsi +++ b/src-tauri/nsis/template.nsi @@ -858,6 +858,27 @@ 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 _internal folder + RmDir /r "$INSTDIR\_internal" + + ; Delete log folder + RmDir /r "$INSTDIR\logs" + + ; Delete weights folder + RmDir /r "$INSTDIR\weights" + ; Delete uninstaller Delete "$INSTDIR\uninstall.exe" diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index e47c9aef..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": "both", + "installMode": "currentUser", "displayLanguageSelector": true } } 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; diff --git a/src-ui/app/splash_component/SplashComponent.jsx b/src-ui/app/splash_component/SplashComponent.jsx index 6de17662..05b2307c 100644 --- a/src-ui/app/splash_component/SplashComponent.jsx +++ b/src-ui/app/splash_component/SplashComponent.jsx @@ -1,12 +1,59 @@ +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"; +import XMarkSvg from "@images/cancel.svg?react"; +import { appWindow } from "@tauri-apps/api/window"; export const SplashComponent = () => { return ( -
+
+ +
); +}; + +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 ( + + + + ); +}; + + +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 031853d0..6ef953b7 100644 --- a/src-ui/app/splash_component/SplashComponent.module.scss +++ b/src-ui/app/splash_component/SplashComponent.module.scss @@ -1,8 +1,70 @@ -.progress_container { +.container { + width: 100%; + height: 100%; + overflow: hidden; 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; +} + + + +.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 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