dylan/gander
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/john-david3/cs3305-team11

Browse Source
This commit is contained in:
white
2025-02-06 18:57:28 +00:00
parent 1841e08a09 acc38cc73e
commit 1a52239ae2
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/src/components/Layout/ListRow.tsx
View File

@@ -15,6 +15,7 @@ interface ListRowProps {
title: string; title: string;
description: string; description: string;
items: ListItemProps[]; items: ListItemProps[];
extraClasses?: string;
onClick: (itemId: number, itemName: string) => void; onClick: (itemId: number, itemName: string) => void;
} }
@@ -43,10 +44,10 @@ const ListItem: React.FC<ListItemProps> = ({
<div className="absolute top-0 left-0 w-full h-full bg-gray-600" /> <div className="absolute top-0 left-0 w-full h-full bg-gray-600" />
)} )}
</div> </div>
<div className="p-3"> <div className="p-3 bg-white">
<h3 className="font-semibold text-lg">{title}</h3> <h3 className="font-semibold text-lg">{title}</h3>
{type === "stream" && <p className="text-gray-400">{streamer}</p>} {type === "stream" && <p className="text-red-600">{streamer}</p>}
<p className="text-sm text-gray-500">{viewers} viewers</p> <p className="text-sm text-white">{viewers} viewers</p>
</div> </div>
</div> </div>
); );
@@ -58,12 +59,13 @@ const ListRow: React.FC<ListRowProps> = ({
description, description,
items, items,
onClick, onClick,
extraClasses="",
}) => { }) => {
return ( return (
<div className="flex flex-col space-y-4 py-6"> <div className={`flex flex-col space-y-4 py-6 px-5 mx-2 mt-5 rounded-md ${extraClasses}`}>
<div className="space-y-1"> <div className="space-y-1">
<h2 className="text-2xl font-bold">{title}</h2> <h2 className="text-2xl font-bold text-white">{title}</h2>
<p className="text-gray-400">{description}</p> <p className="text-white">{description}</p>
</div> </div>
<div className="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-4"> <div className="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-4">
{items.map((item) => ( {items.map((item) => (

3
frontend/src/pages/HomePage.tsx
View File

@@ -43,6 +43,7 @@ const HomePage: React.FC<HomePageProps> = ({ variant = "default" }) => {
} }
items={featuredStreams} items={featuredStreams}
onClick={handleStreamClick} onClick={handleStreamClick}
extraClasses="border border-gray-700 bg-[#FF7F50]/80"
/> />
{/* If Personalised_HomePage, display Categories the logged-in user follows. Else, trending categories. */} {/* If Personalised_HomePage, display Categories the logged-in user follows. Else, trending categories. */}
@@ -60,6 +61,8 @@ const HomePage: React.FC<HomePageProps> = ({ variant = "default" }) => {
} }
items={featuredCategories} items={featuredCategories}
onClick={handleCategoryClick} onClick={handleCategoryClick}
extraClasses="border border-gray-700 bg-[#5AFF75]/80"
/> />
</div> </div>
); );