Skip to content

Commit ff893b2

Browse files
authored
Merge pull request #19 from AIVLE-School-Third-Big-Project/mergeTemp
πŸ’„ Design : ν”ΌνŒ… νŽ˜μ΄μ§€ μˆ˜μ •
2 parents 4f192d3 + 28f6302 commit ff893b2

File tree

5 files changed

+18
-10
lines changed

5 files changed

+18
-10
lines changed

β€Žsrc/main.jsβ€Ž

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ const aiAPI = process.env.AI_API
1818

1919
const allowedOrigins = [
2020
'http://localhost:3000',
21-
'http://localhost:3001',
2221
'http://www.model-fit.kro.kr',
2322
aiAPI,
2423
]

β€Žstyle/src/components/FittingPage/ButtonBar.jsβ€Ž

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import saveImage from '../../images/save.png'
1010
import uploadImage from '../../images/upload.png'
1111
import changeBgImage from '../../images/landscape.png'
1212
import resetImage from '../../images/reset.png'
13+
import helpImage from '../../images/help.png'
1314
import { API_URL } from '../../api/apiConfig'
1415
import ClassMerger from '../common/ClassNameGenerater'
1516

@@ -147,6 +148,7 @@ function ButtonBar({ setErrorCode, showAlert, setIsDefaultPage }) {
147148
text="되돌리기"
148149
onClick={() => setIsDefaultPage(true)}
149150
/>
151+
<CardButton src={helpImage} alt="help" text="도움말" onClick={() => {}} />
150152
{isModalOpen && (
151153
<div
152154
className={styles.modal}

β€Žstyle/src/components/FittingPage/FittingPage.module.cssβ€Ž

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919

2020
display: grid;
21-
grid-template-columns: 6% 42% 4% 42% 6%;
21+
grid-template-columns: 4% 46% 4% 42% 4%;
2222
height: var(--height);
2323
/* overflow: hidden; */
2424
}
@@ -63,6 +63,7 @@
6363

6464
.fittingImage {
6565
height: 650px;
66+
object-fit: cover;
6667
}
6768

6869
.rightFitContainer {
@@ -282,17 +283,23 @@
282283

283284
.closet {
284285
display: grid;
285-
grid-template-columns: repeat(auto-fit, minmax(240px, 1fr));
286-
grid-auto-rows: minmax(250px, 1fr);
287-
grid-gap: 20px;
286+
grid-template-columns: repeat(3, minmax(220px, 1fr));
287+
grid-auto-rows: 269px;
288+
/* grid-gap: 20px; */
288289
overflow-y: auto;
289290
max-height: 72%;
291+
justify-content: space-between;
292+
padding: 5px;
290293
}
291294

292295
.clothesElement {
293-
width: 242px;
294-
height: 264px;
296+
width: 232px;
297+
height: 254px;
295298
display: inline-block;
299+
border-radius: 6px;
300+
background-color: #f6f6f6;
301+
margin: 10px 10px;
302+
padding: 12px;
296303
/* border: 1px solid black; */
297304
}
298305

@@ -305,8 +312,8 @@
305312
.clothesImage {
306313
display: block;
307314
margin: 0 auto;
308-
width: 180px;
309-
height: 200px;
315+
width: 160px;
316+
height: 180px;
310317
}
311318

312319
.favoriteBtn {

β€Žstyle/src/components/FittingPage/LeftFitContainer.jsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ function LeftFitContainer({
4646
<ButtonBar setErrorCode={setErrorCode} showAlert={showAlert} />
4747
<div className={styles.imageContainer}>
4848
<img
49-
className={styles.mainImage}
49+
className={styles.fittingImage}
5050
src={isDefaultPage ? defaultImageUrl : fittingImage}
5151
alt="userImage"
5252
/>

β€Žstyle/src/images/help.pngβ€Ž

17.7 KB
Loading

0 commit comments

Comments
Β (0)