diff --git a/index.html b/index.html index 1c664cf7..ed89159a 100644 --- a/index.html +++ b/index.html @@ -3,6 +3,13 @@ + @@ -20,32 +27,6 @@ 밋팀 -
diff --git a/public/logo_large.webp b/public/logo_large.webp new file mode 100644 index 00000000..cee07f4c Binary files /dev/null and b/public/logo_large.webp differ diff --git a/public/logo_medium.webp b/public/logo_medium.webp new file mode 100644 index 00000000..7438c4d5 Binary files /dev/null and b/public/logo_medium.webp differ diff --git a/public/logo_small copy.webp b/public/logo_small copy.webp new file mode 100644 index 00000000..6a1fc104 Binary files /dev/null and b/public/logo_small copy.webp differ diff --git a/public/logo_small.webp b/public/logo_small.webp new file mode 100644 index 00000000..6a1fc104 Binary files /dev/null and b/public/logo_small.webp differ diff --git a/public/logo_typo_large.webp b/public/logo_typo_large.webp new file mode 100644 index 00000000..16c7e84f Binary files /dev/null and b/public/logo_typo_large.webp differ diff --git a/public/logo_typo_medium.webp b/public/logo_typo_medium.webp new file mode 100644 index 00000000..efc21e83 Binary files /dev/null and b/public/logo_typo_medium.webp differ diff --git a/public/logo_typo_small.webp b/public/logo_typo_small.webp new file mode 100644 index 00000000..896ba1bd Binary files /dev/null and b/public/logo_typo_small.webp differ diff --git a/public/meeteam_banner_icon_large.webp b/public/meeteam_banner_icon_large.webp new file mode 100644 index 00000000..15d890fe Binary files /dev/null and b/public/meeteam_banner_icon_large.webp differ diff --git a/public/meeteam_banner_icon_medium.webp b/public/meeteam_banner_icon_medium.webp new file mode 100644 index 00000000..4e9aeb18 Binary files /dev/null and b/public/meeteam_banner_icon_medium.webp differ diff --git a/public/meeteam_banner_icon_small.webp b/public/meeteam_banner_icon_small.webp new file mode 100644 index 00000000..75c8d14d Binary files /dev/null and b/public/meeteam_banner_icon_small.webp differ diff --git a/sitemap.xml b/sitemap.xml index 3ad0f236..7550732d 100644 --- a/sitemap.xml +++ b/sitemap.xml @@ -9,7 +9,7 @@ https://www.meeteam.co.kr/ - 2024-05-16T08:00:44+00:00 + 2024-10-14T08:20:21+00:00 diff --git a/src/assets/index.ts b/src/assets/index.ts index 28e4c52b..b4559ea2 100644 --- a/src/assets/index.ts +++ b/src/assets/index.ts @@ -65,7 +65,6 @@ import LogoFooter from './LogoFooter.svg'; import Email from './Email.svg'; import GrayDelete from './GrayDelete.svg'; import NotFoundIcon from './NotFoundIcon.webp'; -import meeteam_banner_icon from './meeteam_banner_icon.webp'; export { Exit, @@ -135,5 +134,4 @@ export { Email, GrayDelete, NotFoundIcon, - meeteam_banner_icon, }; diff --git a/src/assets/meeteam_banner_icon.webp b/src/assets/meeteam_banner_icon.webp deleted file mode 100644 index d2b1b187..00000000 Binary files a/src/assets/meeteam_banner_icon.webp and /dev/null differ diff --git a/src/components/comment/comment/ReplyComment.tsx b/src/components/comment/comment/ReplyComment.tsx index eb456606..73c99a7d 100644 --- a/src/components/comment/comment/ReplyComment.tsx +++ b/src/components/comment/comment/ReplyComment.tsx @@ -109,7 +109,7 @@ const ReplyComment = ({ return (
- + 답변 아이콘
diff --git a/src/components/comment/replyInput/ReplyInput.tsx b/src/components/comment/replyInput/ReplyInput.tsx index a670151e..0379519d 100644 --- a/src/components/comment/replyInput/ReplyInput.tsx +++ b/src/components/comment/replyInput/ReplyInput.tsx @@ -50,7 +50,7 @@ const ReplyInput = ({ pageNum, groupNumber, onClickCancel, replyInputHandler }: return ( - + 답변 아이콘
diff --git a/src/components/dropdown/Dropdown.tsx b/src/components/dropdown/Dropdown.tsx index c454dfa3..adb64e97 100644 --- a/src/components/dropdown/Dropdown.tsx +++ b/src/components/dropdown/Dropdown.tsx @@ -249,7 +249,7 @@ const Dropdown = ({ data, initialData, scope, category, applicant, roleObj }: Dr
)} {applicant &&
{currentValue}
} - + 드롭다운 아이콘 {showDropdown && ( <> @@ -345,7 +345,7 @@ const Dropdown = ({ data, initialData, scope, category, applicant, roleObj }: Dr
- + 초기화 아이콘 초기화
) : ( 로그인 @@ -172,4 +178,4 @@ const Header = () => { ); }; -export default React.memo(Header); +export default Header; diff --git a/src/components/inputDropdown/inputRole/InputRole.tsx b/src/components/inputDropdown/inputRole/InputRole.tsx index 57ff587a..e1696b18 100644 --- a/src/components/inputDropdown/inputRole/InputRole.tsx +++ b/src/components/inputDropdown/inputRole/InputRole.tsx @@ -32,7 +32,7 @@ const InputRole = ({ id, role, count, skill, onDelete }: InputRole) => {
); diff --git a/src/components/inputDropdown/inputRole/InputRoleForm.tsx b/src/components/inputDropdown/inputRole/InputRoleForm.tsx index 3de69ade..3cc1c497 100644 --- a/src/components/inputDropdown/inputRole/InputRoleForm.tsx +++ b/src/components/inputDropdown/inputRole/InputRoleForm.tsx @@ -412,7 +412,7 @@ const InputRoleForm = (props: InputRoleObj) => { {isValid.isRoleSubmitted && !isValidBeforeSubmit.role.valid && (

{isValidBeforeSubmit.role.message}

)} - + 검색 아이콘
{ onClick={event => deleteTagHandler(event, tagItem.id)} className='btn-delete__tag' > - + 취소 아이콘 ); @@ -459,7 +459,7 @@ const InputRoleForm = (props: InputRoleObj) => { onClick={event => deleteTagHandler(event, tagItem.id)} className='btn-delete__tag' > - + 취소 아이콘 ); @@ -513,7 +513,7 @@ const InputRoleForm = (props: InputRoleObj) => { onClick={event => deleteTagHandler(event, tagItem.id)} className='btn-delete__tag' > - + 취소 아이콘 ); @@ -528,7 +528,7 @@ const InputRoleForm = (props: InputRoleObj) => { onClick={event => deleteTagHandler(event, skill.id)} className='btn-delete__tag' > - + 취소 아이콘 ); @@ -539,11 +539,11 @@ const InputRoleForm = (props: InputRoleObj) => {
)} - + 검색 아이콘
diff --git a/src/components/meeteam/card/RecruitCard.tsx b/src/components/meeteam/card/RecruitCard.tsx index ffaa8099..13cf2a80 100644 --- a/src/components/meeteam/card/RecruitCard.tsx +++ b/src/components/meeteam/card/RecruitCard.tsx @@ -77,7 +77,7 @@ const RecruitCard = ({
{category}
- + 북마크 아이콘
{title}
@@ -97,4 +97,4 @@ const RecruitCard = ({ ); }; -export default React.memo(RecruitCard); +export default RecruitCard; diff --git a/src/components/recruit/applicants/ApplicantCard.tsx b/src/components/recruit/applicants/ApplicantCard.tsx index 3c8c71cc..f164155d 100644 --- a/src/components/recruit/applicants/ApplicantCard.tsx +++ b/src/components/recruit/applicants/ApplicantCard.tsx @@ -55,22 +55,22 @@ const ApplicantCard = ({ {!isOpen && ( <>
- + 유저 아이콘 {name}
- + 학교 아이콘 {universityName}
- + 학교 아이콘 {score !== 0 ? score : '-'}
)}
{!isOpen ? '더보기' : '접기'} - + 드롭다운 아이콘
diff --git a/src/components/recruit/applicants/toast/Toast.tsx b/src/components/recruit/applicants/toast/Toast.tsx index 33ffe614..ee2de37d 100644 --- a/src/components/recruit/applicants/toast/Toast.tsx +++ b/src/components/recruit/applicants/toast/Toast.tsx @@ -26,7 +26,7 @@ const Toast = ({ message }: ToastInfo) => { return ( - + 경고 아이콘 {message} ); diff --git a/src/components/recruit/create/recruitRoles/RecruitRolesForm.tsx b/src/components/recruit/create/recruitRoles/RecruitRolesForm.tsx index f051f4fc..26e4107b 100644 --- a/src/components/recruit/create/recruitRoles/RecruitRolesForm.tsx +++ b/src/components/recruit/create/recruitRoles/RecruitRolesForm.tsx @@ -133,7 +133,7 @@ const RecruitRoleForm = ({ applicantsList, applicantsListData }: RecruitRoleForm ))}
- + 추가 아이콘 diff --git a/src/components/recruit/recruitBoard/banner/MainBanner.styled.ts b/src/components/recruit/recruitBoard/banner/MainBanner.styled.ts index 9f2ff7bd..fa4d5187 100644 --- a/src/components/recruit/recruitBoard/banner/MainBanner.styled.ts +++ b/src/components/recruit/recruitBoard/banner/MainBanner.styled.ts @@ -3,7 +3,7 @@ import styled from 'styled-components'; const Banner = styled.section` margin-top: 5rem; width: 100%; - height: 206px; + height: 200px; flex-shrink: 0; border-radius: 20px; background: linear-gradient(90deg, #3f80ff 0%, #c9deff 100%); @@ -12,6 +12,7 @@ const Banner = styled.section` align-items: center; padding: 0 11rem; box-sizing: border-box; + font-family: Pretendard; .container-title { display: flex; @@ -21,9 +22,7 @@ const Banner = styled.section` .subtitle { color: #fff; - font-family: Pretendard; font-size: 21.6px; - font-style: normal; font-weight: 500; line-height: 34.8px; letter-spacing: 0.864px; @@ -31,21 +30,17 @@ const Banner = styled.section` .title { color: #fff; - font-family: Pretendard; font-size: 28.8px; - font-style: normal; font-weight: 700; line-height: 34.8px; letter-spacing: 1.152px; } img { - width: 177px; - height: 178px; - flex-shrink: 0; + aspect-ratio: 1/1; } - @media (max-width: 768px) { + @media (max-width: 900px) { font-size: 1rem; padding: 0 2rem; height: 160px; @@ -61,9 +56,15 @@ const Banner = styled.section` line-height: 1.6rem; letter-spacing: 0.04rem; } + + img { + aspect-ratio: 1/1; + } } - @media (max-width: 431px) { + @media (max-width: 600px) { + height: 120px; + .title { font-size: 1.6rem; line-height: 2rem; @@ -77,8 +78,7 @@ const Banner = styled.section` } img { - width: 90px; - height: 90px; + aspect-ratio: 1/1; } } `; diff --git a/src/components/recruit/recruitBoard/banner/MainBanner.tsx b/src/components/recruit/recruitBoard/banner/MainBanner.tsx index 4dc89c4f..156aeb0a 100644 --- a/src/components/recruit/recruitBoard/banner/MainBanner.tsx +++ b/src/components/recruit/recruitBoard/banner/MainBanner.tsx @@ -1,5 +1,4 @@ import React from 'react'; -import { meeteam_banner_icon } from '../../../../assets'; import S from './MainBanner.styled'; const MainBanner = () => { @@ -10,7 +9,13 @@ const MainBanner = () => { 밋팀으로 팀원을 만나보세요!
- + main-banner-image
); diff --git a/src/components/recruit/recruitBoard/clear/ClearConditions.tsx b/src/components/recruit/recruitBoard/clear/ClearConditions.tsx index 2c3dbdda..6543133e 100644 --- a/src/components/recruit/recruitBoard/clear/ClearConditions.tsx +++ b/src/components/recruit/recruitBoard/clear/ClearConditions.tsx @@ -8,7 +8,7 @@ interface ClearConditionsProps { const ClearConditions = ({ onClick }: ClearConditionsProps) => { return (
- + 초기화 아이콘 초기화
); diff --git a/src/components/recruit/recruitBoard/detailedFilter/DetailedInput.tsx b/src/components/recruit/recruitBoard/detailedFilter/DetailedInput.tsx index 570161af..60a23c5c 100644 --- a/src/components/recruit/recruitBoard/detailedFilter/DetailedInput.tsx +++ b/src/components/recruit/recruitBoard/detailedFilter/DetailedInput.tsx @@ -187,7 +187,7 @@ const DetailedInput = ({ type, closeHandler }: DetailedInfo) => { {message.intro}
- + 검색 아이콘
{isOpenMenu && (
@@ -222,7 +222,7 @@ const DetailedInput = ({ type, closeHandler }: DetailedInfo) => {
{elem.name}
))} @@ -231,7 +231,7 @@ const DetailedInput = ({ type, closeHandler }: DetailedInfo) => {
{elem.name}
))} @@ -240,14 +240,14 @@ const DetailedInput = ({ type, closeHandler }: DetailedInfo) => {
{elem.name}
))}
- + 초기화 아이콘 초기화
{isApplied ? ( diff --git a/src/components/recruit/recruitDetail/footer/WriterFooter.tsx b/src/components/recruit/recruitDetail/footer/WriterFooter.tsx index 5a4a81ab..55709f3c 100644 --- a/src/components/recruit/recruitDetail/footer/WriterFooter.tsx +++ b/src/components/recruit/recruitDetail/footer/WriterFooter.tsx @@ -28,10 +28,10 @@ const WriterFooter = ({ pageNum, onClickEditPage }: WriterFooter) => { return ( <>
diff --git a/src/components/tag/MeeteamTag.tsx b/src/components/tag/MeeteamTag.tsx index 0d2a8799..218b68ca 100644 --- a/src/components/tag/MeeteamTag.tsx +++ b/src/components/tag/MeeteamTag.tsx @@ -111,7 +111,7 @@ const MeeteamTag = ({ tags }: RecruitTagListProps) => { onKeyPress={onKeyPress} className='tag-input body1-medium' /> - + 검색 아이콘 {isDropdownVisible && (
{isSuccess && @@ -148,7 +148,7 @@ const MeeteamTag = ({ tags }: RecruitTagListProps) => {
{tagItem}
); diff --git a/src/main.tsx b/src/main.tsx index 6f5e8761..f43a534f 100644 --- a/src/main.tsx +++ b/src/main.tsx @@ -27,6 +27,18 @@ import { AccountSetting, } from './pages/index.ts'; import './globalStyle.css'; +import { getPostList } from './service/recruit/board.ts'; +import { FilterData } from './types/index.ts'; + +const filterState: FilterData = { + field: null, + scope: null, + category: null, + keyword: null, + skill: undefined, + role: undefined, + tag: undefined, +}; const router = createBrowserRouter([ { @@ -36,6 +48,9 @@ const router = createBrowserRouter([ { path: '', element: , + loader: () => { + return getPostList({ filterState: filterState, page: 1 }); + }, }, { path: 'recruitment/postings/:id', diff --git a/src/pages/notFound/NotFound.tsx b/src/pages/notFound/NotFound.tsx index 4e592f10..7b4d5425 100644 --- a/src/pages/notFound/NotFound.tsx +++ b/src/pages/notFound/NotFound.tsx @@ -11,7 +11,7 @@ const NotFound = () => { return ( - + 404 아이콘

죄송합니다.

요청하신 페이지는 찾을 수 없습니다.

diff --git a/src/pages/recruit/applierManagePage/ApplierManagePage.tsx b/src/pages/recruit/applierManagePage/ApplierManagePage.tsx index 5f56440a..e9b99dd8 100644 --- a/src/pages/recruit/applierManagePage/ApplierManagePage.tsx +++ b/src/pages/recruit/applierManagePage/ApplierManagePage.tsx @@ -180,7 +180,7 @@ const ApplierManagePage = () => {
{!isOpenChat ? (
- + link-icon {!recruitManageInfo.link ? '오픈채팅방 주소를 입력해주세요.' @@ -241,7 +241,7 @@ const ApplierManagePage = () => {
setIsOpenCurrent(prev => !prev)}> 모집 현황 - + dropdown-icon
{isOpenCurrent && (
@@ -261,9 +261,9 @@ const ApplierManagePage = () => { )}
- + floating-icon
- + arrow-icon TOP
diff --git a/src/pages/recruit/recruitPage/RecruitPage.tsx b/src/pages/recruit/recruitPage/RecruitPage.tsx index 782ad8e3..8ca6287b 100644 --- a/src/pages/recruit/recruitPage/RecruitPage.tsx +++ b/src/pages/recruit/recruitPage/RecruitPage.tsx @@ -302,7 +302,7 @@ const RecruitPage = () => { }, []); useEffect(() => { - setSearchKeyword(filterState.keyword as any); + setSearchKeyword(filterState.keyword as string); }, [filterState.keyword]); return ( @@ -358,7 +358,7 @@ const RecruitPage = () => {
- + bookmark-icon 북마크 모아보기 {'❯'}
{isLoading ? ( diff --git a/src/service/recruit/board.ts b/src/service/recruit/board.ts index 93894c91..1c936cec 100644 --- a/src/service/recruit/board.ts +++ b/src/service/recruit/board.ts @@ -3,7 +3,7 @@ import { ListResult, FilterData } from '../../types'; interface FilterItem { filterState: FilterData; - isLogin: boolean; + isLogin?: boolean; page: number; }