Skip to content

Commit

Permalink
Merge pull request #122 from boostcampwm2023/feat/background-img
Browse files Browse the repository at this point in the history
[Feat] 배경 이미지 수정
  • Loading branch information
dmson1218 authored Nov 23, 2023
2 parents 6832e4f + 80e280e commit fa765dd
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 24 deletions.
Binary file added FE/src/assets/homeBackground.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 3 additions & 13 deletions FE/src/pages/HomePage.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import styled from "styled-components";
import { useRecoilValue } from "recoil";
import headerAtom from "../atoms/headerAtom";

import background from "../assets/background.png";
import homeBackground from "../assets/homeBackground.png";
import LoginModal from "../components/LoginModal/LoginModal";
import SignUpModal from "../components/SignUpModal/SignUpModal";

Expand All @@ -12,9 +12,7 @@ function HomePage() {

return (
<>
<HomePageWrapper>
<HomeTitle>너의 이야기를 담은 별</HomeTitle>
</HomePageWrapper>
<HomePageWrapper />

{headerState.isLogin ? <LoginModal /> : null}
{headerState.isSignUp ? <SignUpModal /> : null}
Expand All @@ -25,7 +23,7 @@ function HomePage() {
// TODO: 배경 이미지 제거하고 영상으로 대체할 것
const HomePageWrapper = styled.div`
height: 100vh;
background-image: url(${background});
background-image: url(${homeBackground});
background-repeat: no-repeat;
background-position: center;
background-size: cover;
Expand All @@ -35,12 +33,4 @@ const HomePageWrapper = styled.div`
align-items: center;
`;

const HomeTitle = styled.h1`
position: relative;
top: -4rem;
font-size: 3rem;
color: #ffffff;
`;

export default HomePage;
12 changes: 1 addition & 11 deletions FE/src/pages/MainPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ function MainPage() {
e.preventDefault();
setDiaryState((prev) => ({ ...prev, isCreate: true, isRead: false }));
}}
>
<MainTitle>대충 메인 페이지</MainTitle>
</MainPageWrapper>
/>
{diaryState.isCreate ? <DiaryCreateModal /> : null}
{diaryState.isRead ? <DiaryReadModal /> : null}
{diaryState.isUpdate ? <DiaryUpdateModal /> : null}
Expand All @@ -44,12 +42,4 @@ const MainPageWrapper = styled.div`
align-items: center;
`;

const MainTitle = styled.h1`
position: relative;
top: -4rem;
font-size: 3rem;
color: #ffffff;
`;

export default MainPage;

0 comments on commit fa765dd

Please sign in to comment.