Skip to content

Commit

Permalink
커밋내역삭제1
Browse files Browse the repository at this point in the history
  • Loading branch information
kimjuyoung99 committed May 26, 2024
1 parent dc78304 commit 7c102a0
Show file tree
Hide file tree
Showing 15 changed files with 163 additions and 52 deletions.
Binary file modified src/Assets/Animals/M_Wolf.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 modified src/Assets/Animals/W_Cat.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 modified src/Assets/Animals/W_Dog.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 modified src/Assets/Animals/W_Rabbit.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 modified src/Assets/image/ChineseFood.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 modified src/Assets/image/JapaneseFood.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/Pages/Festival/AnimalMatchResult/AnimalMatchResult.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ const AnimalMatchResult = () => {
setMeetingGroupType(data.data.meetingGroupType);
setKakaoLink(data.data.kakaoLink);
} catch (error) {
console.error('Error fetching match result:', error);
console.error('Error fetching match result!!:', error);
}
};

Expand Down
4 changes: 2 additions & 2 deletions src/Pages/Honbob/Matching/CSS/H_Btn2.module.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.selectBtn {
font-size: 18px;
font-weight: bold;
font-weight: 600;
width: 151px;
height: 152px;
/* height: 184px; */
Expand All @@ -19,7 +19,7 @@
background: #ffffff;
color: #333333;
font-size: 18px;
font-weight: bold;
font-weight: 600;
width: 151px;
height: 152px;
/* height: 184px; */
Expand Down
16 changes: 11 additions & 5 deletions src/Pages/Honbob/Matching/CSS/H_Container.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ html {

.title {
margin: 1vh 0px 1vh 0px;
font-size: 20px;
font-weight: bold;
font-size: 0.8em;
font-weight: 600;
text-align: center;
}

Expand Down Expand Up @@ -81,10 +81,13 @@ html {
}
.title {
margin: 3vh 0px 1vh 0px;
font-size: 20px;
font-size: 1.1em;
font-weight: bold;
text-align: center;
}
.btnContainer {
margin-top: 1.2vh;
}
}
/* 모바일 */
@media (max-width: 670px) {
Expand All @@ -95,7 +98,7 @@ html {
flex-direction: column;
align-items: center;
position: relative;
margin-top: 70px;
margin-top: 84px;
overflow-y: hidden;
}

Expand All @@ -110,7 +113,7 @@ html {

.title {
margin: 1vh 0px 1vh 0px;
font-size: 20px;
font-size: 1.1em;
font-weight: bold;
}

Expand All @@ -128,4 +131,7 @@ html {
display: flex;
flex-direction: column;
}
.btnContainer {
margin-top: 1.2vh;
}
}
59 changes: 43 additions & 16 deletions src/Pages/Honbob/Matching/CSS/H_Menu.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -109,16 +109,30 @@
}
.menuText {
font-size: 1.3em;
font-weight: 600;
}
}

/* 모바일 */
@media (max-width: 670px) {
.menuContainer {
width: 40vh;
display: flex;
flex-direction: row;
/* 수직으로 아이템을 배치합니다. */
flex-wrap: wrap;
justify-content: space-around;
align-items: center;
height: 50vh;
margin-top: 1.2vh;
}
.menuBtn {
font-size: 16px;
font-weight: bold;
width: 45%;
aspect-ratio: 1/1;
width: 18vh;
height: 18vh;
margin-bottom: 1vh;
padding-top: 20px;
border-radius: 36px;
Expand All @@ -133,6 +147,19 @@
padding-bottom: 2vh;
box-sizing: border-box;
}
.menuBox {
margin-bottom: 1vh;
height: 100%;
width: 90%;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
}
.menuText {
font-size: 1em;
font-weight: 600;
}

.item {
font-size: 16px;
Expand All @@ -152,16 +179,26 @@
background-repeat: no-repeat;
background-position: center;
background-size: contain;
width: 130%;
aspect-ratio: 1/1;
width: 150%;
margin-bottom: 5%;
aspect-ratio: 2/1;
}

.item-1 {
/* .item-1 {
background-image: url('../../../../Assets/image/westernFood.png');
background-repeat: no-repeat;
background-position: center;
background-size: contain;
width: 180%;
background-size: 100% 100%;
width: 100%;
aspect-ratio: 1/1;
} */
.item-1 {
background-image: url('../../../../Assets/image/westernFood.png');
background-repeat: no-repeat;
background-position: center;
background-size: cover;
width: 70%;
aspect-ratio: 1/1;
}

Expand All @@ -170,7 +207,7 @@
background-repeat: no-repeat;
background-position: center;
background-size: 100% 100%;
width: 80%;
width: 50%;
aspect-ratio: 1/1;
margin-bottom: 20%;
/* aspect-ratio:; */
Expand All @@ -181,18 +218,8 @@
background-repeat: no-repeat;
background-position: center;
background-size: 100% 100%;
width: 80%;
width: 50%;
aspect-ratio: 1/1;
margin-bottom: 20%;
}
.menuBox {
margin-bottom: 1vh;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
}
.menuText {
font-size: 1em;
}
}
61 changes: 53 additions & 8 deletions src/Pages/Honbob/Matching/CSS/H_informCheck.module.css
Original file line number Diff line number Diff line change
@@ -1,23 +1,68 @@
.informContainer {
/* 데스크탑 */
@media (min-width: 670px) {
.informContainer {
width: 40vh;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}
margin-top: 1.2vh;
}

.divBox {
border: 3px solid #FF7474;
.divBox {
border: 1px solid #ff7474;
font-weight: 600;
width: 35vh;
height: 5vh;
height: 5.5vh;
display: flex;
align-items: center;
padding: 2vh;
border-radius: 12px;
font-size: 1.7vh;
font-size: 1em;
color: #555555;
margin-bottom: 1.5vh;
margin-top: 0.5vh;
background-color: #ffffff;
}
.titleContainer {
margin-bottom: 1vh;
}
.font {
font-weight: bold;
font-size: 1em;
}
}
/* 모바일 */
@media (max-width: 670px) {
.informContainer {
width: 40vh;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
margin-top: 2vh;
}

.divBox {
border: 1px solid #ff7474;
font-weight: 600;
width: 35vh;
height: 6.5vh;
display: flex;
align-items: center;
padding: 2vh;
border-radius: 12px;
font-size: 1em;
color: #555555;
margin-bottom: 1.5vh;
margin-top: 0.5vh;
background-color: #FFFFFF;
}
background-color: #ffffff;
}
.titleContainer {
margin-bottom: 1.3vh;
}
.font {
font-weight: bold;
font-size: 1em;
}
}
3 changes: 2 additions & 1 deletion src/Pages/Honbob/Matching/JS/H_Gender.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { useState } from 'react';
import con from '../CSS/H_Container.module.css';
import btn2 from '../CSS/H_Btn2.module.css';
import styled from 'styled-components';

const H_Gender = props => {
const [isSameClicked, setIsSameClicked] = useState(false);
Expand Down Expand Up @@ -30,7 +31,7 @@ const H_Gender = props => {
return (
<div className={con.container}>
<p className={con.title}>원하는 축제짝꿍 성별을 선택해주세요!</p>
<div>
<div className={con.btnContainer}>
<button className={clickSameBtnColor} onClick={clickSameBtnHandler}>
동성
</button>
Expand Down
56 changes: 44 additions & 12 deletions src/Pages/Honbob/Matching/JS/H_InformCheck.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,63 @@ const H_informCheck = props => {
<p className={con.title}>입력하신 정보를 확인해주세요.</p>
<div className={style.informContainer}>
<div className={style.genderCon}>
<div>
<span style={{ color: '#FF7474', fontSize: '2.5vh' }}></span>{' '}
대동지 성별
<div className={style.titleContainer}>
<span
style={{
color: '#FF7474',
fontSize: '2.5vh',
fontWeight: 'bold',
}}
>
</span>{' '}
<span className={style.font}>대동지 성별</span>
</div>

<div className={style.divBox}>{props.choiceGenderKorean}</div>
</div>
<div className={style.menuCon}>
<div>
<span style={{ color: '#FF7474', fontSize: '2.5vh' }}></span> 선호
액티비티
<div className={style.titleContainer}>
<span
style={{
color: '#FF7474',
fontSize: '2.5vh',
fontWeight: 'bold',
}}
>
</span>{' '}
<span className={style.font}>선호 액티비티</span>
</div>
<div className={style.divBox}>{props.choiceMenuKorean}</div>
</div>
<div className={style.kakaoCon}>
<div>
<span style={{ color: '#FF7474', fontSize: '2.5vh' }}></span>{' '}
카카오톡 아이디
<div className={style.titleContainer}>
<span
style={{
color: '#FF7474',
fontSize: '2.5vh',
fontWeight: 'bold',
}}
>
</span>{' '}
<span className={style.font}>카카오톡 아이디</span>
</div>
<div className={style.divBox}>{kakaoAccount}</div>
</div>
<div className={style.phoneNumCon}>
<div>
<span style={{ color: '#FF7474', fontSize: '2.5vh' }}></span>{' '}
전화번호
<div className={style.titleContainer}>
<span
style={{
color: '#FF7474',
fontSize: '2.5vh',
fontWeight: 'bold',
}}
>
</span>{' '}
<span className={style.font}>전화번호</span>
</div>
<div className={style.divBox}>{phoneNumber}</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions src/Pages/Honbob/Matching/JS/H_Menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ const H_Menu = props => {
{' '}
{index === 0 || index === 1 || index === 2 || index === 3 ? (
<div className={style.menuBox}>
<div
className={`${style.imgBox} ${style[`item-${index}`]}`}
></div>
<div className={style.menuText}>{val}</div>
<div className={`${style.imgBox} ${style[`item-${index}`]}`} />
<div className={`${style.menuText} ${style[`text-${index}`]}`}>
{val}
</div>
</div>
) : (
<div className={style.menuText}>{val}</div>
Expand Down
6 changes: 3 additions & 3 deletions src/Pages/Honbob/waiting/HonbobWaiting.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@
}

.moveToHomeBtn {
font-size: 2vh;
font-weight: 700;
font-size: 1.15em;
font-weight: 500;
width: 42vh;
height: 8.5vh;
max-height: 56px;
Expand All @@ -149,7 +149,7 @@
}

.cancelBtn {
font-size: 2vh;
font-size: 1em;
font-weight: 700;
color: #999999;
background-color: transparent;
Expand Down

0 comments on commit 7c102a0

Please sign in to comment.