Merge pull request #423 from LetsGetTechnical/develop

Release 5/19/25

Author: shashilo

.eslintignore

@@ -4,7 +4,6 @@
 **/*.test.tsx
 **/*.test.js
 **/*.test.jsx
-app/api/gift-exchanges/route.ts
 app/api/gift-exchanges/\[id\]/draw/route.ts
 app/api/gift-exchanges/\[id\]/giftSuggestions/route.ts
 app/api/gift-exchanges/\[id\]/members/route.ts
@@ -37,9 +36,7 @@ components/Avatar/AvatarBody.tsx
 components/Button/button.tsx
 components/Calendar/calendar.tsx
 components/GiftDetailsView/GiftDetailsView.tsx
-components/GiftExchangeHeader/GiftExchangeHeader.tsx
 components/GiftSuggestionCard/GiftSuggestionCard.tsx
-components/GlobalGiftSpinner/GlobalGiftSpinner.tsx
 components/GlobalHeader/GlobalHeader.tsx
 components/GroupCard/GroupCard.tsx
 components/ImageSelector/ImageSelector.tsx
@@ -61,11 +58,9 @@ components/SnowOverlayToggle/SnowOverlayToggle.tsx
 components/SnowOverlayWrapper/react-snow-overlay.d.ts
 lib/drawGiftExchange.ts
 lib/generateAndStoreSuggestion.ts
-lib/generateAndUpdateNewGiftSuggestion.ts
 lib/getAmazonImage.ts
 lib/getUserAvatar.ts
 lib/getUserAvatar.ts
-lib/supabase/client.ts
 lib/supabase/middleware.ts
 lib/supabase/server.ts
 lib/utils.ts

CODEOWNERS

@@ -1,4 +1,5 @@
 # Code Owners File
 
 # All files are owned by the entire team
-*       @kepsteen @alexappleget @jennifertieu @HoldUpFjord @shashilo
+*       @kepsteen @alexappleget @jennifertieu @HoldUpFjord @shashilo @nickytonline @bethanyann
+

app/api/gift-exchanges/route.ts

@@ -1,10 +1,16 @@
+// Copyright (c) Gridiron Survivor.
+// Licensed under the MIT License.
+
 import { createClient } from '@/lib/supabase/server';
 import { NextResponse } from 'next/server';
 import { CreateGiftExchangeRequest } from '@/app/types/giftExchange';
 import { validateGroupExchangeDates } from '@/lib/utils';
 
-// Get all gift exchanges for the current user
-export async function GET() {
+/**
+ * Get all gift exchanges for the current user
+ * @returns {Promise<NextResponse>} Promise that resolved to a Response object
+ */
+export async function GET(): Promise<NextResponse> {
   try {
     const supabase = await createClient();
     const {
@@ -24,7 +30,7 @@ export async function GET() {
     }
     return NextResponse.json(data);
   } catch (error) {
-    console.log(error);
+    console.error(error);
 
     return NextResponse.json(
       { error: 'Internal server error' },
@@ -33,7 +39,12 @@ export async function GET() {
   }
 }
 
-export async function POST(req: Request) {
+/**
+ * Create a new gift exchange
+ * @param {Request} req The request object
+ * @returns {Promise<NextResponse>} Promise that resolved to a Response object
+ */
+export async function POST(req: Request): Promise<NextResponse> {
   try {
     const supabase = await createClient();
     const {
@@ -77,7 +88,7 @@ export async function POST(req: Request) {
 
     return NextResponse.json(data);
   } catch (error) {
-    console.log(error);
+    console.error(error);
 
     return NextResponse.json(
       { error: 'Internal server error' },
@@ -86,7 +97,12 @@ export async function POST(req: Request) {
   }
 }
 
-export async function PATCH(req: Request) {
+/**
+ * Update a gift exchange
+ * @param {Request} req The request object
+ * @returns {Promise<NextResponse>} Promise that resolved to a Response object
+ */
+export async function PATCH(req: Request): Promise<NextResponse> {
   try {
     const supabase = await createClient();
     const {
@@ -132,7 +148,8 @@ export async function PATCH(req: Request) {
 
     return NextResponse.json(data);
   } catch (error) {
-    console.log(error);
+    console.error(error);
+
     return NextResponse.json(
       { error: 'Internal server error' },
       { status: 500 },

app/onboarding/page.tsx

@@ -31,7 +31,7 @@ import {
   SelectItem,
   SelectTrigger,
   SelectValue,
-} from '@/components/Select/select';
+} from '@/components/Select';
 import { MultiSelect } from '@/components/MultiSelect/multi-select-input';
 import { Textarea } from '@/components/TextArea/textarea';
 import { Slider } from '@/components/Slider/slider';

components/Avatar/Avatar.tsx

@@ -4,15 +4,19 @@
 import { JSX } from 'react';
 
 import { AvatarImage } from './AvatarImage';
-import { AvatarFallback } from './AvatarFallback';
-import { AvatarBody } from './AvatarBody';
+import { AvatarFallback } from './AvatarFallback/AvatarFallback';
+import { AvatarBody } from './AvatarBody/AvatarBody';
 
 /**
  * An Avatar component that displays a provided image URL or a default image if not provided.
  * @param {string} userAvatar - URL string for the avatar image. If undefined, the AvatarFallback img will be used.
  * @returns {JSX.Element} - The rendered Avatar element.
  */
-const Avatar = ({ userAvatar }: { userAvatar: string | undefined }) : JSX.Element => {
+const Avatar = ({
+  userAvatar,
+}: {
+  userAvatar: string | undefined;
+}): JSX.Element => {
   return (
     <AvatarBody>
       <AvatarImage src={userAvatar} alt="" />

components/Avatar/AvatarBody/AvatarBody.test.tsx

@@ -0,0 +1,49 @@
+// Copyright (c) Gridiron Survivor.
+// Licensed under the MIT License.
+
+import { AvatarBody } from './AvatarBody';
+import { render, screen } from '@testing-library/react';
+
+describe('AvatarBody Component', () => {
+  it('renders correctly with passed children', () => {
+    render(
+      <AvatarBody>
+        <div>Test child</div>
+      </AvatarBody>,
+    );
+
+    const avatarBodyElement = screen.getByTestId('avatar-body');
+    const testChild = screen.getByText('Test child');
+
+    expect(avatarBodyElement).toBeInTheDocument();
+    expect(testChild).toBeInTheDocument();
+  });
+
+  it('renders the component with custom classes', () => {
+    render(
+      <AvatarBody className="custom-class">
+        <div>Test child</div>
+      </AvatarBody>,
+    );
+
+    const avatarBodyElement = screen.getByTestId('avatar-body');
+
+    expect(avatarBodyElement).toHaveClass('custom-class');
+  });
+
+  it('renders correctly with no children', () => {
+    render(<AvatarBody />);
+
+    const avatarBodyElement = screen.getByTestId('avatar-body');
+
+    expect(avatarBodyElement).toBeEmptyDOMElement();
+  });
+
+  it('renders with custom attributes', () => {
+    render(<AvatarBody data-custom-prop="customProp" />);
+
+    const avatarBodyElement = screen.getByTestId('avatar-body');
+
+    expect(avatarBodyElement).toHaveAttribute('data-custom-prop', 'customProp');
+  });
+});

components/Avatar/AvatarBody.tsx …ponents/Avatar/AvatarBody/AvatarBody.tsxcomponents/Avatar/AvatarBody.tsx renamed to components/Avatar/AvatarBody/AvatarBody.tsx components/Avatar/AvatarBody.tsx renamed to components/Avatar/AvatarBody/AvatarBody.tsx

@@ -23,6 +23,7 @@ const AvatarBody = forwardRef<
       'relative flex h-10 w-10 shrink-0 overflow-hidden rounded-full',
       className,
     )}
+    data-testid="avatar-body"
     {...props}
   />
 ));

components/Avatar/AvatarFallback/AvatarFallback.test.tsx

@@ -0,0 +1,54 @@
+// Copyright (c) Gridiron Survivor.
+// Licensed under the MIT License.
+
+import { AvatarFallback } from './AvatarFallback';
+import { Root as AvatarPrimitiveRoot } from '@radix-ui/react-avatar';
+import { render, screen } from '@testing-library/react';
+
+describe('AvatarFallback Component', () => {
+  it('renders the component with image as child', () => {
+    render(
+      <AvatarPrimitiveRoot>
+        <AvatarFallback>
+          <img
+            src="fallback-image.jpg"
+            alt="default avatar"
+            data-testid="fallback-image"
+          />
+        </AvatarFallback>
+      </AvatarPrimitiveRoot>,
+    );
+
+    const avatarFallbackElement = screen.getByTestId('avatar-fallback');
+    const imgElement = screen.getByTestId('fallback-image');
+
+    expect(avatarFallbackElement).toBeInTheDocument();
+    expect(imgElement).toBeInTheDocument();
+  });
+
+  it('renders the component with custom classes', () => {
+    render(
+      <AvatarPrimitiveRoot>
+        <AvatarFallback className="custom-class">
+          <img src="fallback-image.jpg" alt="default avatar" />
+        </AvatarFallback>
+      </AvatarPrimitiveRoot>,
+    );
+
+    const avatarFallbackElement = screen.getByTestId('avatar-fallback');
+
+    expect(avatarFallbackElement).toHaveClass('custom-class');
+  });
+
+  it('renders the component with no children', () => {
+    render(
+      <AvatarPrimitiveRoot>
+        <AvatarFallback />
+      </AvatarPrimitiveRoot>,
+    );
+
+    const avatarFallbackElement = screen.getByTestId('avatar-fallback');
+
+    expect(avatarFallbackElement).toBeEmptyDOMElement();
+  });
+});

components/Avatar/AvatarFallback.tsx …Avatar/AvatarFallback/AvatarFallback.tsxcomponents/Avatar/AvatarFallback.tsx renamed to components/Avatar/AvatarFallback/AvatarFallback.tsx components/Avatar/AvatarFallback.tsx renamed to components/Avatar/AvatarFallback/AvatarFallback.tsx

@@ -23,6 +23,7 @@ const AvatarFallback = forwardRef<
       'flex h-full w-full items-center justify-center rounded-full bg-muted',
       className,
     )}
+    data-testid="avatar-fallback"
     {...props}
   />
 ));

components/Badge/Badge.test.tsx

@@ -0,0 +1,61 @@
+// Copyright (c) Gridiron Survivor.
+// Licensed under the MIT License.
+
+import { Badge, BadgeProps, badgeVariants } from './Badge';
+import { render, screen } from '@testing-library/react';
+import { variants } from './Badge';
+
+const variantNames = Object.keys(variants.variant) as NonNullable<
+  BadgeProps['variant']
+>[];
+
+describe('Badge', () => {
+  it('renders the component with default variant', () => {
+    render(<Badge />);
+
+    const badge = screen.getByTestId('badge');
+
+    expect(badge).toBeInTheDocument();
+
+    const classNames = badgeVariants({ variant: 'default' });
+    expect(badge).toHaveClass(classNames);
+  });
+
+  for (let i = 0; i < variantNames.length; i++) {
+    const variant = variantNames[i];
+    it(`renders with the "${variant}" variant and applies correct styles`, () => {
+      render(<Badge variant={variant} />);
+
+      const badge = screen.getByTestId('badge');
+
+      const classNames = badgeVariants({ variant });
+      expect(badge).toHaveClass(classNames);
+    });
+  }
+
+  it('renders the provided children inside the badge', () => {
+    render(<Badge>children</Badge>);
+
+    const badge = screen.getByTestId('badge');
+
+    expect(badge).toHaveTextContent('children');
+  });
+
+  it('renders with custom className alongside variant styles', () => {
+    render(<Badge className="custom-class" />);
+
+    const badge = screen.getByTestId('badge');
+
+    const classNames = badgeVariants({ variant: 'default' });
+    expect(badge).toHaveClass(classNames);
+    expect(badge).toHaveClass('custom-class');
+  });
+
+  it('renders with aria-label attribute', () => {
+    render(<Badge aria-label="test" />);
+
+    const badge = screen.getByTestId('badge');
+
+    expect(badge).toHaveAttribute('aria-label', 'test');
+  });
+});