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

Development #19

Merged
merged 2 commits into from
Dec 17, 2023
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
3 changes: 2 additions & 1 deletion src/api/diaryApis.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ export const diaryApis = {
const response = await instance.get(`/api/diary/list`, {
params: { month },
});
return monthlyDiarySchema.validate(response.data);
// return monthlyDiarySchema.validate(response.data);
return response;
},
getDiary: async (diaryId: number) => {
const response = await instance.get(`/api/diary/get/${diaryId}`);
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/EmotionLabel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const labelByEmotion = {
[Emotion.UNFAIR]: '억울한',
};

const colorByEmotion = {
export const colorByEmotion = {
[Emotion.COMFORTABLE]: {
container: 'rgba(133, 224, 142, 0.20)',
indicator: '#85E08E',
Expand Down
40 changes: 31 additions & 9 deletions src/components/home/Calendar.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import dayjs, { Dayjs } from 'dayjs';
import { useRecoilState, useRecoilValue } from 'recoil';
import dayjs from 'dayjs';
import { useRecoilState } from 'recoil';
import { CurrentDateState } from 'store/CurrentDateState';
import weekdayPlugin from 'dayjs/plugin/weekday';
import objectPlugin from 'dayjs/plugin/toObject';
Expand All @@ -10,10 +10,12 @@ import { useGetMonthlyDiary } from 'api/hook/useDiary';
import { AddIcon } from 'assets/home';
import { useNavigate } from 'react-router-dom';
import locale from 'dayjs/locale/ko';
import { Emotion } from 'constants/enum';
import { colorByEmotion } from 'components/common/EmotionLabel';

export interface MonthlyDiaryRespose {
id: number;
emotion: string[];
emotion: Emotion[];
summary: string;
content: string;
writingDay: string;
Expand All @@ -38,6 +40,22 @@ export default function Calendar() {
getAllDays();
}, [currentDate]);

const generateEmotionColor = (emotion: Emotion[] | undefined) => {
if (!emotion) return '';
let emotionResult = '';

emotion.forEach((item: Emotion) => {
emotionResult =
emotionResult.length > 0
? emotionResult
.concat(', ')
.concat(colorByEmotion[`${item}`].indicator)
: colorByEmotion[`${item}`].indicator;
});

return emotionResult;
};

useEffect(() => {
monthly &&
SetLoggedDate(
Expand Down Expand Up @@ -96,6 +114,7 @@ export default function Calendar() {
};

const renderCells = () => {
if (!loggedDate) return;
const rows: any = [];
let days: any = [];

Expand All @@ -108,12 +127,14 @@ export default function Calendar() {
};

const checkDiary = () => {
if (loggedDate?.get(d.day)) return 'logged';
if (loggedDate?.get(d.day)) return true;
else return false;
};

days.push(
<DayContainer
className={`${checkToday()} ${checkDiary()}`}
emotionColor={generateEmotionColor(loggedDate.get(d.day)?.emotion)}
className={`${checkToday()} ${checkDiary() ? 'logged' : ''}`}
onClick={() => {
if (d.isCurrentMonth && !d.isFuture)
onClickDate(
Expand All @@ -124,7 +145,9 @@ export default function Calendar() {
}}
key={i}
>
<DailyEmotion>{d.isCurrentDay && <AddIcon />}</DailyEmotion>
<DailyEmotion>
{d.isCurrentDay && !checkDiary() ? <AddIcon /> : null}
</DailyEmotion>
<DateNumber>{d.day}</DateNumber>
</DayContainer>
);
Expand Down Expand Up @@ -175,7 +198,6 @@ const DateNumber = styled.div`

const DailyEmotion = styled.div`
background-color: #d9d9d9;
/* background: linear-gradient(to bottom, orange 50%, cyan); */

width: 36px;
height: 36px;
Expand All @@ -186,7 +208,7 @@ const DailyEmotion = styled.div`
align-items: center;
`;

const DayContainer = styled.div`
const DayContainer = styled.div<{ emotionColor?: string }>`
flex-direction: column;
font-size: 0.875rem;
display: flex;
Expand Down Expand Up @@ -218,7 +240,7 @@ const DayContainer = styled.div`
cursor: pointer;

& > ${DailyEmotion} {
background: linear-gradient(red, blue);
background: ${(props) => `linear-gradient(${props.emotionColor})`};
}
}
`;
Expand Down
Loading