diff --git a/src/App.tsx b/src/App.tsx index 307ca61..f41a414 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -47,6 +47,14 @@ function App() { } /> + }> + + } /> + } /> + } /> + } /> + + }> @@ -61,12 +69,6 @@ function App() { }> } /> - - } /> - } /> - } /> - } /> - } /> } /> diff --git a/src/components/layout/Header/components/InfoHeader.tsx b/src/components/layout/Header/components/InfoHeader.tsx index c33586e..b7b4c8c 100644 --- a/src/components/layout/Header/components/InfoHeader.tsx +++ b/src/components/layout/Header/components/InfoHeader.tsx @@ -6,9 +6,9 @@ function InfoHeader() { return (
-
-
{myInfo.universityName}
-
+
+
{myInfo.universityName}
+
{myInfo.name} {myInfo.studentNumber}
diff --git a/src/components/layout/index.tsx b/src/components/layout/index.tsx index 12280b4..9451ba5 100644 --- a/src/components/layout/index.tsx +++ b/src/components/layout/index.tsx @@ -1,8 +1,9 @@ import { Suspense } from 'react'; -import { Outlet } from 'react-router-dom'; +import { Outlet, useLocation } from 'react-router-dom'; import { twMerge } from 'tailwind-merge'; import BottomNav from './BottomNav'; import Header from './Header'; +import { HEADER_CONFIGS } from './Header/headerConfig'; interface LayoutProps { showBottomNav?: boolean; @@ -10,6 +11,10 @@ interface LayoutProps { } export default function Layout({ showBottomNav = false, contentClassName }: LayoutProps) { + const { pathname } = useLocation(); + const headerConfig = HEADER_CONFIGS.find((config) => config.match(pathname)); + const isInfoHeader = headerConfig?.type === 'info'; + return (
모든 동아리를{'\n'}하나로 연결하다
-
KONECT
+
KONECT
소셜 계정으로 로그인 diff --git a/src/pages/Auth/SignUp/ConfirmStep.tsx b/src/pages/Auth/SignUp/ConfirmStep.tsx index 5bb3704..c07139b 100644 --- a/src/pages/Auth/SignUp/ConfirmStep.tsx +++ b/src/pages/Auth/SignUp/ConfirmStep.tsx @@ -28,36 +28,36 @@ function ConfirmStep() { return (
반드시 정확한 값을 입력해주세요
- +
- +
- +
{error && ( diff --git a/src/pages/Auth/SignUp/FinishStep.tsx b/src/pages/Auth/SignUp/FinishStep.tsx index d05333c..69bb816 100644 --- a/src/pages/Auth/SignUp/FinishStep.tsx +++ b/src/pages/Auth/SignUp/FinishStep.tsx @@ -22,11 +22,11 @@ function FinishStep() {
-
환영합니다!
+
환영합니다!
-
{myInfo.name}님
-
+
{myInfo.name}님
+
KONECT 가입이 완료되었습니다.
동아리 활동을 시작해보세요!
diff --git a/src/pages/Auth/SignUp/NameStep.tsx b/src/pages/Auth/SignUp/NameStep.tsx index 72cadd9..011f669 100644 --- a/src/pages/Auth/SignUp/NameStep.tsx +++ b/src/pages/Auth/SignUp/NameStep.tsx @@ -28,7 +28,7 @@ function NameStep() { const value = e.target.value.replace(/[^a-zA-Z가-힣ㆍᆞᆢㄱ-ㅎㅏ-ㅣ\s]/g, ''); setName(value); }} - className="mt-5 w-full border-b-2 border-indigo-400 py-4 text-[20px] font-bold text-indigo-300" + className="text-h3 mt-5 w-full border-b-2 border-indigo-400 py-4 text-indigo-300" /> ); diff --git a/src/pages/Auth/SignUp/StudentIdStep.tsx b/src/pages/Auth/SignUp/StudentIdStep.tsx index 5bb7002..31661db 100644 --- a/src/pages/Auth/SignUp/StudentIdStep.tsx +++ b/src/pages/Auth/SignUp/StudentIdStep.tsx @@ -28,7 +28,7 @@ function StudentIdStep() { const value = e.target.value.replace(/[^0-9]/g, ''); setStudentId(value); }} - className="mt-5 w-full border-b-2 border-indigo-400 py-4 text-[20px] font-bold text-indigo-300" + className="text-h3 mt-5 w-full border-b-2 border-indigo-400 py-4 text-indigo-300" /> ); diff --git a/src/pages/Auth/SignUp/TermStep.tsx b/src/pages/Auth/SignUp/TermStep.tsx index e024602..edddc73 100644 --- a/src/pages/Auth/SignUp/TermStep.tsx +++ b/src/pages/Auth/SignUp/TermStep.tsx @@ -35,7 +35,7 @@ function TermStep() { return (
-
서비스 이용 동의
+
서비스 이용 동의
원활한 서비스 이용을 위해 동의해주세요
diff --git a/src/pages/Auth/SignUp/UniversityStep.tsx b/src/pages/Auth/SignUp/UniversityStep.tsx index e38f77e..1ef1b82 100644 --- a/src/pages/Auth/SignUp/UniversityStep.tsx +++ b/src/pages/Auth/SignUp/UniversityStep.tsx @@ -9,7 +9,7 @@ import { useGetUniversityList } from './hooks/useUniversity'; function UniversityCard({ label, onClick }: { label: string; onClick: () => void }) { return ( -
{label}
+
{label}
); @@ -40,7 +40,7 @@ function UniversityStep() { value={universityName} placeholder="학교를 입력해주세요.." onChange={(e) => setUniversityName(e.target.value)} - className="mt-5 w-full border-b-2 border-indigo-400 py-4 text-[20px] font-bold text-indigo-300 placeholder:text-indigo-300" + className="text-h3 mt-5 w-full border-b-2 border-indigo-400 py-4 text-indigo-300 placeholder:text-indigo-300" />
{filteredUniversities.map((university) => ( diff --git a/src/pages/Auth/SignUp/components/AgreementArrow.tsx b/src/pages/Auth/SignUp/components/AgreementArrow.tsx index 594a6fd..5d90086 100644 --- a/src/pages/Auth/SignUp/components/AgreementArrow.tsx +++ b/src/pages/Auth/SignUp/components/AgreementArrow.tsx @@ -21,7 +21,7 @@ function AgreementRow({ checked, onChange, label, route, RightIcon, CheckIcon }: onChange={(e) => onChange(e.target.checked)} /> - {label} + {label} {RightIcon ? ( @@ -45,7 +45,7 @@ function AgreementAllRow({ checked, onChange, label, BigCheckIcon }: AgreementAl ); } diff --git a/src/pages/Auth/SignUp/components/StepLayout.tsx b/src/pages/Auth/SignUp/components/StepLayout.tsx index e1702a9..e425ecd 100644 --- a/src/pages/Auth/SignUp/components/StepLayout.tsx +++ b/src/pages/Auth/SignUp/components/StepLayout.tsx @@ -14,8 +14,8 @@ function StepLayout({ return (
-
{title}
-
{description}
+
{title}
+
{description}
{children}
diff --git a/src/pages/Chat/ChatRoom.tsx b/src/pages/Chat/ChatRoom.tsx index aad0d7e..0ff8e1d 100644 --- a/src/pages/Chat/ChatRoom.tsx +++ b/src/pages/Chat/ChatRoom.tsx @@ -51,6 +51,8 @@ function ChatRoom() { sendMessage({ chatRoomId: Number(chatRoomId), content: message }); textareaRef.current.value = ''; textareaRef.current.style.height = 'auto'; + textareaRef.current.focus(); + messagesEndRef.current?.scrollIntoView(); } } }; diff --git a/src/pages/Club/ClubDetail/components/ClubIntro.tsx b/src/pages/Club/ClubDetail/components/ClubIntro.tsx index 9a3bbde..93c5a8c 100644 --- a/src/pages/Club/ClubDetail/components/ClubIntro.tsx +++ b/src/pages/Club/ClubDetail/components/ClubIntro.tsx @@ -22,8 +22,8 @@ function ClubIntro({ clubDetail }: ClubIntroProps) { return ( <> -
동아리 소개
-
{clubDetail.introduce}
+
동아리 소개
+
{clubDetail.introduce}
위치 및 회원 수
@@ -54,13 +54,13 @@ function ClubIntro({ clubDetail }: ClubIntroProps) {
-
-
동아리에 대해 궁금한 점이 있으신가요?
-
편하게 문의해주세요!
+
+
동아리에 대해 궁금한 점이 있으신가요?
+
편하게 문의해주세요!