Merge branch 'main' into dev

.env

@@ -4,6 +4,5 @@
 REACT_APP_BASE_LOGO_URL=https://clubber-bucket.s3.ap-northeast-2.amazonaws.com/logo/soongsil_default.png
 REACT_APP_REST_API_KEY=6a5dafa758e469d18292acc6fbca333b
 
-
-
 # 빌드 명령어는 기본적으로 .env.production 의 우선순위가 가장 높음
+

.gitignore

@@ -18,6 +18,7 @@
 .env.development.local
 .env.test.local
 .env.production.local
+.env.staging
 
 npm-debug.log*
 yarn-debug.log*

src/App.jsx

@@ -33,6 +33,12 @@ import AdminRecruitWrite from './component/admin/recruit/AdminRecruitWrite';
 import DetailRecruitList from './component/recruit/DetailRecruitList';
 
 function App() {
+    const appStyle = {
+        backgroundColor: '#f9f9f9',
+        margin: 0,
+        padding: 0,
+      };
+
     const isPc = useMediaQuery({
         query: '(min-width:769px)',
     });
@@ -41,7 +47,7 @@ function App() {
     });
 
     return (
-        <>
+        <div style={appStyle}>
             {isPc && (
                 <BrowserRouter>
                     <Header />
@@ -125,7 +131,7 @@ function App() {
                     <Footer />
                 </BrowserRouter>
             )}
-        </>
+        </div>
     );
 }
 export default App;

src/component/admin/editPage.module.css

@@ -69,39 +69,39 @@
         color: white;
         border: none;
         border-radius: 5px;
-        width: 85px;
-        height: 25px;
+        width: 70px;
+        height: 23px;
         margin-right: 8px;
-        font-size: 12px;
+        font-size: 11px;
     }
     .fileUpload input[type='file']::file-selector-button {
-        /* border-color: #7bc8e0; */
+        border: none;
         background-color: #7bc8e0;
         color: #ffffff;
         margin-top: 5px;
         border: none;
         border-radius: 5px;
         width: 85px;
-        height: 25px;
+        height: 23px;
         margin-right: 5px;
         font-size: 12px;
         margin-bottom: 10px;
     }
 
     .association_btn {
-        width: 160px;
-        height: 30px;
+        width: 110px;
+        height: 25px;
         background-color: #7bc8e0;
         color: white;
-        font-size: 12.5px;
+        font-size: 10px;
         font-weight: 400;
         border-radius: 5px;
         /* text-align: center; */
         display: flex;
         flex-direction: row;
         align-items: center;
         justify-content: space-evenly;
-        padding: 0px 6px 0px 6px;
+        padding: 0px 5px 0px 5px;
         margin-top: 8px;
     }
 

src/component/hashtag/HashTagClub.jsx

@@ -27,7 +27,7 @@ function HashTagClub({ clubId, imageUrl, clubName, introduction, agreeToProvideI
             {isModalOpen && (
                 <ConfirmModal
                     isOpen={isModalOpen}
-                    message={'정보 미동의한 동아리입니다.'}
+                    message={'정보제공에 동의하지 않은 동아리입니다.'}
                     onClickOk={() => setIsModalOpen(false)}
                     onClose={() => setIsModalOpen(false)} // 모달 닫기
                 />

src/component/hashtag/hashtag.css

@@ -26,6 +26,7 @@
 }
 
 .tag_circle img {
+    background-color: transparent;
     object-fit: cover; /* 이미지가 원 안에서 잘리더라도 비율 유지하며 꽉 차게 */
     background-color: transparent;
 }

src/component/layout/Header.jsx

@@ -2,8 +2,6 @@ import React, { useEffect, useState, useRef } from 'react';
 import { Link, useLocation, useNavigate } from 'react-router-dom';
 import TagScroll from '../hashtag/TagScroll';
 import ErrorModal from '../modal/ErrorModal';
-// import BookMarkPage from '../../pages/BookMarkPage';
-// import { LinkItem } from '../branch/BranchCentral';
 import './header.css';
 import { customAxios } from '../../config/axios-config';
 

src/component/layout/header.css

@@ -20,6 +20,7 @@
         width: 53%;
         height: 53px;
         /* padding: 12px 21px; */
+        background-color: #fff;
     }
 
     .input_header {

src/component/login/login.css

@@ -40,7 +40,7 @@
     }
 
     .inner_cont .sign .active {
-        background-color: #fff;
+        background-color: #F9F9F9;
         border-top: 2px solid #7bc8e0;
         border-left: 1px solid#7BC8E0;
         border-right: 1px solid#7BC8E0;
@@ -65,7 +65,7 @@
     .inner_cont .sign-in-form-active,
     .inner_cont .sign-up-form-active {
         display: block;
-        background-color: #fff;
+        /* background-color: #fff; */
     }
 
     .inner_cont .sign-in-form-active .button-style {
@@ -127,6 +127,7 @@
         border: 1.3px solid #9c9c9c80;
         padding: 20px;
         margin: 20px 0px 8px 0px;
+        background-color: #fff;
     }
 
     .password-input {
@@ -136,6 +137,7 @@
         border: 1.3px solid #9c9c9c80;
         margin: auto;
         padding: 20px;
+        background-color: #fff;
     }
 
     .login-button {
@@ -274,6 +276,7 @@
         border-radius: 5px;
         border: 1.3px solid #9c9c9c80;
         padding: 20px;
+        background-color: #fff;
     }
 
     .email-input {

src/component/main/mainBanner.css

@@ -2,7 +2,7 @@
     * {
         box-sizing: border-box;
         margin: 0;
-        background-color: #f9f9f9;
+        /* background-color: #f9f9f9; */
     }
 
     /* .banner_container {

src/component/mypage/bookmark/component/bookmark.jsx

@@ -4,7 +4,6 @@ import styled from 'styled-components';
 import FavoriteClubs from './favoriteClubs';
 import { customAxios } from '../../../../config/axios-config';
 import StarImg from '../bookmark_image/starYellow.png';
-import EmptyStarImg from '../bookmark_image/star.png';
 import BookMarkIcon from '../bookmark_image/bookmarkIcon.png';
 import { LinkItem } from '../../../branch/BranchCentral';
 

src/component/mypage/bookmark/component/bookmark.module.css

@@ -34,7 +34,9 @@
         margin: auto;
         margin-left: 120px;
         padding-top: 30px;
+
     }
+
     .club_branch {
         font-family: Noto Sans KR;
         font-size: 13px;

src/pages/DetailPage.jsx

@@ -55,14 +55,33 @@ export default function ClubsPage() {
 
     const onClickIntroTab = () => {
         setWhichTab('Introduction');
-        //console.log('동아리 상세 소개 탭뷰');
     };
 
-    const onClickReviewTab = () => {
-        setWhichTab('Review');
-        //console.log('동아리 상세 리뷰 탭뷰');
+    const onClickReviewTab = async () => {
+        try {
+            const res = await customAxios.get(`/v1/clubs/${intClubId}/reviews/agree`);
+            if (res.data.data.agreeToReview) {
+                setWhichTab('Review');
+            } else {
+                setModalMessage('리뷰 제공에 동의하지 않은 동아리 입니다.');
+                setIsModalOpen(true);
+            }
+        } catch (error) {
+            console.error();
+        }
     };
 
+    const handleReviewError = (error) => {
+        console.log(error.data);
+        if (error.response && error.response.status === 403) {
+            setModalMessage(error.response.reason);
+            setIsModalOpen(true);
+        } else {
+            setModalMessage('알 수 없는 오류가 발생했습니다.');
+            setIsModalOpen(true);
+        }
+    }
+
     const getBookmarkData = async () => {
         setIsLoading(true);
         if (isAdmin) return;
@@ -218,7 +237,7 @@ export default function ClubsPage() {
                     room={clubInfoData.room}
                 />
             )}
-            {whichTab === 'Review' && <ReviewPage clubId={clubId} clubName={detailData.clubName} />}
+            {whichTab === 'Review' && <ReviewPage clubId={clubId} clubName={detailData.clubName} onError={(error) => handleReviewError(error)}/>}
             <ErrorModal isOpen={isModalOpen} message={modalMessage} onClose={closeModal} />
         </div>
     );