Skip to content

Commit

Permalink
Feat/issue-16 (#25)
Browse files Browse the repository at this point in the history
* Feat: Ocean Page 생성 및 카메라 클릭가능

* Feat: Ocean 페이지 디자인 구현

* Feat: Ocean 이미지 등록가능
  • Loading branch information
DingX2 authored Feb 19, 2024
1 parent 6d0365b commit 8e2c90f
Show file tree
Hide file tree
Showing 7 changed files with 737 additions and 7 deletions.
234 changes: 234 additions & 0 deletions BlueMosaic/src/assets/Cam.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
240 changes: 240 additions & 0 deletions BlueMosaic/src/components/CamSVG.tsx

Large diffs are not rendered by default.

190 changes: 190 additions & 0 deletions BlueMosaic/src/components/SmartphoneSVG.tsx

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion BlueMosaic/src/pages/Mypage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Dashboard } from "../components/dashboard/dashboard"
export const Mypage = () => {

return(
<Wrapper backgroundImage={HomeSVG}>
<Wrapper backgroundImage={HomeSVG} style={{ backgroundSize: 'cover' }}>
<Container>
<Dashboard/>
</Container>
Expand Down
74 changes: 70 additions & 4 deletions BlueMosaic/src/pages/Ocean.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,72 @@
import styled from "@emotion/styled"
import { Wrapper, Container, DivCenterContainter } from "../styles/Layout"
import UploadBackGround from "../assets/UploadBackground.jpg"
import WaterWave from 'react-water-wave';
import { CamSVG } from "../components/CamSVG";
import { SmartphoneSVG } from "../components/SmartphoneSVG";
import { useState } from "react"
import imageUrl from "../assets/UploadBackground.jpg"

export const Ocean = () => {
const [showSmartphone, setShowSmartphone] = useState(false);

const handleCircleClickParent = () => {
console.log('Circle clicked in parent!');
setShowSmartphone(true);
};

const handleClickParent = () => {
console.log('Circle clicked in parent!');

};

return(
<WaterWave imageUrl={ UploadBackGround } style={{ backgroundSize: 'cover' }}>
{({ pause, play }) => (
<Wrapper>
<Container>

{
showSmartphone ? (
<SmartphoneWrapper>
<SmartphoneSVG handleClickParent={handleClickParent} imageUrl={imageUrl} />
</SmartphoneWrapper>
) : (
<CamWrapper>
<CamSVG handleCircleClickParent={handleCircleClickParent}/>
</CamWrapper>
)
}

</Container>
</Wrapper>
)}
</WaterWave>
)
}

const CamWrapper = styled.div`
width: 100%;
height: 100%;
display: flex;
justify-content: center;
align-items: center;
SmartphoneSVG {
width: 50%;
height: 50%;
}
`

const SmartphoneWrapper = styled.div`
width: 100%;
height: 100%;
display: flex;
justify-content: center;
align-items: center;
return(<>
Ocean
</>)
}
CamSVG {
width: 40%;
height: 40%;
}
`
2 changes: 1 addition & 1 deletion BlueMosaic/src/pages/Signin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const Signin = () => {
};

return(
<WaterWave imageUrl={LoginBackround}>
<WaterWave imageUrl={LoginBackround} style={{ backgroundSize: 'cover' }}>
{({ pause, play }) => (
<Wrapper>
<Container>
Expand Down
2 changes: 1 addition & 1 deletion BlueMosaic/src/pages/Signup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export const Signup = () => {
};

return(
<WaterWave imageUrl={Signupbackground}>
<WaterWave imageUrl={Signupbackground} style={{ backgroundSize: 'cover' }}>
{({ pause, play }) => (
<Wrapper>
<Container>
Expand Down

0 comments on commit 8e2c90f

Please sign in to comment.