Skip to content

Commit e4a86b7

Browse files
authored
Merge pull request #74 from codeit-sprint-part3-6team/#65_페이지_마이페이지
#65 페이지 마이페이지
2 parents 4d3ec67 + e5d5b77 commit e4a86b7

35 files changed

+962
-10
lines changed

package-lock.json

Lines changed: 97 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,17 @@
1414
"@mui/material": "^6.2.0",
1515
"@mui/system": "^6.2.0",
1616
"@mui/x-date-pickers": "^7.23.1",
17+
"@reduxjs/toolkit": "^2.5.0",
1718
"axios": "^1.7.9",
1819
"clsx": "^2.1.1",
1920
"date-fns": "^2.30.0",
2021
"dayjs": "^1.11.13",
2122
"next": "15.0.3",
2223
"react": "^18.3.1",
2324
"react-dom": "^18.3.1",
24-
"react-router-dom": "^7.0.2"
25+
"react-redux": "^9.2.0",
26+
"react-router-dom": "^7.0.2",
27+
"redux": "^5.0.1"
2528
},
2629
"devDependencies": {
2730
"@svgr/webpack": "^8.1.0",

public/ic/ic_imgplus.svg

Lines changed: 3 additions & 0 deletions
Loading

src/components/common/button/Button.module.css

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,16 @@
136136
border-radius: 0 4px 4px 0;
137137
}
138138

139+
.profile.save {
140+
width: 100%;
141+
height: 54px;
142+
border-radius: 8px;
143+
padding: 14px 46px;
144+
font-size: 16px;
145+
font-weight: 600;
146+
line-height: 26px;
147+
}
148+
139149
.border {
140150
border: 1px solid var(--gray-medium);
141151
}
@@ -300,4 +310,10 @@
300310
width: 36px;
301311
height: 36px;
302312
}
313+
314+
.profile.save {
315+
font-size: 14px;
316+
line-height: 24px;
317+
font-family: 'Pretendard';
318+
}
303319
}

src/components/common/button/ReturnButton.module.css

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,21 @@
33
align-items: center;
44
font-size: 16px;
55
font-weight: 500;
6-
line-height: 26px;
6+
line-height: 26px;
7+
cursor: pointer;
78
}
89

910
.icon {
1011
width: 20px;
1112
height: 20px;
13+
cursor: pointer;
1214
}
1315

1416
@media screen and (max-width: 743px) {
15-
.returnButton {
16-
font-size: 14px;
17-
line-height: 24px;
18-
}
17+
.returnButton {
18+
font-size: 14px;
19+
line-height: 24px;
20+
}
1921

2022
.icon {
2123
width: 2rem;

src/components/common/input/CommentInput.module.css renamed to src/components/common/input/info-input/CommentInput.module.css

File renamed without changes.

src/components/common/input/CommentInput.tsx renamed to src/components/common/input/info-input/CommentInput.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { useState } from 'react';
2-
import CDSButton from '../button/CDSButton';
2+
import CDSButton from '../../button/CDSButton';
33
import styles from './CommentInput.module.css';
44

55
export default function CommentInput() {

src/components/common/input/DeadlineInput.module.css renamed to src/components/common/input/info-input/DeadlineInput.module.css

File renamed without changes.
File renamed without changes.

src/components/common/input/TitleTagInput.module.css renamed to src/components/common/input/info-input/TitleTagInput.module.css

File renamed without changes.

0 commit comments

Comments
 (0)