Skip to content

Commit

Permalink
[#123] bugfix: Removve warning msg
Browse files Browse the repository at this point in the history
  • Loading branch information
rosieyeon committed Feb 17, 2022
1 parent 8cc33cd commit c8d318f
Show file tree
Hide file tree
Showing 13 changed files with 34 additions and 13 deletions.
6 changes: 4 additions & 2 deletions src/components/home/achievement/achievementList.js
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,10 @@ export default function AchievementList({
},
})
.then((res) => {
let data = res.data.achieveActive.achieve.achieveSeq;
setMainachieveSeq(() => data);
if (res.data.achieveActive) {
let data = res.data.achieveActive.achieve.achieveSeq;
setMainachieveSeq(() => data);
}
});
}

Expand Down
3 changes: 3 additions & 0 deletions src/components/home/todays/homeTodos.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ export default function HomeTodos(props) {
day={today}
/>
))}
{!dailyList && !isAdd && (
<div className="todo-no-data">오늘 해야할 일을 추가해주세요</div>
)}
{isAdd ? (
<CreateTodo dailyList={dailyList} setDailyList={setDailyList} />
) : (
Expand Down
10 changes: 6 additions & 4 deletions src/pages/Home_achievement.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,12 @@ export default function HomeAchievement() {
},
})
.then((res) => {
let data = res.data.achieveActive.achieve;
setAchieveName(() => data.achieveName);
setAchieveImg(() => data.achieveImg);
setAchieveCount(0);
if (res.data.achieveActive) {
let data = res.data.achieveActive.achieve;
setAchieveName(() => data.achieveName);
setAchieveImg(() => data.achieveImg);
setAchieveCount(0);
}
});
}
useEffect(() => {
Expand Down
1 change: 0 additions & 1 deletion src/pages/Meetingrooms.js
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@ export default function Meetingrooms() {
setImgSelected(images[Math.floor(Math.random() * images.length)]);
}, [meetingSeq]);

console.log(selectedMeeting);
const meetingroomImg =
"https://i6a301.p.ssafy.io:8080/images/" + selectedMeeting.meetingImg;
const defaultImg = `images/${imgSelected}`;
Expand Down
2 changes: 1 addition & 1 deletion src/statics/css/home/homeTodays.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/statics/css/home/homeTodays.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions src/statics/css/home/homeTodos.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/statics/css/home/homeTodos.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions src/statics/css/studyRecruitDetail.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/statics/css/studyRecruitDetail.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions src/statics/scss/home/homeTodays.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
.home-todays-top {
width: 100%;
display: grid;
// grid-template-columns: 4fr 5fr;
grid-template-columns: repeat(2, auto);
grid-template-columns: 4fr 5fr;
// grid-template-columns: repeat(2, auto);
// grid-template-columns: repeat(2, minmax(200px, auto));
gap: 15px;
// grid-template-rows: repeat(auo-fit, minmax(200px, 2fr));
// grid-template-rows: 197px;
Expand Down
5 changes: 5 additions & 0 deletions src/statics/scss/home/homeTodos.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,8 @@
height: 40px;
}
}
.todo-no-data {
// text-align: center;
padding: 0.5rem 1rem;
color: var(--textColor-todo);
}
2 changes: 2 additions & 0 deletions src/statics/scss/studyRecruitDetail.scss
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,8 @@
width: 8rem;
height: 30px;
border-radius: 5px;
margin-top: 60px;
margin-bottom: 20px;
}
.studyapply-modal-msg {
font-size: 14px;
Expand Down

0 comments on commit c8d318f

Please sign in to comment.