diff --git a/src/app/admin/announce/Announce.tsx b/src/app/admin/announce/Announce.tsx index aeb269ce5..397c0df85 100644 --- a/src/app/admin/announce/Announce.tsx +++ b/src/app/admin/announce/Announce.tsx @@ -286,7 +286,9 @@ const Announce = () => { } else return await axios - .put(`${API_URL}/api/v1/admin/announcement`, submitData) + .put(`${API_URL}/api/v1/admin/announcement`, submitData, { + withCredentials: true, + }) .then(() => { openToast({ message: '공지 글이 성공적으로 수정되었습니다.', diff --git a/src/app/admin/banner/Banner.tsx b/src/app/admin/banner/Banner.tsx index db38de320..1dd65c589 100644 --- a/src/app/admin/banner/Banner.tsx +++ b/src/app/admin/banner/Banner.tsx @@ -704,7 +704,13 @@ const Banner = () => { ) : null} {writeMode === 'view' ? ( - ) : writeMode === 'edit' ? ( diff --git a/src/app/hitchhiking/panel/HitchhikingCard.tsx b/src/app/hitchhiking/panel/HitchhikingCard.tsx index 827259a41..264503cf6 100644 --- a/src/app/hitchhiking/panel/HitchhikingCard.tsx +++ b/src/app/hitchhiking/panel/HitchhikingCard.tsx @@ -179,10 +179,23 @@ const HitchhikingCardBack = ({ fontSize: '0.75rem', color: 'text.alternative', margin: 0, + lineHeight: '1.125rem', + marginBlockStart: '0', + marginBlockEnd: '0', + marginTop: 0, }} sx={{ ...style.cardContentStyleBase, WebkitLineClamp: getLineCount(46, 18, 10) /* 라인수 */, + '& .toastui-editor-contents > h1:first-of-type': { + marginTop: 0, + }, + '.toastui-editor-contents h1': { + paddingBottom: 0, + }, + '.toastui-editor-contents h2': { + paddingBottom: 0, + }, }} /> diff --git a/src/app/panel/OthersProfile.tsx b/src/app/panel/OthersProfile.tsx index b5fe9274a..e5048c561 100644 --- a/src/app/panel/OthersProfile.tsx +++ b/src/app/panel/OthersProfile.tsx @@ -49,6 +49,9 @@ const OthersProfile = ({ name, userId, children }: IOthersProfile) => { router.push('/my-page') } + // 유령회원일 경우 + if (Number(userId) === -1) return <>{children} + return (
{children && ( diff --git a/src/app/panel/main-page/MainCard.tsx b/src/app/panel/main-page/MainCard.tsx index 2827f8936..1f10c07fb 100644 --- a/src/app/panel/main-page/MainCard.tsx +++ b/src/app/panel/main-page/MainCard.tsx @@ -43,7 +43,7 @@ const MainCard = ({ if (statusLabel === '모집완료') { sx = { ...sx, - filter: 'grayscale(120%) brightness(1.3)', + filter: 'grayscale(120%)', } } diff --git a/src/app/recruit/[id]/edit/page.tsx b/src/app/recruit/[id]/edit/page.tsx index 67ccf3d09..a073c52bb 100644 --- a/src/app/recruit/[id]/edit/page.tsx +++ b/src/app/recruit/[id]/edit/page.tsx @@ -28,6 +28,7 @@ const Page = ({ params }: { params: { id: string } }) => { const { data, isLoading, error } = useSWR<{ defaultValues: IRecruitWriteField isAnswered: boolean + content: string }>(`/api/v1/recruit/edit/${params.id}`, (url: string) => axiosWithAuth .get(url) @@ -52,6 +53,7 @@ const Page = ({ params }: { params: { id: string } }) => { max: data.totalNumber ? `${data.totalNumber}` : `2`, }, isAnswered: data.isAnswered, + content: data.content, })), ) @@ -129,6 +131,7 @@ const Page = ({ params }: { params: { id: string } }) => { submitHandler={handleSubmit} isAnswered={data.isAnswered} isSubmitting={isSubmitting} + content={data.content} /> ) } diff --git a/src/app/recruit/write/panel/CreateTeamEditor.tsx b/src/app/recruit/write/panel/CreateTeamEditor.tsx index d382991ce..3fb59b19c 100644 --- a/src/app/recruit/write/panel/CreateTeamEditor.tsx +++ b/src/app/recruit/write/panel/CreateTeamEditor.tsx @@ -41,6 +41,7 @@ const CreateTeamEditor = ({ editorType, isAnswered, isSubmitting, + content, }: { defaultValues: IRecruitWriteField submitHandler: (data: IRecruitWriteField) => Promise @@ -48,6 +49,7 @@ const CreateTeamEditor = ({ editorType: 'edit' | 'write' isAnswered?: boolean isSubmitting?: boolean + content?: string }) => { const [completedInterview, setCompletedInterview] = useState(false) @@ -211,7 +213,7 @@ const CreateTeamEditor = ({ } @@ -220,13 +222,13 @@ const CreateTeamEditor = ({ variant={'Caption'} color={'text.alternative'} > - 프로젝트 + 스터디 } disabled={editorType === 'edit'} /> } @@ -235,7 +237,7 @@ const CreateTeamEditor = ({ variant={'Caption'} color={'text.alternative'} > - 스터디 + 프로젝트 } disabled={editorType === 'edit'} @@ -546,7 +548,7 @@ const CreateTeamEditor = ({ > diff --git a/src/app/showcase/detail/[id]/page.tsx b/src/app/showcase/detail/[id]/page.tsx index 42231e9db..d1f8c4a10 100644 --- a/src/app/showcase/detail/[id]/page.tsx +++ b/src/app/showcase/detail/[id]/page.tsx @@ -1,6 +1,6 @@ 'use client' -import { Typography } from '@mui/material' +import { Stack, Typography } from '@mui/material' import React from 'react' import ShowcaseViewer from './panel/ShowcaseViewer' import { IShowcaseViewerFields } from '@/types/IShowcaseEdit' @@ -29,10 +29,10 @@ const ShowcaseDetailPage = ({ params }: { params: { id: number } }) => { return ( data && ( - <> + - + ) ) } diff --git a/src/app/showcase/detail/[id]/panel/CommentContainer.tsx b/src/app/showcase/detail/[id]/panel/CommentContainer.tsx index 656dfebb7..f415faf4b 100644 --- a/src/app/showcase/detail/[id]/panel/CommentContainer.tsx +++ b/src/app/showcase/detail/[id]/panel/CommentContainer.tsx @@ -151,7 +151,7 @@ const CommentContainer = ({ postId }: IPostId) => { @@ -168,7 +168,7 @@ const CommentContainer = ({ postId }: IPostId) => { diff --git a/src/app/showcase/detail/[id]/panel/ShowcaseViewer.tsx b/src/app/showcase/detail/[id]/panel/ShowcaseViewer.tsx index e60cace2a..81349c37b 100644 --- a/src/app/showcase/detail/[id]/panel/ShowcaseViewer.tsx +++ b/src/app/showcase/detail/[id]/panel/ShowcaseViewer.tsx @@ -32,7 +32,7 @@ const CoverImage = ({ image }: { image: string }) => { const InformationViewer = ({ data }: any) => { return ( - + @@ -74,10 +74,10 @@ const ShowcaseViewer = ({ data, postId }: IShowcaseViewerProps) => { @@ -88,10 +88,10 @@ const ShowcaseViewer = ({ data, postId }: IShowcaseViewerProps) => { ) : ( - - - - - {title} - - - - - {tagList?.map(({ name, color }: IShowcaseTag, idx: number) => { - return ( - {name}} - size="small" - key={idx} - style={{ - backgroundColor: alpha(color, 0.3), - borderRadius: 2, - height: '1.25rem', - }} - /> - ) - })} - - - - + + + + + {title} + + + + + {tagList?.map(({ name, color }: IShowcaseTag, idx: number) => { + return ( + {name}} + size="small" + key={idx} + style={{ + backgroundColor: alpha(color, 0.3), + borderRadius: 2, + height: '1.25rem', + }} + /> + ) + })} + + + ) diff --git a/src/app/showcase/panel/common/ImageInput.tsx b/src/app/showcase/panel/common/ImageInput.tsx index 22c5abc82..df1e80ae4 100644 --- a/src/app/showcase/panel/common/ImageInput.tsx +++ b/src/app/showcase/panel/common/ImageInput.tsx @@ -23,7 +23,7 @@ const ImageInput = ({ svgIcon={} message={'쇼케이스 대표 이미지'} /> - + {previewImage && ( { } - message="기술 스택" + message="기술스택" color="text.alternative" /> diff --git a/src/app/showcase/panel/common/StartEndDateViewer.style.ts b/src/app/showcase/panel/common/StartEndDateViewer.style.ts index d4720c379..e25eb346f 100644 --- a/src/app/showcase/panel/common/StartEndDateViewer.style.ts +++ b/src/app/showcase/panel/common/StartEndDateViewer.style.ts @@ -1,9 +1,10 @@ export const StartEndDateViewerBox = (isPc?: boolean) => ({ - display: isPc ? 'flex' : 'none', - justifyContent: isPc ? 'space-between' : 'none', + display: 'flex', + justifyContent: 'space-between', alignItems: 'center', gap: '1rem', gridArea: 'startEndDateViewer', width: '100%', height: isPc ? '6.25rem' : '3.375rem', + paddingTop: isPc ? '0' : '1.25rem', }) diff --git a/src/app/showcase/panel/common/StartEndDateViewer.tsx b/src/app/showcase/panel/common/StartEndDateViewer.tsx index 4fdc80a92..d19d9250e 100644 --- a/src/app/showcase/panel/common/StartEndDateViewer.tsx +++ b/src/app/showcase/panel/common/StartEndDateViewer.tsx @@ -21,7 +21,7 @@ const StartEndDateViewer = ({ start, end }: Idate) => { message="시작일" color="text.alternative" /> - + {start.split('T')[0]} (모집글 게시일) @@ -31,7 +31,7 @@ const StartEndDateViewer = ({ start, end }: Idate) => { message="종료일" color="text.alternative" /> - + {end.split('T')[0]} (진행 완료일) diff --git a/src/app/teams/[id]/page.tsx b/src/app/teams/[id]/page.tsx index ae5d3cd8f..927831d6f 100644 --- a/src/app/teams/[id]/page.tsx +++ b/src/app/teams/[id]/page.tsx @@ -15,10 +15,10 @@ const TeamsPage = ({ params }: { params: { id: string } }) => { router.push('/team-list')} - message={'팀리스트로 돌아가기'} + message={'팀 리스트로 돌아가기'} TypographyProps={{ - color: 'text.normal', - variant: 'Title3', + color: 'text.alternative', + variant: 'Caption', }} variant="text" style={{ width: 'fit-content' }} diff --git a/src/app/teams/[id]/setting/page.tsx b/src/app/teams/[id]/setting/page.tsx index d00f2834c..e74f59f6a 100644 --- a/src/app/teams/[id]/setting/page.tsx +++ b/src/app/teams/[id]/setting/page.tsx @@ -2,7 +2,7 @@ import { isAxiosError } from 'axios' import { useRouter } from 'next/navigation' -import { Button, Stack, Typography } from '@mui/material' +import { Button, Stack, Typography, Card } from '@mui/material' import { useEffect, useState } from 'react' import SetupMember from './panel/SettingTeamMember' import ApplicantList from './panel/ApplicantList' @@ -96,12 +96,13 @@ const TeamsSetupPage = ({ params }: { params: { id: string } }) => { /> )} {!showApplicant ? ( - { teamId={teams.team.id} jobs={teams.job} /> - + ) : ( )} diff --git a/src/app/teams/[id]/setting/panel/RedirectRecruitPage.tsx b/src/app/teams/[id]/setting/panel/RedirectRecruitPage.tsx index 3cde67c77..ea0753783 100644 --- a/src/app/teams/[id]/setting/panel/RedirectRecruitPage.tsx +++ b/src/app/teams/[id]/setting/panel/RedirectRecruitPage.tsx @@ -1,20 +1,25 @@ import TeamTypeCard from '@/app/team-list/panel/TeamTypeCard' import { ITeam } from '@/app/teams/types/types' -import { Button, Stack, Typography } from '@mui/material' +import { Button, Stack, Typography, Card } from '@mui/material' import { useRouter } from 'next/navigation' const RedirectRecruitPage = ({ id, data }: { id: string; data: ITeam }) => { const router = useRouter() return ( - - + 모집글 @@ -239,7 +247,7 @@ const SettingTeamJobs = ({ team, mutate }: ISettingTeamJobs) => { mutate={mutate} /> - + - 팀 활동을 완료하겠습니까? + 팀 활동을 완료하겠습니까? diff --git a/src/app/teams/[id]/setting/panel/TeamEndProcess/TeamDisperseButton.tsx b/src/app/teams/[id]/setting/panel/TeamEndProcess/TeamDisperseButton.tsx index 370f9d11e..1e2a04189 100644 --- a/src/app/teams/[id]/setting/panel/TeamEndProcess/TeamDisperseButton.tsx +++ b/src/app/teams/[id]/setting/panel/TeamEndProcess/TeamDisperseButton.tsx @@ -83,7 +83,7 @@ const TeamDisperseButton = ({ teamId, teamStatus }: ITeamDisperseButton) => { justifyContent={'space-between'} alignItems={'center'} > - 팀을 해산시겠습니까? + 팀을 해산시겠습니까? diff --git a/src/app/teams/[id]/setting/panel/TeamEndProcess/TeamQuitButton.tsx b/src/app/teams/[id]/setting/panel/TeamEndProcess/TeamQuitButton.tsx index 62d5d9ae0..0bc6062a8 100644 --- a/src/app/teams/[id]/setting/panel/TeamEndProcess/TeamQuitButton.tsx +++ b/src/app/teams/[id]/setting/panel/TeamEndProcess/TeamQuitButton.tsx @@ -76,7 +76,7 @@ const TeamQuitButton = ({ teamId, teamStatus }: ITeamQuitButton) => { justifyContent={'space-between'} alignItems={'center'} > - 팀을 나가겠습니까? + 팀을 나가겠습니까? diff --git a/src/app/teams/[id]/setting/panel/TeamInfoProcess/SettingTeamActivity.tsx b/src/app/teams/[id]/setting/panel/TeamInfoProcess/SettingTeamActivity.tsx index 706f6bdca..c80f76a1b 100644 --- a/src/app/teams/[id]/setting/panel/TeamInfoProcess/SettingTeamActivity.tsx +++ b/src/app/teams/[id]/setting/panel/TeamInfoProcess/SettingTeamActivity.tsx @@ -24,9 +24,9 @@ const SettingTeamActivity = ({ mx={!isPc ? '0.5rem' : ''} spacing={'0.5rem'} > - + - 활동방식 + 활동방식 @@ -49,9 +49,15 @@ const SettingTeamActivity = ({ TeamOperationForm.MIX, ].map((operation) => ( - {operation === TeamOperationForm.OFFLINE && '오프라인'} - {operation === TeamOperationForm.ONLINE && '온라인'} - {operation === TeamOperationForm.MIX && '온/오프라인'} + {operation === TeamOperationForm.OFFLINE && ( + 오프라인 + )} + {operation === TeamOperationForm.ONLINE && ( + 온라인 + )} + {operation === TeamOperationForm.MIX && ( + 온/오프라인 + )} ))} diff --git a/src/app/teams/[id]/setting/panel/TeamInfoProcess/SettingTeamLocation.tsx b/src/app/teams/[id]/setting/panel/TeamInfoProcess/SettingTeamLocation.tsx index 9d8d48051..2d6c5fa9e 100644 --- a/src/app/teams/[id]/setting/panel/TeamInfoProcess/SettingTeamLocation.tsx +++ b/src/app/teams/[id]/setting/panel/TeamInfoProcess/SettingTeamLocation.tsx @@ -9,7 +9,7 @@ import useMedia from '@/hook/useMedia' import { TeamOperationForm } from '@/app/teams/types/types' interface ISettingTeamLocation { - teamLocation: string[] + teamLocation: Array teamActivity: TeamOperationForm control: Control } @@ -29,49 +29,33 @@ const SettingTeamLocation = ({ spacing={'0.5rem'} mx={!isPc ? '0.5rem' : ''} > - + - 활동지역 + 활동지역 - ( - - )} - /> - + + + - - - )} - /> + sx={{ + m: 0, + minWidth: '8rem', + }} + > + + ) @@ -83,9 +67,9 @@ const SettingTeamLocation = ({ spacing={'0.5rem'} mx={!isPc ? '0.5rem' : ''} > - + - 활동지역 + 활동지역 { setPreview('/icons/ios/128.png') - setValue('teamImage', '') + setValue('teamImage', null) setIsLogoEdit(true) closeModal() } @@ -47,12 +47,7 @@ const SettingTeamLogo = ({ return ( <> - + { spacing={'0.5rem'} height={'4.5rem'} > - {teamType === TeamType.PROJECT && 프로젝트명} - {teamType === TeamType.STUDY && 스터디명} + {teamType === TeamType.PROJECT && ( + 프로젝트명 + )} + {teamType === TeamType.STUDY && ( + 스터디명 + )} { }} {...register('name', { required: '필수 입력사항입니다.', - maxLength: 10, + maxLength: 40, minLength: { value: 2, message: '2글자 이상 입력해주세요.', diff --git a/src/app/teams/[id]/setting/panel/TeamInfoProcess/SettingTeamStatus.tsx b/src/app/teams/[id]/setting/panel/TeamInfoProcess/SettingTeamStatus.tsx index d03e787e6..e2aba97ff 100644 --- a/src/app/teams/[id]/setting/panel/TeamInfoProcess/SettingTeamStatus.tsx +++ b/src/app/teams/[id]/setting/panel/TeamInfoProcess/SettingTeamStatus.tsx @@ -3,7 +3,6 @@ import { TargetClearIcon } from '../Icons' import { Control, Controller } from 'react-hook-form' import { TeamStatus } from '@/app/teams/types/types' import { ISetupTeam } from '../SettingTeamInfo' -import useMedia from '@/hook/useMedia' interface ISettingTeamStatus { teamStatus: TeamStatus @@ -11,18 +10,16 @@ interface ISettingTeamStatus { } const SettingTeamStatus = ({ teamStatus, control }: ISettingTeamStatus) => { - const { isPc } = useMedia() return ( - 상태 + 상태 { TeamStatus.ONGOING, ].map((status) => ( - {status === TeamStatus.RECRUITING && '모집 중'} - {status === TeamStatus.BEFORE && '모집 완료'} - {status === TeamStatus.ONGOING && '활동 중'} + {status === TeamStatus.RECRUITING && ( + 모집 중 + )} + {status === TeamStatus.BEFORE && ( + 모집 완료 + )} + {status === TeamStatus.ONGOING && ( + 활동중 + )} )) : [TeamStatus.COMPLETE].map((status) => ( - {status === TeamStatus.COMPLETE && '완료'} + {status === TeamStatus.COMPLETE && ( + 완료 + )} ))} diff --git a/src/app/teams/[id]/setting/panel/TeamInfoProcess/SettingTeamTime.tsx b/src/app/teams/[id]/setting/panel/TeamInfoProcess/SettingTeamTime.tsx index 83ca37f5f..d3656ed12 100644 --- a/src/app/teams/[id]/setting/panel/TeamInfoProcess/SettingTeamTime.tsx +++ b/src/app/teams/[id]/setting/panel/TeamInfoProcess/SettingTeamTime.tsx @@ -20,9 +20,11 @@ const SettingTeamTime = ({ teamTime, control }: ISettingTeamTime) => { mb={'1.2rem'} spacing={'0.5rem'} > - + - 목표기간 + + 목표기간 + { variant="outlined" sx={{ m: 0, - minWidth: '8rem', + minWidth: '5rem', }} {...field} > {dueList.map((dueTo) => ( - {dueTo} + {dueTo} ))}