Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
<meta property="og:title" content="GlobalNomad | κΈ€λ‘œλ²Œ μ•‘ν‹°λΉ„ν‹° μ˜ˆμ•½ ν”Œλž«νΌ" />
<meta property="og:description" content="μ „ 세계 μ•‘ν‹°λΉ„ν‹°Β·μ²΄ν—˜μ„ ν•œ λ²ˆμ— μ˜ˆμ•½ν•˜μ„Έμš”." />
<meta property="og:url" content="https://globalnomad-team6.vercel.app" />
<meta property="og:image" content="https://globalnomad-team6.vercel.app/image/GlobalNomad.webp" />
<meta
property="og:image"
content="https://globalnomad-team6.vercel.app/GlobalNomad.webp" />
<meta property="og:image:width" content="1200" />
<meta property="og:image:height" content="630" />
<meta property="og:locale" content="ko_KR" />
Expand All @@ -26,7 +28,7 @@
<meta name="twitter:card" content="summary_large_image" />
<meta name="twitter:title" content="GlobalNomad | κΈ€λ‘œλ²Œ μ•‘ν‹°λΉ„ν‹° μ˜ˆμ•½ ν”Œλž«νΌ" />
<meta name="twitter:description" content="μ „ 세계 μ•‘ν‹°λΉ„ν‹°Β·μ²΄ν—˜μ„ ν•œ λ²ˆμ— μ˜ˆμ•½ν•˜μ„Έμš”." />
<meta name="twitter:image" content="https://globalnomad-team6.vercel.app/image/GlobalNomad.webp" />
<meta name="twitter:image" content="https://globalnomad-team6.vercel.app/GlobalNomad.webp" />

<link
rel="stylesheet"
Expand Down
File renamed without changes
3 changes: 0 additions & 3 deletions src/assets/icons/footer/facebook.svg

This file was deleted.

3 changes: 3 additions & 0 deletions src/assets/icons/footer/github.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 0 additions & 4 deletions src/assets/icons/footer/instagram.svg

This file was deleted.

1 change: 1 addition & 0 deletions src/assets/icons/footer/notion.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 0 additions & 3 deletions src/assets/icons/footer/x.svg

This file was deleted.

5 changes: 2 additions & 3 deletions src/assets/icons/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ export { default as Bell } from './header/bell.svg';
export { default as ProfileLg } from './header/default-profile-lg.svg';
export { default as ProfileMd } from './header/default-profile-md.svg';
export { default as ProfileSm } from './header/default-profile-sm.svg';
export { default as FaceBook } from './footer/facebook.svg';
export { default as X } from './footer/x.svg';
export { default as Instagram } from './footer/instagram.svg';
export { default as Youtube } from './footer/youtube.svg';
export { default as Github } from './footer/github.svg';
export { default as Notion } from './footer/notion.svg';
export { default as ArrowDown } from './page/arrow_down.svg';
export { default as ArrowRight } from './page/arrow_right.svg';
export { default as ArrowUp } from './page/arrow_up.svg';
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/Footer/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const Footer = () => {
{/* λͺ¨λ°”일 ν•˜λ‹¨ + PC 전체 ν•œ 쀄 */}
<div className='flex items-center justify-between md:h-full'>
{/* μ™Όμͺ½: μΉ΄ν”ΌλΌμ΄νŠΈ */}
<span className='text-sm text-gray-400'>&copy; codeit - 2023</span>
<span className='text-sm text-gray-400'>&copy; codeit - 2026</span>

{/* κ°€μš΄λ°: PC μ „μš© μ •μ±… / FAQ */}
<div className='hidden md:flex'>
Expand Down
21 changes: 12 additions & 9 deletions src/components/common/Footer/FooterSNS.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,24 @@
* - 접근성을 κ³ λ €ν•˜μ—¬ λͺ¨λ“  링크에 `aria-label`을 μ œκ³΅ν•©λ‹ˆλ‹€.
*/

import { FaceBook, Instagram, X, Youtube } from '@/assets/icons';
import { Youtube, Github, Notion } from '@/assets/icons';

const snsLinks = [
{
Icon: FaceBook,
label: '페이슀뢁으둜 이동',
href: '#',
Icon: Youtube,
label: '유튜브둜 이동',
href: 'https://www.youtube.com/?app=desktop&hl=ko&gl=KR',
},
{
Icon: Instagram,
label: 'μΈμŠ€νƒ€κ·Έλž¨μœΌλ‘œ 이동',
href: '#',
Icon: Github,
label: 'κΉƒν—ˆλΈŒλ‘œ 이동',
href: 'https://github.com/Codeit-FE19-Part4-Team6/GlobalNomad',
},
{
Icon: Notion,
label: 'λ…Έμ…˜μœΌλ‘œ 이동',
href: 'https://www.notion.so/PART4-6-GlobalNomad-2c356c5be06980c3898df2ff5decf023?source=copy_link',
},
{ Icon: Youtube, label: '유튜브둜 이동', href: '#' },
{ Icon: X, label: 'X둜 이동', href: '#' },
];

const FooterSNS = () => {
Expand Down
11 changes: 7 additions & 4 deletions src/components/common/card/CardImage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,20 @@ import { cn } from '@/utils/cn';
*
* <Card.Image src="..." alt="..." />
*/

export default function CardImage({ src, alt }: { src?: string; alt?: string }) {
const { variant } = useCardContext();

const imageWrapperStyle = {
grid: 'aspect-square h-38.75 w-full overflow-hidden rounded-[18px_18px_0_0] md:h-86.75 md:rounded-[32px_32px_0_0] lg:h-72.5',
list: 'h-20.5 w-20.5 shrink-0 lg:h-35.5 lg:w-35.5',
grid: 'group aspect-square h-38.75 w-full overflow-hidden rounded-[18px_18px_0_0] md:h-86.75 md:rounded-[32px_32px_0_0] lg:h-72.5',
list: 'group h-20.5 w-20.5 shrink-0 overflow-hidden lg:h-35.5 lg:w-35.5',
reservation:
'aspect-square h-34 min-h-38.25 w-34 shrink-0 overflow-hidden rounded-[0_24px_24px_0] bg-gray-100 lg:h-45.25 lg:w-45.25 lg:rounded-[0_32px_32px_0] relative z-0 -ml-6 lg:-ml-10',
'group aspect-square h-34 min-h-38.25 w-34 shrink-0 overflow-hidden rounded-[0_24px_24px_0] bg-gray-100 lg:h-45.25 lg:w-45.25 lg:rounded-[0_32px_32px_0] relative z-0 -ml-6 lg:-ml-10',
}[variant];

const imgStyle = 'h-full w-full object-cover';
const imgStyle =
'h-full w-full object-cover transition-all duration-300 ease-out group-hover:scale-[1.03] group-hover:brightness-93';

const listImgStyle = variant === 'list' ? 'rounded-[20px] lg:rounded-4xl' : '';

return (
Expand Down
6 changes: 3 additions & 3 deletions src/pages/ActivityDetail/ActivityReviews.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default function ActivityReviews({ activityId }: ActivityReviewsProps) {
if (isLoading) {
return (
<section className='mb-10 border-t border-gray-100 pt-10'>
<div className='flex h-[200px] items-center justify-center'>
<div className='flex h-50 items-center justify-center'>
<span className='font-md-medium text-gray-500'>ν›„κΈ°λ₯Ό λΆˆλŸ¬μ˜€λŠ” 쀑...</span>
</div>
</section>
Expand All @@ -53,8 +53,8 @@ export default function ActivityReviews({ activityId }: ActivityReviewsProps) {
μ²΄ν—˜ ν›„κΈ°
</Title>
</div>
<div className='flex h-[200px] items-center justify-center'>
<span className='font-md-medium text-gray-500'>아직 ν›„κΈ°κ°€ μ—†μŠ΅λ‹ˆλ‹€.</span>
<div className='flex h-50 items-center justify-center'>
<span className='font-md-medium text-gray-500'>아직 λ“±λ‘λœ ν›„κΈ°κ°€ μ—†μŠ΅λ‹ˆλ‹€.</span>
</div>
</section>
);
Expand Down