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.

Sign up for GitHub

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: Ocean Page 연결 #56

Merged
merged 1 commit into from
Feb 25, 2024
Merged

Feat: Ocean Page 연결 #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 13 additions & 13 deletions BlueMosaic/src/components/SmartphoneSVG.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,30 +158,30 @@ export const SmartphoneSVG = ({ handleClickParent, imageUrl }) => {
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_102_2637" result="shape"/>
</filter>
<linearGradient id="paint0_linear_102_2637" x1="48" y1="32" x2="48" y2="858" gradientUnits="userSpaceOnUse">
<stop stop-opacity="0.01"/>
<stop offset="1" stop-opacity="0.5"/>
<stop stopOpacity="0.01"/>
<stop offset="1" stopOpacity="0.5"/>
</linearGradient>
<linearGradient id="paint1_linear_102_2637" x1="143" y1="53" x2="143" y2="69" gradientUnits="userSpaceOnUse">
<stop stop-opacity="0.3"/>
<stop offset="0.48778" stopColor="#838383" stop-opacity="0.3"/>
<stop offset="1" stop-opacity="0.3"/>
<stop stopOpacity="0.3"/>
<stop offset="0.48778" stopColor="#838383" stopOpacity="0.3"/>
<stop offset="1" stopOpacity="0.3"/>
</linearGradient>
<linearGradient id="paint2_linear_102_2637" x1="146" y1="56" x2="146" y2="66" gradientUnits="userSpaceOnUse">
<stop stop-opacity="0.3"/>
<stop offset="0.48778" stopColor="#838383" stop-opacity="0.3"/>
<stop offset="1" stop-opacity="0.3"/>
<stop stopOpacity="0.3"/>
<stop offset="0.48778" stopColor="#838383" stopOpacity="0.3"/>
<stop offset="1" stopOpacity="0.3"/>
</linearGradient>
<radialGradient id="paint3_radial_102_2637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(151 61) rotate(90) scale(3)">
<stop/>
<stop offset="1" stopColor="#637BB2" stop-opacity="0.529857"/>
<stop offset="1" stopColor="#637BB2" stopOpacity="0.529857"/>
</radialGradient>
<linearGradient id="paint4_linear_102_2637" x1="142.131" y1="52" x2="142.131" y2="69.7373" gradientUnits="userSpaceOnUse">
<stop stopColor="white" stop-opacity="0.05"/>
<stop offset="1" stopColor="white" stop-opacity="0.1"/>
<stop stopColor="white" stopOpacity="0.05"/>
<stop offset="1" stopColor="white" stopOpacity="0.1"/>
</linearGradient>
<linearGradient id="paint5_linear_102_2637" x1="50.7732" y1="32" x2="50.7732" y2="845.944" gradientUnits="userSpaceOnUse">
<stop stopColor="white" stop-opacity="0.01"/>
<stop offset="1" stopColor="white" stop-opacity="0.03"/>
<stop stopColor="white" stopOpacity="0.01"/>
<stop offset="1" stopColor="white" stopOpacity="0.03"/>
</linearGradient>
</defs>
</svg>
Expand Down
19 changes: 10 additions & 9 deletions BlueMosaic/src/pages/Ocean.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { useNavigate } from "react-router-dom";
import { Toast } from "../components/Toast";
import { MarineApis } from "../hooks/useMarineQuery";
import { TrashInfoStore } from "../stores/TrashStore";
import imageUrl from "../assets/UploadBackground.jpg"

export const Ocean = () => {
const [showSmartphone, setShowSmartphone] = useState(false);
Expand Down Expand Up @@ -52,12 +51,13 @@ export const Ocean = () => {
// const resFriend = MarineApis.uploadFriend(formData);
// console.log(resFriend);
const response = await MarineApis.upload(formData);
console.log(response);
console.log("Upload Response:", response);
const formattedData = response.map(item => ({
score: item.score,
total: item.total,
names: item.names.join(', '), // Assuming names is an array
}));
const formattedData = {
score: response.score,
total: response.total,
names: response.marinelife.map(item => item.name).join(', '),
};

setReturndata(formattedData);
console.log(formattedData);
Expand All @@ -73,7 +73,7 @@ export const Ocean = () => {
};

const handleClickUpload = () => {
setShowSmartphone(true);
setShowSmartphone(false);
};

const handleClick = () => {
Expand All @@ -97,8 +97,8 @@ export const Ocean = () => {
{
showSmartphone ? (
<SmartphoneWrapper>
<SmartphoneSVG handleClickParent="" imageUrl={imageUrl} />
{ showSmartphone && <Toast found={`I found ${"cod"}`} points={`My total score is ${100}`} handleClickUpload={handleClickUpload} handleGoto={handleGoto} button1={"Reupload"} button2={"Collection"} />}
<SmartphoneSVG handleClickParent="" imageUrl={selectedImageUrl} />
{ showSmartphone && <Toast found={`I found ${returndata && returndata.names}`} points={`My total score is ${returndata && returndata.total}`} handleClickUpload={handleClickUpload} handleGoto={handleGoto} button1={"Reupload"} button2={"Collection"} />}
</SmartphoneWrapper>
) : (
<CamWrapper>
Expand Down Expand Up @@ -159,6 +159,7 @@ const StyledButton = styled.button`
border: none;
border-radius: 4px;
cursor: pointer;
margin-top: 1rem;

&:hover {
filter: brightness(70%);
Expand Down