Skip to content

Commit 6d70ee1

Browse files
phyuna0525phyuna0525
committed
Merge branch 'develop'
2 parents af0571d + 2845362 commit 6d70ee1

File tree

7 files changed

+35
-22
lines changed

7 files changed

+35
-22
lines changed

‎index.html‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,14 @@
66
<link rel="icon" type="image/svg+xml" href="/public/favicon.ico" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
88
<meta name="google-site-verification" content="f6SW0E7W4CHxa4q1JnrkwHbANIxV2jf0oNE7fGVHZn4" />
9-
<title>Pick</title>
9+
<meta name="title" content="PiCK" />
10+
<meta name="description" content="대덕SW마이스터고등학교 온라인 출결관리 서비스 PiCK입니다🤗" />
11+
<meta name="keywords" content="pick, PiCK, PICK, dsm, DSM, attendance" />
12+
<meta name="publisher" content="DSM PiCK" />
13+
<meta name="og:description" content="대덕SW마이스터고등학교 온라인 출결관리 서비스 PiCK입니다🤗" />
14+
<meta name="og:keywords" content="pick, PiCK, PICK, dsm, DSM, attendance" />
15+
<meta name="og:title" content="PiCK" />
16+
<meta name="og:type" content="website" />
1017
</head>
1118

1219
<body>

‎src/apis/weekend-meals/type.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export interface GetAllMealsType {
22
id: string;
33
user_name: string;
4-
status: 'OK' | 'NO' | 'QUIET';
4+
status: 'OK' | 'NO';
55
grade: number;
66
class_num: number;
77
num: number;

‎src/components/calendar/style.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ export const ScheduleContent = styled.div`
115115
align-items: center;
116116
`;
117117

118-
export const ScheduleList = styled.p`
118+
export const ScheduleList = styled.div`
119119
font-size: ${theme.font.heading[4].size};
120120
color: ${theme.color.normal.black};
121121
display: flex;

‎src/components/list/weekendMeal.tsx‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import MealDrop from '../dropdown/mealStatus';
55
interface ListProp {
66
number: string;
77
name: string;
8-
status: 'OK' | 'NO' | 'QUIET';
8+
status: 'OK' | 'NO';
99
id: string;
1010
grade: boolean;
1111
}
@@ -21,16 +21,15 @@ const WeekEndList = ({ number, name, status, id, grade }: ListProp) => {
2121
return '미신청';
2222
case 'OK':
2323
return '신청';
24-
case 'QUIET':
25-
return '미응답';
2624
}
2725
};
2826
return (
2927
<ContentWrap type={grade}>
3028
<Title>{number}</Title>
3129
<Title>{name}</Title>
32-
{status !== 'QUIET' && <Option status={status}>{StatusChange()}</Option>}
33-
{status === 'QUIET' && <MealDrop id={id} />}
30+
<OptionWrap>
31+
<Option status={status}>{StatusChange()}</Option>
32+
</OptionWrap>
3433
</ContentWrap>
3534
);
3635
};
@@ -50,9 +49,16 @@ const Title = styled.p`
5049
`;
5150

5251
const Option = styled.div<BadgeProps>`
52+
text-align: center;
5353
background-color: ${({ status, theme }) =>
5454
status === 'OK' ? theme.color.main[500] : theme.color.main[300]};
5555
padding: 8px 20px;
5656
border-radius: 12px;
5757
color: ${theme.color.normal.white};
5858
`;
59+
60+
const OptionWrap = styled.div`
61+
width: 82px;
62+
display:flex;
63+
justify-content: end;
64+
`

‎src/pages/notice/detail/index.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ const NoticeDetail = () => {
5555
onSuccess: () => {
5656
setEdit(false);
5757
showToast({
58-
type: 'error',
58+
type: 'success',
5959
message: '공지 수정에 성공하였습니다',
6060
});
6161
ReGetDetailNotice();
@@ -138,7 +138,7 @@ const NoticeDetail = () => {
138138
)}
139139
{deleteNotice && (
140140
<Modal
141-
refetchStatus={() => {}}
141+
refetchStatus={() => { }}
142142
title="이 공지를 삭제하시겠습니까?"
143143
subTitle="삭제 시에는 복구 시킬 수 없습니다."
144144
onCancel={() => setDeleteNotice(false)}

‎src/pages/notice/write/index.tsx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { useState } from 'react';
99
import { UploadNotice } from '@/apis/notice';
1010
import { Textarea } from '@/components/input/textarea';
1111
import { showToast } from '@/components/toast';
12+
import { Button } from '@/components/Button';
1213

1314
const NoticeWrite = () => {
1415
const router = useNavigate();
@@ -88,13 +89,12 @@ const NoticeWrite = () => {
8889
onChange={handleChange}
8990
/>
9091
</Layout>
91-
<BottomButtonWrap
92-
firstContent="공지작성"
93-
disabled={disabled}
94-
firstOnclick={Upload}
95-
firstSize="standard"
96-
firstType="main"
97-
/>
92+
<BottomButtonWrap>
93+
<Button onClick={Upload} disabled={disabled} type="main" size="standard">
94+
공지 등록
95+
</Button>
96+
</BottomButtonWrap>
97+
9898
</>
9999
);
100100
};

‎src/pages/outList/index.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ const OutList = () => {
5959
}, [currentMenu]);
6060

6161
useEffect(() => {
62-
refetchOutList();
6362
resetSelection();
6463
}, [selectedFloor]);
6564

@@ -87,10 +86,10 @@ const OutList = () => {
8786
<S.OutListContainer>
8887
{currentMenu === 'application' ? (
8988
OutListFloorData?.length ? (
90-
OutListFloorData?.map((item, index) => (
89+
OutListFloorData?.map((item) => (
9190
<OutAcceptList
9291
type={`${currentMenu}List`}
93-
key={index}
92+
key={item.id}
9493
name={getStudentString(item)}
9594
content={item.reason}
9695
date={`${item.start.slice(0, 5)} ~ ${item.end.slice(0, 5)}`}
@@ -103,9 +102,10 @@ const OutList = () => {
103102
)
104103
) : earlyreturnListData?.length ? (
105104
earlyreturnListData?.map((item) => (
106-
<OutAcceptList
105+
106+
< OutAcceptList
107107
type={`${currentMenu}List`}
108-
key={item.class_num}
108+
key={item.id}
109109
name={getStudentString(item)}
110110
content={item.reason}
111111
date={item.start.slice(0, 5)}

0 commit comments

Comments
 (0)