Skip to content

[fix] 비참여동아리 alert 및 리다이렉션 기능 제거 #559

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

Merged
seongwon030 merged 3 commits into from
Jul 20, 2025
Merged

[fix] 비참여동아리 alert 및 리다이렉션 기능 제거 #559

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
41da1c3
Revert "Merge pull request #553 from Moadong/feature/#552-gray-nonjoi…
seongwon030 Jul 20, 2025
fb4010f
Revert "Merge pull request #551 from Moadong/feature/#550-disable-hov…
seongwon030 Jul 20, 2025
cd37b8c
Revert "Merge pull request #548 from Moadong/feature/#547-alert-for-u…
seongwon030 Jul 20, 2025
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
32 changes: 0 additions & 32 deletions frontend/src/constants/joinedClubNames.ts
View file
Open in desktop

This file was deleted.

21 changes: 2 additions & 19 deletions frontend/src/pages/ClubDetailPage/ClubDetailPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useEffect, useState } from 'react';
import { useNavigate, useParams } from 'react-router-dom';
import { useParams } from 'react-router-dom';
import * as Styled from '@/styles/PageContainer.styles';
import Header from '@/components/common/Header/Header';
import BackNavigationBar from '@/pages/ClubDetailPage/components/BackNavigationBar/BackNavigationBar';
Expand All @@ -13,31 +13,14 @@ import ClubDetailFooter from '@/pages/ClubDetailPage/components/ClubDetailFooter
import useTrackPageView from '@/hooks/useTrackPageView';
import useAutoScroll from '@/hooks/InfoTabs/useAutoScroll';
import { useGetClubDetail } from '@/hooks/queries/club/useGetClubDetail';
import { joinedClubNames } from '@/constants/joinedClubNames';

const ClubDetailPage = () => {
const { clubId } = useParams<{ clubId: string }>();
const { sectionRefs, scrollToSection } = useAutoScroll();
const [showHeader, setShowHeader] = useState(window.innerWidth > 500);

const navigate = useNavigate();
const [blockState, setBlockState] = useState<
'checking' | 'blocked' | 'allowed'
>('checking');
const { data: clubDetail, error } = useGetClubDetail(clubId || '');

useEffect(() => {
if (!clubDetail) return;

if (!joinedClubNames.includes(clubDetail?.name || '')) {
setBlockState('blocked');
alert('참여하지 않는 동아리입니다.');
navigate('/', { replace: true });
} else {
setBlockState('allowed');
}
}, [clubDetail, navigate]);

useEffect(() => {
const handleResize = () => {
setShowHeader(window.innerWidth > 500);
Expand All @@ -49,7 +32,7 @@ const ClubDetailPage = () => {

useTrackPageView(`ClubDetailPage`, clubDetail?.name);

if (!clubDetail || blockState !== 'allowed') {
if (!clubDetail) {
return null;
}

Expand Down
10 changes: 3 additions & 7 deletions frontend/src/pages/MainPage/components/ClubCard/ClubCard.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@ import styled from 'styled-components';
const CardContainer = styled.div<{
$state: string;
$isClicked: boolean;
$isBlockedClub: boolean;
}>`
display: flex;
flex-direction: column;
border-radius: 14px;
padding: 20px;
background-color: ${({ $isBlockedClub }) =>
$isBlockedClub ? '#F5F5F5' : '#fff'};
background-color: #fff;
width: 100%;
height: 170px;
box-shadow: ${({ $state }) =>
Expand All @@ -25,10 +23,8 @@ const CardContainer = styled.div<{
cursor: pointer;

&:hover {
${({ $isBlockedClub, $isClicked }) =>
$isBlockedClub
? 'transform: none; cursor: not-allowed;'
: `transform: ${$isClicked ? 'scale(1.05)' : 'scale(1.03)'};`}
transform: ${({ $isClicked }) =>
$isClicked ? 'scale(1.05)' : 'scale(1.03)'};
}

&:active {
Expand Down
5 changes: 1 addition & 4 deletions frontend/src/pages/MainPage/components/ClubCard/ClubCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import * as Styled from './ClubCard.styles';
import { Club } from '@/types/club';
import { useNavigate } from 'react-router-dom';
import default_profile_image from '@/assets/images/logos/default_profile_image.svg';
import { joinedClubNames } from '@/constants/joinedClubNames';

const ClubCard = ({ club }: { club: Club }) => {
const navigate = useNavigate();
Expand All @@ -29,11 +28,9 @@ const ClubCard = ({ club }: { club: Club }) => {

return (
<Styled.CardContainer
$isBlockedClub={!joinedClubNames.includes(club.name)}
$state={club.recruitmentStatus}
$isClicked={isClicked}
onClick={handleNavigate}
>
onClick={handleNavigate}>
<Styled.CardHeader>
<Styled.ClubProfile>
<ClubLogo $imageSrc={club.logo || default_profile_image} />
Expand Down