Skip to content

Commit

Permalink
Merge pull request #177 from Codeit-Part4-SFJs/sh/logoAndFavicon
Browse files Browse the repository at this point in the history
design: 로고, favicon, 로딩 디자인 및 적용
  • Loading branch information
linason-esc authored Jun 24, 2024
2 parents acb553c + 72dd657 commit 75f16a7
Show file tree
Hide file tree
Showing 11 changed files with 31 additions and 13 deletions.
4 changes: 4 additions & 0 deletions public/icon/newLoading.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: 4 additions & 0 deletions public/icon/newLogo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion public/next.svg

This file was deleted.

1 change: 0 additions & 1 deletion public/vercel.svg

This file was deleted.

Binary file modified src/app/favicon.ico
Binary file not shown.
8 changes: 7 additions & 1 deletion src/components/Detail/ProductDetail/ProductDetail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import { useSuspenseQuery } from '@tanstack/react-query';
import { productOptions } from '@/app/[category]/[product]/queryOptions';
import { useRouter } from 'next/navigation';
import { useCompareItems } from '@/stores/useCompareItems';
import { convertIdToCategory } from '@/shared/@common/utils';
import Link from 'next/link';

export const ProductDetail = ({
userId,
Expand Down Expand Up @@ -59,7 +61,11 @@ export const ProductDetail = ({
<div className="w-full flex flex-col gap-[60px]">
<div className="flex flex-col gap-[20px] md:gap-[50px] lg:gap-[50px]">
<div className="flex flex-col gap-[10px]">
<CategoryChip categoryID={productDetailData.categoryId} />
<Link
href={`/${convertIdToCategory(productDetailData.categoryId)}`}
>
<CategoryChip categoryID={productDetailData.categoryId} />
</Link>
<div className="mobile:relative flex justify-between items-center">
<div className="flex gap-[15px] mobile:justify-between mobile:w-full">
<div className="text-gray-F1 not-italic font-normal mobile:leading-7 md:leading-normal lg:leading-normal text-xl lg:text-2xl">
Expand Down
12 changes: 9 additions & 3 deletions src/components/Home/MainProducts/HotProducts/HotProducts.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
'use client';

import { SideMenuOpenButton } from '@/shared/ui/Menu/SideMenu/SideMenuOpenButton';
import ProductCard from '@/components/@common/ProductCard';
import { useSuspenseQuery } from '@tanstack/react-query';
import { hotProductOptions } from '@/app/[category]/homeQueryOptions';
Expand All @@ -9,9 +10,14 @@ export const HotProducts = () => {

return (
<section className="mb-20">
<h2 className="text-[24px] text-gray-F1 font-semibold mb-6">
지금 핫한 상품 <span className="text-main-blue">TOP 6</span>
</h2>
<div className="mobile:flex mobile:place-content-between">
<h2 className="text-[24px] text-gray-F1 font-semibold mb-6">
지금 핫한 상품 <span className="text-main-blue">TOP 6</span>
</h2>
<div className="mobile:relative">
<SideMenuOpenButton />
</div>
</div>
<div className="grid grid-cols-2 md:grid-cols-2 lg:grid-cols-3 gap-3">
{hotProductsData
?.slice(0, 6)
Expand Down
2 changes: 1 addition & 1 deletion src/components/Home/ReviewerRanking/ReviewerRanking.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const ReviewerRanking = () => {
<h2 className="text-[16px] text-gray-F1 font-normal mb-4 lg:mb-8 md:mt-7 lg:mt-7">
리뷰어 랭킹
</h2>
<ul className="flex flex-row lg:flex-col gap-5 lg:gap-1 overflow-hidden">
<ul className="flex flex-row lg:flex-col gap-5 lg:gap-1 mobile:overflow-x-scroll md:overflow-x-scroll scrollbar-hide">
{rankingData?.map((ranking) => (
<RankingCard key={ranking.id} ranking={ranking} />
))}
Expand Down
4 changes: 2 additions & 2 deletions src/shared/ui/Icon/Loading.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { twMerge } from 'tailwind-merge';
import { PropsWithChildren } from 'react';
import LoadingIcon from '../../../../public/icon/loading.svg';
import LoadingIcon from '../../../../public/icon/newLoading.svg';
import { LoadingProps } from './types/iconType';

export const Loading = ({
Expand All @@ -12,7 +12,7 @@ export const Loading = ({
<div className="flex flex-col items-center gap-3">
<LoadingIcon
className={twMerge(
'mobile:w-[39px] mobile:h-[32px] w-[39px] h-[32px] lg:w-[49px] lg:h-[40px] fill-gray-6E',
'mobile:w-[50px] mobile:h-[32px] w-[50px] h-[32px] lg:w-[50px] lg:h-[40px] fill-gray-6E',
iconClassName,
)}
/>
Expand Down
4 changes: 2 additions & 2 deletions src/shared/ui/Icon/Logo.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import LogoIcon from '../../../../public/icon/logo.svg';
import LogoIcon from '../../../../public/icon/newLogo.svg';

export const Logo = () => {
return (
<LogoIcon className="mobile:w-[112px] mobile:h-[18px] md:w-[138px] md:h-[24px] lg:w-[166px] lg:h-[28px] " />
<LogoIcon className="mobile:w-[140px] mobile:h-[30px] md:w-[150px] md:h-[35px] lg:w-[180px] lg:h-[40px] " />
);
};
4 changes: 2 additions & 2 deletions svgr.d.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { FC, SVGProps, SVGSVGElement } from "react";
import { FC, SVGProps, SVGSVGElement } from 'react';

declare global {
module "*.svg" {
module '*.svg' {
const component: FC<SVGProps<SVGSVGElement>>;

export default component;
Expand Down

0 comments on commit 75f16a7

Please sign in to comment.