Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions front/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
8 changes: 4 additions & 4 deletions front/src/App.tsx
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down
Original file line number Diff line number Diff line change
@@ -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();
Expand Down
4 changes: 2 additions & 2 deletions front/src/components/Phaser/ServerMap.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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<ServerMapTypes, ServerMapProps>(
function ServerMap({ currentActiveScene, selectedTheme }, ref) {
Expand Down
2 changes: 1 addition & 1 deletion front/src/components/Server/ServerMapWithTheme.tsx
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
2 changes: 1 addition & 1 deletion front/src/components/user/components/UserProfile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion front/src/pages/Home.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import PreviewServerMap from "../components/home/PreviewServerMap";
import PreviewServerMap from "../components/Home/PreviewServerMap";

const Home = () => {
return (
Expand Down
2 changes: 1 addition & 1 deletion front/src/pages/Join.tsx
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion front/src/pages/Login.tsx
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down
Loading