From d4f346c78a513cc3bde37c81bd18e64f9173457a Mon Sep 17 00:00:00 2001 From: Ubinquitous Date: Wed, 19 Jul 2023 19:54:19 +0900 Subject: [PATCH 01/47] =?UTF-8?q?chore(package):=20moment=20=EB=9D=BC?= =?UTF-8?q?=EC=9D=B4=EB=B8=8C=EB=9F=AC=EB=A6=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + yarn.lock | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/package.json b/package.json index 7ba9d3c5..7beec06e 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "eslint-config-next": "13.0.0", "eslint-plugin-prettier": "^4.2.1", "jest": "^29.3.1", + "moment": "^2.29.4", "next": "13.4.4", "prettier": "^2.8.8", "react": "18.2.0", diff --git a/yarn.lock b/yarn.lock index dd6b18db..52278940 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5420,6 +5420,11 @@ modify-values@^1.0.0: resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022" integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw== +moment@^2.29.4: + version "2.29.4" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" + integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== + ms@2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" From 44b2d2e89efdd41489e1727878a798667ba84df9 Mon Sep 17 00:00:00 2001 From: Ubinquitous Date: Wed, 19 Jul 2023 19:55:21 +0900 Subject: [PATCH 02/47] =?UTF-8?q?refactor(schedule):=20schedule=EC=97=90?= =?UTF-8?q?=EC=84=9C=20calender=EB=A1=9C=20=EB=9D=BC=EC=9A=B0=ED=84=B0?= =?UTF-8?q?=EB=AA=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/calender/page.tsx | 9 +++++++++ src/app/schedule/page.tsx | 9 --------- src/page/{schedule => calender}/index.tsx | 4 ++-- src/page/{schedule => calender}/layouts/CalenderList.tsx | 0 .../{schedule => calender}/layouts/CalenderListItem.tsx | 0 src/page/{schedule => calender}/layouts/DateBox.tsx | 0 src/page/{schedule => calender}/layouts/ScheduleBox.tsx | 0 src/page/{schedule => calender}/layouts/WeekBox.tsx | 0 8 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 src/app/calender/page.tsx delete mode 100644 src/app/schedule/page.tsx rename src/page/{schedule => calender}/index.tsx (89%) rename src/page/{schedule => calender}/layouts/CalenderList.tsx (100%) rename src/page/{schedule => calender}/layouts/CalenderListItem.tsx (100%) rename src/page/{schedule => calender}/layouts/DateBox.tsx (100%) rename src/page/{schedule => calender}/layouts/ScheduleBox.tsx (100%) rename src/page/{schedule => calender}/layouts/WeekBox.tsx (100%) diff --git a/src/app/calender/page.tsx b/src/app/calender/page.tsx new file mode 100644 index 00000000..2b68f714 --- /dev/null +++ b/src/app/calender/page.tsx @@ -0,0 +1,9 @@ +"use client"; + +import CalenderPage from "@/page/calender"; + +const Calender = () => { + return ; +}; + +export default Calender; diff --git a/src/app/schedule/page.tsx b/src/app/schedule/page.tsx deleted file mode 100644 index b05d0087..00000000 --- a/src/app/schedule/page.tsx +++ /dev/null @@ -1,9 +0,0 @@ -"use client"; - -import SchedulePage from "@/page/schedule"; - -const Schedule = () => { - return ; -}; - -export default Schedule; diff --git a/src/page/schedule/index.tsx b/src/page/calender/index.tsx similarity index 89% rename from src/page/schedule/index.tsx rename to src/page/calender/index.tsx index 21679469..d54c482f 100644 --- a/src/page/schedule/index.tsx +++ b/src/page/calender/index.tsx @@ -3,7 +3,7 @@ import React from "react"; import styled from "styled-components"; import ScheduleBox from "./layouts/ScheduleBox"; -const SchedulePage = () => { +const CalenderPage = () => { return ( @@ -27,4 +27,4 @@ const Container = styled.div` gap: 8px; `; -export default SchedulePage; +export default CalenderPage; diff --git a/src/page/schedule/layouts/CalenderList.tsx b/src/page/calender/layouts/CalenderList.tsx similarity index 100% rename from src/page/schedule/layouts/CalenderList.tsx rename to src/page/calender/layouts/CalenderList.tsx diff --git a/src/page/schedule/layouts/CalenderListItem.tsx b/src/page/calender/layouts/CalenderListItem.tsx similarity index 100% rename from src/page/schedule/layouts/CalenderListItem.tsx rename to src/page/calender/layouts/CalenderListItem.tsx diff --git a/src/page/schedule/layouts/DateBox.tsx b/src/page/calender/layouts/DateBox.tsx similarity index 100% rename from src/page/schedule/layouts/DateBox.tsx rename to src/page/calender/layouts/DateBox.tsx diff --git a/src/page/schedule/layouts/ScheduleBox.tsx b/src/page/calender/layouts/ScheduleBox.tsx similarity index 100% rename from src/page/schedule/layouts/ScheduleBox.tsx rename to src/page/calender/layouts/ScheduleBox.tsx diff --git a/src/page/schedule/layouts/WeekBox.tsx b/src/page/calender/layouts/WeekBox.tsx similarity index 100% rename from src/page/schedule/layouts/WeekBox.tsx rename to src/page/calender/layouts/WeekBox.tsx From 46007be067f6e9e846c3d05a3476c2b9f6c09e0e Mon Sep 17 00:00:00 2001 From: Ubinquitous Date: Wed, 19 Jul 2023 19:55:33 +0900 Subject: [PATCH 03/47] =?UTF-8?q?feat(timetable):=20=EC=8B=9C=EA=B0=84?= =?UTF-8?q?=ED=91=9C=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=ED=8D=BC=EB=B8=94?= =?UTF-8?q?=EB=A6=AC=EC=8B=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/timetable/page.tsx | 9 +++++++++ src/page/timetable/index.tsx | 30 ++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 src/app/timetable/page.tsx create mode 100644 src/page/timetable/index.tsx diff --git a/src/app/timetable/page.tsx b/src/app/timetable/page.tsx new file mode 100644 index 00000000..f690aaab --- /dev/null +++ b/src/app/timetable/page.tsx @@ -0,0 +1,9 @@ +"use client"; + +import TimeTablePage from "@/page/timetable"; + +const TimeTable = () => { + return ; +}; + +export default TimeTable; diff --git a/src/page/timetable/index.tsx b/src/page/timetable/index.tsx new file mode 100644 index 00000000..2dff697b --- /dev/null +++ b/src/page/timetable/index.tsx @@ -0,0 +1,30 @@ +import Aside from "@/components/common/Aside"; +import React from "react"; +import styled from "styled-components"; +import TimteTableBox from "./layouts/TimteTableBox"; + +const TimeTablePage = () => { + return ( + + + +