Skip to content

Commit

Permalink
Merge pull request #231 from depromeet/fix/#229
Browse files Browse the repository at this point in the history
Fix/#229
  • Loading branch information
YOOJS1205 authored Feb 2, 2024
2 parents e8c2389 + bdb872e commit 93d3c64
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 15 deletions.
14 changes: 7 additions & 7 deletions src/app/login/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ import { useRouter } from 'next/navigation';

import CTAButton from '@components/common/CTAButton';
import DdoeatLogo from 'public/assets/ddoeat_logo.svg';
import AppleLogo from 'public/assets/icon24/apple_logo_24.svg';
// import AppleLogo from 'public/assets/icon24/apple_logo_24.svg';
import KakaoLogo from 'public/assets/icon24/kakao_logo_24.svg';

export default function Page() {
const { push } = useRouter();

const handleClickKakaoLoginButton = () => {
// TODO: 추후에 env=development, env=production으로 변경 요청
const env = process.env.NODE_ENV === 'development' ? 'local' : 'dev';
Expand All @@ -17,31 +18,30 @@ export default function Page() {
);
};

const handleClickAppleLoginButton = () => {
// TODO: 애플 로그인 구현
};
// const handleClickAppleLoginButton = () => {
// // TODO: 애플 로그인 구현
// };

return (
<div className="absolute right-0 left-0 top-0 bottom-0">
<div className="flex flex-col gap-[70px] justify-center items-center w-full h-full">
<DdoeatLogo />
<div className="flex flex-col gap-[16px] w-full px-[24px] py-[16px]">
<CTAButton
// NOTE: body-16-bold 스타일 미적용 확인
className="body-16-bold bg-system-kakaoYellow text-gray-900"
onClick={handleClickKakaoLoginButton}
>
<KakaoLogo />
카카오로 시작하기
</CTAButton>
<CTAButton
{/* <CTAButton
// NOTE: body-16-bold 스타일 미적용 확인
className="body-16-bold border-gray-900 border-[1px] bg-white text-gray-900"
onClick={handleClickAppleLoginButton}
>
<AppleLogo />
Apple로 시작하기
</CTAButton>
</CTAButton> */}
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/app/review/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ export default function Page() {
};

return (
<div className="bg-gray-100">
<div className="bg-gray-100 text-gray-900">
<Header className="w-full bg-gray-100 z-header">
<p className="body-16-bold">맛집 기록 작성</p>
</Header>
Expand Down
7 changes: 4 additions & 3 deletions src/components/common/Modal/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,16 @@ export default function Modal({
<p className="body-16-bold mb-[12px]">{text}</p>
<p className="caption-12-regular">{subText}</p>
</div>
<div className="flex gap-[12px]">
<div className="flex gap-[12px] text-gray-900">
{controls.map(({ buttonText, buttonHandler }, index) => (
<button
key={index}
className={cn(
'w-[120px] h-[49px] bg-gray-300 rounded-[24px]',
'w-[120px] h-[40px] bg-gray-300 rounded-[24px]',
{
'bg-gray-300': index !== controls.length - 1,
'bg-primary-300': index === controls.length - 1,
'bg-primary-300 text-white':
index === controls.length - 1,
},
)}
onClick={buttonHandler}
Expand Down
4 changes: 2 additions & 2 deletions src/components/review/VisitDate/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ export default function VisitDate({
const today = new Date().toISOString().substring(0, 10);

return (
<div className="w-full bg-white flex justify-between rounded-[24px] px-[24px] py-[16px]">
<div className="w-full bg-white flex justify-between items-center rounded-[24px] px-[24px] py-[16px]">
<p className="body-16-bold text-gray-900">방문 날짜</p>
<input
placeholder="방문 날짜"
defaultValue={today}
max={today}
type="date"
className="text-gray-500"
className="text-gray-500 h-[24px]"
onChange={onChange}
/>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/components/terms/TermsItem/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export default function TermsItem({
};

return (
<li className="pl-[32px] pr-[16px]">
<li className="pl-[32px] pr-[16px] text-gray-900">
<div className="flex justify-between py-[12px]">
<label className="flex gap-[4px] items-center pl-[8px]">
<input
Expand All @@ -37,7 +37,7 @@ export default function TermsItem({
{...restProps}
/>
{checked ? <CheckFill /> : <CheckDefault />}
<p className="body-14-extraBold text-gray-900">{title}</p>
<p className="body-14-extraBold">{title}</p>
</label>
<button onClick={handleClickArrowButton}>
{isOpenTermsItem ? <UpArrow /> : <DownArrow />}
Expand Down

0 comments on commit 93d3c64

Please sign in to comment.