From 7db35537f8d67c40fd003fbfd14cce18081474c7 Mon Sep 17 00:00:00 2001 From: "BOOK-7HF2F58CR4\\sour1" Date: Sat, 14 Dec 2024 21:38:57 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=ED=94=84=EB=A1=A0=ED=8A=B8=20?= =?UTF-8?q?=EB=B0=B0=ED=8F=AC=20RUN=20BUILD=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/Dockerfile | 8 ++++---- front/src/App.tsx | 8 ++++---- .../components/leftSidebar/components/AddServer.tsx | 2 +- front/src/components/Phaser/ServerMap.tsx | 4 ++-- front/src/components/Server/ServerMapWithTheme.tsx | 2 +- front/src/components/user/components/UserProfile.tsx | 2 +- front/src/pages/Home.tsx | 2 +- front/src/pages/Join.tsx | 2 +- front/src/pages/Login.tsx | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/front/Dockerfile b/front/Dockerfile index e6513b92..76dca4bf 100644 --- a/front/Dockerfile +++ b/front/Dockerfile @@ -1,14 +1,14 @@ -FROM node:16-alpine as build +FROM node:18-alpine as build WORKDIR /app -COPY package*.json ./ +COPY package*.json yarn.lock ./ -RUN npm install +RUN yarn install COPY . . -RUN npm run build +RUN yarn build FROM nginx:stable-alpine diff --git a/front/src/App.tsx b/front/src/App.tsx index 38606ad0..7b536183 100644 --- a/front/src/App.tsx +++ b/front/src/App.tsx @@ -1,12 +1,12 @@ import { Navigate, Route, Routes } from "react-router-dom"; import "./App.css"; -import AuthLayout from "./components/auth/AuthLayout"; -import PrivateRoute from "./components/auth/PrivateRoute"; -import Layout from "./components/layout/Layout"; +import AuthLayout from "./components/Auth/AuthLayout"; +import PrivateRoute from "./components/Auth/PrivateRoute"; +import Layout from "./components/Layout/Layout"; import Home from "./pages/Home"; import Join from "./pages/Join"; import Login from "./pages/Login"; -import ServerMapWithTheme from "./components/server/ServerMapWithTheme"; +import ServerMapWithTheme from "./components/Server/ServerMapWithTheme"; function App() { return ( diff --git a/front/src/components/Layout/components/leftSidebar/components/AddServer.tsx b/front/src/components/Layout/components/leftSidebar/components/AddServer.tsx index 9142eaae..661456cf 100644 --- a/front/src/components/Layout/components/leftSidebar/components/AddServer.tsx +++ b/front/src/components/Layout/components/leftSidebar/components/AddServer.tsx @@ -1,7 +1,7 @@ import { IoAddCircle } from "react-icons/io5"; import useModal from "../../../../common/modal/hooks/useModal"; import Modal from "../../../../common/modal/Modal"; -import CreateServerForm from "../../../../server/components/CreateServerForm"; +import CreateServerForm from "../../../../Server/components/CreateServerForm"; const AddServer = () => { const { isOpen, openModal, closeModal } = useModal(); diff --git a/front/src/components/Phaser/ServerMap.tsx b/front/src/components/Phaser/ServerMap.tsx index e1e56f7a..bf380791 100644 --- a/front/src/components/Phaser/ServerMap.tsx +++ b/front/src/components/Phaser/ServerMap.tsx @@ -5,8 +5,8 @@ import { forwardRef, useEffect, useLayoutEffect, useRef } from "react"; import StartGame from "./main"; import { EventBus } from "./EventBus"; import { ServerMapProps, ServerMapTypes } from "../../types/map"; -import VideoCallBoxList from "../videoCall/VideoCallBoxList"; -import VideoCallToolBar from "../videoCall/VideoCallToolBar"; +import VideoCallBoxList from "../VideoCall/VideoCallBoxList"; +import VideoCallToolBar from "../VideoCall/VideoCallToolBar"; export const ServerMap = forwardRef( function ServerMap({ currentActiveScene, selectedTheme }, ref) { diff --git a/front/src/components/Server/ServerMapWithTheme.tsx b/front/src/components/Server/ServerMapWithTheme.tsx index 3e33a688..62e5306e 100644 --- a/front/src/components/Server/ServerMapWithTheme.tsx +++ b/front/src/components/Server/ServerMapWithTheme.tsx @@ -1,6 +1,6 @@ import React from "react"; import { useThemeStore } from "../../store/useThemeStore"; -import { ServerMap } from "../phaser/ServerMap"; +import { ServerMap } from "../Phaser/ServerMap"; const ServerMapWithTheme = () => { const selectedTheme = useThemeStore((state) => state.selectedTheme); diff --git a/front/src/components/user/components/UserProfile.tsx b/front/src/components/user/components/UserProfile.tsx index 0f8fb8b4..118e1e48 100644 --- a/front/src/components/user/components/UserProfile.tsx +++ b/front/src/components/user/components/UserProfile.tsx @@ -3,7 +3,7 @@ import { useLoginStore } from "../../../store/useLoginStore"; import Button from "../../common/button/Button"; import useProfile from "../hooks/useProfile"; import Avatar from "boring-avatars"; -import CurrentUserAvatar from "../../layout/components/leftSidebar/components/CurrentUserAvatar"; +import CurrentUserAvatar from "../../Layout/components/leftSidebar/components/CurrentUserAvatar"; const UserProfile = () => { const token = localStorage.getItem("dicoTown_AccessToken"); diff --git a/front/src/pages/Home.tsx b/front/src/pages/Home.tsx index 083453d9..2a8cfd92 100644 --- a/front/src/pages/Home.tsx +++ b/front/src/pages/Home.tsx @@ -1,4 +1,4 @@ -import PreviewServerMap from "../components/home/PreviewServerMap"; +import PreviewServerMap from "../components/Home/PreviewServerMap"; const Home = () => { return ( diff --git a/front/src/pages/Join.tsx b/front/src/pages/Join.tsx index 05e0f9d6..1a38e653 100644 --- a/front/src/pages/Join.tsx +++ b/front/src/pages/Join.tsx @@ -1,5 +1,5 @@ import { ThemeProvider } from "@mui/material/styles"; -import JoinBox from "../components/auth/JoinBox"; +import JoinBox from "../components/Auth/JoinBox"; import theme from "../theme/themeConfig"; const Login = () => { return ( diff --git a/front/src/pages/Login.tsx b/front/src/pages/Login.tsx index 34821f9c..c799317c 100644 --- a/front/src/pages/Login.tsx +++ b/front/src/pages/Login.tsx @@ -1,5 +1,5 @@ import { ThemeProvider } from "@mui/material/styles"; -import LoginBox from "../components/auth/LoginBox"; +import LoginBox from "../components/Auth/LoginBox"; import theme from "../theme/themeConfig"; const Login = () => { return (