diff --git a/src/apis/personalScheduleApi.ts b/src/apis/personalScheduleApi.ts index dab3429..02ba878 100644 --- a/src/apis/personalScheduleApi.ts +++ b/src/apis/personalScheduleApi.ts @@ -2,7 +2,14 @@ import supabase from '@/supabase'; import { Events } from '@/utils/index'; export const getPersonalSchedule = async () => { - const { data, error } = await supabase.from('personal_schedules').select(); + const { data: userData, error: userError } = await supabase.auth.getUser(); + + if (userError) { + throw userError; + } + + const { data, error } = await supabase.from('personal_schedules').select('*').eq('user_id', userData.user.id); + if (error) { throw error; } diff --git a/src/main.tsx b/src/main.tsx index 5206aa5..a54c5bd 100644 --- a/src/main.tsx +++ b/src/main.tsx @@ -1,28 +1,24 @@ import ReactDOM from 'react-dom/client'; import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; import './styles/index.css'; -import App from './App.tsx'; -import TextInputForm from './pages/InputFormTest.tsx'; import { createBrowserRouter, RouterProvider } from 'react-router-dom'; import ChangePasswordPage from './pages/ChangePasswordPage.tsx'; -import { JoinPage, LoginPage, ResetPwPage, NotFound, Policy } from './pages/index.ts'; +import { JoinPage, LoginPage, NotFound, Policy, ResetPwPage } from './pages/index.ts'; import ProtectedRoute from './providers/ProtectedRoute.tsx'; import EditGroupSchedule from './pages/EditGroupSchedulePage.tsx'; import AddGroupSchedulePage from './pages/AddGroupSchedulePage.tsx'; import GroupSchedulePage from './pages/GroupSchedulePage.tsx'; import ProfilePage from './pages/ProfilePage.tsx'; +import App from '@/App.tsx'; const router = createBrowserRouter([ { path: '/', + element: , children: [ { index: true, - element: ( - - - - ), + element: , }, { path: '/group/:groupId/edit/:scheduleId', @@ -37,50 +33,42 @@ const router = createBrowserRouter([ element: , }, { - path: '/login', - element: , - }, - { - path: '/join', - element: , - }, - { - path: '/editPw', - element: , - }, - { - path: '/change-password', - element: , - }, - { - path: '*', - element: , - }, - { - path: '/test', - children: [ - { - path: 'inputForm', - element: , - }, - ], + path: '/profile', + element: , }, + ], + }, + { + path: '/login', + element: , + }, + { + path: '/join', + element: , + }, + { + path: '/editPw', + element: , + }, + { + path: '/change-password', + element: , + }, + { + path: '*', + element: , + }, + + { + path: '/policy', + children: [ { - path: '/policy', - children: [ - { - path: 'personalInfo', - element: , - }, - { - path: 'usecondition', - element: , - }, - ], + path: 'personalInfo', + element: , }, { - path: '/profile', - element: , + path: 'usecondition', + element: , }, ], }, diff --git a/src/pages/MyCalendarPage.tsx b/src/pages/MyCalendarPage.tsx index 9a85d5c..cc3091c 100644 --- a/src/pages/MyCalendarPage.tsx +++ b/src/pages/MyCalendarPage.tsx @@ -2,7 +2,7 @@ import AppBar from '@/components/common/AppBar.tsx'; import Calendar from '../components/common/Calendar.tsx'; import CreateEventDialog from '@/components/MyCalendar/CreateEventButton.tsx'; import HamburgerButton from '@/components/common/SideBar/HamburgerButton.tsx'; -import { getPersonalSchedule, deletePersonalSchedule } from '@/apis/personalScheduleApi'; +import { deletePersonalSchedule, getPersonalSchedule } from '@/apis/personalScheduleApi'; import { useEventState } from '@/stores/myEventsStore'; import { useEffect, useRef } from 'react'; import Dialog from '@/components/common/Dialog.tsx'; @@ -15,6 +15,8 @@ interface DialogElement { const MyCalendarPage: React.FC = () => { const { db_events, addDBEvents } = useEventState(); + console.log('dv_events : ', db_events); + useEffect(() => { getPersonalSchedule().then((schedule) => { schedule.map((x) => { @@ -45,7 +47,7 @@ const MyCalendarPage: React.FC = () => { return (
} calendarName="내 캘린더" /> -
+
diff --git a/src/providers/ProtectedRoute.tsx b/src/providers/ProtectedRoute.tsx index 179f5f6..5fbf3a6 100644 --- a/src/providers/ProtectedRoute.tsx +++ b/src/providers/ProtectedRoute.tsx @@ -1,13 +1,8 @@ import { Loading } from '@/pages'; import { useGetSession } from '@/react-queries/useGetSession'; -import { FC, ReactNode } from 'react'; -import { useNavigate } from 'react-router-dom'; +import { Outlet, useNavigate } from 'react-router-dom'; -interface Props { - children: ReactNode; -} - -const ProtectedRoute: FC = ({ children }) => { +const ProtectedRoute = () => { const { data, isError, error, isLoading } = useGetSession(); const navigate = useNavigate(); @@ -23,7 +18,7 @@ const ProtectedRoute: FC = ({ children }) => { navigate('/login'); } - return children; + return ; }; export default ProtectedRoute; diff --git a/src/styles/index.css b/src/styles/index.css index b469415..2328e6c 100644 --- a/src/styles/index.css +++ b/src/styles/index.css @@ -70,7 +70,7 @@ button { position: absolute; width: 100%; height: 100%; - background-color: #bec00038; + background-color: rgba(215, 217, 39, 0.22); top: 0; left: 0; } @@ -78,7 +78,7 @@ button { } @media (min-width: 1024px) { - main { + .main-padding-right { padding-right: 25vw; } .eventCardList {