From ba94400a68f1e5d0225a3fca934c5dd61b03d2f5 Mon Sep 17 00:00:00 2001 From: LSJ Date: Sun, 5 May 2024 17:07:36 +0900 Subject: [PATCH 1/5] temp --- components/services/StudyVotePlacesPicker.tsx | 3 +- .../services/studyVote/StudyVoteDrawer.tsx | 3 +- constants/storage/userPermissions.ts | 6 ++ modals/study/StudyAttendCheckModal.tsx | 3 +- modals/study/StudyChangeTimeModal.tsx | 3 +- modals/study/StudyFreeOpenModal.tsx | 3 +- pageTemplates/record/RecordCalendar.tsx | 3 +- .../record/RecordLocationCategory.tsx | 3 +- pageTemplates/record/detail/RecordDetail.tsx | 3 +- .../record/detail/RecordDetailStudyBlock.tsx | 3 +- pageTemplates/study/StudyNavigation.tsx | 7 +- pages/vote.tsx | 11 ++- storage/study.ts | 91 ++----------------- 13 files changed, 42 insertions(+), 100 deletions(-) create mode 100644 constants/storage/userPermissions.ts diff --git a/components/services/StudyVotePlacesPicker.tsx b/components/services/StudyVotePlacesPicker.tsx index d80c649d9..615054131 100644 --- a/components/services/StudyVotePlacesPicker.tsx +++ b/components/services/StudyVotePlacesPicker.tsx @@ -1,9 +1,10 @@ import { useParams } from "next/navigation"; import { useEffect, useState } from "react"; import styled from "styled-components"; +import { PLACE_TO_LOCATION } from "../../constants/serviceConstants/studyConstants/studyLocationConstants"; import { useStudyVoteQuery } from "../../hooks/study/queries"; -import { PLACE_TO_LOCATION } from "../../storage/study"; + import { DispatchType } from "../../types/hooks/reactTypes"; import { IPlace } from "../../types/models/studyTypes/studyDetails"; import { IStudyVotePlaces } from "../../types/models/studyTypes/studyInterActions"; diff --git a/components/services/studyVote/StudyVoteDrawer.tsx b/components/services/studyVote/StudyVoteDrawer.tsx index b083d8042..896ee73ab 100644 --- a/components/services/studyVote/StudyVoteDrawer.tsx +++ b/components/services/studyVote/StudyVoteDrawer.tsx @@ -5,6 +5,7 @@ import { useEffect, useState } from "react"; import { useQueryClient } from "react-query"; import { useRecoilValue } from "recoil"; import { STUDY_VOTE } from "../../../constants/keys/queryKeys"; +import { PLACE_TO_LOCATION } from "../../../constants/serviceConstants/studyConstants/studyLocationConstants"; import { useToast } from "../../../hooks/custom/CustomToast"; import { useStudyParticipationMutation } from "../../../hooks/study/mutations"; import { usePointSystemMutation } from "../../../hooks/user/mutations"; @@ -15,7 +16,7 @@ import { myStudyState, studyDateStatusState, } from "../../../recoils/studyRecoils"; -import { PLACE_TO_LOCATION, PLACE_TO_NAME } from "../../../storage/study"; +import { PLACE_TO_NAME } from "../../../storage/study"; import { IModal } from "../../../types/components/modalTypes"; import { IStudyVote, diff --git a/constants/storage/userPermissions.ts b/constants/storage/userPermissions.ts new file mode 100644 index 000000000..e89798f40 --- /dev/null +++ b/constants/storage/userPermissions.ts @@ -0,0 +1,6 @@ +export const DESIGN_PAGE_USER_PERMISSION = [ + "2259633694", + "3432278224", + "3432815587", + "3407452344", +]; diff --git a/modals/study/StudyAttendCheckModal.tsx b/modals/study/StudyAttendCheckModal.tsx index ce35a9b0e..20c8fc0e0 100644 --- a/modals/study/StudyAttendCheckModal.tsx +++ b/modals/study/StudyAttendCheckModal.tsx @@ -27,7 +27,8 @@ import { IFooterOptions, ModalLayout } from "../Modals"; import { myStudyState } from "../../recoils/studyRecoils"; import { transferAlphabetState } from "../../recoils/transferRecoils"; -import { PLACE_TO_LOCATION } from "../../storage/study"; + +import { PLACE_TO_LOCATION } from "../../constants/serviceConstants/studyConstants/studyLocationConstants"; import { ModalSubtitle } from "../../styles/layout/modal"; import { IModal } from "../../types/components/modalTypes"; import { LocationEn } from "../../types/services/locationTypes"; diff --git a/modals/study/StudyChangeTimeModal.tsx b/modals/study/StudyChangeTimeModal.tsx index 9b81e4cb6..fafdda2e5 100644 --- a/modals/study/StudyChangeTimeModal.tsx +++ b/modals/study/StudyChangeTimeModal.tsx @@ -15,7 +15,8 @@ import { usePointSystemMutation } from "../../hooks/user/mutations"; import { usePointSystemLogQuery } from "../../hooks/user/queries"; import { getMyStudyVoteInfo } from "../../libs/study/getMyStudy"; import { myStudyState } from "../../recoils/studyRecoils"; -import { PLACE_TO_LOCATION } from "../../storage/study"; + +import { PLACE_TO_LOCATION } from "../../constants/serviceConstants/studyConstants/studyLocationConstants"; import { IModal } from "../../types/components/modalTypes"; import { IStudyVoteTime } from "../../types/models/studyTypes/studyInterActions"; import { createTimeArr, parseTimeToDayjs } from "../../utils/dateTimeUtils"; diff --git a/modals/study/StudyFreeOpenModal.tsx b/modals/study/StudyFreeOpenModal.tsx index b22b1d494..5de10eaf8 100644 --- a/modals/study/StudyFreeOpenModal.tsx +++ b/modals/study/StudyFreeOpenModal.tsx @@ -18,9 +18,10 @@ import { import { IFooterOptions, ModalLayout } from "../Modals"; import TimeSelector from "../../components/molecules/picker/TimeSelector"; -import { PLACE_TO_LOCATION } from "../../storage/study"; + import { IModal } from "../../types/components/modalTypes"; +import { PLACE_TO_LOCATION } from "../../constants/serviceConstants/studyConstants/studyLocationConstants"; import { IPlace } from "../../types/models/studyTypes/studyDetails"; import { ITimeStartToEnd } from "../../types/utils/timeAndDate"; diff --git a/pageTemplates/record/RecordCalendar.tsx b/pageTemplates/record/RecordCalendar.tsx index 4e56e25ec..853c618a9 100644 --- a/pageTemplates/record/RecordCalendar.tsx +++ b/pageTemplates/record/RecordCalendar.tsx @@ -6,7 +6,8 @@ import { LOCATION_OPEN_DATE, LOCATION_TABLE_COLOR, } from "../../constants/location"; -import { PLACE_TO_LOCATION } from "../../storage/study"; +import { PLACE_TO_LOCATION } from "../../constants/serviceConstants/studyConstants/studyLocationConstants"; + import { IArrivedData } from "../../types/models/studyTypes/studyRecords"; import { Location } from "../../types/services/locationTypes"; diff --git a/pageTemplates/record/RecordLocationCategory.tsx b/pageTemplates/record/RecordLocationCategory.tsx index a9900692a..ce9d223e2 100644 --- a/pageTemplates/record/RecordLocationCategory.tsx +++ b/pageTemplates/record/RecordLocationCategory.tsx @@ -5,7 +5,8 @@ import { LOCATION_OPEN, LOCATION_TABLE_COLOR, } from "../../constants/location"; -import { PLACE_TO_LOCATION } from "../../storage/study"; +import { PLACE_TO_LOCATION } from "../../constants/serviceConstants/studyConstants/studyLocationConstants"; + import { DispatchType } from "../../types/hooks/reactTypes"; import { IArrivedData } from "../../types/models/studyTypes/studyRecords"; diff --git a/pageTemplates/record/detail/RecordDetail.tsx b/pageTemplates/record/detail/RecordDetail.tsx index caf570fec..f59b88712 100644 --- a/pageTemplates/record/detail/RecordDetail.tsx +++ b/pageTemplates/record/detail/RecordDetail.tsx @@ -2,7 +2,8 @@ import { Dayjs } from "dayjs"; import { Fragment } from "react"; import styled from "styled-components"; import { LOCATION_OPEN } from "../../../constants/location"; -import { PLACE_TO_LOCATION } from "../../../storage/study"; +import { PLACE_TO_LOCATION } from "../../../constants/serviceConstants/studyConstants/studyLocationConstants"; + import { IArrivedData, IArrivedInfoList, diff --git a/pageTemplates/record/detail/RecordDetailStudyBlock.tsx b/pageTemplates/record/detail/RecordDetailStudyBlock.tsx index 02f7501dd..b3c89ecb8 100644 --- a/pageTemplates/record/detail/RecordDetailStudyBlock.tsx +++ b/pageTemplates/record/detail/RecordDetailStudyBlock.tsx @@ -3,7 +3,8 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { Fragment } from "react"; import styled from "styled-components"; import { LOCATION_TABLE_COLOR } from "../../../constants/location"; -import { PLACE_TO_LOCATION, PLACE_TO_NAME } from "../../../storage/study"; +import { PLACE_TO_LOCATION } from "../../../constants/serviceConstants/studyConstants/studyLocationConstants"; +import { PLACE_TO_NAME } from "../../../storage/study"; import { Location } from "../../../types/services/locationTypes"; import { ISortedLocationStudies } from "./RecordDetail"; diff --git a/pageTemplates/study/StudyNavigation.tsx b/pageTemplates/study/StudyNavigation.tsx index 821b42a95..73b74e800 100644 --- a/pageTemplates/study/StudyNavigation.tsx +++ b/pageTemplates/study/StudyNavigation.tsx @@ -24,7 +24,8 @@ import { useStudyParticipationMutation } from "../../hooks/study/mutations"; import { usePointSystemMutation } from "../../hooks/user/mutations"; import { usePointSystemLogQuery } from "../../hooks/user/queries"; import { myStudyState, studyDateStatusState } from "../../recoils/studyRecoils"; -import { PLACE_TO_LOCATION } from "../../storage/study"; + +import { PLACE_TO_LOCATION } from "../../constants/serviceConstants/studyConstants/studyLocationConstants"; import { IParticipation, StudyStatus, @@ -255,7 +256,9 @@ const Layout = styled.nav` padding: 16px; background-color: white; z-index: 50; - box-shadow: 0 -1px 3px 0 rgba(0, 0, 0, 0.1), 0 -1px 2px 0 rgba(0, 0, 0, 0.06); + box-shadow: + 0 -1px 3px 0 rgba(0, 0, 0, 0.1), + 0 -1px 2px 0 rgba(0, 0, 0, 0.06); max-width: var(--max-width); margin: 0 auto; `; diff --git a/pages/vote.tsx b/pages/vote.tsx index a2adbe625..364745f21 100644 --- a/pages/vote.tsx +++ b/pages/vote.tsx @@ -11,6 +11,7 @@ import VoteMapController from "../components/organisms/VoteMapController"; import MapBottomNav from "../components/services/studyVote/MapBottomNav"; import { STUDY_PREFERENCE_LOCAL } from "../constants/keys/queryKeys"; import { STUDY_DISTANCE } from "../constants/serviceConstants/studyConstants/studyDistanceConstants"; +import { PLACE_TO_LOCATION } from "../constants/serviceConstants/studyConstants/studyLocationConstants"; import { useToast } from "../hooks/custom/CustomToast"; import { useStudyPreferenceQuery, @@ -23,7 +24,7 @@ import { } from "../libs/study/getStudyVoteMap"; import StudyPresetModal from "../modals/userRequest/StudyPresetModal"; import { myStudyState, studyDateStatusState } from "../recoils/studyRecoils"; -import { PLACE_TO_LOCATION } from "../storage/study"; + import { IMapOptions, IMarkerOptions } from "../types/externals/naverMapTypes"; import { IParticipation, @@ -189,8 +190,8 @@ export default function StudyVoteMap() { precision === 0 ? [] : precision === 2 - ? [...sub1, ...sub2] - : [...sub1], + ? [...sub1, ...sub2] + : [...sub1], })); setVoteScore( (old) => @@ -355,8 +356,8 @@ export const getMarkersOptions = ( placeId === myVote?.place ? "main" : myVote?.subPlace?.includes(placeId) - ? "sub" - : "default"; + ? "sub" + : "default"; const infoWindow = placeId === myVote?.place ? getInfoWindow(par) : null; const polyline = mainPlace && myVote?.subPlace?.includes(placeId) diff --git a/storage/study.ts b/storage/study.ts index 59b835f77..a6e940919 100644 --- a/storage/study.ts +++ b/storage/study.ts @@ -3,7 +3,7 @@ export const ALL_스터디인증 = "65263917e90698c18a3b1e99"; //수원 export const SUWAN_수원시청 = "64395f1e8d1edf4e056e993d"; -export const SUWAN_수원역 = "640c271121863deff358f459"; +export const SUWAN_수원역 = "6637352830c7250eac355cc6"; export const SUWAN_아주대 = "62e5d6e0e098c232c05c3d3f"; export const SUWAN_상현역 = "64b15fb72704a3af110733ba"; export const SUWAN_송죽 = "644f6ffe9edb56992ccda5e9"; @@ -76,6 +76,8 @@ export const DONG_혜화역 = "6597be44a11634850ed506d3"; export const DONG_혜화역2 = "6597be67a11634850ed506d4"; export const DONG_화랑대역 = "65bfac8f7d1dd938049ed19f"; export const DONG_중화역 = "6604c1ee4920fb76c1a64e62"; +export const DONG_노원역 = "663739e230c7250eac355cc8"; +export const DONG_수유역 = "66373a7d30c7250eac355cc9"; //인천 export const INC_인하대 = "65fbc711ba2597c46415a027"; @@ -83,6 +85,7 @@ export const INC_송도DT = "65fbc8eeba2597c46415a028"; export const INC_송도 = "65fbcba6ba2597c46415a029"; export const INC_구월동 = "65fbd787ba2597c46415a02a"; export const INC_부평 = "65fbd888ba2597c46415a02b"; +export const INC_인천대 = "6637373030c7250eac355cc7"; export const PLACE_TO_NAME = { //전체 @@ -157,95 +160,15 @@ export const PLACE_TO_NAME = { [DONG_혜화역2]: "커피빈", [DONG_화랑대역]: "마르티", [DONG_중화역]: "스타벅스", + [DONG_수유역]: "엔제리너스", + [DONG_노원역]: "투썸플레이스", [INC_구월동]: "파스쿠찌", [INC_부평]: "하이테이블", [INC_송도]: "카페꼼마", [INC_송도DT]: "스타벅스", [INC_인하대]: "더스토리", -}; - -export const PLACE_TO_LOCATION = { - //전체 - [ALL_스터디인증]: "전체", - //수원 - [SUWAN_상현역]: "수원", - [SUWAN_아주대]: "수원", - [SUWAN_수원역]: "수원", - [SUWAN_수원시청]: "수원", - [SUWAN_경희대]: "수원", - [SUWAN_송죽]: "수원", - [SUWAN_구운동]: "수원", - [SUWAN_스타벅스]: "수원", - [SUWAN_경기대]: "수원", - [SUWAN_자유신청]: "수원", - [SUWAN_고색역]: "수원", - [SUWAN_워터쿨러]: "수원", - [SUWAN_광교]: "수원", - - [SUWAN_성균관대역]: "수원", - [SUWAN_광교엘리웨이]: "수원", - [SUWAN_행궁동]: "수원", - [SUWAN_광교중앙역]: "수원", - [SUWAN_망포역]: "수원", - //양천 - [YANG_이디야]: "양천", - [YANG_위카페]: "양천", - [YANG_파스쿠찌]: "양천", - [YANG_할리스]: "양천", - [YANG_카페베네]: "양천", - [YANG_스타벅스]: "양천", - [YANG_몽글]: "양천", - [YANG_카페꼼마]: "양천", - [YANG_화곡역]: "양천", - [YANG_발산역]: "양천", - [YANG_목동점]: "양천", - [YANG_자유신청]: "양천", - - [YANG_신풍역]: "양천", - [YANG_신길역]: "양천", - [YANG_신월동]: "양천", - [YANG_양천구청역]: "양천", - - //안양 - [ANYANG_숨맑은집]: "안양", - [ANYANG_인뎃커피]: "안양", - [ANYANG_커피인더스트리]: "안양", - [ANYANG_파스쿠찌]: "안양", - [ANYANG_자유신청]: "안양", - //강남 - [GANGNAM_강남]: "강남", - [GANGNAM_강남구청]: "강남", - [GANGNAM_신논현]: "강남", - [GANGNAM_논현]: "강남", - [GANGNAM_교대]: "강남", - [GANGNAM_양재]: "강남", - [GANGNAM_선릉]: "강남", - [GANGNAM_도곡]: "강남", - [GANGNAM_자유신청]: "강남", - - [DONG_장안동]: "동대문", - [DONG_석계역]: "동대문", - [DONG_딥십리역]: "동대문", - [DONG_서울시립대]: "동대문", - [DONG_경희대]: "동대문", - [DONG_월곡역]: "동대문", - [DONG_왕십리역]: "동대문", - [DONG_안암역]: "동대문", - [DONG_신설동역]: "동대문", - [DONG_길음역]: "동대문", - [DONG_성신여대]: "동대문", - [DONG_동대문역]: "동대문", - [DONG_혜화역]: "동대문", - [DONG_화랑대역]: "동대문", - [DONG_혜화역2]: "동대문", - [DONG_중화역]: "동대문", - - [INC_구월동]: "인천", - [INC_부평]: "인천", - [INC_송도]: "인천", - [INC_송도DT]: "인천", - [INC_인하대]: "인천", + [INC_인천대]: "스타벅스", }; export interface IstudyInfo { From df72326ac23ca7f9aaaeeecf5b03fc87a84ecced Mon Sep 17 00:00:00 2001 From: LSJ Date: Sun, 5 May 2024 18:00:57 +0900 Subject: [PATCH 2/5] fix: resolve merge conflicts --- components/services/StudyVotePlacesPicker.tsx | 3 +-- .../services/studyVote/StudyVoteDrawer.tsx | 6 ------ modals/study/StudyChangeTimeModal.tsx | 3 +-- modals/study/StudyFreeOpenModal.tsx | 13 +------------ pageTemplates/record/RecordCalendar.tsx | 8 +------- .../record/RecordLocationCategory.tsx | 8 +------- pageTemplates/record/detail/RecordDetail.tsx | 9 --------- pageTemplates/study/StudyNavigation.tsx | 8 +------- pages/vote.tsx | 18 ------------------ 9 files changed, 6 insertions(+), 70 deletions(-) diff --git a/components/services/StudyVotePlacesPicker.tsx b/components/services/StudyVotePlacesPicker.tsx index 102ae96b5..12f97e806 100644 --- a/components/services/StudyVotePlacesPicker.tsx +++ b/components/services/StudyVotePlacesPicker.tsx @@ -1,10 +1,9 @@ import { useParams } from "next/navigation"; import { useEffect, useState } from "react"; import styled from "styled-components"; -import { PLACE_TO_LOCATION } from "../../constants/serviceConstants/studyConstants/studyLocationConstants"; +import { PLACE_TO_LOCATION } from "../../constants/serviceConstants/studyConstants/studyLocationConstants"; import { useStudyVoteQuery } from "../../hooks/study/queries"; - import { DispatchType } from "../../types/hooks/reactTypes"; import { IPlace } from "../../types/models/studyTypes/studyDetails"; import { IStudyVotePlaces } from "../../types/models/studyTypes/studyInterActions"; diff --git a/components/services/studyVote/StudyVoteDrawer.tsx b/components/services/studyVote/StudyVoteDrawer.tsx index d33f0c668..fdfddcfbc 100644 --- a/components/services/studyVote/StudyVoteDrawer.tsx +++ b/components/services/studyVote/StudyVoteDrawer.tsx @@ -13,17 +13,11 @@ import { useStudyParticipationMutation } from "../../../hooks/study/mutations"; import { usePointSystemMutation } from "../../../hooks/user/mutations"; import { usePointSystemLogQuery } from "../../../hooks/user/queries"; import StudyVoteSubModalPrivate from "../../../modals/study/studyVoteSubModal/StudyVoteSubModalPrivate"; -<<<<<<< HEAD - import { myStudyState, studyDateStatusState, } from "../../../recoils/studyRecoils"; import { PLACE_TO_NAME } from "../../../storage/study"; -======= -import { myStudyState, studyDateStatusState } from "../../../recoils/studyRecoils"; -import { PLACE_TO_LOCATION, PLACE_TO_NAME } from "../../../storage/study"; ->>>>>>> main import { IModal } from "../../../types/components/modalTypes"; import { IStudyVote, diff --git a/modals/study/StudyChangeTimeModal.tsx b/modals/study/StudyChangeTimeModal.tsx index 13a4b3fdc..183c5d1dd 100644 --- a/modals/study/StudyChangeTimeModal.tsx +++ b/modals/study/StudyChangeTimeModal.tsx @@ -7,6 +7,7 @@ import { useRecoilValue } from "recoil"; import RulletPickerTwo from "../../components/molecules/picker/RulletPickerTwo"; import { STUDY_VOTE } from "../../constants/keys/queryKeys"; +import { PLACE_TO_LOCATION } from "../../constants/serviceConstants/studyConstants/studyLocationConstants"; import { STUDY_VOTE_HOUR_ARR } from "../../constants/serviceConstants/studyConstants/studyTimeConstant"; import { POINT_SYSTEM_DEPOSIT } from "../../constants/settingValue/pointSystem"; import { useToast, useTypeToast } from "../../hooks/custom/CustomToast"; @@ -15,8 +16,6 @@ import { usePointSystemMutation } from "../../hooks/user/mutations"; import { usePointSystemLogQuery } from "../../hooks/user/queries"; import { getMyStudyVoteInfo } from "../../libs/study/getMyStudy"; import { myStudyState } from "../../recoils/studyRecoils"; - -import { PLACE_TO_LOCATION } from "../../constants/serviceConstants/studyConstants/studyLocationConstants"; import { IModal } from "../../types/components/modalTypes"; import { IStudyVoteTime } from "../../types/models/studyTypes/studyInterActions"; import { createTimeArr, parseTimeToDayjs } from "../../utils/dateTimeUtils"; diff --git a/modals/study/StudyFreeOpenModal.tsx b/modals/study/StudyFreeOpenModal.tsx index 84922ff04..76e7d3da9 100644 --- a/modals/study/StudyFreeOpenModal.tsx +++ b/modals/study/StudyFreeOpenModal.tsx @@ -5,24 +5,13 @@ import { useQueryClient } from "react-query"; import TimeSelector from "../../components/molecules/picker/TimeSelector"; import { STUDY_VOTE } from "../../constants/keys/queryKeys"; +import { PLACE_TO_LOCATION } from "../../constants/serviceConstants/studyConstants/studyLocationConstants"; import { useCompleteToast, useErrorToast, useFailToast } from "../../hooks/custom/CustomToast"; import { useStudyOpenFreeMutation, useStudyParticipationMutation, } from "../../hooks/study/mutations"; -<<<<<<< HEAD -import { IFooterOptions, ModalLayout } from "../Modals"; - -import TimeSelector from "../../components/molecules/picker/TimeSelector"; - -import { IModal } from "../../types/components/modalTypes"; - -import { PLACE_TO_LOCATION } from "../../constants/serviceConstants/studyConstants/studyLocationConstants"; -import { IPlace } from "../../types/models/studyTypes/studyDetails"; -======= -import { PLACE_TO_LOCATION } from "../../storage/study"; import { IModal } from "../../types/components/modalTypes"; ->>>>>>> main import { ITimeStartToEnd } from "../../types/utils/timeAndDate"; import { IFooterOptions, ModalLayout } from "../Modals"; diff --git a/pageTemplates/record/RecordCalendar.tsx b/pageTemplates/record/RecordCalendar.tsx index 2d76f3900..aac5f14d9 100644 --- a/pageTemplates/record/RecordCalendar.tsx +++ b/pageTemplates/record/RecordCalendar.tsx @@ -2,18 +2,12 @@ import { faEllipsisStroke } from "@fortawesome/pro-regular-svg-icons"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import dayjs, { Dayjs } from "dayjs"; import styled from "styled-components"; -<<<<<<< HEAD + import { LOCATION_OPEN_DATE, LOCATION_TABLE_COLOR, } from "../../constants/location"; import { PLACE_TO_LOCATION } from "../../constants/serviceConstants/studyConstants/studyLocationConstants"; - -======= - -import { LOCATION_OPEN_DATE, LOCATION_TABLE_COLOR } from "../../constants/location"; -import { PLACE_TO_LOCATION } from "../../storage/study"; ->>>>>>> main import { IArrivedData } from "../../types/models/studyTypes/studyRecords"; import { Location } from "../../types/services/locationTypes"; import { dayjsToStr } from "../../utils/dateTimeUtils"; diff --git a/pageTemplates/record/RecordLocationCategory.tsx b/pageTemplates/record/RecordLocationCategory.tsx index cf3c634d6..e37f78969 100644 --- a/pageTemplates/record/RecordLocationCategory.tsx +++ b/pageTemplates/record/RecordLocationCategory.tsx @@ -1,18 +1,12 @@ import { useEffect, useState } from "react"; import styled from "styled-components"; -<<<<<<< HEAD + import { LOCATION_CONVERT, LOCATION_OPEN, LOCATION_TABLE_COLOR, } from "../../constants/location"; import { PLACE_TO_LOCATION } from "../../constants/serviceConstants/studyConstants/studyLocationConstants"; - -======= - -import { LOCATION_CONVERT, LOCATION_OPEN, LOCATION_TABLE_COLOR } from "../../constants/location"; -import { PLACE_TO_LOCATION } from "../../storage/study"; ->>>>>>> main import { DispatchType } from "../../types/hooks/reactTypes"; import { IArrivedData } from "../../types/models/studyTypes/studyRecords"; import { Location, LocationFilterType } from "../../types/services/locationTypes"; diff --git a/pageTemplates/record/detail/RecordDetail.tsx b/pageTemplates/record/detail/RecordDetail.tsx index ee9ad183c..f637586d9 100644 --- a/pageTemplates/record/detail/RecordDetail.tsx +++ b/pageTemplates/record/detail/RecordDetail.tsx @@ -3,17 +3,8 @@ import { Fragment } from "react"; import styled from "styled-components"; import { LOCATION_OPEN } from "../../../constants/location"; -<<<<<<< HEAD import { PLACE_TO_LOCATION } from "../../../constants/serviceConstants/studyConstants/studyLocationConstants"; - -import { - IArrivedData, - IArrivedInfoList, -} from "../../../types/models/studyTypes/studyRecords"; -======= -import { PLACE_TO_LOCATION } from "../../../storage/study"; import { IArrivedData, IArrivedInfoList } from "../../../types/models/studyTypes/studyRecords"; ->>>>>>> main import { Location } from "../../../types/services/locationTypes"; import { dayjsToFormat } from "../../../utils/dateTimeUtils"; import RecordDetailStudyBlock from "./RecordDetailStudyBlock"; diff --git a/pageTemplates/study/StudyNavigation.tsx b/pageTemplates/study/StudyNavigation.tsx index e8f42186a..579476c27 100644 --- a/pageTemplates/study/StudyNavigation.tsx +++ b/pageTemplates/study/StudyNavigation.tsx @@ -14,23 +14,17 @@ import { IIconLinkTile } from "../../components/atoms/IconLinkTile"; import Slide from "../../components/layouts/PageSlide"; import IconTileRowLayout from "../../components/organisms/IconTileRowLayout"; import { STUDY_VOTE } from "../../constants/keys/queryKeys"; +import { PLACE_TO_LOCATION } from "../../constants/serviceConstants/studyConstants/studyLocationConstants"; import { MAX_USER_PER_PLACE } from "../../constants/settingValue/study/study"; import { useToast, useTypeToast } from "../../hooks/custom/CustomToast"; import { useStudyParticipationMutation } from "../../hooks/study/mutations"; import { usePointSystemMutation } from "../../hooks/user/mutations"; import { usePointSystemLogQuery } from "../../hooks/user/queries"; import { myStudyState, studyDateStatusState } from "../../recoils/studyRecoils"; -<<<<<<< HEAD - -import { PLACE_TO_LOCATION } from "../../constants/serviceConstants/studyConstants/studyLocationConstants"; import { IParticipation, StudyStatus, } from "../../types/models/studyTypes/studyDetails"; -======= -import { PLACE_TO_LOCATION } from "../../storage/study"; -import { IParticipation, StudyStatus } from "../../types/models/studyTypes/studyDetails"; ->>>>>>> main import { StudyDateStatus } from "../../types/models/studyTypes/studyInterActions"; import { IPointLog } from "../../types/services/pointSystem"; import StudyNavModal from "./studyNavModal"; diff --git a/pages/vote.tsx b/pages/vote.tsx index 4dd68e64c..5029fcb66 100644 --- a/pages/vote.tsx +++ b/pages/vote.tsx @@ -19,7 +19,6 @@ import { getStudyVoteIcon } from "../libs/study/getStudyVoteIcon"; import { getVoteLocationCenterDot, getVoteLocationMaxBound } from "../libs/study/getStudyVoteMap"; import StudyPresetModal from "../modals/userRequest/StudyPresetModal"; import { myStudyState, studyDateStatusState } from "../recoils/studyRecoils"; - import { IMapOptions, IMarkerOptions } from "../types/externals/naverMapTypes"; import { IParticipation, IPlace } from "../types/models/studyTypes/studyDetails"; import { IStudyVote, IStudyVotePlaces } from "../types/models/studyTypes/studyInterActions"; @@ -165,16 +164,7 @@ export default function StudyVoteMap() { setMyVote((old) => ({ ...old, -<<<<<<< HEAD - subPlace: - precision === 0 - ? [] - : precision === 2 - ? [...sub1, ...sub2] - : [...sub1], -======= subPlace: precision === 0 ? [] : precision === 2 ? [...sub1, ...sub2] : [...sub1], ->>>>>>> main })); setVoteScore((old) => old + getPlaceVoteRankScore(place, studyVoteData, data.user.uid)); } else { @@ -315,15 +305,7 @@ export const getMarkersOptions = ( const placeId = par.place._id; const iconType = -<<<<<<< HEAD - placeId === myVote?.place - ? "main" - : myVote?.subPlace?.includes(placeId) - ? "sub" - : "default"; -======= placeId === myVote?.place ? "main" : myVote?.subPlace?.includes(placeId) ? "sub" : "default"; ->>>>>>> main const infoWindow = placeId === myVote?.place ? getInfoWindow(par) : null; const polyline = mainPlace && myVote?.subPlace?.includes(placeId) From 575581d16cd594e86cbd817bfaab69240542da43 Mon Sep 17 00:00:00 2001 From: LSJ Date: Sun, 5 May 2024 19:12:24 +0900 Subject: [PATCH 3/5] temp --- .../services/studyVote/StudyVoteDrawer.tsx | 8 +- .../studyConstants/studyCafeLogoConstants.ts | 2 + .../studyConstants/studyCafeNameConstants.ts | 152 +++++++++++++++ .../studyConstants/studyDistanceConstants.ts | 20 +- .../studyConstants/studyLocationConstants.ts | 29 ++- .../studyConstants/studyPlaceConstants.ts | 28 ++- .../settingValue/study/StudyCafeLogo.tsx | 2 + .../study/StudyDistanceService.tsx | 2 +- libs/study/getStudyVoteMap.ts | 2 +- modals/study/StudyLightAbsentModal.tsx | 2 +- .../record/detail/RecordDetailStudyBlock.tsx | 2 +- pageTemplates/study/StudyCover.tsx | 1 + pages/admin/system/resetStudyStatus.tsx | 2 +- pages/admin/system/studyStatus.tsx | 2 + storage/study.ts | 180 ------------------ 15 files changed, 207 insertions(+), 227 deletions(-) create mode 100644 constants/serviceConstants/studyConstants/studyCafeNameConstants.ts delete mode 100644 storage/study.ts diff --git a/components/services/studyVote/StudyVoteDrawer.tsx b/components/services/studyVote/StudyVoteDrawer.tsx index fdfddcfbc..1aa4592e8 100644 --- a/components/services/studyVote/StudyVoteDrawer.tsx +++ b/components/services/studyVote/StudyVoteDrawer.tsx @@ -7,17 +7,14 @@ import { useQueryClient } from "react-query"; import { useRecoilValue } from "recoil"; import { STUDY_VOTE } from "../../../constants/keys/queryKeys"; +import { PLACE_TO_NAME } from "../../../constants/serviceConstants/studyConstants/studyCafeNameConstants"; import { PLACE_TO_LOCATION } from "../../../constants/serviceConstants/studyConstants/studyLocationConstants"; import { useToast } from "../../../hooks/custom/CustomToast"; import { useStudyParticipationMutation } from "../../../hooks/study/mutations"; import { usePointSystemMutation } from "../../../hooks/user/mutations"; import { usePointSystemLogQuery } from "../../../hooks/user/queries"; import StudyVoteSubModalPrivate from "../../../modals/study/studyVoteSubModal/StudyVoteSubModalPrivate"; -import { - myStudyState, - studyDateStatusState, -} from "../../../recoils/studyRecoils"; -import { PLACE_TO_NAME } from "../../../storage/study"; +import { myStudyState, studyDateStatusState } from "../../../recoils/studyRecoils"; import { IModal } from "../../../types/components/modalTypes"; import { IStudyVote, @@ -28,6 +25,7 @@ import { dayjsToStr } from "../../../utils/dateTimeUtils"; import BottomDrawerLg, { IBottomDrawerLgOptions } from "../../organisms/drawer/BottomDrawerLg"; import StudyVotePlacesPicker from "../StudyVotePlacesPicker"; import StudyVoteTimeRulletDrawer from "./StudyVoteTimeRulletDrawer"; + dayjs.locale("ko"); interface IStudyVoteDrawer extends IModal {} diff --git a/constants/serviceConstants/studyConstants/studyCafeLogoConstants.ts b/constants/serviceConstants/studyConstants/studyCafeLogoConstants.ts index baff4aa44..a7674d846 100644 --- a/constants/serviceConstants/studyConstants/studyCafeLogoConstants.ts +++ b/constants/serviceConstants/studyConstants/studyCafeLogoConstants.ts @@ -88,4 +88,6 @@ export const STUDY_CAFE_LOGO: { [key in string]: string } = { "https://studyabout.s3.ap-northeast-2.amazonaws.com/%EC%B9%B4%ED%8E%98+%EB%A1%9C%EA%B3%A0/%EC%8A%A4%ED%8A%B8%EB%A6%AC%ED%8A%B8+%EB%A1%9C%EA%B3%A0.png", 마르티: "https://studyabout.s3.ap-northeast-2.amazonaws.com/%EC%B9%B4%ED%8E%98+%EB%A1%9C%EA%B3%A0/%EB%A7%88%EB%A5%B4%ED%8B%B0+%EB%A1%9C%EA%B3%A0.png", + 엔제리너스: + "https://studyabout.s3.ap-northeast-2.amazonaws.com/%EC%B9%B4%ED%8E%98+%EB%A1%9C%EA%B3%A0/%EC%97%94%EC%A0%9C%EB%A6%AC%EB%84%88%EC%8A%A4+%EB%A1%9C%EA%B3%A0.jpg", }; diff --git a/constants/serviceConstants/studyConstants/studyCafeNameConstants.ts b/constants/serviceConstants/studyConstants/studyCafeNameConstants.ts new file mode 100644 index 000000000..44704dbcc --- /dev/null +++ b/constants/serviceConstants/studyConstants/studyCafeNameConstants.ts @@ -0,0 +1,152 @@ +import { + ALL_스터디인증, + ANYANG_숨맑은집, + ANYANG_인뎃커피, + ANYANG_커피인더스트리, + ANYANG_파스쿠찌, + DONG_경희대, + DONG_길음역, + DONG_노원역, + DONG_동대문역, + DONG_딥십리역, + DONG_서울시립대, + DONG_석계역, + DONG_성신여대, + DONG_수유역, + DONG_신설동역, + DONG_안암역, + DONG_왕십리역, + DONG_월곡역, + DONG_장안동, + DONG_중화역, + DONG_혜화역, + DONG_혜화역2, + DONG_화랑대역, + GANGNAM_강남, + GANGNAM_강남구청, + GANGNAM_교대, + GANGNAM_논현, + GANGNAM_도곡, + GANGNAM_선릉, + GANGNAM_신논현, + GANGNAM_양재, + INC_구월동, + INC_부평, + INC_송도, + INC_송도DT, + INC_인천대, + INC_인하대, + SUWAN_경기대, + SUWAN_경희대, + SUWAN_고색역, + SUWAN_광교, + SUWAN_광교엘리웨이, + SUWAN_구운동, + SUWAN_망포역, + SUWAN_상현역, + SUWAN_성균관대역, + SUWAN_송죽, + SUWAN_수원시청, + SUWAN_수원역, + SUWAN_스타벅스, + SUWAN_아주대, + SUWAN_워터쿨러, + SUWAN_행궁동, + YANG_목동점, + YANG_몽글, + YANG_발산역, + YANG_스타벅스, + YANG_신길역, + YANG_신월동, + YANG_신풍역, + YANG_양천구청역, + YANG_위카페, + YANG_이디야, + YANG_카페꼼마, + YANG_카페베네, + YANG_파스쿠찌, + YANG_할리스, + YANG_화곡역, +} from "./studyPlaceConstants"; + +export const PLACE_TO_NAME = { + //전체 + [ALL_스터디인증]: "스터디인증", + //수원 + [SUWAN_수원시청]: "투썸플레이스", + [SUWAN_수원역]: "탐앤탐스", + [SUWAN_아주대]: "카탈로그", + [SUWAN_상현역]: "투썸플레이스", + [SUWAN_송죽]: "커피빈", + [SUWAN_경희대]: "칸나", + [SUWAN_구운동]: "이디야", + [SUWAN_스타벅스]: "스타벅스", + [SUWAN_경기대]: "탐앤탐스", + + [SUWAN_고색역]: "에이티씨", + [SUWAN_성균관대역]: "스타벅스", + [SUWAN_광교엘리웨이]: "책발전소", + [SUWAN_워터쿨러]: "워터쿨러", + [SUWAN_망포역]: "스타벅스", + [SUWAN_행궁동]: "행궁동", + [SUWAN_광교]: "디어커피", + //양천 + [YANG_위카페]: "위카페", + [YANG_할리스]: "할리스", + [YANG_파스쿠찌]: "파스쿠찌", + [YANG_이디야]: "이디야", + [YANG_카페베네]: "카페베네", + [YANG_스타벅스]: "스타벅스", + [YANG_몽글]: "몽글", + [YANG_카페꼼마]: "카페꼼마", + + [YANG_신풍역]: "이디야", + [YANG_신길역]: "레어 그루브", + [YANG_신월동]: "코나빈스", + [YANG_양천구청역]: "시나본", + [YANG_화곡역]: "투썸플레이스", + [YANG_목동점]: "스타벅스", + [YANG_발산역]: "스타벅스", + + //안양 + [ANYANG_커피인더스트리]: "커피인더스트리", + [ANYANG_숨맑은집]: "숨맑은집", + [ANYANG_파스쿠찌]: "파스쿠찌", + [ANYANG_인뎃커피]: "인뎃커피", + + //강남 + [GANGNAM_강남]: "커피빈", + [GANGNAM_강남구청]: "파스쿠찌", + [GANGNAM_신논현]: "커피빈", + [GANGNAM_논현]: "커피빈", + [GANGNAM_교대]: "아펜즈커피", + [GANGNAM_양재]: "미오커피", + [GANGNAM_선릉]: "커피빈", + [GANGNAM_도곡]: "카페올로", + + [DONG_장안동]: "투썸플레이스", + [DONG_석계역]: "카페디졸브", + [DONG_딥십리역]: "아띠커피", + [DONG_서울시립대]: "해머스미스커피", + [DONG_경희대]: "빵쌤", + [DONG_월곡역]: "카페어바웃", + [DONG_왕십리역]: "어질인", + [DONG_안암역]: "캐치카페", + [DONG_신설동역]: "커피니", + [DONG_길음역]: "일일커피", + [DONG_성신여대]: "카페 뮬", + [DONG_동대문역]: "D CAFE", + [DONG_혜화역]: "캐치카페", + [DONG_혜화역2]: "커피빈", + [DONG_화랑대역]: "마르티", + [DONG_중화역]: "스타벅스", + [DONG_수유역]: "엔제리너스", + [DONG_노원역]: "투썸플레이스", + + [INC_구월동]: "파스쿠찌", + [INC_부평]: "하이테이블", + [INC_송도]: "카페꼼마", + [INC_송도DT]: "스타벅스", + [INC_인하대]: "더스토리", + [INC_인천대]: "스타벅스", +}; diff --git a/constants/serviceConstants/studyConstants/studyDistanceConstants.ts b/constants/serviceConstants/studyConstants/studyDistanceConstants.ts index 1b23c24b8..370f6d358 100644 --- a/constants/serviceConstants/studyConstants/studyDistanceConstants.ts +++ b/constants/serviceConstants/studyConstants/studyDistanceConstants.ts @@ -1,14 +1,3 @@ -import { - DONG_화랑대역, - INC_구월동, - INC_송도, - INC_송도DT, - INC_인하대, - SUWAN_광교, - SUWAN_워터쿨러, - YANG_목동점, - YANG_발산역, -} from "../../../storage/study"; import { ActiveLocation } from "../../../types/services/locationTypes"; import { ANYANG_범계학원가, @@ -30,6 +19,7 @@ import { DONG_월곡역, DONG_장안동, DONG_혜화역, + DONG_화랑대역, GANGNAM_강남, GANGNAM_강남구청, GANGNAM_교대, @@ -38,9 +28,14 @@ import { GANGNAM_선릉, GANGNAM_신논현, GANGNAM_양재, + INC_구월동, + INC_송도, + INC_송도DT, + INC_인하대, SUWAN_경기대, SUWAN_경희대, SUWAN_고색역, + SUWAN_광교, SUWAN_광교엘리웨이, SUWAN_구운동, SUWAN_망포역, @@ -50,8 +45,11 @@ import { SUWAN_수원시청, SUWAN_수원역, SUWAN_아주대, + SUWAN_워터쿨러, SUWAN_행궁동, + YANG_목동점, YANG_몽글, + YANG_발산역, YANG_스타벅스, YANG_신길역, YANG_신월동, diff --git a/constants/serviceConstants/studyConstants/studyLocationConstants.ts b/constants/serviceConstants/studyConstants/studyLocationConstants.ts index b1c18e4b8..6d2006c34 100644 --- a/constants/serviceConstants/studyConstants/studyLocationConstants.ts +++ b/constants/serviceConstants/studyConstants/studyLocationConstants.ts @@ -1,16 +1,3 @@ -import { - DONG_중화역, - DONG_화랑대역, - INC_구월동, - INC_부평, - INC_송도, - INC_송도DT, - INC_인하대, - SUWAN_광교, - SUWAN_워터쿨러, - YANG_목동점, - YANG_발산역, -} from "../../../storage/study"; import { ActiveLocation } from "../../../types/services/locationTypes"; import { ANYANG_숨맑은집, @@ -29,10 +16,11 @@ import { DONG_안암역, DONG_왕십리역, DONG_월곡역, - DONG_자유신청, DONG_장안동, + DONG_중화역, DONG_혜화역, DONG_혜화역2, + DONG_화랑대역, DONG_회기역, GANGNAM_강남, GANGNAM_강남구청, @@ -43,9 +31,15 @@ import { GANGNAM_신논현, GANGNAM_양재, GANGNAM_자유신청, + INC_구월동, + INC_부평, + INC_송도, + INC_송도DT, + INC_인하대, SUWAN_경기대, SUWAN_경희대, SUWAN_고색역, + SUWAN_광교, SUWAN_광교엘리웨이, SUWAN_광교중앙역, SUWAN_구운동, @@ -57,10 +51,12 @@ import { SUWAN_수원역, SUWAN_스타벅스, SUWAN_아주대, + SUWAN_워터쿨러, SUWAN_자유신청, SUWAN_행궁동, - YANG_당산역, + YANG_목동점, YANG_몽글, + YANG_발산역, YANG_스타벅스, YANG_신월동, YANG_신풍역, @@ -113,7 +109,7 @@ export const LOCATION_TO_PLACE: LocationToPlace = { YANG_화곡역, YANG_자유신청, YANG_신월동, - YANG_당산역, + YANG_목동점, YANG_발산역, ], @@ -144,7 +140,6 @@ export const LOCATION_TO_PLACE: LocationToPlace = { DONG_동대문역, DONG_혜화역, DONG_혜화역2, - DONG_자유신청, DONG_화랑대역, DONG_중화역, DONG_회기역, diff --git a/constants/serviceConstants/studyConstants/studyPlaceConstants.ts b/constants/serviceConstants/studyConstants/studyPlaceConstants.ts index 86de8d108..e6cad68f6 100644 --- a/constants/serviceConstants/studyConstants/studyPlaceConstants.ts +++ b/constants/serviceConstants/studyConstants/studyPlaceConstants.ts @@ -2,14 +2,12 @@ export const ALL_스터디인증 = "65263917e90698c18a3b1e99"; //수원 - export const SUWAN_수원시청 = "64395f1e8d1edf4e056e993d"; -export const SUWAN_수원역 = "640c271121863deff358f459"; +export const SUWAN_수원역 = "6637352830c7250eac355cc6"; export const SUWAN_아주대 = "62e5d6e0e098c232c05c3d3f"; export const SUWAN_상현역 = "64b15fb72704a3af110733ba"; export const SUWAN_송죽 = "644f6ffe9edb56992ccda5e9"; -// export const SUWAN_경희대 = "644f70529edb56992ccda5eb"; -export const SUWAN_경희대 = "661cdae4aaae875d410236d2"; +export const SUWAN_경희대 = "644f70529edb56992ccda5eb"; export const SUWAN_구운동 = "6527c32774e4622ec48d12dd"; export const SUWAN_스타벅스 = "64ba45feefd3711264521a87"; export const SUWAN_경기대 = "65211465032de083c092353c"; @@ -19,7 +17,9 @@ export const SUWAN_행궁동 = "6559f7e8e5c9066b9b8e7d2a"; export const SUWAN_망포역 = "6559f61fe5c9066b9b8e7d29"; export const SUWAN_고색역 = "654ca7770f651095a2e41845"; export const SUWAN_성균관대역 = "654ca7b50f651095a2e41846"; +export const SUWAN_워터쿨러 = "65bfc9347d1dd938049ed1a2"; export const SUWAN_광교엘리웨이 = "654ca92f0f651095a2e41848"; +export const SUWAN_광교 = "65fbdd5eba2597c46415a02c"; //양천 export const YANG_위카페 = "6437e9d7ab537b843c6143ac"; @@ -31,13 +31,13 @@ export const YANG_스타벅스 = "64bbc30787f8dc1a5210da6a"; export const YANG_카페꼼마 = "650afdb79ea186d7d9b2a1b6"; export const YANG_몽글 = "650afd559ea186d7d9b2a1b5"; export const YANG_신풍역 = "6551d99dd01680084c5c6a92"; -export const YANG_당산역 = "661cdb45aaae875d410236d3"; - export const YANG_신길역 = "6551d7cbd01680084c5c6a91"; export const YANG_신월동 = "6551d5bdd01680084c5c6a90"; export const YANG_양천구청역 = "6551d2b3d01680084c5c6a8f"; export const YANG_자유신청 = "6437eb3fab537b843c6143ae"; export const YANG_화곡역 = "658fbbc2113d3959183e36c2"; +export const YANG_발산역 = "65bfac0a7d1dd938049ed19e"; +export const YANG_목동점 = "65bfab8b7d1dd938049ed19d"; //안양 export const ANYANG_커피인더스트리 = "6456ef2820352b2d87582959"; @@ -64,8 +64,7 @@ export const DONG_장안동 = "6597c1f1a11634850ed506e0"; export const DONG_석계역 = "6597c184a11634850ed506df"; export const DONG_딥십리역 = "6597c124a11634850ed506de"; export const DONG_서울시립대 = "6597c0a2a11634850ed506dd"; -// export const DONG_경희대 = "6597c076a11634850ed506dc"; -export const DONG_경희대 = "661cd9aeaaae875d410236d1"; +export const DONG_경희대 = "6597c076a11634850ed506dc"; export const DONG_월곡역 = "6597c047a11634850ed506db"; export const DONG_왕십리역 = "6597c004a11634850ed506da"; export const DONG_안암역 = "6597bfd5a11634850ed506d9"; @@ -75,5 +74,16 @@ export const DONG_성신여대 = "6597bf26a11634850ed506d6"; export const DONG_동대문역 = "6597bed1a11634850ed506d5"; export const DONG_혜화역 = "6597be44a11634850ed506d3"; export const DONG_혜화역2 = "6597be67a11634850ed506d4"; -export const DONG_자유신청 = "6597c957a11634850ed506e3"; +export const DONG_화랑대역 = "65bfac8f7d1dd938049ed19f"; +export const DONG_중화역 = "6604c1ee4920fb76c1a64e62"; +export const DONG_노원역 = "663739e230c7250eac355cc8"; +export const DONG_수유역 = "66373a7d30c7250eac355cc9"; export const DONG_회기역 = "661cd8d3aaae875d410236d0"; + +//인천 +export const INC_인하대 = "65fbc711ba2597c46415a027"; +export const INC_송도DT = "65fbc8eeba2597c46415a028"; +export const INC_송도 = "65fbcba6ba2597c46415a029"; +export const INC_구월동 = "65fbd787ba2597c46415a02a"; +export const INC_부평 = "65fbd888ba2597c46415a02b"; +export const INC_인천대 = "6637373030c7250eac355cc7"; diff --git a/constants/settingValue/study/StudyCafeLogo.tsx b/constants/settingValue/study/StudyCafeLogo.tsx index f5093b8ec..64a5fa2b3 100644 --- a/constants/settingValue/study/StudyCafeLogo.tsx +++ b/constants/settingValue/study/StudyCafeLogo.tsx @@ -77,4 +77,6 @@ export const STUDY_CAFE_LOGO = { "https://studyabout.s3.ap-northeast-2.amazonaws.com/%EC%B9%B4%ED%8E%98+%EB%A1%9C%EA%B3%A0/%EC%B9%B8%EB%82%98.webp", 마르티: "https://studyabout.s3.ap-northeast-2.amazonaws.com/%EC%B9%B4%ED%8E%98+%EB%A1%9C%EA%B3%A0/%EB%A7%88%EB%A5%B4%ED%8B%B0+%EB%A1%9C%EA%B3%A0.png", + 엔제리너스: + "https://studyabout.s3.ap-northeast-2.amazonaws.com/%EC%B9%B4%ED%8E%98+%EB%A1%9C%EA%B3%A0/%EC%97%94%EC%A0%9C%EB%A6%AC%EB%84%88%EC%8A%A4+%EB%A1%9C%EA%B3%A0.jpg", }; diff --git a/constants/settingValue/study/StudyDistanceService.tsx b/constants/settingValue/study/StudyDistanceService.tsx index 5e412e2d4..29867ac3c 100644 --- a/constants/settingValue/study/StudyDistanceService.tsx +++ b/constants/settingValue/study/StudyDistanceService.tsx @@ -53,7 +53,7 @@ import { YANG_파스쿠찌, YANG_할리스, YANG_화곡역, -} from "../../../storage/study"; +} from "../../serviceConstants/studyConstants/studyPlaceConstants"; //15 //25 export const STUDY_DISTANCE = { diff --git a/libs/study/getStudyVoteMap.ts b/libs/study/getStudyVoteMap.ts index 23e815422..f5d711d54 100644 --- a/libs/study/getStudyVoteMap.ts +++ b/libs/study/getStudyVoteMap.ts @@ -26,7 +26,7 @@ export const getVoteLocationMaxBound = () => ({ ), 동대문: new naver.maps.LatLngBounds( new naver.maps.LatLng(37.557579, 126.989614), - new naver.maps.LatLng(37.638954, 127.106856), + new naver.maps.LatLng(37.648954, 127.106856), ), 인천: new naver.maps.LatLngBounds( new naver.maps.LatLng(37.584965, 126.580845), diff --git a/modals/study/StudyLightAbsentModal.tsx b/modals/study/StudyLightAbsentModal.tsx index 796cd3329..4d36110fa 100644 --- a/modals/study/StudyLightAbsentModal.tsx +++ b/modals/study/StudyLightAbsentModal.tsx @@ -1,11 +1,11 @@ import dayjs from "dayjs"; import { useRouter } from "next/router"; +import { PLACE_TO_NAME } from "../../constants/serviceConstants/studyConstants/studyCafeNameConstants"; import { POINT_SYSTEM_DEPOSIT } from "../../constants/settingValue/pointSystem"; import { useCompleteToast, useErrorToast } from "../../hooks/custom/CustomToast"; import { useStudyAbsentMutation } from "../../hooks/study/mutations"; import { usePointSystemMutation } from "../../hooks/user/mutations"; -import { PLACE_TO_NAME } from "../../storage/study"; import { IModal } from "../../types/components/modalTypes"; import { IFooterOptions, ModalLayout } from "../Modals"; diff --git a/pageTemplates/record/detail/RecordDetailStudyBlock.tsx b/pageTemplates/record/detail/RecordDetailStudyBlock.tsx index 7c71979ea..545d1b6ba 100644 --- a/pageTemplates/record/detail/RecordDetailStudyBlock.tsx +++ b/pageTemplates/record/detail/RecordDetailStudyBlock.tsx @@ -4,8 +4,8 @@ import { Fragment } from "react"; import styled from "styled-components"; import { LOCATION_TABLE_COLOR } from "../../../constants/location"; +import { PLACE_TO_NAME } from "../../../constants/serviceConstants/studyConstants/studyCafeNameConstants"; import { PLACE_TO_LOCATION } from "../../../constants/serviceConstants/studyConstants/studyLocationConstants"; -import { PLACE_TO_NAME } from "../../../storage/study"; import { Location } from "../../../types/services/locationTypes"; import { ISortedLocationStudies } from "./RecordDetail"; diff --git a/pageTemplates/study/StudyCover.tsx b/pageTemplates/study/StudyCover.tsx index a78c9e5e4..493f0da20 100644 --- a/pageTemplates/study/StudyCover.tsx +++ b/pageTemplates/study/StudyCover.tsx @@ -13,6 +13,7 @@ interface IStudyCover { function StudyCover({ brand, imageUrl, isPrivateStudy }: IStudyCover) { const brandName = brand === "행궁 81.2" ? "행궁" : isPrivateStudy ? "개인스터디" : brand; const logo = STUDY_CAFE_LOGO[brandName]; + console.log(brandName); return ( diff --git a/pages/admin/system/resetStudyStatus.tsx b/pages/admin/system/resetStudyStatus.tsx index 05598ff6e..28a0246f2 100644 --- a/pages/admin/system/resetStudyStatus.tsx +++ b/pages/admin/system/resetStudyStatus.tsx @@ -43,7 +43,7 @@ function ResetStudyStatus() { )} - {[12, 1, 2, 3, 4].map((item) => ( + {[3, 4, 5, 6, 7].map((item) => ( diff --git a/pages/admin/system/studyStatus.tsx b/pages/admin/system/studyStatus.tsx index 15a3f3d88..69885b87b 100644 --- a/pages/admin/system/studyStatus.tsx +++ b/pages/admin/system/studyStatus.tsx @@ -37,6 +37,8 @@ function AdminStudyStatus() { const { data: SUWAN } = useStudyVoteQuery(dayjsToStr(date), "수원"); const { data: YANG } = useStudyVoteQuery(dayjsToStr(date), "양천"); + console.log(date, SUWAN); + const handleStatus = (type: StudyStatus) => {}; return ( diff --git a/storage/study.ts b/storage/study.ts deleted file mode 100644 index a6e940919..000000000 --- a/storage/study.ts +++ /dev/null @@ -1,180 +0,0 @@ -//전체 -export const ALL_스터디인증 = "65263917e90698c18a3b1e99"; - -//수원 -export const SUWAN_수원시청 = "64395f1e8d1edf4e056e993d"; -export const SUWAN_수원역 = "6637352830c7250eac355cc6"; -export const SUWAN_아주대 = "62e5d6e0e098c232c05c3d3f"; -export const SUWAN_상현역 = "64b15fb72704a3af110733ba"; -export const SUWAN_송죽 = "644f6ffe9edb56992ccda5e9"; -export const SUWAN_경희대 = "644f70529edb56992ccda5eb"; -export const SUWAN_구운동 = "6527c32774e4622ec48d12dd"; -export const SUWAN_스타벅스 = "64ba45feefd3711264521a87"; -export const SUWAN_경기대 = "65211465032de083c092353c"; -export const SUWAN_광교중앙역 = "63625f1d958585371af0248b"; -export const SUWAN_자유신청 = "6479f39e907daf3e8a5cda6e"; -export const SUWAN_행궁동 = "6559f7e8e5c9066b9b8e7d2a"; -export const SUWAN_망포역 = "6559f61fe5c9066b9b8e7d29"; -export const SUWAN_고색역 = "654ca7770f651095a2e41845"; -export const SUWAN_성균관대역 = "654ca7b50f651095a2e41846"; -export const SUWAN_워터쿨러 = "65bfc9347d1dd938049ed1a2"; -export const SUWAN_광교엘리웨이 = "654ca92f0f651095a2e41848"; -export const SUWAN_광교 = "65fbdd5eba2597c46415a02c"; - -//양천 -export const YANG_위카페 = "6437e9d7ab537b843c6143ac"; -export const YANG_할리스 = "6437ea69ab537b843c6143ad"; -export const YANG_파스쿠찌 = "652a5093db9e8e554deafd63"; -export const YANG_이디야 = "6456f0b320352b2d8758295c"; -export const YANG_카페베네 = "64ba43a5efd3711264521a86"; -export const YANG_스타벅스 = "64bbc30787f8dc1a5210da6a"; -export const YANG_카페꼼마 = "650afdb79ea186d7d9b2a1b6"; -export const YANG_몽글 = "650afd559ea186d7d9b2a1b5"; -export const YANG_신풍역 = "6551d99dd01680084c5c6a92"; -export const YANG_신길역 = "6551d7cbd01680084c5c6a91"; -export const YANG_신월동 = "6551d5bdd01680084c5c6a90"; -export const YANG_양천구청역 = "6551d2b3d01680084c5c6a8f"; -export const YANG_자유신청 = "6437eb3fab537b843c6143ae"; -export const YANG_화곡역 = "658fbbc2113d3959183e36c2"; -export const YANG_발산역 = "65bfac0a7d1dd938049ed19e"; -export const YANG_목동점 = "65bfab8b7d1dd938049ed19d"; - -//안양 -export const ANYANG_커피인더스트리 = "6456ef2820352b2d87582959"; -export const ANYANG_숨맑은집 = "6456ede120352b2d87582955"; -export const ANYANG_파스쿠찌 = "652a52a6db9e8e554deafd67"; -export const ANYANG_인뎃커피 = "6456ef8120352b2d8758295b"; -export const ANYANG_범계학원가 = "6551ba13d01680084c5c6a8c"; -export const ANYANG_호계 = "6551bdbfd01680084c5c6a8d"; -export const ANYANG_자유신청 = "6456eed520352b2d87582957"; - -//강남 -export const GANGNAM_신논현 = "64ecc33940f6dace3b065598"; -export const GANGNAM_논현 = "64ecc3c240f6dace3b06559c"; -export const GANGNAM_교대 = "652a5245db9e8e554deafd66"; -export const GANGNAM_양재 = "64ecc48d40f6dace3b06559e"; -export const GANGNAM_선릉 = "64ecc54240f6dace3b0655a0"; -export const GANGNAM_강남구청 = "64ecc4ef40f6dace3b06559f"; -export const GANGNAM_강남 = "652a9e8adb9e8e554deafd68"; -export const GANGNAM_도곡 = "65522b7ed01680084c5c6a93"; -export const GANGNAM_자유신청 = "64ecc41640f6dace3b06559d"; - -//동대문 -export const DONG_장안동 = "6597c1f1a11634850ed506e0"; -export const DONG_석계역 = "6597c184a11634850ed506df"; -export const DONG_딥십리역 = "6597c124a11634850ed506de"; -export const DONG_서울시립대 = "6597c0a2a11634850ed506dd"; -export const DONG_경희대 = "6597c076a11634850ed506dc"; -export const DONG_월곡역 = "6597c047a11634850ed506db"; -export const DONG_왕십리역 = "6597c004a11634850ed506da"; -export const DONG_안암역 = "6597bfd5a11634850ed506d9"; -export const DONG_신설동역 = "6597bf9ca11634850ed506d8"; -export const DONG_길음역 = "6597bf65a11634850ed506d7"; -export const DONG_성신여대 = "6597bf26a11634850ed506d6"; -export const DONG_동대문역 = "6597bed1a11634850ed506d5"; -export const DONG_혜화역 = "6597be44a11634850ed506d3"; -export const DONG_혜화역2 = "6597be67a11634850ed506d4"; -export const DONG_화랑대역 = "65bfac8f7d1dd938049ed19f"; -export const DONG_중화역 = "6604c1ee4920fb76c1a64e62"; -export const DONG_노원역 = "663739e230c7250eac355cc8"; -export const DONG_수유역 = "66373a7d30c7250eac355cc9"; - -//인천 -export const INC_인하대 = "65fbc711ba2597c46415a027"; -export const INC_송도DT = "65fbc8eeba2597c46415a028"; -export const INC_송도 = "65fbcba6ba2597c46415a029"; -export const INC_구월동 = "65fbd787ba2597c46415a02a"; -export const INC_부평 = "65fbd888ba2597c46415a02b"; -export const INC_인천대 = "6637373030c7250eac355cc7"; - -export const PLACE_TO_NAME = { - //전체 - [ALL_스터디인증]: "스터디인증", - //수원 - [SUWAN_수원시청]: "투썸플레이스", - [SUWAN_수원역]: "탐앤탐스", - [SUWAN_아주대]: "카탈로그", - [SUWAN_상현역]: "투썸플레이스", - [SUWAN_송죽]: "커피빈", - [SUWAN_경희대]: "칸나", - [SUWAN_구운동]: "이디야", - [SUWAN_스타벅스]: "스타벅스", - [SUWAN_경기대]: "탐앤탐스", - [SUWAN_자유신청]: "자유신청", - [SUWAN_고색역]: "에이티씨", - [SUWAN_성균관대역]: "스타벅스", - [SUWAN_광교엘리웨이]: "책발전소", - [SUWAN_워터쿨러]: "워터쿨러", - [SUWAN_망포역]: "스타벅스", - [SUWAN_행궁동]: "행궁동", - [SUWAN_광교중앙역]: "아티제", - [SUWAN_광교]: "디어커피", - //양천 - [YANG_위카페]: "위카페", - [YANG_할리스]: "할리스", - [YANG_파스쿠찌]: "파스쿠찌", - [YANG_이디야]: "이디야", - [YANG_카페베네]: "카페베네", - [YANG_스타벅스]: "스타벅스", - [YANG_몽글]: "몽글", - [YANG_카페꼼마]: "카페꼼마", - [YANG_자유신청]: "자유신청", - [YANG_신풍역]: "이디야", - [YANG_신길역]: "레어 그루브", - [YANG_신월동]: "코나빈스", - [YANG_양천구청역]: "시나본", - [YANG_화곡역]: "투썸플레이스", - [YANG_목동점]: "스타벅스", - [YANG_발산역]: "스타벅스", - - //안양 - [ANYANG_커피인더스트리]: "커피인더스트리", - [ANYANG_숨맑은집]: "숨맑은집", - [ANYANG_파스쿠찌]: "파스쿠찌", - [ANYANG_인뎃커피]: "인뎃커피", - [ANYANG_자유신청]: "자유신청", - //강남 - [GANGNAM_강남]: "커피빈", - [GANGNAM_강남구청]: "파스쿠찌", - [GANGNAM_신논현]: "커피빈", - [GANGNAM_논현]: "커피빈", - [GANGNAM_교대]: "아펜즈커피", - [GANGNAM_양재]: "미오커피", - [GANGNAM_선릉]: "커피빈", - [GANGNAM_도곡]: "카페올로", - [GANGNAM_자유신청]: "자유신청", - - [DONG_장안동]: "투썸플레이스", - [DONG_석계역]: "카페디졸브", - [DONG_딥십리역]: "아띠커피", - [DONG_서울시립대]: "해머스미스커피", - [DONG_경희대]: "빵쌤", - [DONG_월곡역]: "카페어바웃", - [DONG_왕십리역]: "어질인", - [DONG_안암역]: "캐치카페", - [DONG_신설동역]: "커피니", - [DONG_길음역]: "일일커피", - [DONG_성신여대]: "카페 뮬", - [DONG_동대문역]: "D CAFE", - [DONG_혜화역]: "캐치카페", - [DONG_혜화역2]: "커피빈", - [DONG_화랑대역]: "마르티", - [DONG_중화역]: "스타벅스", - [DONG_수유역]: "엔제리너스", - [DONG_노원역]: "투썸플레이스", - - [INC_구월동]: "파스쿠찌", - [INC_부평]: "하이테이블", - [INC_송도]: "카페꼼마", - [INC_송도DT]: "스타벅스", - [INC_인하대]: "더스토리", - [INC_인천대]: "스타벅스", -}; - -export interface IstudyInfo { - id: string; - location: string; - time: string; - image?: string; - logo?: string; -} From 3d377667817d120ca0ae40c8ef0af3eb9f84cecc Mon Sep 17 00:00:00 2001 From: LSJ Date: Sun, 5 May 2024 20:04:26 +0900 Subject: [PATCH 4/5] docs: add study space and notice --- .../studyConstants/studyCafeNameConstants.ts | 25 ++++++--- .../studyConstants/studyLocationConstants.ts | 56 +++++++++++-------- .../studyConstants/studyPlaceConstants.ts | 15 ++--- pages/study/[id]/[date]/index.tsx | 4 +- storage/notice.ts | 11 +++- 5 files changed, 64 insertions(+), 47 deletions(-) diff --git a/constants/serviceConstants/studyConstants/studyCafeNameConstants.ts b/constants/serviceConstants/studyConstants/studyCafeNameConstants.ts index 44704dbcc..8f385c54f 100644 --- a/constants/serviceConstants/studyConstants/studyCafeNameConstants.ts +++ b/constants/serviceConstants/studyConstants/studyCafeNameConstants.ts @@ -1,9 +1,11 @@ import { ALL_스터디인증, + ANYANG_범계학원가, ANYANG_숨맑은집, ANYANG_인뎃커피, ANYANG_커피인더스트리, ANYANG_파스쿠찌, + ANYANG_호계, DONG_경희대, DONG_길음역, DONG_노원역, @@ -22,6 +24,7 @@ import { DONG_혜화역, DONG_혜화역2, DONG_화랑대역, + DONG_회기역, GANGNAM_강남, GANGNAM_강남구청, GANGNAM_교대, @@ -72,6 +75,7 @@ import { export const PLACE_TO_NAME = { //전체 [ALL_스터디인증]: "스터디인증", + //수원 [SUWAN_수원시청]: "투썸플레이스", [SUWAN_수원역]: "탐앤탐스", @@ -82,7 +86,6 @@ export const PLACE_TO_NAME = { [SUWAN_구운동]: "이디야", [SUWAN_스타벅스]: "스타벅스", [SUWAN_경기대]: "탐앤탐스", - [SUWAN_고색역]: "에이티씨", [SUWAN_성균관대역]: "스타벅스", [SUWAN_광교엘리웨이]: "책발전소", @@ -90,6 +93,7 @@ export const PLACE_TO_NAME = { [SUWAN_망포역]: "스타벅스", [SUWAN_행궁동]: "행궁동", [SUWAN_광교]: "디어커피", + //양천 [YANG_위카페]: "위카페", [YANG_할리스]: "할리스", @@ -97,33 +101,35 @@ export const PLACE_TO_NAME = { [YANG_이디야]: "이디야", [YANG_카페베네]: "카페베네", [YANG_스타벅스]: "스타벅스", - [YANG_몽글]: "몽글", [YANG_카페꼼마]: "카페꼼마", - + [YANG_몽글]: "몽글", [YANG_신풍역]: "이디야", [YANG_신길역]: "레어 그루브", [YANG_신월동]: "코나빈스", [YANG_양천구청역]: "시나본", [YANG_화곡역]: "투썸플레이스", - [YANG_목동점]: "스타벅스", [YANG_발산역]: "스타벅스", + [YANG_목동점]: "스타벅스", //안양 [ANYANG_커피인더스트리]: "커피인더스트리", [ANYANG_숨맑은집]: "숨맑은집", [ANYANG_파스쿠찌]: "파스쿠찌", [ANYANG_인뎃커피]: "인뎃커피", + [ANYANG_범계학원가]: "숨맑은집", + [ANYANG_호계]: "숨맑은집", //강남 [GANGNAM_강남]: "커피빈", - [GANGNAM_강남구청]: "파스쿠찌", [GANGNAM_신논현]: "커피빈", [GANGNAM_논현]: "커피빈", [GANGNAM_교대]: "아펜즈커피", [GANGNAM_양재]: "미오커피", [GANGNAM_선릉]: "커피빈", + [GANGNAM_강남구청]: "파스쿠찌", [GANGNAM_도곡]: "카페올로", + //동대문 [DONG_장안동]: "투썸플레이스", [DONG_석계역]: "카페디졸브", [DONG_딥십리역]: "아띠커피", @@ -140,13 +146,14 @@ export const PLACE_TO_NAME = { [DONG_혜화역2]: "커피빈", [DONG_화랑대역]: "마르티", [DONG_중화역]: "스타벅스", - [DONG_수유역]: "엔제리너스", [DONG_노원역]: "투썸플레이스", + [DONG_수유역]: "엔제리너스", + [DONG_회기역]: "READSTREET", + [INC_인하대]: "더스토리", + [INC_송도DT]: "스타벅스", [INC_구월동]: "파스쿠찌", - [INC_부평]: "하이테이블", [INC_송도]: "카페꼼마", - [INC_송도DT]: "스타벅스", - [INC_인하대]: "더스토리", + [INC_부평]: "하이테이블", [INC_인천대]: "스타벅스", }; diff --git a/constants/serviceConstants/studyConstants/studyLocationConstants.ts b/constants/serviceConstants/studyConstants/studyLocationConstants.ts index 6d2006c34..6088ae086 100644 --- a/constants/serviceConstants/studyConstants/studyLocationConstants.ts +++ b/constants/serviceConstants/studyConstants/studyLocationConstants.ts @@ -1,17 +1,20 @@ import { ActiveLocation } from "../../../types/services/locationTypes"; import { + ANYANG_범계학원가, ANYANG_숨맑은집, ANYANG_인뎃커피, - ANYANG_자유신청, ANYANG_커피인더스트리, ANYANG_파스쿠찌, + ANYANG_호계, DONG_경희대, DONG_길음역, + DONG_노원역, DONG_동대문역, DONG_딥십리역, DONG_서울시립대, DONG_석계역, DONG_성신여대, + DONG_수유역, DONG_신설동역, DONG_안암역, DONG_왕십리역, @@ -30,18 +33,17 @@ import { GANGNAM_선릉, GANGNAM_신논현, GANGNAM_양재, - GANGNAM_자유신청, INC_구월동, INC_부평, INC_송도, INC_송도DT, + INC_인천대, INC_인하대, SUWAN_경기대, SUWAN_경희대, SUWAN_고색역, SUWAN_광교, SUWAN_광교엘리웨이, - SUWAN_광교중앙역, SUWAN_구운동, SUWAN_망포역, SUWAN_상현역, @@ -52,17 +54,17 @@ import { SUWAN_스타벅스, SUWAN_아주대, SUWAN_워터쿨러, - SUWAN_자유신청, SUWAN_행궁동, YANG_목동점, YANG_몽글, YANG_발산역, YANG_스타벅스, + YANG_신길역, YANG_신월동, YANG_신풍역, + YANG_양천구청역, YANG_위카페, YANG_이디야, - YANG_자유신청, YANG_카페꼼마, YANG_카페베네, YANG_파스쿠찌, @@ -77,53 +79,57 @@ type LocationToPlace = { export const LOCATION_TO_PLACE: LocationToPlace = { // 전체: [ALL_스터디인증], 수원: [ - SUWAN_상현역, - SUWAN_아주대, - SUWAN_수원역, SUWAN_수원시청, - SUWAN_경희대, + SUWAN_수원역, + SUWAN_아주대, + SUWAN_상현역, SUWAN_송죽, + SUWAN_경희대, SUWAN_구운동, SUWAN_스타벅스, SUWAN_경기대, - SUWAN_자유신청, SUWAN_고색역, SUWAN_성균관대역, SUWAN_광교엘리웨이, - SUWAN_행궁동, - SUWAN_광교중앙역, - SUWAN_망포역, SUWAN_워터쿨러, + SUWAN_망포역, + SUWAN_행궁동, SUWAN_광교, ], 양천: [ - YANG_이디야, YANG_위카페, - YANG_파스쿠찌, YANG_할리스, + YANG_파스쿠찌, + YANG_이디야, YANG_카페베네, - YANG_신풍역, YANG_스타벅스, - YANG_몽글, YANG_카페꼼마, - YANG_화곡역, - YANG_자유신청, + YANG_몽글, + YANG_신풍역, + YANG_신길역, YANG_신월동, - + YANG_양천구청역, + YANG_화곡역, YANG_목동점, YANG_발산역, ], - 안양: [ANYANG_숨맑은집, ANYANG_인뎃커피, ANYANG_커피인더스트리, ANYANG_파스쿠찌, ANYANG_자유신청], + 안양: [ + ANYANG_숨맑은집, + ANYANG_인뎃커피, + ANYANG_커피인더스트리, + ANYANG_파스쿠찌, + ANYANG_범계학원가, + ANYANG_호계, + ], 강남: [ GANGNAM_강남, - GANGNAM_강남구청, GANGNAM_신논현, GANGNAM_논현, GANGNAM_교대, GANGNAM_양재, GANGNAM_선릉, + GANGNAM_강남구청, GANGNAM_도곡, - GANGNAM_자유신청, ], 동대문: [ DONG_장안동, @@ -142,9 +148,11 @@ export const LOCATION_TO_PLACE: LocationToPlace = { DONG_혜화역2, DONG_화랑대역, DONG_중화역, + DONG_노원역, + DONG_수유역, DONG_회기역, ], - 인천: [INC_구월동, INC_부평, INC_인하대, INC_송도, INC_송도DT], + 인천: [INC_구월동, INC_부평, INC_인하대, INC_송도, INC_송도DT, INC_인천대], }; export const PLACE_TO_LOCATION = createPlaceToLocationMap(LOCATION_TO_PLACE); diff --git a/constants/serviceConstants/studyConstants/studyPlaceConstants.ts b/constants/serviceConstants/studyConstants/studyPlaceConstants.ts index e6cad68f6..44a9d9bde 100644 --- a/constants/serviceConstants/studyConstants/studyPlaceConstants.ts +++ b/constants/serviceConstants/studyConstants/studyPlaceConstants.ts @@ -11,14 +11,12 @@ export const SUWAN_경희대 = "644f70529edb56992ccda5eb"; export const SUWAN_구운동 = "6527c32774e4622ec48d12dd"; export const SUWAN_스타벅스 = "64ba45feefd3711264521a87"; export const SUWAN_경기대 = "65211465032de083c092353c"; -export const SUWAN_광교중앙역 = "63625f1d958585371af0248b"; -export const SUWAN_자유신청 = "6479f39e907daf3e8a5cda6e"; -export const SUWAN_행궁동 = "6559f7e8e5c9066b9b8e7d2a"; -export const SUWAN_망포역 = "6559f61fe5c9066b9b8e7d29"; export const SUWAN_고색역 = "654ca7770f651095a2e41845"; export const SUWAN_성균관대역 = "654ca7b50f651095a2e41846"; -export const SUWAN_워터쿨러 = "65bfc9347d1dd938049ed1a2"; export const SUWAN_광교엘리웨이 = "654ca92f0f651095a2e41848"; +export const SUWAN_워터쿨러 = "65bfc9347d1dd938049ed1a2"; +export const SUWAN_망포역 = "6559f61fe5c9066b9b8e7d29"; +export const SUWAN_행궁동 = "6559f7e8e5c9066b9b8e7d2a"; export const SUWAN_광교 = "65fbdd5eba2597c46415a02c"; //양천 @@ -34,7 +32,6 @@ export const YANG_신풍역 = "6551d99dd01680084c5c6a92"; export const YANG_신길역 = "6551d7cbd01680084c5c6a91"; export const YANG_신월동 = "6551d5bdd01680084c5c6a90"; export const YANG_양천구청역 = "6551d2b3d01680084c5c6a8f"; -export const YANG_자유신청 = "6437eb3fab537b843c6143ae"; export const YANG_화곡역 = "658fbbc2113d3959183e36c2"; export const YANG_발산역 = "65bfac0a7d1dd938049ed19e"; export const YANG_목동점 = "65bfab8b7d1dd938049ed19d"; @@ -46,25 +43,23 @@ export const ANYANG_파스쿠찌 = "652a52a6db9e8e554deafd67"; export const ANYANG_인뎃커피 = "6456ef8120352b2d8758295b"; export const ANYANG_범계학원가 = "6551ba13d01680084c5c6a8c"; export const ANYANG_호계 = "6551bdbfd01680084c5c6a8d"; -export const ANYANG_자유신청 = "6456eed520352b2d87582957"; //강남 +export const GANGNAM_강남 = "652a9e8adb9e8e554deafd68"; export const GANGNAM_신논현 = "64ecc33940f6dace3b065598"; export const GANGNAM_논현 = "64ecc3c240f6dace3b06559c"; export const GANGNAM_교대 = "652a5245db9e8e554deafd66"; export const GANGNAM_양재 = "64ecc48d40f6dace3b06559e"; export const GANGNAM_선릉 = "64ecc54240f6dace3b0655a0"; export const GANGNAM_강남구청 = "64ecc4ef40f6dace3b06559f"; -export const GANGNAM_강남 = "652a9e8adb9e8e554deafd68"; export const GANGNAM_도곡 = "65522b7ed01680084c5c6a93"; -export const GANGNAM_자유신청 = "64ecc41640f6dace3b06559d"; //동대문 export const DONG_장안동 = "6597c1f1a11634850ed506e0"; export const DONG_석계역 = "6597c184a11634850ed506df"; export const DONG_딥십리역 = "6597c124a11634850ed506de"; export const DONG_서울시립대 = "6597c0a2a11634850ed506dd"; -export const DONG_경희대 = "6597c076a11634850ed506dc"; +export const DONG_경희대 = "661cd9aeaaae875d410236d1"; export const DONG_월곡역 = "6597c047a11634850ed506db"; export const DONG_왕십리역 = "6597c004a11634850ed506da"; export const DONG_안암역 = "6597bfd5a11634850ed506d9"; diff --git a/pages/study/[id]/[date]/index.tsx b/pages/study/[id]/[date]/index.tsx index 82564bb96..a345010da 100644 --- a/pages/study/[id]/[date]/index.tsx +++ b/pages/study/[id]/[date]/index.tsx @@ -1,5 +1,5 @@ -import { useParams } from "next/navigation"; import { useSession } from "next-auth/react"; +import { useParams } from "next/navigation"; import { useEffect } from "react"; import { useRecoilState, useSetRecoilState } from "recoil"; import styled from "styled-components"; @@ -26,7 +26,7 @@ export default function Page() { const setMyStudy = useSetRecoilState(myStudyState); const location = PLACE_TO_LOCATION[id]; - + console.log(location); const { data: studyAll } = useStudyVoteQuery(date, location, { enabled: !!location && !!date, }); diff --git a/storage/notice.ts b/storage/notice.ts index 328e336f4..bf372def2 100644 --- a/storage/notice.ts +++ b/storage/notice.ts @@ -696,8 +696,7 @@ export const NOTICE_ARR: INoticeArr[] = [ id: "88", title: "시험기간 추가 이벤트", category: "event", - content: - "시험기간 동안 힘내라고 각 지역 톡방에서 기프티콘을 뿌려요! 선착순 당첨입니다 ㅎㅎ", + content: "시험기간 동안 힘내라고 각 지역 톡방에서 기프티콘을 뿌려요! 선착순 당첨입니다 ㅎㅎ", date: "2023-04-22", }, { @@ -716,4 +715,12 @@ export const NOTICE_ARR: INoticeArr[] = [ "조모임은 신청자들의 지역, 나이, 성별, 희망 사항 등을 고려해서 조를 매칭하고, 6~8인의 조별로 모임을 진행하게 되는 컨텐츠입니다. 작년 9월에 처음 시작했는데 반응이 좋았어요! 누가 나올지 모른다는 부담없이 재밌는 모임 가져봐요! 상세 내용은 단톡방에서 공지하겠습니다.", date: "2023-04-29", }, + { + id: "91", + title: "스터디 장소 추가 및 변경", + category: "main", + content: + "수원역 탐탐에서 엔제리너스로 변경. 송도 컨벤션DT 스타벅스점 추가. 동대문 노원역 투썸 추가. 동대문 수유역 엔제리너스 추가. 기타 기존에 추가되었지만 페이지 접속이 안됐던 오류 수정.", + date: "2023-05-05", + }, ]; From d9caf85c7899366f330e5c7e7d3328c8c87df508 Mon Sep 17 00:00:00 2001 From: LSJ Date: Sun, 5 May 2024 20:06:21 +0900 Subject: [PATCH 5/5] change study space --- .../settingValue/study/StudyDistanceService.tsx | 14 +++++++------- pages/study/[id]/[date]/index.tsx | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/constants/settingValue/study/StudyDistanceService.tsx b/constants/settingValue/study/StudyDistanceService.tsx index 29867ac3c..a7c810e93 100644 --- a/constants/settingValue/study/StudyDistanceService.tsx +++ b/constants/settingValue/study/StudyDistanceService.tsx @@ -29,8 +29,8 @@ import { SUWAN_경기대, SUWAN_경희대, SUWAN_고색역, + SUWAN_광교, SUWAN_광교엘리웨이, - SUWAN_광교중앙역, SUWAN_구운동, SUWAN_망포역, SUWAN_상현역, @@ -70,19 +70,19 @@ export const STUDY_DISTANCE = { [SUWAN_수원역, SUWAN_구운동], [SUWAN_경희대, SUWAN_망포역], [SUWAN_아주대, SUWAN_경기대], - [SUWAN_아주대, SUWAN_광교중앙역], + [SUWAN_아주대, SUWAN_광교], [SUWAN_아주대, SUWAN_광교엘리웨이], [SUWAN_아주대, SUWAN_행궁동], [SUWAN_아주대, SUWAN_상현역], - [SUWAN_경기대, SUWAN_광교중앙역], + [SUWAN_경기대, SUWAN_광교], [SUWAN_경기대, SUWAN_행궁동], [SUWAN_경기대, SUWAN_상현역], [SUWAN_구운동, SUWAN_고색역], [SUWAN_구운동, SUWAN_성균관대역], - [SUWAN_상현역, SUWAN_광교중앙역], + [SUWAN_상현역, SUWAN_광교], [SUWAN_상현역, SUWAN_경기대], [SUWAN_상현역, SUWAN_광교엘리웨이], - [SUWAN_광교엘리웨이, SUWAN_광교중앙역], + [SUWAN_광교엘리웨이, SUWAN_광교], [SUWAN_송죽, SUWAN_행궁동], [SUWAN_송죽, SUWAN_성균관대역], ], @@ -93,7 +93,7 @@ export const STUDY_DISTANCE = { [SUWAN_수원시청, SUWAN_경희대], [SUWAN_수원역, SUWAN_망포역], [SUWAN_수원시청, SUWAN_광교엘리웨이], - [SUWAN_수원시청, SUWAN_광교중앙역], + [SUWAN_수원시청, SUWAN_광교], [SUWAN_아주대, SUWAN_수원역], [SUWAN_아주대, SUWAN_송죽], [SUWAN_수원역, SUWAN_송죽], @@ -105,7 +105,7 @@ export const STUDY_DISTANCE = { [SUWAN_구운동, SUWAN_행궁동], [SUWAN_구운동, SUWAN_수원시청], [SUWAN_구운동, SUWAN_송죽], - [SUWAN_행궁동, SUWAN_광교중앙역], + [SUWAN_행궁동, SUWAN_광교], [SUWAN_상현역, SUWAN_행궁동], ], }, diff --git a/pages/study/[id]/[date]/index.tsx b/pages/study/[id]/[date]/index.tsx index a345010da..9d02709c2 100644 --- a/pages/study/[id]/[date]/index.tsx +++ b/pages/study/[id]/[date]/index.tsx @@ -1,5 +1,5 @@ -import { useSession } from "next-auth/react"; import { useParams } from "next/navigation"; +import { useSession } from "next-auth/react"; import { useEffect } from "react"; import { useRecoilState, useSetRecoilState } from "recoil"; import styled from "styled-components";