UPDATE: Added more categories to database and updated categories page

frontend/src/components/Layout/ListItem.tsx

@@ -23,7 +23,7 @@ const ListItem: React.FC<ListItemProps> = ({
   return (
     <div className="p-4">
       <div
-        className="min-w-[25vw] overflow-hidden flex-shrink-0 flex flex-col bg-purple-900 rounded-lg 
+        className="min-w-[20vw] overflow-hidden flex-shrink-0 flex flex-col bg-purple-900 rounded-lg 
 	   cursor-pointer hover:bg-pink-700 hover:scale-105 transition-all"
         onClick={onItemClick}
       >

frontend/src/components/Layout/ListRow.tsx

@@ -52,7 +52,7 @@ const ListRow: React.FC<ListRowProps> = ({
       </div>
 
       <div className="relative overflow-hidden flex items-center z-0">
-        {!wrap && items.length > 3 && (
+        {!wrap && items.length > 4 && (
           <>
             <ArrowLeftIcon
               onClick={slideLeft}

frontend/src/pages/AllCategoriesPage.tsx

@@ -1,21 +1,31 @@
-import React, { useEffect } from "react";
+import React, { useEffect, useState } from "react";
 import { useNavigate } from "react-router-dom";
 import ListRow from "../components/Layout/ListRow";
 import { useCategories } from "../context/ContentContext";
 import DynamicPageContent from "../components/Layout/DynamicPageContent";
+import { fetchContentOnScroll } from "../hooks/fetchContentOnScroll";
 
 const AllCategoriesPage: React.FC = () => {
   const { categories, setCategories } = useCategories();
   const navigate = useNavigate();
+  const [categoryOffset, setCategoryOffset] = useState(0);
+  const [noCategories, setNoCategories] = useState(12);
+  const [hasMoreData, setHasMoreData] = useState(true);
 
   useEffect(() => {
     const fetchCategories = async () => {
       try {
-        const response = await fetch("/api/categories/popular/8/0");
+        const response = await fetch(`/api/categories/popular/${noCategories}/${categoryOffset}`);
         if (!response.ok) {
           throw new Error("Failed to fetch categories");
         }
         const data = await response.json();
+        // Adds to offset once data is returned
+        if (data.length > 0) {
+          setCategoryOffset(prev => prev + data.length);
+        } else {
+          setHasMoreData(false);
+        }
 
         // Transform the data to match CategoryItem interface
         const processedCategories = data.map((category: any) => ({
@@ -37,6 +47,11 @@ const AllCategoriesPage: React.FC = () => {
     fetchCategories();
   }, [setCategories]);
 
+  const logOnScroll = () => {
+    console.log("hi")
+  };
+  fetchContentOnScroll(logOnScroll,hasMoreData)
+
   if (!categories.length) {
     return (
       <div className="h-screen w-screen flex items-center justify-center text-white">

frontend/src/pages/HomePage.tsx

@@ -38,7 +38,7 @@ const HomePage: React.FC<HomePageProps> = ({ variant = "default" }) => {
         description={
           variant === "personalised"
             ? "We think you might like these streams - Streamers recommended for you"
-            : "Streamers that are currently live"
+            : "Popular streamers that are currently live!"
         }
         items={streams}
         wrap={false}
@@ -62,7 +62,7 @@ const HomePage: React.FC<HomePageProps> = ({ variant = "default" }) => {
         description={
           variant === "personalised"
             ? "Current streams from your followed categories"
-            : "Categories that have been 'popping off' lately"
+            : "Recently popular categories lately!"
         }
         items={categories}
         wrap={false}

web_server/blueprints/streams.py

@@ -73,10 +73,11 @@ def stream_data(streamer_id):
 ## Category Routes
 @stream_bp.route('/categories/popular/<int:no_categories>')
 @stream_bp.route('/categories/popular/<int:no_categories>/<int:offset>')
-def popular_categories(no_categories, offset=0) -> list[dict]:
+def popular_categories(no_categories=4, offset=0) -> list[dict]:
     """
     Returns a list of most popular categories
     """
+    print(no_categories, offset, flush=True)
     # Limit the number of categories to 100
     if no_categories < 1:
         return jsonify([])

web_server/database/testing_data.sql

@@ -50,15 +50,39 @@ INSERT INTO categories (category_name) VALUES
 ('Music'),  
 ('Art'),  
 ('Education'),  
-('Sports');
+('Sports'),  
+('League of Legends'),  
+('Fortnite'),  
+('Minecraft'),  
+('Call of Duty'),  
+('Counter-Strike 2'),  
+('Valorant'),  
+('Dota 2'),  
+('Apex Legends'),  
+('Grand Theft Auto V'),  
+('The Legend of Zelda: Breath of the Wild'),  
+('Elden Ring'),  
+('Red Dead Redemption 2'),  
+('Cyberpunk 2077'),  
+('Super Smash Bros. Ultimate'),  
+('Overwatch 2'),  
+('Genshin Impact'),  
+('World of Warcraft'),  
+('Rocket League'),  
+('FIFA 24'),  
+('The Sims 4'),  
+('Among Us'),  
+('Dead by Daylight'),  
+('Hogwarts Legacy');  
+
 
 -- Sample Data for streams
-INSERT INTO streams (user_id, title, start_time, num_viewers, category_id) VALUES
+INSERT INTO streams (user_id, title, start_time, category_id) VALUES
-(1, 'Game on!', '2025-02-16 17:00:00', 5, 1),
+(1, 'Game on!', '2025-02-16 17:00:00', 1),
-(2, 'Live Music Jam', '2025-01-25 20:00:00', 350, 2),
+(2, 'Live Music Jam', '2025-01-25 20:00:00', 2),
-(3, 'Sketching Live', '2025-01-24 15:00:00', 80, 3),
+(3, 'Sketching Live', '2025-01-24 15:00:00', 3),
-(4, 'Math Made Easy', '2025-01-23 10:00:00', 400, 4),
+(4, 'Math Made Easy', '2025-01-23 10:00:00', 4),
-(5, 'Sports Highlights', '2025-02-15 23:00:00', 210, 5);
+(5, 'Sports Highlights', '2025-02-15 23:00:00', 5);
 
 -- Sample Data for vods
 INSERT INTO vods (user_id, title, datetime, category_id, length, views) VALUES 
@@ -118,22 +142,3 @@ SELECT * FROM streams;
 SELECT * FROM chat;
 SELECT * FROM tags;
 SELECT * FROM stream_tags;
-
--- To see all tables in the database
-SELECT name FROM sqlite_master WHERE type='table';
-
--- UPDATE users SET is_live = 0 WHERE user_id = 1;
-
-SELECT users.user_id, streams.title, streams.num_viewers, users.username
-FROM streams JOIN users 
-ON streams.user_id = users.user_id
-WHERE users.user_id IN
-(SELECT followed_id FROM follows WHERE user_id = 1)
-AND users.is_live = 1;
-
-SELECT categories.category_id, categories.category_name, SUM(streams.num_viewers) AS total_viewers
-FROM streams
-JOIN categories ON streams.category_id = categories.category_id
-GROUP BY categories.category_name
-ORDER BY SUM(streams.num_viewers) DESC
-LIMIT 10;

web_server/utils/recommendation_utils.py

@@ -72,11 +72,11 @@ def get_highest_view_categories(no_categories: int = 4, offset: int = 0) -> Opti
     """
     with Database() as db:
         categories = db.fetchall("""
-            SELECT categories.category_id, categories.category_name, SUM(streams.num_viewers) AS num_viewers
+            SELECT categories.category_id, categories.category_name, COALESCE(SUM(streams.num_viewers), 0) AS num_viewers
-            FROM streams
+            FROM categories
-            JOIN categories ON streams.category_id = categories.category_id
+            LEFT JOIN streams ON streams.category_id = categories.category_id
-            GROUP BY categories.category_name
+            GROUP BY categories.category_id, categories.category_name
-            ORDER BY SUM(streams.num_viewers) DESC
+            ORDER BY num_viewers DESC
             LIMIT ? OFFSET ?;
         """, (no_categories, offset))
     return categories