Merge pull request #96 from MOVIEJOJO7/feature/#95

Feat : Hotfix
MOVIEJOJO7 · Nov 16, 2023 · 8316771 · 8316771
2 parents e576dd6 + 4dfc141
commit 8316771
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 8 deletions.
diff --git a/Components/Common/Footer.tsx b/Components/Common/Footer.tsx
@@ -23,7 +23,7 @@ const Footer = () => {
 	};
 
 	return (
-		<div className="w-full sm:w-[425px] h-14 flex justify-around items-center bg-primary mx-auto absolute inset-x-0 bottom-0">
+		<div className="w-full sm:w-[425px] h-14 flex justify-around items-center bg-footer mx-auto absolute inset-x-0 bottom-0">
 			<Tooltip
 				content="유저들 👋"
 				animate={{
@@ -95,7 +95,7 @@ const Footer = () => {
 			<Button
 				type="button"
 				onClick={handleLogout}
-				className="flex justify-center items-center bg-secondary text-chat"
+				className="flex justify-center items-center bg-send text-white"
 			>
 				로그아웃
 			</Button>

diff --git a/Components/Login/LoginForm.tsx b/Components/Login/LoginForm.tsx
@@ -4,7 +4,7 @@ import React from 'react';
 import { useForm, SubmitHandler } from 'react-hook-form';
 import { fetchLogin } from '../../app/login/login.utils';
 import { setCookie } from '@/Components/Login/Cookie';
-import { Button, Typography } from '@material-tailwind/react';
+import { Button } from '@material-tailwind/react';
 import Link from 'next/link';
 import { useRouter } from 'next/navigation';
 import Swal from 'sweetalert2';
@@ -13,6 +13,7 @@ import Image from 'next/image';
 import useAsyncLoading from '@/hooks/Open/useAsyncLoading';
 import { IFormInput } from './Login.types';
 import icon_cat from '@/public/icon_cat.svg';
+import icon_cat_words from '@/public/icon_cat_words.svg';
 
 const LoginForm = () => {
 	const loadingControl = useAsyncLoading();
@@ -97,9 +98,14 @@ const LoginForm = () => {
 					</div>
 				</Link>
 			</form>
-			<Typography variant="h3" className="absolute bottom-8">
-				CatTalk
-			</Typography>
+
+			<Image
+				src={icon_cat_words}
+				alt="logo"
+				width={50}
+				height={50}
+				className="absolute bottom-3 w-24"
+			/>
 		</div>
 	);
 };

diff --git a/app/loading.tsx b/app/loading.tsx
@@ -16,7 +16,7 @@ const Loading = () => {
 					height={100}
 					className="w-32 h-32"
 				/>
-				<div className=" w-56 h-20 flex flex-col items-center justify-center rounded-md bg-white">
+				<div className=" w-56 h-20 flex flex-col items-center justify-center rounded-md ">
 					<PageSpinner />
 					<h1>Loading...</h1>
 				</div>

diff --git a/app/users/page.tsx b/app/users/page.tsx
@@ -21,7 +21,7 @@ const Users = async () => {
 				<MyProfile user={myUser} />
 			</div>
 			<div className="w-full my-5 pt-2 border-t border-gray-400 px-4 ">
-				<h4>친구{allUsersExceptMe?.length}명</h4>
+				<h4>집사 {allUsersExceptMe?.length}명</h4>
 			</div>
 			<div className="px-4">
 				<FriendProfilesCheckOnline allUsersExceptMe={allUsersExceptMe} />

diff --git a/public/icon_cat_words.svg b/public/icon_cat_words.svg