Skip to content

Commit

Permalink
Merge pull request #118 from softeerbootcamp4th/hotfix
Browse files Browse the repository at this point in the history
hotfix: 폰트 및 이미지 수정
  • Loading branch information
DaeWon9 authored Aug 23, 2024
2 parents 3ed6ddd + dfd2b91 commit c7f0fe9
Show file tree
Hide file tree
Showing 81 changed files with 47 additions and 803 deletions.
6 changes: 3 additions & 3 deletions packages/core/src/theme/globalStyles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ import { css } from "@emotion/react";
export const globalStyles = css`
@font-face {
font-family: "Pretendard-Bold";
src: url("/fonts/pretendard/Pretendard-Bold.woff") format("woff");
src: url("/fonts/pretendard/Pretendard-Bold.otf") format("opentype");
}
@font-face {
font-family: "Pretendard-Medium";
src: url("/fonts/pretendard/Pretendard-Medium.woff") format("woff");
src: url("/fonts/pretendard/Pretendard-Medium.otf") format("opentype");
}
@font-face {
font-family: "Pretendard-SemiBold";
src: url("/fonts/pretendard/Pretendard-SemiBold.woff") format("woff");
src: url("/fonts/pretendard/Pretendard-SemiBold.otf") format("opentype");
}
@font-face {
font-family: "PyeongChang-Bold";
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
9 changes: 0 additions & 9 deletions packages/service/public/images/main/event-card-1.svg

This file was deleted.

Binary file not shown.
9 changes: 0 additions & 9 deletions packages/service/public/images/main/event-card-2.svg

This file was deleted.

Binary file not shown.
Binary file modified packages/service/public/images/main/main-banner-1.webp
Binary file not shown.
Binary file modified packages/service/public/images/main/main-banner-2.webp
Binary file not shown.
Binary file modified packages/service/public/images/main/main-banner-3.webp
Binary file not shown.
Binary file modified packages/service/public/images/main/main-banner-4.webp
Binary file not shown.
Binary file modified packages/service/public/images/main/main-banner-5.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified packages/service/public/images/newCar/new-car-main-img.webp
Binary file not shown.
40 changes: 0 additions & 40 deletions packages/service/public/images/parts/background.svg

This file was deleted.

53 changes: 0 additions & 53 deletions packages/service/public/images/parts/holo.svg

This file was deleted.

9 changes: 0 additions & 9 deletions packages/service/public/images/partsCollection/defaultCar.svg

This file was deleted.

Binary file not shown.
78 changes: 0 additions & 78 deletions packages/service/public/images/pickEvent/card/card-1.svg

This file was deleted.

Binary file not shown.
106 changes: 0 additions & 106 deletions packages/service/public/images/pickEvent/card/card-2.svg

This file was deleted.

Binary file not shown.
70 changes: 0 additions & 70 deletions packages/service/public/images/pickEvent/card/card-3.svg

This file was deleted.

Binary file not shown.
63 changes: 0 additions & 63 deletions packages/service/public/images/pickEvent/card/card-4.svg

This file was deleted.

Binary file not shown.
63 changes: 0 additions & 63 deletions packages/service/public/images/pickEvent/card/card-5.svg

This file was deleted.

Binary file not shown.
63 changes: 0 additions & 63 deletions packages/service/public/images/pickEvent/card/card-6.svg

This file was deleted.

Binary file not shown.
63 changes: 0 additions & 63 deletions packages/service/public/images/pickEvent/card/card-7.svg

This file was deleted.

Binary file not shown.
9 changes: 0 additions & 9 deletions packages/service/public/images/pickEvent/prize/prize-1.svg

This file was deleted.

Binary file not shown.
9 changes: 0 additions & 9 deletions packages/service/public/images/pickEvent/prize/prize-2.svg

This file was deleted.

Binary file not shown.
9 changes: 0 additions & 9 deletions packages/service/public/images/pickEvent/prize/prize-3.svg

This file was deleted.

Binary file not shown.
9 changes: 0 additions & 9 deletions packages/service/public/images/pickEvent/prize/prize-4.svg

This file was deleted.

Binary file not shown.
9 changes: 0 additions & 9 deletions packages/service/public/images/pickEvent/prize/prize-5.svg

This file was deleted.

Binary file not shown.
9 changes: 0 additions & 9 deletions packages/service/public/images/pickEvent/prize/prize-mini.svg

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
42 changes: 0 additions & 42 deletions packages/service/public/images/quiz/quiz1.svg

This file was deleted.

9 changes: 0 additions & 9 deletions packages/service/public/images/quiz/reward1.svg

This file was deleted.

9 changes: 0 additions & 9 deletions packages/service/public/images/quiz/reward2.svg

This file was deleted.

9 changes: 0 additions & 9 deletions packages/service/public/images/quiz/reward3.svg

This file was deleted.

9 changes: 0 additions & 9 deletions packages/service/public/images/quiz/reward4.svg

This file was deleted.

9 changes: 0 additions & 9 deletions packages/service/public/images/quiz/reward5.svg

This file was deleted.

22 changes: 12 additions & 10 deletions packages/service/src/components/newCar/NewCarInfo/NewCarInfo.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import * as style from "./NewCarInfo.css";
import { motion, useScroll, useTransform } from "framer-motion";
import { throttle } from "throttle-debounce-ts";
import { useEffect, useRef, useState } from "react";
import { useRef, useState } from "react";
import { useMobile } from "@service/common/hooks/useMobile";
import { Space } from "@service/common/styles/Space";
import { css } from "@emotion/react";
Expand All @@ -18,7 +17,7 @@ export const NewCarInfo = () => {
const x = useTransform(scrollYProgress, position, [0, carouselEndPosition]);
const isMobile = useMobile();

useEffect(() => {
const initCarouselEndPosition = () => {
if (!carouselRef || !carouselRef.current) return;

const parent = carouselRef.current.parentElement;
Expand All @@ -38,11 +37,7 @@ export const NewCarInfo = () => {
};

resetCarouselEndPosition();
const handleResize = throttle(10, resetCarouselEndPosition);

window.addEventListener("resize", handleResize);
return () => window.removeEventListener("resize", handleResize);
}, []);
};

if (isMobile)
return (
Expand Down Expand Up @@ -76,7 +71,14 @@ export const NewCarInfo = () => {
<div css={style.stickyWrap}>
<img css={style.bgCirlce1} src="/images/common/bg-circle-green.svg" />
<img css={style.bgCirlce2} src="/images/common/bg-circle-blue.svg" />
<motion.div css={style.imgWrap} ref={carouselRef} style={{ x }}>
<motion.div
css={style.imgWrap}
ref={carouselRef}
style={{ x }}
onViewportEnter={() => {
initCarouselEndPosition();
}}
>
<div
css={css`
margin-left: 200px;
Expand Down Expand Up @@ -108,6 +110,6 @@ export const NewCarInfo = () => {

// 신차 소개 이미지 path
const carInfoImgs = Array.from(
{ length: 15 },
{ length: 24 },
(_, i) => `images/newCar/new-car-info-${i + 1}.webp`,
);
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ export const TracingCar = ({

const pathData = useMemo(() => {
if (isMobile)
return generateVerticalSinPath(width / 3, 5, width, height, width);
else return generateSinPath(300, 10, height, 1000, width);
return generateVerticalSinPath(width / 3, 8, width, height, width);
else return generateSinPath(300, 16, height, 1000, width);
}, [isMobile, width, height]);

useEffect(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const CustomCard = ({
}: ICustomCardProps) => {
return (
<div css={style.card}>
<img css={style.carImg} src="/images/partsCollection/defaultCar.svg" />
<img css={style.carImg} src="/images/partsCollection/defaultCar.webp" />

{bgParts?.imgSrc && <img css={style.bgImg} src={bgParts.imgSrc} />}
<img css={style.spoilerImg} src={spoilerParts?.imgSrc} />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@ export const CardCarousel = () => {

const cardImgsPath = Array.from(
{ length: 7 },
(_, idx) => `images/pickEvent/card/card-${idx + 1}.svg`,
(_, idx) => `images/pickEvent/card/card-${idx + 1}.webp`,
);
12 changes: 6 additions & 6 deletions packages/service/src/components/pickEvent/PrizeContainer/data.ts
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
export const winnerPrizeData = {
img: `images/pickEvent/prize/prize-1.svg`,
img: `images/pickEvent/prize/prize-1.webp`,
rank: "1등(1명)",
name: "아반떼 N",
};

export const prizeData = [
{
img: `images/pickEvent/prize/prize-2.svg`,
img: `images/pickEvent/prize/prize-2.webp`,
rank: "2등(2명)",
name: "현대셀렉션 아반떼 N 3개월 구독권",
},
{
img: `images/pickEvent/prize/prize-3.svg`,
img: `images/pickEvent/prize/prize-3.webp`,
rank: "3등(3명)",
name: "현대셀렉션 아반떼 N 1개월 구독권",
},
{
img: `images/pickEvent/prize/prize-4.svg`,
img: `images/pickEvent/prize/prize-4.webp`,
rank: "4등(50명)",
name: "현대 N 기어봉 우산",
},
{
img: `images/pickEvent/prize/prize-5.svg`,
img: `images/pickEvent/prize/prize-5.webp`,
rank: "5등(100명)",
name: "미니 손 선풍기",
},
];

export const miniatureData = {
img: `images/pickEvent/prize/prize-mini.svg`,
img: `images/pickEvent/prize/prize-mini.webp`,
rank: "10명",
name: "아반떼 N 미니어처",
};
3 changes: 2 additions & 1 deletion packages/service/src/pages/Error/Error.css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import { css } from "@emotion/react";
import { theme } from "@watermelon-clap/core/src/theme";

export const errorContainerStyle = css`
background-image: url("/images/parts/background.svg");
background-image: url("/images/common/main-bg.webp"),
url("/images/common/main-bg.webp");
background-size: cover;
background-position: center;
Expand Down
3 changes: 2 additions & 1 deletion packages/service/src/pages/Loading/Loading.css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import { css } from "@emotion/react";
import { theme } from "@watermelon-clap/core/src/theme";

export const loadingStyle = css`
background-image: url("/images/parts/background.svg");
background-image: url("/images/common/main-bg.webpg"),
url("images/common/main-bg.webp");
background-size: cover;
background-position: center;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import { mobile } from "@service/common/responsive/responsive";
import { theme } from "@watermelon-clap/core/src/theme";

export const mainBg = css`
background-image: url("/images/common/main-bg.webp");
background-image: url("/images/common/main-bg.webp"),
url("/images/common/main-bg.webp");
background-size: cover;
padding-bottom: 200px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import { mobile } from "@service/common/responsive/responsive";
import { theme } from "@watermelon-clap/core/src/theme";

export const mainBg = css`
background-image: url("/images/common/main-bg.webp");
background-image: url("/images/common/main-bg.webp"),
url("/images/common/main-bg.webp");
background-size: cover;
padding-bottom: 200px;
min-height: calc(100vh - 356px);
Expand Down
3 changes: 2 additions & 1 deletion packages/service/src/pages/Main/Main.css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import { css } from "@emotion/react";
import { mobile } from "@service/common/responsive/responsive";

export const mainBg = css`
background-image: url("images/common/main-bg.webp");
background-image: url("images/common/main-bg.webp"),
url("images/common/main-bg.webp");
background-size: cover;
padding-bottom: 200px;
Expand Down
4 changes: 2 additions & 2 deletions packages/service/src/pages/Main/eventData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export const eventData: IEventData[] = [
title: "내 아반떼 N 뽑기",
subTitle: `나만의 아반떼 N을 뽑고 응모하면
아반떼 N을 0원에 준다?`,
img: "images/main/event-card-1.svg",
img: "images/main/event-card-1.webp",
desc: `새로 무장해서 돌아온 아반떼 N,
온라인 상에서만 만날 수 있는
특별한 디자인과 스펙을 확인해보세요!`,
Expand All @@ -25,7 +25,7 @@ export const eventData: IEventData[] = [
title: "N 퀴즈",
subTitle: `매일매일 선착순 200명에게
선물을 드립니다!`,
img: "images/main/event-card-2.svg",
img: "images/main/event-card-2.webp",
desc: `아반떼 N이 뭐야? N 시리즈가 뭐야?
항상 궁금해하셨던 여러분을 위해 준비한,
5일간의 선착순 퀴즈 이벤트!`,
Expand Down
2 changes: 1 addition & 1 deletion packages/service/src/pages/NQuizEvent/NQuizEvent.css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export const containerStyle = css`
`;

export const backgroundStyle = css`
background-image: url("/images/quiz/nQuizBackground.png");
background-image: url("/images/quiz/nQuizBackground.webp");
background-size: cover;
background-position: top;
background-repeat: no-repeat;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { mobile } from "@service/common/responsive/responsive";
import { theme } from "@watermelon-clap/core/src/theme";

export const backgroundStyle = css`
background-image: url("/images/quiz/nQuizBackground.png");
background-image: url("/images/quiz/nQuizBackground.webp");
background-size: cover;
background-position: top;
background-repeat: no-repeat;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import { mobile } from "@service/common/responsive/responsive";
import { theme } from "@watermelon-clap/core/src/theme";

export const mainBg = css`
background-image: url("/images/common/main-bg.webp");
background-image: url("/images/common/main-bg.webp"),
url("/images/common/main-bg.webp");
background-size: cover;
padding: 0 5%;
padding-bottom: 100px;
Expand Down
3 changes: 2 additions & 1 deletion packages/service/src/pages/PartsPick/PartsPick.css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import { mobile } from "@service/common/responsive/responsive";
import { theme } from "@watermelon-clap/core/src/theme";

export const partsPickBackgroundStyle = css`
background-image: url("/images/parts/background.svg");
background-image: url("/images/common/main-bg.webp"),
url("/images/common/main-bg.webp");
background-size: cover;
background-position: center;
Expand Down
3 changes: 2 additions & 1 deletion packages/service/src/pages/PickEvent/PickEvent.css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import { mobile } from "@service/common/responsive/responsive";
import { theme } from "@watermelon-clap/core/src/theme";

export const bg = css`
background-image: url("images/common/main-bg.webp");
background-image: url("images/common/main-bg.webp"),
url("images/common/main-bg.webp");
background-size: cover;
padding-top: 54px;
padding-bottom: 200px;
Expand Down
3 changes: 2 additions & 1 deletion packages/service/src/pages/Share/Share.css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import { SHARE_BREAKPOINT } from "@service/constants/breakpoints";
import { theme } from "@watermelon-clap/core/src/theme";

export const mainBg = css`
background-image: url("/images/common/main-bg.webp");
background-image: url("/images/common/main-bg.webp"),
url("/images/common/main-bg.webp");
background-size: cover;
padding-bottom: 200px;
Expand Down

0 comments on commit c7f0fe9

Please sign in to comment.