diff --git a/src/pages/dashboard/dashboard.tsx b/src/pages/dashboard/dashboard.tsx index 6e89161..8ff7a96 100644 --- a/src/pages/dashboard/dashboard.tsx +++ b/src/pages/dashboard/dashboard.tsx @@ -11,8 +11,8 @@ export default function Page() { HANSPACE: 대시보드 - {/* */} - + + {/* */} ); } diff --git a/src/sections/auth/jwt/jwt-login-view.tsx b/src/sections/auth/jwt/jwt-login-view.tsx index 3e4e782..a4eb5ad 100644 --- a/src/sections/auth/jwt/jwt-login-view.tsx +++ b/src/sections/auth/jwt/jwt-login-view.tsx @@ -46,7 +46,7 @@ export default function JwtLoginView() { const defaultValues = { name: '최혜림', - email: '22000770@handong.ac.kr', + email: 'HyelimChoi@handong.ac.kr', // password: 'demo1234', }; @@ -131,7 +131,7 @@ export default function JwtLoginView() { {renderHead} - Use name : 최혜림 / email : 22000770@handong.ac.kr + Use name : 최혜림 / email : HyelimChoi@handong.ac.kr {renderForm} diff --git a/src/sections/dashboard/admin-view.tsx b/src/sections/dashboard/admin-view.tsx index 169c79d..a1efbb1 100644 --- a/src/sections/dashboard/admin-view.tsx +++ b/src/sections/dashboard/admin-view.tsx @@ -21,6 +21,7 @@ import { Link } from 'react-router-dom'; import { paths } from 'src/routes/paths'; import styled from 'styled-components'; import AnalyticsWidgetSummary from './analytics-widget-summary'; +import { UserCalendarView } from './calendar/view'; // import AdminCalendarView from './calendar/view/admin-calendar-view'; // ---------------------------------------------------------------------- @@ -101,6 +102,7 @@ export default function AdminDashboardView() { {/* 2번째 */} + {/* */} diff --git a/src/sections/home/dept-card.tsx b/src/sections/home/dept-card.tsx index 95adea6..d6cf446 100644 --- a/src/sections/home/dept-card.tsx +++ b/src/sections/home/dept-card.tsx @@ -56,8 +56,8 @@ export default function DeptCard({ deptInfo, onAccess, onPending }: Props) { > {deptInfo.image} diff --git a/src/sections/home/dept-list.tsx b/src/sections/home/dept-list.tsx index 86b888d..f5e7587 100644 --- a/src/sections/home/dept-list.tsx +++ b/src/sections/home/dept-list.tsx @@ -8,138 +8,138 @@ import DeptCard from './dept-card'; import AccessedDialog from './success-modal-accessed'; import PendingDialog from './success-modal-pending'; -const deptlist: IDeptInfo[] = [ - { - deptId: 1, - deptName: '전산전자공학부', - memberCount: 123, - spaceCount: 15, - userAccept: true, - image: 'https://www.snunews.com/news/photo/201809/18599_11268_2922.jpg', - deptMemberResponse: [], - }, - { - deptId: 2, - deptName: '상담심리사회복지', - memberCount: 75, - spaceCount: 8, - userAccept: true, - image: 'https://map.snu.ac.kr/api/upload/spot/84a71dc3-9891-4e67-8f8a-b1b0cf9bfe9c.jpg', - deptMemberResponse: [ - { - deptMemberId: 9, - deptRole: 'User', - approve: '승인', - }, - ], - }, - { - deptId: 3, - deptName: '생명과학부', - memberCount: 60, - spaceCount: 10, - userAccept: false, - image: - 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRyelkwHA6AFR2bCzp06Ceauo4YQ7nfA1XP30gGZkEffQ8ZP3-WcxygRO2PccgIfET6rXU&usqp=CAU', - deptMemberResponse: [], - }, - { - deptId: 4, - deptName: 'ICT창업학부', - memberCount: 100, - image: - 'https://wimg.mk.co.kr/news/cms/202212/14/news-p.v1.20221213.88bc4288ad01428c9f29203f20cba568_P1.jpg', - spaceCount: 12, - userAccept: true, - deptMemberResponse: [ - { - deptMemberId: 9, - deptRole: 'Admin', - approve: '승인', - }, - ], - }, - { - deptId: 5, - deptName: '공간환경시스템디자인학부', - memberCount: 45, - image: - 'https://search.pstatic.net/common/?src=http%3A%2F%2Fblogfiles.naver.net%2FMjAxOTAzMjlfNjYg%2FMDAxNTUzODM4MTg1MDEy.h7Vx5F3Fj8OsCpWnhZv9jI_54LFCFr-5k5jmuvfQkmgg.-2_GcmAI44-hRnKN_pawJH9ocytF4-ecMiqgLuK8dYcg.JPEG.su_mini214%2Foutput_2725856160.jpg&type=sc960_832', - spaceCount: 5, - userAccept: false, - deptMemberResponse: [], - }, - { - deptId: 6, - deptName: '경영경제학부', - memberCount: 50, - image: 'https://cdn.crowdpic.net/detail-thumb/thumb_d_8B8E1C3B87961CEAC3D6AA8BA5AD7D4C.jpg', - spaceCount: 7, - userAccept: true, - deptMemberResponse: [ - { - deptMemberId: 9, - deptRole: 'Admin', - approve: '승인', - }, - ], - }, - { - deptId: 7, - deptName: '기계제어공학부', - memberCount: 40, - image: - 'https://search.pstatic.net/common/?src=http%3A%2F%2Fblogfiles.naver.net%2F20160725_172%2Fhyun_a_99_1469449498743J8Gp0_JPEG%2F20160528_165238_%25281%2529.jpg&type=sc960_832', - spaceCount: 6, - userAccept: true, - deptMemberResponse: [ - { - deptMemberId: 9, - deptRole: 'User', - approve: '승인대기', - }, - ], - }, - { - deptId: 8, - deptName: '법학부', - memberCount: 85, - image: 'https://www.osan.ac.kr/usr/images/buildings/8_1.png', - spaceCount: 9, - userAccept: true, - deptMemberResponse: [ - { - deptMemberId: 9, - deptRole: 'User', - approve: '승인대기', - }, - ], - }, - { - deptId: 9, - deptName: '심리학 프로이드 강당', - memberCount: 110, - image: 'https://source.unsplash.com/random', - spaceCount: 11, - userAccept: true, - deptMemberResponse: [ - { - deptMemberId: 9, - deptRole: 'Admin', - approve: '승인', - }, - ], - }, - { - deptId: 10, - deptName: '경제 아담스미스 스튜디오', - memberCount: 95, - image: 'https://source.unsplash.com/random', - spaceCount: 14, - deptMemberResponse: [], - userAccept: true, - }, -]; +// const deptlist: IDeptInfo[] = [ +// { +// deptId: 1, +// deptName: '전산전자공학부', +// memberCount: 123, +// spaceCount: 15, +// userAccept: true, +// image: 'https://www.snunews.com/news/photo/201809/18599_11268_2922.jpg', +// deptMemberResponse: [], +// }, +// { +// deptId: 2, +// deptName: '상담심리사회복지', +// memberCount: 75, +// spaceCount: 8, +// userAccept: true, +// image: 'https://map.snu.ac.kr/api/upload/spot/84a71dc3-9891-4e67-8f8a-b1b0cf9bfe9c.jpg', +// deptMemberResponse: [ +// { +// deptMemberId: 9, +// deptRole: 'User', +// approve: '승인', +// }, +// ], +// }, +// { +// deptId: 3, +// deptName: '생명과학부', +// memberCount: 60, +// spaceCount: 10, +// userAccept: false, +// image: +// 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRyelkwHA6AFR2bCzp06Ceauo4YQ7nfA1XP30gGZkEffQ8ZP3-WcxygRO2PccgIfET6rXU&usqp=CAU', +// deptMemberResponse: [], +// }, +// { +// deptId: 4, +// deptName: 'ICT창업학부', +// memberCount: 100, +// image: +// 'https://wimg.mk.co.kr/news/cms/202212/14/news-p.v1.20221213.88bc4288ad01428c9f29203f20cba568_P1.jpg', +// spaceCount: 12, +// userAccept: true, +// deptMemberResponse: [ +// { +// deptMemberId: 9, +// deptRole: 'Admin', +// approve: '승인', +// }, +// ], +// }, +// { +// deptId: 5, +// deptName: '공간환경시스템디자인학부', +// memberCount: 45, +// image: +// 'https://search.pstatic.net/common/?src=http%3A%2F%2Fblogfiles.naver.net%2FMjAxOTAzMjlfNjYg%2FMDAxNTUzODM4MTg1MDEy.h7Vx5F3Fj8OsCpWnhZv9jI_54LFCFr-5k5jmuvfQkmgg.-2_GcmAI44-hRnKN_pawJH9ocytF4-ecMiqgLuK8dYcg.JPEG.su_mini214%2Foutput_2725856160.jpg&type=sc960_832', +// spaceCount: 5, +// userAccept: false, +// deptMemberResponse: [], +// }, +// { +// deptId: 6, +// deptName: '경영경제학부', +// memberCount: 50, +// image: 'https://cdn.crowdpic.net/detail-thumb/thumb_d_8B8E1C3B87961CEAC3D6AA8BA5AD7D4C.jpg', +// spaceCount: 7, +// userAccept: true, +// deptMemberResponse: [ +// { +// deptMemberId: 9, +// deptRole: 'Admin', +// approve: '승인', +// }, +// ], +// }, +// { +// deptId: 7, +// deptName: '기계제어공학부', +// memberCount: 40, +// image: +// 'https://search.pstatic.net/common/?src=http%3A%2F%2Fblogfiles.naver.net%2F20160725_172%2Fhyun_a_99_1469449498743J8Gp0_JPEG%2F20160528_165238_%25281%2529.jpg&type=sc960_832', +// spaceCount: 6, +// userAccept: true, +// deptMemberResponse: [ +// { +// deptMemberId: 9, +// deptRole: 'User', +// approve: '승인대기', +// }, +// ], +// }, +// { +// deptId: 8, +// deptName: '법학부', +// memberCount: 85, +// image: 'https://www.osan.ac.kr/usr/images/buildings/8_1.png', +// spaceCount: 9, +// userAccept: true, +// deptMemberResponse: [ +// { +// deptMemberId: 9, +// deptRole: 'User', +// approve: '승인대기', +// }, +// ], +// }, +// { +// deptId: 9, +// deptName: '심리학 프로이드 강당', +// memberCount: 110, +// image: 'https://source.unsplash.com/random', +// spaceCount: 11, +// userAccept: true, +// deptMemberResponse: [ +// { +// deptMemberId: 9, +// deptRole: 'Admin', +// approve: '승인', +// }, +// ], +// }, +// { +// deptId: 10, +// deptName: '경제 아담스미스 스튜디오', +// memberCount: 95, +// image: 'https://source.unsplash.com/random', +// spaceCount: 14, +// deptMemberResponse: [], +// userAccept: true, +// }, +// ]; export default function DeptList({ deptList }: { deptList: IDeptInfo[] | null }) { const [currentDept, setCurrentDept] = useState(null); diff --git a/src/types/dept.ts b/src/types/dept.ts index 701beba..38e3bd6 100644 --- a/src/types/dept.ts +++ b/src/types/dept.ts @@ -9,7 +9,7 @@ export type IDeptInfo = { // siteName: string; deptName: string | null; // logo: string | null; - image: string; + deptImage: string; userAccept: boolean; // maxRserveCount: number | null; // link: string | null;