🔀 Fix Add NotionPdf Portfolio

#278 지원서 포폴 기능 보완 및 전체 스타일 수정
Gongjakso · Oct 2, 2024 · ed1116a · ed1116a
2 parents 6120a9b + c2bb179
commit ed1116a
Show file tree

Hide file tree

Showing 12 changed files with 193 additions and 56 deletions.
diff --git a/gongjakso/src/assets/images/blackLink.svg b/gongjakso/src/assets/images/blackLink.svg
diff --git a/gongjakso/src/components/common/AlertModal/AlertModal.Styled.jsx b/gongjakso/src/components/common/AlertModal/AlertModal.Styled.jsx
@@ -30,9 +30,9 @@ export const AlertModalInnerContainer = styled.div`
     background: #fff;
     text-align: center;
     border-radius: 40px;
-    padding: 20px;
+    padding: 30px;
     position: relative;
-    width: 45%;
+    width: 40%;
     height: 40%;
 `;
 export const MainTitle = styled.p`
@@ -52,7 +52,7 @@ export const AlertText = styled.h3`
     align-items: center;
     flex-direction: column;
     text-align: center;
-    font-size: 1.3rem;
+    font-size: 1.1rem;
     font-family: 'PreMedium';
 `;
 
@@ -71,9 +71,8 @@ export const AlertBtn = styled.button`
     justify-content: center;
     width: ${props => props.$w};
     border-radius: 10px;
-    padding: 15px;
-    font-size: ${({ theme }) => theme.fontSize.md};
+    padding: 10px;
+    font-size: ${({ theme }) => theme.fontSize.m};
     background: ${({ theme }) => theme.Main1};
-    font-family: 'PreBold';
     color: white;
 `;
diff --git a/gongjakso/src/components/common/Input/Input.Styled.jsx b/gongjakso/src/components/common/Input/Input.Styled.jsx
@@ -6,7 +6,7 @@ export const SelectContainer = styled.div`
 
 export const SelectValue = styled.div`
     display: block;
-    width: ${props => (props.$case === 'true' ? '190px' : '400px')};
+    width: ${props => (props.$case === 'true' ? '155px' : '400px')};
     display: flex;
     flex-direction: row;
     justify-content: space-between;
@@ -26,7 +26,7 @@ export const OptionList = styled.div`
     position: absolute;
     font-family: 'PreMedium';
     right: -10px;
-    width: ${props => (props.$case === 'true' ? '220px' : '430px')};
+    width: ${props => (props.$case === 'true' ? '185px' : '430px')};
     font-size: ${({ theme }) => theme.fontSize.m};
     margin: ${props => (props.$case === 'true' ? '20px 0px' : '20px 0px')};
     list-style: none;

diff --git a/gongjakso/src/components/common/Input/Multilevel.styled.jsx b/gongjakso/src/components/common/Input/Multilevel.styled.jsx
@@ -12,22 +12,22 @@ export const Dropdown = styled.div`
         text-align: left;
         padding: ${props =>
             props.$ispost === 'true' ? '10px 19px' : '12px 18px'};
-        width: ${props => (props.$ispost === 'true' ? '200px' : '220px')};
+        width: ${props => (props.$ispost === 'true' ? '200px' : '190px')};
         font-size: ${({ theme, $ispost }) =>
-            $ispost === 'true' ? '1.15rem' : theme.fontSize.md};
+            $ispost === 'true' ? theme.fontSize.base : theme.fontSize.m};
         color: ${props => (props.$ispost === 'true' ? 'gray' : 'black')};
-        border-radius: ${props => (props.$ispost === 'true' ? '25px' : '10px')};
+        border-radius: ${props => (props.$ispost === 'true' ? '25px' : '6px')};
     }
     .rnd__root-menu.rnd__menu {
         width: ${props =>
-            props.$ispost === 'true' ? '200px!important' : '220px!important'};
+            props.$ispost === 'true' ? '200px!important' : '190px!important'};
         z-index: 9999;
         font-family: 'PreRegular';
     }
 
     .rnd .rnd__root-menu.rnd__menu .rnd__option .rnd__option-label {
         font-size: ${({ theme, $ispost }) =>
-            $ispost === 'true' ? '1.15rem' : theme.fontSize.md};
+            $ispost === 'true' ? theme.fontSize.base : theme.fontSize.m};
         padding-left: 20px;
     }
 
@@ -37,7 +37,7 @@ export const Dropdown = styled.div`
         .rnd__menu.rnd__submenu.rnd__submenu--opened {
         max-height: 300px;
         overflow-y: scroll;
-        width: 200px !important;
+        width: 190px !important;
     }
     .rnd__option--with-menu:hover > .rnd__submenu {
         display: block;
@@ -46,7 +46,7 @@ export const Dropdown = styled.div`
     .rnd__option:not(.rnd__option--disabled):hover {
         background-color: black;
         color: white;
-        transition: background-color 0.1s ease;
+        transition: background-color 0.2s ease;
         border-radius: 4px;
     }
 `;

diff --git a/gongjakso/src/features/modal/ApplyModal.styled.jsx b/gongjakso/src/features/modal/ApplyModal.styled.jsx
@@ -95,7 +95,7 @@ export const RoundForm = styled.button`
 `;
 
 export const PortForm = styled(RoundForm)`
-    min-width: 250px;
+    min-width: 230px;
     display: inline-block;
     max-width: 250px;
     white-space: nowrap;

diff --git a/gongjakso/src/features/modal/ClickmyApply.jsx b/gongjakso/src/features/modal/ClickmyApply.jsx
@@ -25,7 +25,7 @@ const ClickmyApply = props => {
     // 특정 지원자 지원서 열람하기
     useEffect(() => {
         getMyApplication(props.applyId).then(res => {
-            console.log(res?.data);
+            // console.log(res?.data);
             setmyApp(res?.data);
         });
 

diff --git a/gongjakso/src/features/modal/Completed.jsx b/gongjakso/src/features/modal/Completed.jsx
@@ -29,6 +29,7 @@ const Completed = props => {
             part: props.clickedFields,
             status: 'COMPLETED',
             isPrivate: props.isclosed,
+            dataType: props.dataType,
         };
         postApply(props.id, newData).then(res => {});
     };

diff --git a/gongjakso/src/pages/ContestDetailPage/ContestDetailPage.Styled.jsx b/gongjakso/src/pages/ContestDetailPage/ContestDetailPage.Styled.jsx
@@ -28,7 +28,6 @@ export const ContestInfo = styled.div`
 `;
 
 export const ContestTitle = styled.p`
-    font-family: 'The Jamsil OTF';
     font-size: ${({ theme }) => theme.fontSize.xl};
     font-weight: 700;
     line-height: 52.8px;
@@ -47,7 +46,6 @@ export const ContestImg = styled.img`
 `;
 export const RemainDate = styled.div`
     width: auto;
-    height: 27px;
     display: flex;
     align-items: center;
     justify-content: center;
@@ -58,8 +56,7 @@ export const RemainDate = styled.div`
     text-align: center;
     color: ${({ theme }) => theme.mainFont2};
     background-color: ${({ theme }) => theme.Purple};
-    padding-left: 10px;
-    padding-right: 10px;
+    padding: 0.5rem 1rem;
 `;
 
 export const SpanP = styled.p`
@@ -74,26 +71,26 @@ export const FireImage = styled(Fire)`
 `;
 
 export const Organization = styled.h2`
-    font-family: 'Pretendard';
     font-size: ${({ theme }) => theme.fontSize.mdd};
     font-weight: 700;
     line-height: 28.64px;
     text-align: left;
     margin-bottom: 25px;
+    padding-left: 0.5rem;
 `;
 
 export const InfoContent = styled.h3`
     display: flex;
     flex-direction: row;
-    font-family: 'Pretendard';
+    // font-family: 'Pretendard';
     font-size: 16px;
     font-weight: 700;
     line-height: 23.87px;
     text-align: left;
     gap: 10px;
 `;
 export const InfoSpan = styled.p`
-    font-family: 'Pretendard';
+    // font-family: 'Pretendard';
     font-size: ${({ theme }) => theme.fontSize.m};
     font-weight: 500;
     line-height: 23.87px;
@@ -111,32 +108,37 @@ export const ContestButtonOption = styled.div`
 
 export const GotohomeBtn = styled.button`
     background-color: ${({ theme }) => theme.border};
-    width: 20%;
+    width: 25%;
     display: flex;
     align-items: center;
     justify-content: center;
     text-align: center;
     height: 50px;
-    border-radius: 15px;
+    border-radius: 12px;
     margin: 15px;
-    padding: 18px;
+    padding: 20px;
     font-size: ${({ theme }) => theme.fontSize.md};
     font-weight: bold;
+
+    img {
+        margin-left: 0.2rem;
+        width: 1.3rem;
+    }
 `;
 export const TeamBuildBtn = styled.button`
     background-color: ${({ theme }) => theme.box1};
-    width: 20%;
+    width: 24%;
     display: flex;
     align-items: center;
     justify-content: center;
     text-align: center;
     height: 50px;
-    border-radius: 15px;
+    border-radius: 12px;
     margin: 15px;
-    padding: 18px;
+    padding: 20px;
     color: ${({ theme }) => theme.mainFont2};
     font-size: ${({ theme }) => theme.fontSize.md};
-    font-weight: bold;
+    font-weight: 500;
 `;
 
 export const Headline = styled.hr`
@@ -156,8 +158,8 @@ export const Fillterbox = styled.div`
     margin-bottom: 30px;
 `;
 export const Fillter1 = styled.div`
-    width: 220px;
-    border-radius: 10px;
+    width: 190px;
+    border-radius: 5px;
     border: 1.5px solid #c4c4c4;
     padding: 12px 18px;
     display: flex;

diff --git a/gongjakso/src/pages/ContestDetailPage/ContestDetailPage.jsx b/gongjakso/src/pages/ContestDetailPage/ContestDetailPage.jsx
@@ -3,6 +3,7 @@ import { Link, useLocation } from 'react-router-dom';
 import * as S from './ContestDetailPage.Styled';
 import Multilevel from '../../components/common/Input/Multilevel';
 import { SelectInput } from '../../components/common/Input/Input';
+import HomeLink from '../../assets/images/blackLink.svg';
 import { useForm } from 'react-hook-form';
 import TeamBox from '../TeamBox/TeamBox';
 import NoContents from '../../features/NoContents/NoContents';
@@ -156,15 +157,16 @@ const ContestDetailPage = () => {
                 </S.ContestDetail>
                 <S.ContestButtonOption>
                     <S.GotohomeBtn onClick={handlegotoHomePage}>
-                        홈페이지로 바로가기
+                        홈페이지 바로가기
+                        <img src={HomeLink} alt="homepage-link" />
                     </S.GotohomeBtn>
                     <S.TeamBuildBtn onClick={handleTeamBuildClick}>
                         팀빌딩하기
                     </S.TeamBuildBtn>
                 </S.ContestButtonOption>
                 <S.ContestInfo>
                     <S.ContestTitle>
-                        '{contestDetail?.title}'의 팀 찾기
+                        '{contestDetail?.title}' 의 팀 찾기
                     </S.ContestTitle>
                     <S.Organization>
                         현재 {contestPosts?.length}명이 팀을 모집하고 있어요