Revert "Refactored Everything to use supabase_server & client"

This reverts commit 2a5ac8c.

package.json

@@ -23,7 +23,6 @@
     "@mui/material": "^5.14.14",
     "@sentry/nextjs": "^7.74.1",
     "@supabase/supabase-js": "^2.38.4",
-    "@types/jsonwebtoken": "^9.0.4",
     "@types/node": "20.6.3",
     "@types/react": "18.2.22",
     "@types/react-dom": "18.2.7",
@@ -34,7 +33,6 @@
     "date-fns-tz": "^2.0.0",
     "fuse.js": "^6.6.2",
     "ics": "^3.5.0",
-    "jsonwebtoken": "^9.0.2",
     "leaflet": "^1.9.4",
     "negotiator": "^0.6.3",
     "next": "13.5.6",

src/app/[lang]/bus/bus/[busId]/page.tsx

@@ -1,23 +1,26 @@
-'use client';;
+'use client';
 import Fade from '@/components/Animation/Fade';
-import { getVehicleDescription, routes, stops } from '@/const/bus';
+import GreenLineIcon from '@/components/BusIcons/GreenLineIcon';
+import RedLineIcon from '@/components/BusIcons/RedLineIcon';
+import supabase, { BusScheduleDefinition } from '@/config/supabase';
+import { Route, Stop, getVehicleDescription, routes, stops } from '@/const/bus';
 import useDictionary from '@/dictionaries/useDictionary';
 import { useSettings } from '@/hooks/contexts/settings';
-import { Button, Divider, LinearProgress } from '@mui/joy';
-import { format } from 'date-fns';
-import { useMemo } from 'react';
+import { Button, Checkbox, Chip, Divider, LinearProgress } from '@mui/joy';
+import { format, add, formatDistanceStrict } from 'date-fns';
+import { useEffect, useState, useMemo } from 'react';
 import { ChevronLeft, MapPin } from 'react-feather';
 import useSWR from 'swr';
+import NandaLineIcon from '@/components/BusIcons/NandaLineIcon';
 import RouteIcon from '@/components/BusIcons/RouteIcon';
 import useTime from '@/hooks/useTime';
-import useSupabaseClient from '@/config/supabase_client';
 type PageProps = {
     params: { busId: string }
 }
 
 const BusStop = ({ params: { busId } }: PageProps) => {
     const dict = useDictionary();
-    const supabase = useSupabaseClient();
+
     const { language } = useSettings();
     const { data: busSchedule, error, isLoading } = useSWR(['bus_schedule', busId], async ([table, busId]) => {
         const { data: busses, error } = await supabase.from('bus_schedule').select('*').eq('id', busId);

src/app/[lang]/bus/stop/[stopId]/page.tsx

@@ -1,5 +1,6 @@
 'use client';;
 import Fade from '@/components/Animation/Fade';
+import supabase from '@/config/supabase';
 import { ScheduleItem, busDays, getVehicleDescription, routes, stops } from '@/const/bus';
 import useDictionary from '@/dictionaries/useDictionary';
 import { useSettings } from '@/hooks/contexts/settings';
@@ -13,7 +14,6 @@ import useSWR from 'swr'
 import RouteIcon from '@/components/BusIcons/RouteIcon';
 import RoutesFilterChips from './RoutesFilterChips';
 import useTime from '@/hooks/useTime';
-import useSupabaseClient from '@/config/supabase_client';
 import BusDelayAlert from '../../BusDelayAlert';
 import BusDelayReportAlert from './BusDelayReportAlert';
 
@@ -24,8 +24,6 @@ type PageProps = {
 const BusStop = ({ params: { stopId } }: PageProps) => {
     const dict = useDictionary();
     const { language } = useSettings();
-    const supabase = useSupabaseClient();
-
     //update time every 30 seconds
     const date = useTime();
 

src/app/[lang]/cds/page.tsx

@@ -1,8 +1,7 @@
 'use client';
 import NTHUBirdIcon from "@/components/NTHUBirdIcon"
 import CourseSearchbar from "@/components/Timetable/CourseSearchbar";
-import Timetable from "@/components/Timetable/Timetable";
-import getSupabaseServer from "@/config/supabase_server";
+import supabase from "@/config/supabase";
 import { Alert, Button, CircularProgress, DialogActions, DialogContent, Divider, Modal, ModalClose, ModalDialog } from "@mui/joy"
 import { signIn, useSession } from "next-auth/react"
 import { FC, useState } from "react"

src/app/[lang]/courses/[courseId]/page.tsx

@@ -1,4 +1,5 @@
 import Fade from "@/components/Animation/Fade";
+import supabase from "@/config/supabase";
 import { getDictionary } from "@/dictionaries/dictionaries";
 import {getCourse, getCoursePTTReview} from '@/lib/course';
 import { LangProps } from "@/types/pages";

src/app/[lang]/courses/page.tsx

@@ -1,6 +1,7 @@
 'use client';;
 import CourseListItem from "@/components/Courses/CourseListItem";
 import InputControl from "@/components/FormComponents/InputControl";
+import supabase, { CourseDefinition } from "@/config/supabase";
 import { Button, CircularProgress, Divider, Drawer, IconButton, LinearProgress, Stack } from "@mui/joy";
 import { NextPage } from "next";
 import { useEffect, useState, Fragment, useRef, use, useMemo } from "react";
@@ -15,8 +16,6 @@ import { useRouter, useSearchParams } from "next/navigation";
 import queryString from 'query-string';
 import { GETargetCodes } from "@/const/ge_target";
 import { departments } from "@/const/departments";
-import useSupabaseClient from '@/config/supabase_client';
-import { CourseDefinition } from "@/config/supabase.types";
 import useUserTimetable from "@/hooks/useUserTimetable";
 
 const emptyFilters: RefineControlFormTypes = {
@@ -37,7 +36,6 @@ const emptyFilters: RefineControlFormTypes = {
 
 const CoursePage: NextPage = () => {
     const dict = useDictionary();
-    const supabase = useSupabaseClient();
     const [courses, setCourses] = useState<CourseDefinition[]>([]);
     const [loading, setLoading] = useState<boolean>(true);
     const [totalCount, setTotalCount] = useState<number>(0);

src/app/[lang]/timetable/calendar.ics/route.tsx

@@ -1,15 +1,13 @@
+import supabase from "@/config/supabase";
 import { scheduleTimeSlots } from "@/const/timetable";
 import { createTimetableFromCourses } from "@/helpers/timetable";
-import { getHours, getMinutes, parse } from "date-fns";
+import { differenceInMinutes, getHours, getMinutes, parse } from "date-fns";
 import * as ics from 'ics';
 import { NextResponse } from "next/server";
 import { zonedTimeToUtc } from 'date-fns-tz'
-import getSupabaseServer from "@/config/supabase_server";
 
 export async function GET(request: Request) {
     const { searchParams } = new URL(request.url)
-
-    const supabase = await getSupabaseServer();
     const courses_ids = searchParams.get('semester_1121')?.split(',')!;
     const theme = searchParams.get('theme') || 'tsinghuarian';
 

src/app/[lang]/timetable/view/page.tsx

@@ -3,15 +3,14 @@ import Timetable from "@/components/Timetable/Timetable";
 import { NextPage } from "next";
 import { useRouter } from "next/navigation";
 import { useSearchParams } from 'next/navigation'
+import supabase from "@/config/supabase";
 import useSWR from "swr";
 import { createTimetableFromCourses, timetableColors } from "@/helpers/timetable";
-import useSupabaseClient from '@/config/supabase_client';
 import { useSettings } from "@/hooks/contexts/settings";
 
 const ViewTimetablePage: NextPage = () => {
     const router = useRouter();
     const searchParams = useSearchParams();
-    const supabase = useSupabaseClient();
     const courseCodes = searchParams.get('semester_1121')?.split(',');
     const { timetableTheme } = useSettings();
 

src/app/[lang]/venues/[locationId]/page.tsx

@@ -1,16 +1,15 @@
+import supabase from '@/config/supabase'
 import NTHUMap from '@/components/Venue/NTHUMap'
 import {createTimetableFromCourses} from '@/helpers/timetable';
 import Timetable from '@/components/Timetable/Timetable';
 import { Suspense } from 'react';
-import getSupabaseServer from '@/config/supabase_server';
 type Props = {
     params: {
         locationId: string;
     }
 }
 
 const getCoursesWithVenue = async (venueId: string) => {
-    const supabase = await getSupabaseServer();
     const { data, error } = await supabase.from('courses').select('*').containedBy('venues', [venueId]);
     if (error) throw error;
     else return data;

src/app/api/auth/[...nextauth]/route.ts

@@ -1,6 +1,5 @@
 import NextAuth from "next-auth"
 import { SupabaseAdapter } from "@auth/supabase-adapter"
-import jwt from "jsonwebtoken"
 
 const handler = NextAuth({
     providers: [
@@ -32,22 +31,8 @@ const handler = NextAuth({
       url: process.env.NEXT_PUBLIC_SUPABASE_URL!,
       secret: process.env.SUPABASE_SERVICE_ROLE_KEY!,
     }),
-    callbacks: {
-      async session({ session, user }) {
-        const signingSecret = process.env.SUPABASE_JWT_SECRET
-        if (signingSecret) {
-          const payload = {
-            aud: "authenticated",
-            exp: Math.floor(new Date(session.expires).getTime() / 1000),
-            sub: user.id,
-            email: user.email,
-            role: "authenticated",
-          }
-          session.supabaseAccessToken = jwt.sign(payload, signingSecret)
-        }
-        return session
-      },
-    }
+
+
 })
 
 export { handler as GET, handler as POST }

src/components/Courses/CourseListItem.tsx

@@ -1,4 +1,4 @@
-import { CourseDefinition } from '@/config/supabase.types';
+import { CourseDefinition } from '@/config/supabase';
 import useDictionary from '@/dictionaries/useDictionary';
 import { useSettings } from '@/hooks/contexts/settings';
 import { Button, Chip, Tooltip } from '@mui/joy';