- {/* eslint-disable-next-line @typescript-eslint/no-misused-promises */}
+
);
};
+
export default DateBrowser;
diff --git a/src/components/events/EventCard.tsx b/src/components/events/EventCard.tsx
index 1eb41bc5..5452c79d 100644
--- a/src/components/events/EventCard.tsx
+++ b/src/components/events/EventCard.tsx
@@ -1,4 +1,3 @@
-'use server';
import { format, isSameDay } from 'date-fns';
import Image from 'next/image';
import Link from 'next/link';
@@ -6,11 +5,7 @@ import { MoreIcon } from '@src/icons/Icons';
import { type RouterOutputs } from '@src/trpc/shared';
import EventLikeButton from './EventLikeButton';
import { getServerAuthSession } from '@src/server/auth';
-import dynamic from 'next/dynamic';
-
-const EventTimeAlert = dynamic(() => import('./EventTimeAlert'), {
- ssr: false,
-});
+import EventTimeAlert from './EventTimeAlert';
type EventCardProps = {
event: RouterOutputs['event']['findByFilters']['events'][number];
diff --git a/src/server/api/routers/club.ts b/src/server/api/routers/club.ts
index 20b693bd..2dccc77a 100644
--- a/src/server/api/routers/club.ts
+++ b/src/server/api/routers/club.ts
@@ -78,6 +78,10 @@ export const clubRouter = createTRPCRouter({
}
}),
all: publicProcedure.input(allSchema).query(async ({ ctx, input }) => {
+ ctx.headers.set(
+ 'Cache-Control',
+ 'public, s-maxage=300, stale-while-revalidate=59',
+ );
const userID = ctx.session?.user.id;
try {
let query = ctx.db
diff --git a/src/server/auth.ts b/src/server/auth.ts
index 5997249e..617ea613 100644
--- a/src/server/auth.ts
+++ b/src/server/auth.ts
@@ -11,8 +11,8 @@ import { db } from './db';
import { eq } from 'drizzle-orm';
import { type InsertUserMetadata } from './db/models';
import { type UserMetadata } from '@src/models/userMetadata';
-import { pgTable } from 'drizzle-orm/pg-core';
import { userMetadata } from './db/schema/users';
+import { type Adapter } from 'next-auth/adapters';
/**
* Module augmentation for `next-auth` types. Allows us to add custom properties to the `session`
@@ -50,7 +50,7 @@ export interface PreviewUser {
*/
export const authOptions: NextAuthOptions = {
- adapter: DrizzleAdapter(db, pgTable),
+ adapter: DrizzleAdapter(db) as Adapter,
callbacks: {
async session({ session, user }) {
let metadata = await db.query.userMetadata.findFirst({
diff --git a/src/trpc/server.ts b/src/trpc/server.ts
index f95d1214..e38e4b9d 100644
--- a/src/trpc/server.ts
+++ b/src/trpc/server.ts
@@ -1,13 +1,18 @@
-import { headers } from 'next/headers';
-
-import { createCaller } from '@src/server/api/root';
-import { createTRPCContext } from '@src/server/api/trpc';
+import { headers as getHeaders } from 'next/headers';
+import { appRouter } from '@src/server/api/root';
+import { createCallerFactory, createTRPCContext } from '@src/server/api/trpc';
import { cache } from 'react';
+import { createHydrationHelpers } from '@trpc/react-query/rsc';
+import { QueryClient } from '@tanstack/react-query';
-const createContext = cache(() => {
- const heads = new Headers(headers());
+const createContext = cache(async () => {
+ const headers = await getHeaders();
+ const heads = new Headers(headers);
heads.set('x-trpc-source', 'rsc');
return createTRPCContext({ headers: heads });
});
-export const api = createCaller(createContext);
+const caller = createCallerFactory(appRouter)(createContext);
+
+export const { trpc: api, HydrateClient } = createHydrationHelpers
(caller, () => new QueryClient());
+
diff --git a/src/utils/useSyncedSearchParams.ts b/src/utils/useSyncedSearchParams.ts
deleted file mode 100644
index 1ae3c109..00000000
--- a/src/utils/useSyncedSearchParams.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-'use client';
-import { useRouter } from 'next/navigation';
-import { useReducer } from 'react';
-import EncodeParams from './encodeParams';
-
-// not sure about the name, but basically makes updates to searchparams not overwrite themselves
-const useSyncedSearchParams = >(
- searchParams: T,
- route: string,
-) => {
- const router = useRouter();
- const [params, setParams] = useReducer((state: T, action: Partial) => {
- const temp = { ...state, ...action };
- router.push(`${route}?${EncodeParams(temp)}`);
- return temp;
- }, searchParams);
- return [params, setParams] as const;
-};
-export default useSyncedSearchParams;
-
-export type useSyncedSearchParamsDispatch> =
- ReturnType>[1];