Skip to content

Commit 97b10dd

Browse files
committed
chore: url 수정
1 parent 770f154 commit 97b10dd

File tree

5 files changed

+60
-33
lines changed

5 files changed

+60
-33
lines changed

src/components/Card.tsx

+14-3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ import hashtagIcon, { HashTagType } from '@assets/svg';
1616
import useImageDownload from '@hooks/useImageDownload';
1717
import { deleteDaybookById } from '@api';
1818

19+
import monunImage from '../assets/images/monun_background.png';
20+
import linenoteImage from '../assets/images/linenote_background.png';
21+
1922
interface Props {
2023
daybook: GetDaybookResponse;
2124
isHome?: boolean;
@@ -30,7 +33,15 @@ const Card = ({
3033
isCurrent = true,
3134
}: Props) => {
3235
const { target, asyncDownload } = useImageDownload();
33-
const { hearts, paperType, createdAt, content, hashtags, boardId, reactions } = daybook;
36+
const {
37+
hearts,
38+
paperType,
39+
createdAt,
40+
content,
41+
hashtags,
42+
boardId,
43+
reactions,
44+
} = daybook;
3445
const hashtag = hashtags[0] as HashTagType;
3546
const Icon = hashtagIcon[hashtag];
3647

@@ -80,8 +91,8 @@ const Card = ({
8091
opacity: ${!isCurrent ? 0.5 : 1};
8192
8293
background-image: ${paperType === '모눈종이'
83-
? css`url('/src/assets/images/monun_background.png')`
84-
: css`url('/src/assets/images/linenote_background.png')`};
94+
? css`url(${monunImage})`
95+
: css`url(${linenoteImage})`};
8596
`}
8697
>
8798
<CardHeader>

src/pages/auth/PostLogin.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import Button from '@components/Button';
22
import { css } from '@emotion/react';
33
import { Link } from 'react-router-dom';
4+
import background from '../../assets/images/background_landing.png';
45

56
const PostLogin = () => {
67
return (
@@ -11,7 +12,7 @@ const PostLogin = () => {
1112
height: 100vh;
1213
position: relative;
1314
14-
background-image: url('/src/assets/images/background_landing.png');
15+
background-image: url(${background});
1516
background-size: cover;
1617
`}
1718
>

src/pages/auth/PreLogin.tsx

+37-26
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,45 @@
1-
import KakaoLoginButton, { KakaoLoginButtonProps } from '@components/KakaoLoginButton';
1+
import KakaoLoginButton, {
2+
KakaoLoginButtonProps,
3+
} from '@components/KakaoLoginButton';
24
import { css } from '@emotion/react';
35
import { FC } from 'react';
6+
import background from '../../assets/images/background_landing.png';
47

5-
interface PreLoginTemplateProps extends KakaoLoginButtonProps { }
8+
interface PreLoginTemplateProps extends KakaoLoginButtonProps {}
69

710
const PreLogin: FC<PreLoginTemplateProps> = ({ setLandingFunnelState }) => {
8-
return (
9-
<div css={css`
10-
padding-left: 16px;
11-
padding-right: 16px;
12-
height: 100vh;
13-
position: relative;
11+
return (
12+
<div
13+
css={css`
14+
padding-left: 16px;
15+
padding-right: 16px;
16+
height: 100vh;
17+
position: relative;
1418
15-
background-image: url('/src/assets/images/background_landing.png');
16-
background-size: cover;
17-
`}>
18-
<section css={css`
19-
padding-top: 20vh;
20-
padding-left: 20%;
21-
padding-right: 20%;
22-
@media screen and (max-width: 480px) {
23-
padding-left: 10px;
24-
padding-right: 10px;
25-
}
26-
`}>
27-
<img src="/src/assets/images/kakao_landing.png" alt="kakao login background" width={"100%"} />
28-
</section>
29-
<KakaoLoginButton setLandingFunnelState={setLandingFunnelState} />
30-
</div>
31-
);
19+
background-image: url(${background});
20+
background-size: cover;
21+
`}
22+
>
23+
<section
24+
css={css`
25+
padding-top: 20vh;
26+
padding-left: 20%;
27+
padding-right: 20%;
28+
@media screen and (max-width: 480px) {
29+
padding-left: 10px;
30+
padding-right: 10px;
31+
}
32+
`}
33+
>
34+
<img
35+
src="/src/assets/images/kakao_landing.png"
36+
alt="kakao login background"
37+
width={'100%'}
38+
/>
39+
</section>
40+
<KakaoLoginButton setLandingFunnelState={setLandingFunnelState} />
41+
</div>
42+
);
3243
};
3344

34-
export default PreLogin;
45+
export default PreLogin;

src/pages/write/쓰기.tsx

+5-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ import { paperTypeState } from '@state/paperType';
66
import { fadeLeftAnimation } from '@theme/animation';
77
import { useAtom, useAtomValue } from 'jotai';
88

9+
import memo from '../../assets/images/memo.png';
10+
import monun from '../../assets/images/monun.png';
11+
912
function 쓰기() {
1013
const paperTypeAtom = useAtomValue(paperTypeState);
1114
const [daybook, setDaybook] = useAtom(daybookAtom);
@@ -18,10 +21,10 @@ function 쓰기() {
1821
? css`
1922
line-height: 30.24px;
2023
padding-left: 40px;
21-
background-image: url('/src/assets/images/memo.png');
24+
background-image: url(${memo});
2225
`
2326
: css`
24-
background-image: url('/src/assets/images/monun.png');
27+
background-image: url(${monun});
2528
`};
2629
`}
2730
value={daybook?.content}

src/theme/GlobalStyles.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { Global } from '@emotion/react';
22
import emotionNormalize from 'emotion-normalize';
33
import { css } from '@emotion/react';
44
import { colors } from './colors';
5+
import background from '../assets/images/background.png';
56

67
function GlobalStyles() {
78
const globalStyle = css`
@@ -14,7 +15,7 @@ function GlobalStyles() {
1415
font-family: 'Nanum Myeongjo', serif;
1516
font-weight: 700;
1617
17-
background-image: url('/src/assets/images/background.png');
18+
background-image: url(${background});
1819
background-size: cover;
1920
overflow: hidden;
2021
}

0 commit comments

Comments
 (0)