diff --git a/src/features/Projects/pages/CategoryPage/ProjectsGrid/ProjectsGrid.tsx b/src/features/Projects/pages/CategoryPage/ProjectsGrid/ProjectsGrid.tsx index 48243bb..044f8b3 100644 --- a/src/features/Projects/pages/CategoryPage/ProjectsGrid/ProjectsGrid.tsx +++ b/src/features/Projects/pages/CategoryPage/ProjectsGrid/ProjectsGrid.tsx @@ -2,7 +2,6 @@ import ProjectCardMini from "src/features/Projects/Components/ProjectCardMini/ProjectCardMini"; import ProjectCardMiniSkeleton from 'src/features/Projects/Components/ProjectCardMini/ProjectCardMini.Skeleton'; import { openModal } from 'src/redux/features/modals.slice'; -import { openProject } from 'src/redux/features/project.slice'; import { useAppDispatch } from 'src/utils/hooks'; import { ProjectCard } from 'src/utils/interfaces'; @@ -17,7 +16,9 @@ export default function ProjectsGrid({ isLoading, projects }: Props) { const handleClick = (projectId: number) => { dispatch(openModal({ - Modal: "ProjectDetailsCard", props: { + Modal: "ProjectDetailsCard", + isPageModal: true, + props: { projectId } })) diff --git a/src/features/Projects/pages/ExplorePage/ProjectsRow/ProjectsRow.tsx b/src/features/Projects/pages/ExplorePage/ProjectsRow/ProjectsRow.tsx index 71da859..718a644 100644 --- a/src/features/Projects/pages/ExplorePage/ProjectsRow/ProjectsRow.tsx +++ b/src/features/Projects/pages/ExplorePage/ProjectsRow/ProjectsRow.tsx @@ -51,7 +51,7 @@ export default function ProjectsRow({ title, link, projects }: Props) { const handleClick = (projectId: number) => { if (isClickAllowed()) { - dispatch(openModal({ Modal: "ProjectDetailsCard", props: { projectId } })) + dispatch(openModal({ Modal: "ProjectDetailsCard", isPageModal: true, props: { projectId } })) } } diff --git a/src/features/Projects/pages/ProjectPage/ProjectDetailsCard/ProjectDetailsCard.Skeleton.tsx b/src/features/Projects/pages/ProjectPage/ProjectDetailsCard/ProjectDetailsCard.Skeleton.tsx index 0e1c1e1..8da03ca 100644 --- a/src/features/Projects/pages/ProjectPage/ProjectDetailsCard/ProjectDetailsCard.Skeleton.tsx +++ b/src/features/Projects/pages/ProjectPage/ProjectDetailsCard/ProjectDetailsCard.Skeleton.tsx @@ -3,7 +3,8 @@ import { MdClose, } from 'react-icons/md'; import { ModalCard, modalCardVariants } from 'src/Components/Modals/ModalsContainer/ModalsContainer'; import Skeleton from 'react-loading-skeleton'; import Badge from 'src/Components/Badge/Badge'; -import { useAppSelector } from 'src/utils/hooks'; +import { useMediaQuery } from 'src/utils/hooks'; +import { MEDIA_QUERIES } from 'src/utils/theme'; interface Props extends ModalCard { @@ -13,9 +14,7 @@ export default function ProjectDetailsCardSkeleton({ onClose, direction, ...prop - const { isMobileScreen } = useAppSelector(state => ({ - isMobileScreen: state.ui.isMobileScreen - })); + const isMdScreen = useMediaQuery(MEDIA_QUERIES.isMedium) @@ -27,12 +26,12 @@ export default function ProjectDetailsCardSkeleton({ onClose, direction, ...prop initial='initial' animate="animate" exit='exit' - className={`modal-card max-w-[768px] ${props.isPageModal && isMobileScreen && 'rounded-0 w-full min-h-screen'}`} + className={`modal-card max-w-[768px] ${props.isPageModal && !isMdScreen && 'rounded-0 w-full min-h-screen'}`} >