Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[feat]: 리뷰 이미 남긴 것은 그 사실이 보여지도록 하기 #342

Merged
merged 3 commits into from
Jan 14, 2024
Merged

[feat]: 리뷰 이미 남긴 것은 그 사실이 보여지도록 하기 #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff39bd0
Merge branch 'dev' into feat/326-meta-tag
eugene028 Dec 4, 2023
10eda28
fix: manifest 경로 수정
eugene028 Dec 4, 2023
43025e4
fix: 리뷰 남기기
eugene028 Dec 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion public/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"type": "image/png"
}
],
"start_url": "/index.html",
"start_url": "/",
"display": "standalone",
"orientation": "landscape"
}
1 change: 1 addition & 0 deletions src/pages/EditChildren/EditChildren.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
1 change: 0 additions & 1 deletion src/pages/academy/AcademyDashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
8 changes: 7 additions & 1 deletion src/pages/academy/academyDetail/AcademySetting.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading