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

Feature/#111 qa #112

Merged
merged 3 commits into from
Aug 23, 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
Binary file added FITple-Frontend/assets/RecomImg/cloth (1).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FITple-Frontend/assets/RecomImg/cloth (10).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FITple-Frontend/assets/RecomImg/cloth (11).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FITple-Frontend/assets/RecomImg/cloth (12).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FITple-Frontend/assets/RecomImg/cloth (13).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FITple-Frontend/assets/RecomImg/cloth (14).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FITple-Frontend/assets/RecomImg/cloth (15).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FITple-Frontend/assets/RecomImg/cloth (16).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FITple-Frontend/assets/RecomImg/cloth (17).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FITple-Frontend/assets/RecomImg/cloth (18).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FITple-Frontend/assets/RecomImg/cloth (19).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FITple-Frontend/assets/RecomImg/cloth (2).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FITple-Frontend/assets/RecomImg/cloth (20).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FITple-Frontend/assets/RecomImg/cloth (21).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FITple-Frontend/assets/RecomImg/cloth (22).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FITple-Frontend/assets/RecomImg/cloth (23).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FITple-Frontend/assets/RecomImg/cloth (24).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FITple-Frontend/assets/RecomImg/cloth (25).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FITple-Frontend/assets/RecomImg/cloth (26).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FITple-Frontend/assets/RecomImg/cloth (27).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FITple-Frontend/assets/RecomImg/cloth (28).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FITple-Frontend/assets/RecomImg/cloth (3).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FITple-Frontend/assets/RecomImg/cloth (4).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FITple-Frontend/assets/RecomImg/cloth (5).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FITple-Frontend/assets/RecomImg/cloth (6).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FITple-Frontend/assets/RecomImg/cloth (7).png
Binary file added FITple-Frontend/assets/RecomImg/cloth (8).png
Binary file added FITple-Frontend/assets/RecomImg/cloth (9).png
32 changes: 32 additions & 0 deletions FITple-Frontend/public/TestData/ItemTestData.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
{
"cloth_id": 1,
"like": "1",
"clothImg": "../../assets/RecomImg/cloth ",
"closet_num": 5,
"brand": "칼하트",
"cloth_name": "칼하트 K122 미드웨이트 후드집업",
Expand All @@ -13,9 +14,14 @@
"url": "https://www.musinsa.com/app/goods/1382869",
"memo": "팔기장이 조금 길다"
},




{
"cloth_id": 2,
"like": "0",
"clothImg": "../../assets/RecomImg/cloth ",
"closet_num": 5,
"brand": "헤일로샵",
"cloth_name": "5도 쿨링 이글루 세미 와이드 데님팬츠",
Expand All @@ -30,6 +36,7 @@
{
"cloth_id": 3,
"like": "0",
"clothImg": "../../assets/RecomImg/cloth ",
"closet_num": 2,
"brand": "키뮤어",
"cloth_name": "COOL 워셔블 하프 니트",
Expand All @@ -44,6 +51,7 @@
{
"cloth_id": 4,
"like": "1",
"clothImg": "../../assets/RecomImg/cloth ",
"closet_num": 2,
"brand": "MUSINSA STANDARD",
"cloth_name": "라운지 스웨트 팬츠",
Expand All @@ -58,6 +66,7 @@
{
"cloth_id": 5,
"like": "1",
"clothImg": "../../assets/RecomImg/cloth ",
"closet_num": 2,
"brand": "DRAW FIT",
"cloth_name": "소프 울 오버fit 니트 베스트",
Expand All @@ -72,6 +81,7 @@
{
"cloth_id": 6,
"like": "0",
"clothImg": "../../assets/RecomImg/cloth ",
"closet_num": 3,
"brand": "매니크",
"cloth_name": "빈티지 스냅버튼 와이드 데님팬츠",
Expand All @@ -86,6 +96,7 @@
{
"cloth_id": 7,
"like": "1",
"clothImg": "../../assets/RecomImg/cloth ",
"closet_num": 3,
"brand": "러브이즈트루",
"cloth_name": "IN LOVE TEE",
Expand All @@ -100,6 +111,7 @@
{
"cloth_id": 8,
"like": "0",
"clothImg": "../../assets/RecomImg/cloth ",
"closet_num": 3,
"brand": "파르티멘토",
"cloth_name": "링클 체크 박시 오버fit 롤업 하프 셔츠",
Expand All @@ -114,6 +126,7 @@
{
"cloth_id": 9,
"like": "1",
"clothImg": "../../assets/RecomImg/cloth ",
"closet_num": 3,
"brand": "aeae",
"cloth_name": "WEB LOGO T-SHIRT",
Expand All @@ -128,6 +141,7 @@
{
"cloth_id": 10,
"like": "1",
"clothImg": "../../assets/RecomImg/cloth ",
"closet_num": 4,
"brand": "랜덤오프",
"cloth_name": "MOZZI MEONZI 반팔티",
Expand All @@ -142,6 +156,7 @@
{
"cloth_id": 11,
"like": "0",
"clothImg": "../../assets/RecomImg/cloth ",
"closet_num": 4,
"brand": "브렌슨",
"cloth_name": "원턱 와이드 트레이닝 팬츠",
Expand All @@ -156,6 +171,7 @@
{
"cloth_id": 12,
"like": "0",
"clothImg": "../../assets/RecomImg/cloth ",
"closet_num": 4,
"brand": "모즈모즈",
"cloth_name": "와이드 원턱 스웨트 쇼츠 세트",
Expand All @@ -170,6 +186,7 @@
{
"cloth_id": 13,
"like": "0",
"clothImg": "../../assets/RecomImg/cloth ",
"closet_num": 4,
"brand": "엘리메노",
"cloth_name": "EL 하이 스피드 반팔티셔츠 멜란지",
Expand All @@ -184,6 +201,7 @@
{
"cloth_id": 14,
"like": "0",
"clothImg": "../../assets/RecomImg/cloth ",
"closet_num": 1,
"brand": "ERTR(이알티알)",
"cloth_name": "Big Basket Pants (Navy)",
Expand All @@ -198,6 +216,7 @@
{
"cloth_id": 15,
"like": "0",
"clothImg": "../../assets/RecomImg/cloth ",
"closet_num": 1,
"brand": "스웨이드(SUADE)",
"cloth_name": "CARPENTER DENIM SHORTS",
Expand All @@ -212,6 +231,7 @@
{
"cloth_id": 16,
"like": "0",
"clothImg": "../../assets/RecomImg/cloth ",
"closet_num": 1,
"brand": "PunchDrunkParties(펀치드렁크파티즈)",
"cloth_name": "Basic Logo Narrow T-shirt",
Expand All @@ -227,6 +247,7 @@
{
"cloth_id": 17,
"like": "0",
"clothImg": "../../assets/RecomImg/cloth ",
"closet_num": 1,
"brand": "밀로 우먼",
"cloth_name": "레터링 아카이브 티셔츠",
Expand All @@ -241,6 +262,7 @@
{
"cloth_id": 18,
"like": "0",
"clothImg": "../../assets/RecomImg/cloth ",
"closet_num": 1,
"brand": "아디다스",
"cloth_name": "파이어버드 숏 팬츠",
Expand All @@ -255,6 +277,7 @@
{
"cloth_id": 19,
"like": "0",
"clothImg": "../../assets/RecomImg/cloth ",
"closet_num": 1,
"brand": "aeae",
"cloth_name": "WEB LOGO T-SHIRTS",
Expand All @@ -269,6 +292,7 @@
{
"cloth_id": 20,
"like": "1",
"clothImg": "../../assets/RecomImg/cloth ",
"closet_num": 1,
"brand": "스투시",
"cloth_name": "BASIC STÜSSY TEE",
Expand All @@ -283,6 +307,7 @@
{
"cloth_id": 21,
"like": "1",
"clothImg": "../../assets/RecomImg/cloth ",
"closet_num": 1,
"brand": "러브이즈트루",
"cloth_name": "IN LOVE TEE",
Expand All @@ -297,6 +322,7 @@
{
"cloth_id": 22,
"like": "1",
"clothImg": "../../assets/RecomImg/cloth ",
"closet_num": 1,
"brand": "파르티멘토",
"cloth_name": "링클 체크 박시 오버핏 롤업 하프 셔츠",
Expand All @@ -311,6 +337,7 @@
{
"cloth_id": 23,
"like": "0",
"clothImg": "../../assets/RecomImg/cloth ",
"closet_num": 1,
"brand": "aeae",
"cloth_name": "WEB LOGO T-SHIRT",
Expand All @@ -325,6 +352,7 @@
{
"cloth_id": 24,
"like": "0",
"clothImg": "../../assets/RecomImg/cloth ",
"closet_num": 1,
"brand": "인스턴트펑크",
"cloth_name": "벨티드 더블 울 자켓",
Expand All @@ -339,6 +367,7 @@
{
"cloth_id": 25,
"like": "0",
"clothImg": "../../assets/RecomImg/cloth ",
"closet_num": 1,
"brand": "인스턴트펑크",
"cloth_name": "하트넥 슬림 라인 맨투맨",
Expand All @@ -353,6 +382,7 @@
{
"cloth_id": 26,
"like": "0",
"clothImg": "../../assets/RecomImg/cloth ",
"closet_num": 1,
"brand": "스컬프터",
"cloth_name": "Classic Logo Tee",
Expand All @@ -367,6 +397,7 @@
{
"cloth_id": 27,
"like": "0",
"clothImg": "../../assets/RecomImg/cloth ",
"closet_num": 1,
"brand": "마뗑킴",
"cloth_name": "MATIN LOGO CROP TOP",
Expand All @@ -381,6 +412,7 @@
{
"cloth_id": 28,
"like": "0",
"clothImg": "../../assets/RecomImg/cloth ",
"closet_num": 1,
"brand": "로라로라(rolarola)",
"cloth_name": "BASIC LETTERING T-SHIRT",
Expand Down
2 changes: 1 addition & 1 deletion FITple-Frontend/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ function App() {
<Route path="/recommend" element={<RecomMainPage />} />
<Route path="/recommendall" element={<RecomAllPage />} />
<Route path="/recommendFeed" element={<RecomUserFeedPage />} />
<Route path="/recommendClo" element={<RecomUserCloInfomPage />} />
<Route path="/recommendclo" element={<RecomUserCloInfomPage />} />
<Route path="/brand/:id" element={<BrandPage />} />
<Route
path="/recommendUserSearch"
Expand Down
15 changes: 15 additions & 0 deletions FITple-Frontend/src/components/Closet/Closet.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,17 @@ import { Container } from "./Closet.style";
import Goods from "../Goods/Goods"; // Goods 컴포넌트
import EX_IMG from "../../../assets/EXadidas.svg";

import { useNavigate } from "react-router-dom";


function Closet({ clothes }) {
const navigate = useNavigate();

const handleUserClick = (cloth) => {
console.log(cloth);
navigate("/recommendclo", { state: cloth });
};


return (
<Container>
Expand All @@ -17,6 +25,13 @@ function Closet({ clothes }) {
size={cloth.size}
fit={cloth.fit}
like={cloth.like}
color={cloth.color}
cloth_num={cloth.cloth_num}
clothImg={cloth.clothImg}
cloth_id={cloth.cloth_id}
url={cloth.url}
memo={cloth.memo}
onClick={()=>handleUserClick(cloth)}//클릭 옷 상세
/>
))}
</Container>
Expand Down
15 changes: 12 additions & 3 deletions FITple-Frontend/src/components/Goods/Goods.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,21 @@ import {
GoodsSize,
HeartIcon,
} from "./Goods.style";
import { useNavigate } from "react-router-dom";


function Goods({ ...props }) {
console.log(props);
const navigate = useNavigate();

const handleUserClick = (cloth) => {
console.log(cloth);
navigate("/recommendclo", { state: cloth });
};


return (
<Container>
<SetGoodsImg src={props.src} />
<Container onClick={props.onClick}>
<SetGoodsImg src={`${props.clothImg}(${props.cloth_id}).png`} />
<Brand>{props.brand}</Brand>
<GoodsName>{props.cloth_name}</GoodsName>
<GoodsSize>{props.size} - {props.fit}</GoodsSize>
Expand Down
4 changes: 3 additions & 1 deletion FITple-Frontend/src/components/Goods/Goods.style.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
import { Link } from "react-router-dom";
import styled from "styled-components";

export const Container = styled.div`
position: relative;
max-width:250px;
cursor: pointer;
`;
export const SetGoodsImg = styled.img`
width: 250px;
height: 250px;
background-color: #d9d9d9;
border-radius: 20px;
box-shadow: 8px 8px 20px #c9c7c7;
object-fit: cover;

`;

export const Brand = styled.h3`
Expand Down
2 changes: 1 addition & 1 deletion FITple-Frontend/src/components/InfomBox/InfomBox.style.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ export const Title = styled.div`
`

export const Desc = styled.div`
font-size:32px;
font-size:28px;
font-weight:800;
`
Loading