Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/issue-16 #25

Merged
merged 3 commits into from
Feb 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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