Merge branch 'develop' into JUP-76-Make-event-time-client-side

.github/workflows/generateCheck.sh

@@ -1,14 +1,14 @@
-if [ $status == 0 ]; then
-	echo "## Formatting Check passed 🥳" >>$GITHUB_STEP_SUMMARY
-	echo "All files are formatted correctly" >>$GITHUB_STEP_SUMMARY
-	exit 0
+if [ $status == 'success' ]; then
+  echo "## Formatting Check passed 🥳" >>$GITHUB_STEP_SUMMARY
+  echo "All files are formatted correctly" >>$GITHUB_STEP_SUMMARY
+  exit 0
 else
-	echo "## Formatting Check Failed 😅" >>$GITHUB_STEP_SUMMARY
-	echo "Please run prettier using \`npx prettier . --write\` in order to format your code" >>$GITHUB_STEP_SUMMARY
-	echo "### Files with bad formatting:" >>$GITHUB_STEP_SUMMARY
-	for file in $files; do
-		echo "- $file" >>$GITHUB_STEP_SUMMARY
-		echo "::error file=$file::$file not formatted correctly"
-	done
-	exit 1
+  echo "## Formatting Check Failed 😅" >>$GITHUB_STEP_SUMMARY
+  echo "Please run prettier using \`npx prettier . --write\` in order to format your code" >>$GITHUB_STEP_SUMMARY
+  echo "### Files with bad formatting:" >>$GITHUB_STEP_SUMMARY
+  for file in $files; do
+    echo "- $file" >>$GITHUB_STEP_SUMMARY
+    echo "::error file=$file::$file not formatted correctly"
+  done
+  exit 1
 fi

.github/workflows/prettierCheck.yml

@@ -11,14 +11,14 @@ jobs:
           node-version: 18
           cache: 'npm'
       - name: Run npm install
-        run: |
-          mv package.json package.json.bak
-          npm i --no-save prettier prettier-plugin-tailwindcss
-          mv package.json.bak package.json
+        run: npm ci
       - name: Run prettier
+        id: prettier
+        continue-on-error: true
         run: |
-          files=`npx prettier . -l` || st=$? && st=$?
-          echo status=`echo $st`>>"$GITHUB_ENV"
-          echo files=`echo $files`>> "$GITHUB_ENV"
+          files=`npx prettier . -l` 
+          echo files=$files >> "$GITHUB_ENV"
       - name: generate errors/summary
         run: .github/workflows/generateCheck.sh
+        env:
+          status: ${{ steps.prettier.outcome }}

.prettierrc.mjs

@@ -0,0 +1,16 @@
+/**
+ * @see https://prettier.io/docs/en/configuration.html
+ * @type {import("prettier").Config}
+ */
+const config = {
+  printWidth: 80,
+  semi: true,
+  singleQuote: true,
+  tabWidth: 2,
+  trailingComma: 'all',
+  useTabs: false,
+  bracketSameLine: false,
+  plugins: ['prettier-plugin-tailwindcss'],
+};
+
+export default config;

src/app/about/page.tsx

@@ -1,4 +1,4 @@
-import Header from '@src/components/BaseHeader';
+import Header from '@src/components/header/BaseHeader';
 import type { Metadata } from 'next';
 
 export const metadata: Metadata = {

src/app/admin/carousel/add/page.tsx

@@ -1,12 +1,12 @@
-import AddOrg from '@src/components/admin/AddOrg';
+import AddClub from '@src/components/admin/AddClub';
 
 export default function Page() {
   return (
     <div className="m-5 md:pl-72">
       <h1 className="text-center text-4xl font-bold text-black">
-        Add Orgs to Carousel
+        Add Clubs to Carousel
       </h1>
-      <AddOrg />
+      <AddClub />
     </div>
   );
 }

src/app/admin/orgs/[id]/page.tsx → src/app/admin/clubs/[id]/page.tsx

@@ -1,5 +1,5 @@
-import ApprovedOrg from '@src/components/admin/ApprovedOrg';
-import OtherOrgStatus from '@src/components/admin/OtherOrgStatus';
+import ApprovedClub from '@src/components/admin/ApprovedClub';
+import OtherClubStatus from '@src/components/admin/OtherClubStatus';
 import { db } from '@src/server/db';
 import { eq } from 'drizzle-orm';
 import { notFound } from 'next/navigation';
@@ -16,9 +16,9 @@ export default async function Page({ params: { id } }: Props) {
     <div className="m-5 h-screen md:pl-72">
       <h1 className="text-center text-4xl font-bold">{org.name}</h1>
       {org.approved === 'approved' ? (
-        <ApprovedOrg org={org} />
+        <ApprovedClub club={org} />
       ) : (
-        <OtherOrgStatus org={org} />
+        <OtherClubStatus club={org} />
       )}
     </div>
   );

src/app/admin/orgs/page.tsx → src/app/admin/clubs/page.tsx

@@ -1,11 +1,11 @@
-import OrgTable from '@src/components/admin/OrgTable';
+import ClubTable from '@src/components/admin/ClubTable';
 import { api } from '@src/trpc/server';
 
 export default async function Page() {
-  const clubs = await api.admin.allOrgs();
+  const clubs = await api.admin.allClubs();
   return (
     <div className="m-5 md:pl-72">
-      <OrgTable clubs={clubs} />
+      <ClubTable clubs={clubs} />
     </div>
   );
 }

src/app/admin/page.tsx

@@ -8,10 +8,10 @@ export default function Page() {
       </h1>
       <div className="flex justify-center gap-x-5 pt-20">
         <Link
-          href="/admin/orgs"
+          href="/admin/clubs"
           className="rounded-md bg-slate-300 px-2 py-1 text-blue-500 transition-colors hover:bg-slate-400 hover:text-blue-600"
         >
-          Manage Orgs
+          Manage Clubs
         </Link>
         <Link
           href="/admin/users"

src/app/auth/page.tsx

@@ -1,4 +1,4 @@
-import ProviderButton from '@src/components/ProviderButtons';
+import ProviderButton from '@src/app/auth/ProviderButtons';
 import { getServerAuthSession } from '@src/server/auth';
 import { getProviders } from 'next-auth/react';
 import { redirect } from 'next/navigation';

src/app/community/page.tsx

@@ -1,4 +1,4 @@
-import Header from '@src/components/BaseHeader';
+import Header from '@src/components/header/BaseHeader';
 import { getServerAuthSession } from '@src/server/auth';
 import { type Metadata } from 'next';
 import Image from 'next/image';

src/app/directory/[id]/page.tsx

@@ -1,30 +1,30 @@
-import Header from '@src/components/BaseHeader';
-import OrgHeader from '@src/components/OrgHeader';
-import OrgInfoSegment from '@src/components/OrgInfoSegment';
-import OrgUpcomingEvents from '@src/components/OrgUpcomingEvents';
+import Header from '@src/components/header/BaseHeader';
+import ClubHeader from '@src/components/club/listing/ClubHeader';
+import ClubInfoSegment from '@src/components/club/listing/ClubInfoSegment';
+import ClubUpcomingEvents from '@src/components/club/listing/ClubUpcomingEvents';
 import { api } from '@src/trpc/server';
 import { db } from '@src/server/db';
 import { eq } from 'drizzle-orm';
 import { type Metadata } from 'next';
 import NotFound from '@src/components/NotFound';
 
-const OrganizationPage = async ({ params }: { params: { id: string } }) => {
+const ClubPage = async ({ params }: { params: { id: string } }) => {
   const club = await api.club.getDirectoryInfo({ id: params.id });
   if (!club) return <NotFound elementType="Club" />;
 
   return (
     <main className="w-full md:pl-72">
       <Header />
       <div className="mb-5 flex flex-col space-y-4 px-3">
-        <OrgHeader club={club} />
-        <OrgInfoSegment club={club} />
-        <OrgUpcomingEvents clubId={club.id} />
+        <ClubHeader club={club} />
+        <ClubInfoSegment club={club} />
+        <ClubUpcomingEvents clubId={club.id} />
       </div>
     </main>
   );
 };
 
-export default OrganizationPage;
+export default ClubPage;
 
 export async function generateMetadata({
   params,

src/components/CreateContactSelector.tsx → 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,

src/components/OfficerSelector.tsx → 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<z.infer<typeof createClubSchema>>;

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';

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';

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 } };
 

src/app/events/page.tsx

@@ -1,4 +1,4 @@
-import { EventHeader } from '@src/components/BaseHeader';
+import { EventHeader } from '@src/components/header/BaseHeader';
 import { api } from '@src/trpc/server';
 import EventView from './eventView';
 import { type Metadata } from 'next';

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';
 

src/app/layout.tsx

@@ -4,7 +4,7 @@ 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';

src/app/manage/[clubId]/(dashboard)/layout.tsx

@@ -1,5 +1,5 @@
-import Header from '@src/components/BaseHeader';
-import BackButton from '@src/components/BlueBackButton';
+import Header from '@src/components/header/BaseHeader';
+import { BlueBackButton } from '@src/components/backButton';
 import { getServerAuthSession } from '@src/server/auth';
 import { api } from '@src/trpc/server';
 import { signInRoute } from '@src/utils/redirect';
@@ -30,7 +30,7 @@ const Layout = async ({
       <Header />
       <main className="px-5">
         <div className="flex w-full flex-row gap-x-4 align-middle">
-          <BackButton />
+          <BlueBackButton />
           <h1 className="bg-gradient-to-br from-blue-primary to-blue-700 bg-clip-text text-2xl font-extrabold text-transparent">
             {club.name}
           </h1>