From c9168a1be033a24cbda0a8821295e25217185010 Mon Sep 17 00:00:00 2001 From: bigalex2k Date: Mon, 15 Jul 2024 23:53:40 -0600 Subject: [PATCH] OMG Transitions finally work --- package-lock.json | 2 +- package.json | 2 +- src/App.css | 2 ++ src/pages/FullPageCalendar.tsx | 3 ++- src/pages/Notes.tsx | 5 ++++- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6af028a..0c8e688 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@fontsource/roboto": "^5.0.13", "@fullcalendar/daygrid": "^6.1.14", "@fullcalendar/interaction": "^6.1.14", - "@fullcalendar/react": "^6.1.14", + "@fullcalendar/react": "^6.1.15", "@fullcalendar/timegrid": "^6.1.14", "@mui/icons-material": "^5.16.1", "@mui/material": "^5.16.1", diff --git a/package.json b/package.json index 047215b..76cc13d 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "@fontsource/roboto": "^5.0.13", "@fullcalendar/daygrid": "^6.1.14", "@fullcalendar/interaction": "^6.1.14", - "@fullcalendar/react": "^6.1.14", + "@fullcalendar/react": "^6.1.15", "@fullcalendar/timegrid": "^6.1.14", "@mui/icons-material": "^5.16.1", "@mui/material": "^5.16.1", diff --git a/src/App.css b/src/App.css index 7405945..b9d6adb 100644 --- a/src/App.css +++ b/src/App.css @@ -30,6 +30,7 @@ a:link, a:visited, a { height: 100vh; background: #b2dbd7; transform-origin: bottom; + z-index: 5; } .slide-out { @@ -40,4 +41,5 @@ a:link, a:visited, a { height: 100vh; background: #b2dbd7; transform-origin: top; + z-index: 5; } diff --git a/src/pages/FullPageCalendar.tsx b/src/pages/FullPageCalendar.tsx index f217377..7f1e4f3 100644 --- a/src/pages/FullPageCalendar.tsx +++ b/src/pages/FullPageCalendar.tsx @@ -16,6 +16,7 @@ import timeGridPlugin from '@fullcalendar/timegrid'; import interactionPlugin from '@fullcalendar/interaction'; import './FullCalendarCustom.css'; // Import the custom CSS import NavBar from '../Components/NavBar'; // Ensure the import path is correct +import transition from '../transiton'; interface Event { id: string; @@ -175,4 +176,4 @@ const FullPageCalendar: React.FC = () => { ); }; -export default FullPageCalendar; +export default transition(FullPageCalendar); diff --git a/src/pages/Notes.tsx b/src/pages/Notes.tsx index 1a413bc..ec211b3 100644 --- a/src/pages/Notes.tsx +++ b/src/pages/Notes.tsx @@ -1,7 +1,8 @@ import Background from "../Components/Background" import NavBar from "../Components/NavBar" +import transition from "../transiton" -export default function Notes() { +function Notes() { return (
@@ -9,3 +10,5 @@ export default function Notes() {
) } + +export default transition(Notes) \ No newline at end of file