Bug fixes, refactor date app bar

esmalleydev · Apr 13, 2024 · f640a13 · f640a13
1 parent 588188c
commit f640a13
Show file tree

Hide file tree

Showing 19 changed files with 321 additions and 389 deletions.
diff --git a/app/cbb/games/page.tsx b/app/cbb/games/page.tsx
@@ -5,7 +5,8 @@ import HelperCBB from '@/components/helpers/CBB';
 
 import ContentsClientWrapper from '@/components/generic/CBB/Games/Contents/ClientWrapper';
 import ContentsServer from '@/components/generic/CBB/Games/Contents/Server';
-import NavBar from '@/components/generic/CBB/Games/NavBar';
+// import NavBar from '@/components/generic/CBB/Games/NavBar';
+import DateAppBar from '@/components/generic/DateAppBar';
 import SubNavBar from '@/components/generic/CBB/Games/SubNavBar';
 import { Suspense } from 'react';
 import Loading from '@/components/generic/CBB/Games/Contents/Loading';
@@ -78,7 +79,8 @@ export default async function Page({ searchParams }) {
 
   return (
     <>
-      <NavBar dates = {dates} date = {date} />
+      {/* <NavBar dates = {dates} date = {date} /> */}
+      <DateAppBar dates = {dates} date = {date} />
       <SubNavBar />
       <ContentsClientWrapper>
         <Suspense fallback = {<Loading />}>

diff --git a/app/cbb/picks/page.tsx b/app/cbb/picks/page.tsx
@@ -6,14 +6,15 @@ import HelperCBB from '@/components/helpers/CBB';
 import StatsClientWrapper from '@/components/generic/CBB/Picks/Stats/ClientWrapper';
 import StatsServer from '@/components/generic/CBB/Picks/Stats/Server';
 import StatsLoading from '@/components/generic/CBB/Picks/Stats/Loading';
-import NavBar from '@/components/generic/CBB/Picks/NavBar';
+// import NavBar from '@/components/generic/CBB/Picks/NavBar';
 import SubNavBar from '@/components/generic/CBB/Picks/SubNavBar';
 import Picks from '@/components/generic/CBB/Picks/Picks';
 import Calculator from '@/components/generic/CBB/Picks/Calculator';
 import PicksLoader from '@/components/generic/CBB/Picks/PicksLoader';
 import ClientWrapper from '@/components/generic/CBB/Picks/ClientWrapper';
 import Dates from '@/components/utils/Dates';
 import { getDates, getGames } from '@/app/cbb/games/page';
+import DateAppBar from '@/components/generic/DateAppBar';
 
 export async function generateMetadata(): Promise<Metadata> {
   return {
@@ -46,7 +47,8 @@ export default async function Page({ searchParams }) {
 
   return (
     <>
-      <NavBar dates = {dates} date = {date} />
+      {/* <NavBar dates = {dates} date = {date} /> */}
+      <DateAppBar dates = {dates} date = {date} />
       <SubNavBar view = {view} />
       <PicksLoader date = {date} />
 

diff --git a/app/layout.tsx b/app/layout.tsx
@@ -8,8 +8,8 @@ import Script from 'next/script'
 import StoreProvider from './StoreProvider';
 import SessionHandler from '@/components/handlers/SessionHandler';
 import FavoriteHandler from '@/components/handlers/FavoriteHandler';
-import SecretWrapper from '@/components/handlers/secret/SecretWrapper';
-import SecretHandler from '@/components/handlers/secret/SecretHandler';
+import SecretWrapper from '@/components/handlers/secret/ClientWrapper';
+import SecretHandler from '@/components/handlers/secret/Server';
 
 // TODO GO THROUGH WHOLE APP, UPDATE THE REDUX REDUCERS TO ONLY GRAB THE SPECIFIC VALUE, TO ELIMINATE UNNESSACARY RENDERS
 // todo handle fetch failures

diff --git a/components/clientAPI.ts b/components/clientAPI.ts
@@ -1,3 +1,4 @@
+'use client';
 
 // this is just for the github build to pass, since the configuration file is git ignored
 type Config = {

diff --git a/components/generic/CBB/Games/NavBar.tsx b/components/generic/CBB/Games/NavBar.tsx
diff --git a/components/generic/CBB/Games/SubNavBar.tsx b/components/generic/CBB/Games/SubNavBar.tsx
@@ -2,7 +2,7 @@
 import React from 'react';
 import { Dimensions, useWindowDimensions } from '@/components/hooks/useWindowDimensions';
 import { useTheme } from '@mui/material';
-import { getBreakPoint } from '@/components/generic/CBB/Games/NavBar';
+import { getBreakPoint } from '@/components/generic/DateAppBar';
 import ConferencePicker from '@/components/generic/CBB/ConferencePicker';
 import AdditionalOptions from '@/components/generic/CBB/Games/AdditionalOptions';
 import StatusPicker from '@/components/generic/CBB/StatusPicker';

diff --git a/components/generic/CBB/Picks/ClientWrapper.tsx b/components/generic/CBB/Picks/ClientWrapper.tsx
@@ -1,6 +1,6 @@
 'use client';
 import React from 'react';
-import { getMarginTop } from './NavBar';
+import { getMarginTop } from '@/components/generic/DateAppBar';
 import { getHeaderHeight } from './SubNavBar';
 import { useAppSelector } from '@/redux/hooks';
 import { useScrollContext } from '@/contexts/scrollContext';

diff --git a/components/generic/CBB/Picks/NavBar.tsx b/components/generic/CBB/Picks/NavBar.tsx
diff --git a/components/generic/CBB/Picks/SubNavBar.tsx b/components/generic/CBB/Picks/SubNavBar.tsx
@@ -2,7 +2,7 @@
 import React, { useState, useTransition } from 'react';
 import { Dimensions, useWindowDimensions } from '@/components/hooks/useWindowDimensions';
 import { Box, Button, Dialog, DialogActions, DialogContent, DialogContentText, DialogTitle, Link, Tab, Tabs, useTheme } from '@mui/material';
-import { getBreakPoint } from '@/components/generic/CBB/Picks/NavBar';
+import { getBreakPoint } from '@/components/generic/DateAppBar';
 // import ConferencePicker from '@/components/generic/CBB/ConferencePicker';
 // import AdditionalOptions from '@/components/generic/CBB/Picks/AdditionalOptions';
 // import StatusPicker from '@/components/generic/CBB/StatusPicker';