From 245ca210bcba668976bc991cae3a3ecbfc5d16d5 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Sat, 27 Jul 2024 23:03:20 +0900 Subject: [PATCH] [Refactor] Change the way import. and also move useWindow.js to logics. --- src-ui/{utils => logics}/useWindow.js | 0 src-ui/windows/config_window/ConfigWindow.jsx | 3 --- src-ui/windows/config_window/index.jsx | 8 +++----- src-ui/windows/main_window/MainWindow.jsx | 3 ++- src-ui/windows/main_window/index.jsx | 3 ++- .../sidebar_section/open_settings/OpenSettings.jsx | 2 +- vite.config.js | 1 + 7 files changed, 9 insertions(+), 11 deletions(-) rename src-ui/{utils => logics}/useWindow.js (100%) diff --git a/src-ui/utils/useWindow.js b/src-ui/logics/useWindow.js similarity index 100% rename from src-ui/utils/useWindow.js rename to src-ui/logics/useWindow.js diff --git a/src-ui/windows/config_window/ConfigWindow.jsx b/src-ui/windows/config_window/ConfigWindow.jsx index 7820ffaf..421352df 100644 --- a/src-ui/windows/config_window/ConfigWindow.jsx +++ b/src-ui/windows/config_window/ConfigWindow.jsx @@ -1,6 +1,3 @@ -import "../../../locales/config.js"; -import "@utils/root.css"; - import styles from "./ConfigWindow.module.scss"; import { Topbar } from "./topbar/Topbar"; diff --git a/src-ui/windows/config_window/index.jsx b/src-ui/windows/config_window/index.jsx index abf09419..f1a5de76 100644 --- a/src-ui/windows/config_window/index.jsx +++ b/src-ui/windows/config_window/index.jsx @@ -1,11 +1,9 @@ import React from "react"; import ReactDOM from "react-dom/client"; -// import "../locales/config.js"; -import { ConfigWindow } from "./ConfigWindow"; -// import "./reset.css"; -// import "./root.css"; -// import { useWindow } from "@utils/useWindow"; +import "@root/locales/config.js"; +import "@utils/root.css"; +import { ConfigWindow } from "./ConfigWindow"; ReactDOM.createRoot(document.getElementById("root")).render( diff --git a/src-ui/windows/main_window/MainWindow.jsx b/src-ui/windows/main_window/MainWindow.jsx index 7e391cd5..887bcde7 100644 --- a/src-ui/windows/main_window/MainWindow.jsx +++ b/src-ui/windows/main_window/MainWindow.jsx @@ -1,5 +1,6 @@ import { useEffect, useRef } from "react"; import styles from "./MainWindow.module.scss"; + import { SidebarSection } from "./sidebar_section/SidebarSection"; import { MainSection } from "./main_section/MainSection"; import { useStartPython } from "@logics/useStartPython"; @@ -27,7 +28,7 @@ export const MainWindow = () => { import { useTranslation } from "react-i18next"; import { useIsOpenedConfigWindow } from "@store"; -import { useWindow } from "@utils/useWindow"; +import { useWindow } from "@logics/useWindow"; export const MainWindowCover = () => { const { t } = useTranslation(); diff --git a/src-ui/windows/main_window/index.jsx b/src-ui/windows/main_window/index.jsx index 07d4d1d2..8e698c78 100644 --- a/src-ui/windows/main_window/index.jsx +++ b/src-ui/windows/main_window/index.jsx @@ -1,7 +1,8 @@ import React from "react"; import ReactDOM from "react-dom/client"; -import "../../../locales/config.js"; +import "@root/locales/config.js"; import "@utils/root.css"; + import { MainWindow } from "./MainWindow"; ReactDOM.createRoot(document.getElementById("root")).render( diff --git a/src-ui/windows/main_window/sidebar_section/open_settings/OpenSettings.jsx b/src-ui/windows/main_window/sidebar_section/open_settings/OpenSettings.jsx index 2bcbeb54..c664db11 100644 --- a/src-ui/windows/main_window/sidebar_section/open_settings/OpenSettings.jsx +++ b/src-ui/windows/main_window/sidebar_section/open_settings/OpenSettings.jsx @@ -1,7 +1,7 @@ import styles from "./OpenSettings.module.scss"; import ConfigurationSvg from "@images/configuration.svg?react"; -import { useWindow } from "@utils/useWindow"; +import { useWindow } from "@logics/useWindow"; export const OpenSettings = () => { const { createConfigWindow } = useWindow(); diff --git a/vite.config.js b/vite.config.js index 27f60dfe..5767f5e5 100644 --- a/vite.config.js +++ b/vite.config.js @@ -33,6 +33,7 @@ export default defineConfig(async () => ({ resolve: { alias: { + "@root": path.resolve(__dirname), "@data": path.resolve(__dirname, "./data.js"), "@scss_mixins": path.resolve(__dirname, "src-ui/utils/mixins.scss"),