| 
| 
| 
|
+| 
-### Back-End
+#### Back-End
-## Issue & TroubleShooting
-[Issue & TroubleShooting](https://github.com/softeerbootcamp4th/Team6-AwesomeOrange-BE/wiki/%5BIssue-&-TroubleShooting%5D)
+### ๐๏ธ ํด๋ ๊ตฌ์กฐ
+**ํผ์ฒ ๊ธฐ๋ฐ ํด๋ ๊ตฌ์กฐ**๋ฅผ ์ฑ์ฉํ๊ณ ์์ต๋๋ค. ๊ฐ๊ฐ์ feature ํด๋ ๋ด์ ์ปดํฌ๋ํธ, ํ
, ์์ ๋ฑ์ด ์ ์๋์ด ์๋ ํํ๋ก, ๋ถ๋ฅ ๊ธฐ๋ฐ ํด๋ ๊ตฌ์กฐ์ ๋นํด ์ ์ฌํ ๊ธฐ๋ฅ์ ๊ฐ์ง ํ์ผ์ ์ฐพ๊ธฐ ๋งค์ฐ ๋น ๋ฅด๊ธฐ ๋๋ฌธ์ ์ฑ์ฉํ์ต๋๋ค.
+```
+.
+โโโ packages/
+โ โโโ common/ : ๋ฉ์ธ๊ณผ ์ด๋๋ฏผ ๊ณตํต์์ ์ฌ์ฉ๋ฉ๋๋ค.
+โ โ โโโ src
+โ โโโ mainPage/ : ๋ฉ์ธ ํ์ด์ง์ ๋ฃจํธ ๋๋ ํ ๋ฆฌ์
๋๋ค.
+โ โ โโโ src/
+โ โ โ โโโ shared : 2๋ฒ ์ด์ ์ฌ์ฉ๋๋ ๊ณตํต feature์
๋๋ค.
+โ โ โ โโโ features : 1๋ฒ๋ง ์ฌ์ฉ๋๋ ์ฃผ์ feature์
๋๋ค.
+โ โ โ โโโ App.jsx
+โ โ โ โโโ main-client.jsx
+โ โ โ โโโ main-server.jsx
+โ โ โ โโโ mock.js
+โ โ โโโ public : ๋ฉ์ธ ํ์ด์ง์์๋ง ์ฌ์ฉ๋๋ ์ ์ ์์์
๋๋ค.
+โ โ โโโ index.html
+โ โโโ adminPage/ : ์ด๋๋ฏผ ํ์ด์ง์ ๋ฃจํธ ๋๋ ํ ๋ฆฌ์
๋๋ค.
+โ โโโ src/
+โ โ โโโ shared
+โ โ โโโ features
+โ โ โโโ pages : ์ด๋๋ฏผ ํ์ด์ง์ ๊ฐ ํ์ด์ง๋ฅผ ๋ค๋ฃน๋๋ค.
+โ โ โโโ App.jsx
+โ โ โโโ main-client.jsx
+โ โ โโโ main-server.jsx
+โ โ โโโ mock.js
+โ โโโ public
+โ โโโ index.html
+โโโ public
+```
+
+### ๐๏ธ ERD
+
+
+ 
- 
+
-
+ {[1, 2, 3, 4].map((index, i) => (
+
+ setFlipState((state) => {
+ const newState = [...state];
+ newState[i] = flipState;
+ return newState;
+ })
+ }
+ key={`card ${index}`}
+ {...cardProps}
+ />
+ ))}
+
EVENT 2
diff --git a/packages/mainPage/src/features/interactions/index.jsx b/packages/mainPage/src/features/interactions/index.jsx
index a1c1dadc..2c8be557 100644
--- a/packages/mainPage/src/features/interactions/index.jsx
+++ b/packages/mainPage/src/features/interactions/index.jsx
@@ -23,8 +23,9 @@ export default function InteractionPage() {
return (
<>
+
-
+
+
๋ด๊ฐ ์ ํํ ๋จ ํ๋์ ์ ๊ธฐ์ฐจ
The new IONIQ 5
diff --git a/packages/mainPage/src/shared/auth/AuthModal.jsx b/packages/mainPage/src/shared/auth/AuthModal.jsx
index 84cad166..b4d20537 100644
--- a/packages/mainPage/src/shared/auth/AuthModal.jsx
+++ b/packages/mainPage/src/shared/auth/AuthModal.jsx
@@ -5,9 +5,9 @@ import UserFindStage from "./UserFind";
import { ModalCloseContext } from "@common/modal/modal.jsx";
import { login } from "./store.js";
-const AUTH_INPUT_PAGE = Symbol("input");
-const AUTH_CODE_PAGE = Symbol("code");
-const AUTH_FIND_PAGE = Symbol("find");
+const AUTH_INPUT_PAGE = "input";
+const AUTH_CODE_PAGE = "code";
+const AUTH_FIND_PAGE = "find";
function AuthModal({ onComplete: onCompleteCallback }) {
const close = useContext(ModalCloseContext);
diff --git a/packages/mainPage/src/shared/drawEvent/store.js b/packages/mainPage/src/shared/drawEvent/store.js
index 5c17c6d7..d51fb5ea 100644
--- a/packages/mainPage/src/shared/drawEvent/store.js
+++ b/packages/mainPage/src/shared/drawEvent/store.js
@@ -10,6 +10,7 @@ function getJoinDataEvent() {
let newJoinedList = [false, false, false, false, false];
dates.forEach((date) => {
const day = getDayDifference(EVENT_START_DATE, new Date(date));
+ if (day >= 5 || day < 0) return;
newJoinedList[day] = true;
});
return newJoinedList;
diff --git a/packages/mainPage/vite.config.js b/packages/mainPage/vite.config.js
index b21fb821..f797e502 100644
--- a/packages/mainPage/vite.config.js
+++ b/packages/mainPage/vite.config.js
@@ -14,6 +14,7 @@ export default defineConfig({
svgr(),
sharedAssetRouter([
["/font", "/public/font"],
+ ["/favicon", "/public/favicon"],
["/shared", "/public"],
["/mockServiceWorker.js", "/public/mockServiceWorker.js"],
]),
diff --git a/public/favicon/android-chrome-192x192.png b/public/favicon/android-chrome-192x192.png
new file mode 100644
index 00000000..651ca722
Binary files /dev/null and b/public/favicon/android-chrome-192x192.png differ
diff --git a/public/favicon/android-chrome-512x512.png b/public/favicon/android-chrome-512x512.png
new file mode 100644
index 00000000..331a39eb
Binary files /dev/null and b/public/favicon/android-chrome-512x512.png differ
diff --git a/public/favicon/apple-touch-icon.png b/public/favicon/apple-touch-icon.png
new file mode 100644
index 00000000..368984fd
Binary files /dev/null and b/public/favicon/apple-touch-icon.png differ
diff --git a/public/favicon/favicon-16x16.png b/public/favicon/favicon-16x16.png
new file mode 100644
index 00000000..dea99eac
Binary files /dev/null and b/public/favicon/favicon-16x16.png differ
diff --git a/public/favicon/favicon-32x32.png b/public/favicon/favicon-32x32.png
new file mode 100644
index 00000000..7fad71a5
Binary files /dev/null and b/public/favicon/favicon-32x32.png differ
diff --git a/public/favicon/favicon.ico b/public/favicon/favicon.ico
new file mode 100644
index 00000000..0249aa2c
Binary files /dev/null and b/public/favicon/favicon.ico differ
diff --git a/public/favicon/site.webmanifest b/public/favicon/site.webmanifest
new file mode 100644
index 00000000..45dc8a20
--- /dev/null
+++ b/public/favicon/site.webmanifest
@@ -0,0 +1 @@
+{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}
\ No newline at end of file
diff --git a/public/vite.svg b/public/vite.svg
deleted file mode 100644
index e7b8dfb1..00000000
--- a/public/vite.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/vite-devRouter.js b/vite-devRouter.js
deleted file mode 100644
index ab85f5f9..00000000
--- a/vite-devRouter.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// from monument gallery
-export default function devRouter(rawRouteList) {
- // ๋ฌธ์์ด๋ก ๋ route list๋ฅผ ์ ๊ทํํ์์ผ๋ก ๋ณํํ๊ณ , ์ ๊ทํํ์์ด ์๋ ๊ฒ๋ค์ ์ ๊ฑฐํฉ๋๋ค.
- const routeList = rawRouteList
- .map(([route, html]) => {
- if (typeof route === "string") {
- route = new RegExp(`^${route.replace(/\*/g, ".*").replace(/\?/g, ".")}/?$`);
- }
- return [route, html];
- })
- .filter(([route]) => route instanceof RegExp);
-
- // ์์ฒญํ ํจ์ค๊ฐ ์ค์ ๋ ๋ผ์ฐํ
๊ฒฝ๋ก์ ๋ง๋์ง ํ์ธํฉ๋๋ค.
- function foundRoute(path) {
- for (let [route, html] of routeList) {
- if (route.test(path)) return html;
- }
- return null;
- }
-
- return {
- name: "route-server",
- configureServer(server) {
- server.middlewares.use((req, res, next) => {
- const htmlPath = foundRoute(req.originalUrl);
- if (htmlPath === null) return next();
- req.url = htmlPath;
- req.originalUrl = htmlPath;
- next();
- });
- },
- };
-}
\ No newline at end of file