Skip to content

Commit

Permalink
[merge] 폼 컴포넌트화 및 마이페이지 반응형 제작
Browse files Browse the repository at this point in the history
폼 컴포넌트화 및 마이페이지 반응형 제작
  • Loading branch information
Im-younique authored Dec 4, 2023
2 parents d5ef405 + 5c2f683 commit f5a1dd6
Show file tree
Hide file tree
Showing 26 changed files with 770 additions and 780 deletions.
Binary file removed client/public/images/advertise.png
Binary file not shown.
Binary file removed client/public/images/google_logo.png
Binary file not shown.
Binary file removed client/public/images/user_icon.png
Binary file not shown.
8 changes: 6 additions & 2 deletions client/src/components/common/Advertisement/index.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
import Image from 'next/image';
// react
import React from 'react';

// thrid-party
import { Icon } from '@iconify/react';

export default function Advertisement() {
return (
<div className="flex-col items-center justify-center hidden bg-white border-2 border-gray-100 rounded-lg w-60 md:flex bg-blue-5 h-60">
<Image src="/images/advertise.png" alt="Ads" width="60" height="60" />
<Icon icon="ri:advertisement-fill" fontSize={60} />
<p>준비중...</p>
</div>
);
Expand Down
26 changes: 17 additions & 9 deletions client/src/components/common/Avatar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ import Image from 'next/image';

import { positionStyle, avatarSizeStyle } from '@/styles/styleConstant';

// thrid-party
import { Icon } from '@iconify/react';

// service
import { BASE_URL } from '@/service/base/api';

Expand All @@ -24,15 +27,20 @@ export default function Avatar({
const avatarStyle = `relative rounded-full border border-slate-200 ${avatarSizeStyle[size]} max-w-[200px] max-h-[200px] overflow-hidden`;
return (
<div className={avatarStyle}>
<Image
src={
src === `${BASE_URL}` || src === '' ? '/images/user_icon.png' : src
}
width={80}
height={80}
alt={alt}
className="object-cover w-full h-full"
/>
{src === BASE_URL || src === '' ? (
<Icon
icon="iconamoon:profile-fill"
className="object-cover w-full h-full"
/>
) : (
<Image
src={src}
width={80}
height={80}
alt={alt}
className="object-cover w-full h-full"
/>
)}
{hasDot && (
<div
className={`${positionStyle[position]} absolute z-10 bg-white rounded-full p-4`}
Expand Down
Loading

0 comments on commit f5a1dd6

Please sign in to comment.