- Manage Orgs
+ Manage Clubs
{
+const ClubPage = async ({ params }: { params: { id: string } }) => {
const club = await api.club.getDirectoryInfo({ id: params.id });
if (!club) return
;
@@ -16,15 +16,15 @@ const OrganizationPage = async ({ params }: { params: { id: string } }) => {
-
);
};
-export default OrganizationPage;
+export default ClubPage;
export async function generateMetadata({
params,
diff --git a/src/components/CreateContactSelector.tsx b/src/app/directory/create/CreateContactSelector.tsx
similarity index 99%
rename from src/components/CreateContactSelector.tsx
rename to src/app/directory/create/CreateContactSelector.tsx
index cfd09ed7..2d0735c5 100644
--- a/src/components/CreateContactSelector.tsx
+++ b/src/app/directory/create/CreateContactSelector.tsx
@@ -16,7 +16,7 @@ import {
Website,
Youtube,
type logoProps,
-} from './ContactIcons';
+} from '@src/icons/ContactIcons';
import {
type Control,
type UseFormRegister,
diff --git a/src/components/OfficerSelector.tsx b/src/app/directory/create/OfficerSelector.tsx
similarity index 97%
rename from src/components/OfficerSelector.tsx
rename to src/app/directory/create/OfficerSelector.tsx
index 230828fa..05c07ef5 100644
--- a/src/components/OfficerSelector.tsx
+++ b/src/app/directory/create/OfficerSelector.tsx
@@ -7,7 +7,7 @@ import {
type FieldErrors,
} from 'react-hook-form';
import { type z } from 'zod';
-import { UserSearchBar } from './SearchBar';
+import { UserSearchBar } from '@src/components/searchBar/UserSearchBar';
type OfficerSelectorProps = {
control: Control
>;
diff --git a/src/app/directory/create/createForm.tsx b/src/app/directory/create/createForm.tsx
index b9342196..e9c89543 100644
--- a/src/app/directory/create/createForm.tsx
+++ b/src/app/directory/create/createForm.tsx
@@ -1,8 +1,8 @@
'use client';
/* eslint-disable @typescript-eslint/no-misused-promises */
import { zodResolver } from '@hookform/resolvers/zod';
-import ContactSelector from '@src/components/CreateContactSelector';
-import OfficerSelector from '@src/components/OfficerSelector';
+import ContactSelector from '@src/app/directory/create/CreateContactSelector';
+import OfficerSelector from '@src/app/directory/create/OfficerSelector';
import { api } from '@src/trpc/react';
import { createClubSchema } from '@src/utils/formSchemas';
import { useRouter } from 'next/navigation';
diff --git a/src/app/directory/create/page.tsx b/src/app/directory/create/page.tsx
index da5b2791..819bc121 100644
--- a/src/app/directory/create/page.tsx
+++ b/src/app/directory/create/page.tsx
@@ -1,4 +1,4 @@
-import Header from '@src/components/BaseHeader';
+import Header from '@src/components/header/BaseHeader';
import CreateClubForm from './createForm';
import { getServerAuthSession } from '@src/server/auth';
import { redirect } from 'next/navigation';
diff --git a/src/app/directory/search/ClubSearch.tsx b/src/app/directory/search/ClubSearch.tsx
new file mode 100644
index 00000000..3845275f
--- /dev/null
+++ b/src/app/directory/search/ClubSearch.tsx
@@ -0,0 +1,39 @@
+'use client';
+import { api } from '@src/trpc/react';
+import type { SelectClub as Club } from '@src/server/db/models';
+import { type Session } from 'next-auth';
+import ClubCard from '@src/components/club/ClubCard';
+
+interface ClubSearchComponentProps {
+ userSearch: string;
+ session: Session | null;
+}
+
+export const ClubSearchComponent = ({
+ userSearch,
+ session,
+}: ClubSearchComponentProps) => {
+ const { data } = api.club.byNameNoLimit.useQuery(
+ { name: userSearch },
+ { enabled: !!userSearch },
+ );
+
+ if (!data) {
+ return
;
+ }
+ if (data.length === 0) {
+ return (
+
+ No Search Results Found
+
+ );
+ }
+
+ return (
+
+ {data.map((club: Club) => (
+
+ );
+};
diff --git a/src/app/directory/search/page.tsx b/src/app/directory/search/page.tsx
new file mode 100644
index 00000000..8542f9b8
--- /dev/null
+++ b/src/app/directory/search/page.tsx
@@ -0,0 +1,24 @@
+import Header from '@src/components/header/BaseHeader';
+import { ClubSearchComponent } from './ClubSearch';
+import { getServerAuthSession } from '@src/server/auth';
+
+type Params = {
+ searchParams: { [key: string]: string | undefined };
+};
+
+const clubSearch = async (props: Params) => {
+ const { searchParams } = props;
+ const userSearch = searchParams['search'] || '';
+ const session = await getServerAuthSession();
+
+ return (
+
+
+
+
+
+ );
+};
+
+export default clubSearch;
diff --git a/src/components/RegisterButton.tsx b/src/app/event/[id]/RegisterButton.tsx
similarity index 100%
rename from src/components/RegisterButton.tsx
rename to src/app/event/[id]/RegisterButton.tsx
diff --git a/src/app/event/[id]/page.tsx b/src/app/event/[id]/page.tsx
index 405c6452..9943eb68 100644
--- a/src/app/event/[id]/page.tsx
+++ b/src/app/event/[id]/page.tsx
@@ -1,4 +1,4 @@
-import { EventHeader } from '@src/components/BaseHeader';
+import { EventHeader } from '@src/components/header/BaseHeader';
import { db } from '@src/server/db';
import { and, eq } from 'drizzle-orm';
import { type Metadata } from 'next';
@@ -8,7 +8,7 @@ import Image from 'next/image';
import CountdownTimer from './CountdownTimer';
import Link from 'next/link';
import { getServerAuthSession } from '@src/server/auth';
-import RegisterButton from '@src/components/RegisterButton';
+import RegisterButton from '@src/app/event/[id]/RegisterButton';
type Params = { params: { id: string } };
diff --git a/src/app/events/eventView.tsx b/src/app/events/eventView.tsx
index dfaed368..49493e86 100644
--- a/src/app/events/eventView.tsx
+++ b/src/app/events/eventView.tsx
@@ -1,75 +1,33 @@
-'use server';
-import { GridIcon, ListIcon } from '@src/icons/Icons';
-import EventCard from '@src/components/events/EventCard';
-import EventSidebar from '@src/components/events/EventSidebar';
-import { type RouterOutputs } from '@src/trpc/shared';
-import Link from 'next/link';
+'use client';
+import DateBrowser from '@src/components/events/DateBrowser';
+import { type eventParamsSchema } from '@src/utils/eventFilter';
+import useSyncedSearchParams from '@src/utils/useSyncedSearchParams';
+import { type ReactNode } from 'react';
type Props = {
- events: RouterOutputs['event']['findByFilters']['events'];
- params: Record;
+ children: ReactNode;
+ searchParams: eventParamsSchema;
};
-const EventView = ({ events, params }: Props) => {
- const view = (params?.view ?? 'list') as 'list' | 'grid';
-
+const EventView = ({ children, searchParams }: Props) => {
+ const [params, setParams] = useSyncedSearchParams(searchParams, '/events');
return (
-
-
Events
-
-
-
-
-
List view
-
-
-
-
-
Grid view
-
+
-
-
+
- {events.map((event) => {
- return
diff --git a/src/app/events/page.tsx b/src/app/events/page.tsx
index bb5935e2..79bc45dd 100644
--- a/src/app/events/page.tsx
+++ b/src/app/events/page.tsx
@@ -1,27 +1,10 @@
-import { EventHeader } from '@src/components/BaseHeader';
-import { type filterState } from '@src/components/events/EventSidebar';
+import { EventHeader } from '@src/components/header/BaseHeader';
import { api } from '@src/trpc/server';
-import { type z } from 'zod';
-import { type findByFilterSchema } from '@src/server/api/routers/event';
import EventView from './eventView';
import { type Metadata } from 'next';
+import { eventParamsSchema } from '@src/utils/eventFilter';
+import EventCard from '@src/components/events/EventCard';
-function getStartTime(
- filterState: filterState,
-): z.infer
['startTime'] {
- switch (filterState.filter) {
- case 'Upcoming Events':
- return { type: 'now' };
- case 'Last weeks events':
- return { type: 'distance', options: { days: -7 } };
- case 'Last month events':
- return { type: 'distance', options: { days: -30 } };
- case 'pick':
- return filterState.date
- ? { type: 'range', options: filterState.date }
- : { type: 'now' };
- }
-}
export const metadata: Metadata = {
title: 'Events - Jupiter',
description: 'Get connected on campus.',
@@ -33,48 +16,23 @@ export const metadata: Metadata = {
description: 'Get connected on campus.',
},
};
-type searchPams = Partial<
- Omit & {
- date: string | string[] | undefined;
- clubs: string | string[] | undefined;
- view: 'list' | 'grid' | undefined;
- }
->;
-const Events = async ({ searchParams }: { searchParams: searchPams }) => {
- const filters = {
- filter: searchParams.filter ?? 'Upcoming Events',
- date:
- searchParams.filter === 'pick'
- ? searchParams.date
- ? Array.isArray(searchParams.date)
- ? {
- from: searchParams.date[0]
- ? new Date(Number.parseInt(searchParams.date[0]))
- : undefined,
- to: searchParams.date[1]
- ? new Date(Number.parseInt(searchParams.date[1]))
- : undefined,
- }
- : { from: new Date(Number.parseInt(searchParams.date)) }
- : undefined
- : undefined,
- clubs: searchParams.clubs
- ? Array.isArray(searchParams.clubs)
- ? searchParams.clubs
- : [searchParams.clubs]
- : [],
- order: searchParams.order ?? 'soon',
- types: searchParams.types ?? [],
- };
- const { events } = await api.event.findByFilters({
- startTime: getStartTime(filters),
- club: filters.clubs,
- order: filters.order,
+const Events = async ({
+ searchParams,
+}: {
+ searchParams: (typeof eventParamsSchema)['_input'];
+}) => {
+ const parsed = eventParamsSchema.parse(searchParams);
+ const { events } = await api.event.findByDate({
+ date: parsed.date,
});
return (
+ {events.map((event) => {
+ return
);
};
diff --git a/src/app/feedback/page.tsx b/src/app/feedback/page.tsx
index 38feaa5d..069ed2f9 100644
--- a/src/app/feedback/page.tsx
+++ b/src/app/feedback/page.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import Header from '@src/components/BaseHeader';
+import Header from '@src/components/header/BaseHeader';
import { type Metadata } from 'next';
import Form from '@src/app/feedback/Form';
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 504ac436..52a741a0 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -4,10 +4,10 @@ import { Inter } from 'next/font/google';
import { headers } from 'next/headers';
import { TRPCReactProvider } from '@src/trpc/react';
-import Sidebar from '@src/components/Sidebar';
+import Sidebar from '@src/components/nav/Sidebar';
import { type Metadata } from 'next';
-import { Analytics } from '@vercel/analytics/react';
+import { GoogleAnalytics } from '@next/third-parties/google';
const inter = Inter({
subsets: ['latin'],
@@ -48,7 +48,7 @@ export default function RootLayout({
{children}
-