Merge pull request #347 from Guzzing/dev

Dev
Guzzing · Jan 14, 2024 · 07f2683 · 07f2683
2 parents bb5d30e + db3f90c
commit 07f2683
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/pages/EditChildren/EditChildren.tsx b/src/pages/EditChildren/EditChildren.tsx
@@ -4,6 +4,7 @@ import { useNavigate } from 'react-router-dom'
 import { useLocation } from 'react-router-dom'
 import { useQuery } from '@tanstack/react-query'
 import { useMutation } from '@tanstack/react-query'
+import { useSetAtom } from 'jotai'
 import Loading from '@/components/Loading/Loading'
 import Button from '@/components/common/button/Button'
 import ListRow from '@/components/common/listRow/ListRow'

diff --git a/src/pages/academy/AcademyDashboard.tsx b/src/pages/academy/AcademyDashboard.tsx
@@ -27,7 +27,6 @@ const AcademyDashboard = () => {
   const [dashboardData, setDashboardData] = useState<GetAllDashBoardResponse[]>(
     []
   )
-  console.log(childInfo)
   const [dashboardId, setDashboardId] = useState(0)
   const { setToast } = useToastify()
   const { open, close, Modal } = useModal()

diff --git a/src/pages/academy/academyDetail/AcademySetting.tsx b/src/pages/academy/academyDetail/AcademySetting.tsx
@@ -50,13 +50,19 @@ const AcademySetting = ({ data }: { data: GetAllDashBoardResponse }) => {
       <div className={'w-full mt-[37px] px-[20px]'}>
         {data.isActive ? (
           <div className={'flex flex-col gap-[12px]'}>
-            {reviewData?.reviewable && (
+            {reviewData?.reviewable ? (
               <Button
                 fullWidth={true}
                 buttonType={'Plain-blue'}
                 label={'리뷰 남기기'}
                 onClick={() => setBottomSheetOpen(!isbottomSheetOpen)}
               />
+            ) : (
+              <Button
+                fullWidth={true}
+                buttonType={'Plain-disabled'}
+                disabled={true}
+                label={'이미 리뷰를 남긴 학원이에요'}></Button>
             )}
 
             <Button