Merge branch 'justinxue/phs-42-news-feed-backend' of github.com:calbl…

…ueprint/phs into justinxue/phs-42-news-feed-backend
calblueprint · Mar 16, 2024 · fa220ef · fa220ef
2 parents 152d2fa + 0ecddad
commit fa220ef
Show file tree

Hide file tree

Showing 5 changed files with 137 additions and 0 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/app/spotlightPage/[spotlightId]/page.tsx b/src/app/spotlightPage/[spotlightId]/page.tsx
@@ -10,6 +10,10 @@ import {
   fetchDisplayfromSpotlight,
   fetchRelatedSpotlightsfromSpotlightId,
 } from '../../../supabase/tour_displays/queries';
+import {
+  fetchDisplayfromSpotlight,
+  fetchRelatedSpotlightsfromSpotlightId,
+} from '../../../supabase/tour_displays/queries';
 
 /**
  * @param -.params
@@ -38,6 +42,7 @@ export default function Page({ params }: { params: { spotlightId: string } }) {
   const [displays, setDisplays] = useState<DisplayRow[]>([]);
   const [displays, setDisplays] = useState<DisplayRow[]>([]);
 
+  const [relatedSpolights, setRelatedSpotlight] = useState<TourRow[]>([]);
   const [relatedSpolights, setRelatedSpotlight] = useState<TourRow[]>([]);
 
   useEffect(() => {
@@ -58,6 +63,8 @@ export default function Page({ params }: { params: { spotlightId: string } }) {
         const responseDataForDisplays: DisplayRow[] =
           await fetchDisplayfromSpotlight(params.spotlightId);
         setDisplays(responseDataForDisplays);
+        const responseDataForRelatedSpotlights: TourRow[] =
+          await fetchRelatedSpotlightsfromSpotlightId(params.spotlightId);
         const responseDataForRelatedSpotlights: TourRow[] =
           await fetchRelatedSpotlightsfromSpotlightId(params.spotlightId);
         setRelatedSpotlight(responseDataForRelatedSpotlights);
@@ -149,6 +156,23 @@ export default function Page({ params }: { params: { spotlightId: string } }) {
           </li>
         ))}
       </ul>
+        {relatedSpolights.map(otherSpotlight => (
+          <li
+            className="pl-[18px] w-[162px] overflow-x-auto"
+            key={otherSpotlight.id}
+          >
+            <Link href={`/spotlightPage/${spotlight.id}`}>
+              <div className="bg-[#386131] h-[169px] rounded-2xl p-[18px] flex flex-col" />
+              <h4 className="text-black font-Lato text-20 font-bold mt-2">
+                {otherSpotlight.name}
+              </h4>
+              <h2 className="text-gray font-Lato text-sm font-normal">
+                {otherSpotlight.description}
+              </h2>
+            </Link>
+          </li>
+        ))}
+      </ul>
     </div>
   );
 }

diff --git a/src/supabase/tour_displays/queries.tsx b/src/supabase/tour_displays/queries.tsx
@@ -17,6 +17,7 @@ export async function fetchAllTourDisplays(): Promise<TourDisplaysRow[]> {
 }
 
 /**
+ *
  *
  *
  * @param tourId - an id from the tours table
@@ -52,6 +53,9 @@ export async function fetchMatchingTourDisplayIdsfromSpotlight(tourId: string) {
  * @returns given a spotlight ID, get all the displays
  */
 export async function fetchDisplayfromSpotlight(spotlightId: string) {
+  const displayIds: string[] =
+    await fetchMatchingTourDisplayIdsfromSpotlight(spotlightId);
+  const displays: DisplayRow[] = await fetchDisplaysfromIds(displayIds);
   const displayIds: string[] =
     await fetchMatchingTourDisplayIdsfromSpotlight(spotlightId);
   const displays: DisplayRow[] = await fetchDisplaysfromIds(displayIds);

diff --git a/src/types/supabase.ts b/src/types/supabase.ts
@@ -6,6 +6,7 @@ export type Json =
   | { [key: string]: Json | undefined }
   | Json[];
   | Json[];
+  | Json[];
 
 export type Database = {
   public: {
@@ -76,6 +77,13 @@ export type Database = {
           id: string;
           title: string;
           updated_at: string | null;
+        };
+          coordinates: Json | null;
+          created_at: string;
+          description: string;
+          id: string;
+          title: string;
+          updated_at: string | null;
         };
         Insert: {
           coordinates?: Json | null;
@@ -84,6 +92,13 @@ export type Database = {
           id: string;
           title?: string;
           updated_at?: string | null;
+        };
+          coordinates?: Json | null;
+          created_at?: string;
+          description?: string;
+          id: string;
+          title?: string;
+          updated_at?: string | null;
         };
         Update: {
           coordinates?: Json | null;
@@ -94,6 +109,15 @@ export type Database = {
           updated_at?: string | null;
         };
         Relationships: [];
+      };
+          coordinates?: Json | null;
+          created_at?: string;
+          description?: string;
+          id?: string;
+          title?: string;
+          updated_at?: string | null;
+        };
+        Relationships: [];
       };
       media: {
         Row: {
@@ -118,6 +142,13 @@ export type Database = {
           title?: string | null;
           type?: string | null;
           url?: string;
+        };
+          created_at?: string;
+          id?: string;
+          text?: string | null;
+          title?: string | null;
+          type?: string | null;
+          url?: string;
         };
         Update: {
           created_at?: string;
@@ -128,6 +159,15 @@ export type Database = {
           url?: string;
         };
         Relationships: [];
+      };
+          created_at?: string;
+          id?: string;
+          text?: string | null;
+          title?: string | null;
+          type?: string | null;
+          url?: string;
+        };
+        Relationships: [];
       };
       spotlight_recommendations: {
         Row: {
@@ -325,8 +365,47 @@ export type Database = {
           id: string;
           title: string;
           updated_at: string | null;
+        };
+          created_at: string;
+          description: string | null;
+          id: string;
+          name: string | null;
+          spotlight: boolean;
+          stop_count: number | null;
         };
         Insert: {
+          created_at?: string;
+          description?: string | null;
+          id?: string;
+          name?: string | null;
+          spotlight?: boolean;
+          stop_count?: number | null;
+        };
+        Update: {
+          created_at?: string;
+          description?: string | null;
+          id?: string;
+          name?: string | null;
+          spotlight?: boolean;
+          stop_count?: number | null;
+        };
+        Relationships: [];
+      };
+      news: {
+        Row: {
+          content_link: string;
+          created_at: string;
+          id: string;
+          title: string;
+          updated_at: string | null;
+        };
+        Insert: {
+          content_link?: string;
+          created_at?: string;
+          id?: string;
+          title?: string;
+          updated_at?: string | null;
+        };
           content_link?: string;
           created_at?: string;
           id?: string;
@@ -342,6 +421,15 @@ export type Database = {
         };
         Relationships: [];
       };
+    };
+          content_link?: string;
+          created_at?: string;
+          id?: string;
+          title?: string;
+          updated_at?: string | null;
+        };
+        Relationships: [];
+      };
     };
     Views: {
       [_ in never]: never;
@@ -383,9 +471,16 @@ export type Database = {
     };
     Enums: {
       media_type: 'image' | 'video' | 'link';
+    };
+      media_type: 'image' | 'video' | 'link';
     };
     CompositeTypes: {
       [_ in never]: never;
     };
   };
 }
+
+      [_ in never]: never;
+    };
+  };
+}
diff --git a/src/types/types.ts b/src/types/types.ts
@@ -14,6 +14,7 @@ export type TourMediaRow = Database['public']['Tables']['tour_media']['Row'];
 export type TourRow = Database['public']['Tables']['tours']['Row'];
 export type NewsRow = Database['public']['Tables']['news']['Row'];
 export type SpotlightWithMediaRow = TourRow & { media_url: string };
+export type NewsRow = Database['public']['Tables']['news']['Row'];
 export type SpotlightRow = {
   tour_row: TourRow;
   url: string;