Merge branch 'dev' into feature/#4

Choco-Express · Sep 23, 2024 · b7799be · b7799be
2 parents 3c37e12 + b5ba485
commit b7799be
Show file tree

Hide file tree

Showing 23 changed files with 585 additions and 66 deletions.
diff --git a/.env b/.env
@@ -1 +1,3 @@
-VITE_BASE_URL=https://api.choco-express.site
+VITE_BASE_URL=https://api.choco-express.site
+VITE_KAKAO_KEY=b76dd44adf31465496f17842634d7c6b
+VITE_KAKAO_ID=112476
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -16,7 +16,9 @@ jobs:
         uses: actions/checkout@v3
       - name: Create .env file
         run: |
-          echo "VITE_BASE_URL=${{ secrets.VITE_BASE_URL }}" > .env
+          echo "VITE_BASE_URL=${{ secrets.VITE_BASE_URL }}" >> .env
+          echo "VITE_KAKAO_KEY=${{ secrets.VITE_KAKAO_KEY }}" >> .env
+          echo "VITE_KAKAO_ID=${{ secrets.VITE_KAKAO_ID }}" >> .env
       - name: Node.js
         uses: actions/setup-node@v3
         with:

diff --git a/index.html b/index.html
@@ -1,13 +1,18 @@
-<!doctype html>
-<html lang="en">
+<!DOCTYPE html>
+<html lang="ko">
   <head>
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + React</title>
+    <title>Choco Express</title>
   </head>
   <body>
     <div id="root"></div>
     <script type="module" src="/src/main.jsx"></script>
+    <script
+      src="https://t1.kakaocdn.net/kakao_js_sdk/2.7.2/kakao.min.js"
+      integrity="sha384-TiCUE00h649CAMonG018J2ujOgDKW/kVWlChEuu4jK2vxfAAD0eZxzCKakxg55G4"
+      crossorigin="anonymous"
+    ></script>
   </body>
 </html>
diff --git a/jsconfig.json b/jsconfig.json
@@ -0,0 +1,8 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "@/*": ["src/*"]
+    }
+  }
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -11,8 +11,10 @@
   },
   "dependencies": {
     "axios": "^1.7.7",
+    "html2canvas": "^1.4.1",
     "js-cookie": "^3.0.5",
     "react": "^18.3.1",
+    "react-device-detect": "^2.2.3",
     "react-dom": "^18.3.1",
     "react-frame-component": "^5.2.7",
     "react-router-dom": "^6.26.1",

diff --git a/src/App.jsx b/src/App.jsx
@@ -1,58 +1,22 @@
-import React from "react";
-import { styled } from "styled-components";
-import { GlobalStyle } from "./style/globalStyle";
 import { Outlet } from "react-router-dom";
-import { NameSetting } from "./components/NameSetting/NameSetting";
+import styled from "styled-components";
+import { GlobalStyle } from "./style/globalStyle";
 
-const Frame = styled.div`
-  width: 100vw;
+const Wrapper = styled.section`
+  flex-grow: 1;
   min-height: 100vh;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  position: relative;
-`;
+  /* width: 100%; */
 
-const Wrapper = styled.div`
-  margin: 0 auto;
-  min-height: 100vh;
-  flex-grow: 1;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  max-width: 420px;
-  position: absolute;
-  z-index: 0;
   background-color: #fef7e2;
 `;
 
-const Content = styled.div`
-  flex-grow: 1;
-  min-height: 100%;
-  width: 100%;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-`;
-
-const Layout = () => {
-  return (
-    <Frame>
-      <Wrapper>
-        <Content>
-          <Outlet />
-        </Content>
-      </Wrapper>
-    </Frame>
-  );
-};
-
 function App() {
   return (
     <>
       <GlobalStyle />
-      <Layout />
+      <Wrapper>
+        <Outlet />
+      </Wrapper>
     </>
   );
 }

diff --git a/src/assets/images/Layout.png b/src/assets/images/Layout.png
diff --git a/src/assets/images/bird.svg b/src/assets/images/bird.svg