Merge branch 'develop' of https://github.com/Team-Lecue/Lecue-Client …

…into feature/StickerPack

deploy/Dockerfile

@@ -2,14 +2,18 @@ FROM node:18.17.0-slim
 
 WORKDIR /app
 
-RUN npm install -g serve
+# Copy package files and install dependencies
+COPY package.json .
+COPY yarn.lock .
 
-COPY package*.json .
+RUN yarn
 
-RUN npm install --legacy-peer-deps
 
+# Copy the rest of the application code
 COPY . .
 
-RUN npm run build
+# Run the build command using Yarn
+# RUN yarn build
 
-CMD ["serve", "-s", "build"]
+# Set the command to start the server
+CMD ["yarn", "dev"]

package.json

@@ -4,7 +4,7 @@
   "version": "0.0.0",
   "type": "module",
   "scripts": {
-    "dev": "vite",
+    "dev": "vite --host 0.0.0.0 --port 3000",
     "build": "tsc && vite build",
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
     "preview": "vite preview"

src/App.tsx

@@ -1,4 +1,5 @@
 import { Global, ThemeProvider } from '@emotion/react';
+import styled from '@emotion/styled';
 import { QueryClient, QueryClientProvider } from 'react-query';
 
 import Router from './Router';
@@ -9,13 +10,21 @@ const queryClient = new QueryClient();
 
 function App() {
   return (
-    <QueryClientProvider client={queryClient}>
-      <ThemeProvider theme={theme}>
-        <Global styles={gStyle} />
-        <Router />
-      </ThemeProvider>
-    </QueryClientProvider>
+    <Wrapper>
+      <QueryClientProvider client={queryClient}>
+        <ThemeProvider theme={theme}>
+          <Global styles={gStyle} />
+          <Router />
+        </ThemeProvider>
+      </QueryClientProvider>
+    </Wrapper>
   );
 }
 
+const Wrapper = styled.div`
+  border: none;
+  background-color: '#F5F5F5';
+  min-height: calc(var(--vh, 1vh) * 100);
+`;
+
 export default App;

src/styles/GlobalStyles.ts

@@ -153,10 +153,18 @@ const gStyle = css`
 
   #root, body, html {
     max-width: 43rem;
+
     margin: 0 auto;
+    -ms-overflow-style: none; /* 인터넷 익스플로러 */
+    scrollbar-width: none; /* 파이어폭스 */
+  }
+
+  #root::-webkit-scrollbar {
+    display: none; /* 크롬, 사파리, 오페라, 엣지 */
   }
 
   * {
+    max-width: 43rem;
     box-sizing: border-box;
   }
 
@@ -214,7 +222,7 @@ const gStyle = css`
   }
 
   @font-face {
-    font-family: 'Pretendard';
+    font-family: Pretendard;
     src: url('https://cdn.jsdelivr.net/gh/orioncactus/pretendard@v1.3.6/dist/web/static/pretendard.css');
   }
 `;