Skip to content

Commit

Permalink
chore: url 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
kyoung-jnn committed Apr 6, 2024
1 parent 770f154 commit 97b10dd
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 33 deletions.
17 changes: 14 additions & 3 deletions src/components/Card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ import hashtagIcon, { HashTagType } from '@assets/svg';
import useImageDownload from '@hooks/useImageDownload';
import { deleteDaybookById } from '@api';

import monunImage from '../assets/images/monun_background.png';
import linenoteImage from '../assets/images/linenote_background.png';

interface Props {
daybook: GetDaybookResponse;
isHome?: boolean;
Expand All @@ -30,7 +33,15 @@ const Card = ({
isCurrent = true,
}: Props) => {
const { target, asyncDownload } = useImageDownload();
const { hearts, paperType, createdAt, content, hashtags, boardId, reactions } = daybook;
const {
hearts,
paperType,
createdAt,
content,
hashtags,
boardId,
reactions,
} = daybook;
const hashtag = hashtags[0] as HashTagType;
const Icon = hashtagIcon[hashtag];

Expand Down Expand Up @@ -80,8 +91,8 @@ const Card = ({
opacity: ${!isCurrent ? 0.5 : 1};
background-image: ${paperType === '모눈종이'
? css`url('/src/assets/images/monun_background.png')`
: css`url('/src/assets/images/linenote_background.png')`};
? css`url(${monunImage})`
: css`url(${linenoteImage})`};
`}
>
<CardHeader>
Expand Down
3 changes: 2 additions & 1 deletion src/pages/auth/PostLogin.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import Button from '@components/Button';
import { css } from '@emotion/react';
import { Link } from 'react-router-dom';
import background from '../../assets/images/background_landing.png';

const PostLogin = () => {
return (
Expand All @@ -11,7 +12,7 @@ const PostLogin = () => {
height: 100vh;
position: relative;
background-image: url('/src/assets/images/background_landing.png');
background-image: url(${background});
background-size: cover;
`}
>
Expand Down
63 changes: 37 additions & 26 deletions src/pages/auth/PreLogin.tsx
Original file line number Diff line number Diff line change
@@ -1,34 +1,45 @@
import KakaoLoginButton, { KakaoLoginButtonProps } from '@components/KakaoLoginButton';
import KakaoLoginButton, {
KakaoLoginButtonProps,
} from '@components/KakaoLoginButton';
import { css } from '@emotion/react';
import { FC } from 'react';
import background from '../../assets/images/background_landing.png';

interface PreLoginTemplateProps extends KakaoLoginButtonProps { }
interface PreLoginTemplateProps extends KakaoLoginButtonProps {}

const PreLogin: FC<PreLoginTemplateProps> = ({ setLandingFunnelState }) => {
return (
<div css={css`
padding-left: 16px;
padding-right: 16px;
height: 100vh;
position: relative;
return (
<div
css={css`
padding-left: 16px;
padding-right: 16px;
height: 100vh;
position: relative;
background-image: url('/src/assets/images/background_landing.png');
background-size: cover;
`}>
<section css={css`
padding-top: 20vh;
padding-left: 20%;
padding-right: 20%;
@media screen and (max-width: 480px) {
padding-left: 10px;
padding-right: 10px;
}
`}>
<img src="/src/assets/images/kakao_landing.png" alt="kakao login background" width={"100%"} />
</section>
<KakaoLoginButton setLandingFunnelState={setLandingFunnelState} />
</div>
);
background-image: url(${background});
background-size: cover;
`}
>
<section
css={css`
padding-top: 20vh;
padding-left: 20%;
padding-right: 20%;
@media screen and (max-width: 480px) {
padding-left: 10px;
padding-right: 10px;
}
`}
>
<img
src="/src/assets/images/kakao_landing.png"
alt="kakao login background"
width={'100%'}
/>
</section>
<KakaoLoginButton setLandingFunnelState={setLandingFunnelState} />
</div>
);
};

export default PreLogin;
export default PreLogin;
7 changes: 5 additions & 2 deletions src/pages/write/쓰기.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ import { paperTypeState } from '@state/paperType';
import { fadeLeftAnimation } from '@theme/animation';
import { useAtom, useAtomValue } from 'jotai';

import memo from '../../assets/images/memo.png';
import monun from '../../assets/images/monun.png';

function 쓰기() {
const paperTypeAtom = useAtomValue(paperTypeState);
const [daybook, setDaybook] = useAtom(daybookAtom);
Expand All @@ -18,10 +21,10 @@ function 쓰기() {
? css`
line-height: 30.24px;
padding-left: 40px;
background-image: url('/src/assets/images/memo.png');
background-image: url(${memo});
`
: css`
background-image: url('/src/assets/images/monun.png');
background-image: url(${monun});
`};
`}
value={daybook?.content}
Expand Down
3 changes: 2 additions & 1 deletion src/theme/GlobalStyles.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { Global } from '@emotion/react';
import emotionNormalize from 'emotion-normalize';
import { css } from '@emotion/react';
import { colors } from './colors';
import background from '../assets/images/background.png';

function GlobalStyles() {
const globalStyle = css`
Expand All @@ -14,7 +15,7 @@ function GlobalStyles() {
font-family: 'Nanum Myeongjo', serif;
font-weight: 700;
background-image: url('/src/assets/images/background.png');
background-image: url(${background});
background-size: cover;
overflow: hidden;
}
Expand Down

0 comments on commit 97b10dd

Please sign in to comment.