Merge branch 'main' into update-docs

AboutClan · May 6, 2024 · d92aa3e · d92aa3e
2 parents 842438d + ac38f35
commit d92aa3e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/constants/serviceConstants/studyConstants/studyPlaceConstants.ts b/constants/serviceConstants/studyConstants/studyPlaceConstants.ts
@@ -1,5 +1,5 @@
 //전체
-export const ALL_스터디인증 = "65263917e90698c18a3b1e99";
+export const ALL_스터디인증 = "6479f39e907daf3e8a5cda6e";
 
 //수원
 export const SUWAN_수원시청 = "64395f1e8d1edf4e056e993d";

diff --git a/pageTemplates/study/StudyCover.tsx b/pageTemplates/study/StudyCover.tsx
@@ -13,7 +13,6 @@ 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 (
     <StudyCoverWrapper>

diff --git a/pages/admin/system/studyStatus.tsx b/pages/admin/system/studyStatus.tsx
@@ -37,7 +37,7 @@ function AdminStudyStatus() {
   const { data: SUWAN } = useStudyVoteQuery(dayjsToStr(date), "수원");
   const { data: YANG } = useStudyVoteQuery(dayjsToStr(date), "양천");
 
-  console.log(date, SUWAN);
+
 
   const handleStatus = (type: StudyStatus) => {};
 

diff --git a/pages/study/[id]/[date]/index.tsx b/pages/study/[id]/[date]/index.tsx
@@ -7,6 +7,7 @@ import styled from "styled-components";
 import Divider from "../../../../components/atoms/Divider";
 import Slide from "../../../../components/layouts/PageSlide";
 import { PLACE_TO_LOCATION } from "../../../../constants/serviceConstants/studyConstants/studyLocationConstants";
+import { ALL_스터디인증 } from "../../../../constants/serviceConstants/studyConstants/studyPlaceConstants";
 import { useStudyVoteQuery } from "../../../../hooks/study/queries";
 import { getStudyDateStatus } from "../../../../libs/study/date/getStudyDateStatus";
 import { getMyStudy } from "../../../../libs/study/getMyStudy";
@@ -26,9 +27,10 @@ export default function Page() {
   const setMyStudy = useSetRecoilState(myStudyState);
 
   const location = PLACE_TO_LOCATION[id];
-  console.log(location);
+  const isPrivateStudy = id === ALL_스터디인증;
+
   const { data: studyAll } = useStudyVoteQuery(date, location, {
-    enabled: !!location && !!date,
+    enabled: (!!location || isPrivateStudy) && !!date,
   });
 
   const [studyDateStatus, setStudyDateStatus] = useRecoilState(studyDateStatusState);
@@ -50,7 +52,6 @@ export default function Page() {
     studyDateStatus !== "not passed"
       ? study?.attendences.filter((att) => att.firstChoice)
       : study?.attendences;
-  const isPrivateStudy = place?.brand === "자유 신청";
 
   return (
     <Layout>