Merge pull request #234 from manuelc2209/fix/thread-dates

Thread Dates
manuelc2209 · Jul 12, 2023 · 9ee0752 · 9ee0752
2 parents 20a65b0 + f30ddd8
commit 9ee0752
Show file tree

Hide file tree

Showing 6 changed files with 111 additions and 18 deletions.
diff --git a/src/pages/forum/components/header/index.tsx b/src/pages/forum/components/header/index.tsx
@@ -10,7 +10,6 @@ export const Header = () => {
 
     return (
         <>
-            <Banner />
             <StyledHeaderWrapper>
                 <StyledButton size="large" buttonType="border" label="Back" onClick={() => navigate(-1)} />
                 <StyledCTAEnd>

diff --git a/src/pages/forum/components/thread/types.ts b/src/pages/forum/components/thread/types.ts
@@ -10,6 +10,6 @@ export interface ThreadProps {
     sideSection: {
         replies: number;
         views: number;
-        postTimeTracker: Date;
+        postTimeTracker: number;
     };
 }
diff --git a/src/pages/forum/context/contextType.ts b/src/pages/forum/context/contextType.ts
@@ -10,7 +10,7 @@ export interface IThread {
     sideSection: {
         replies: number;
         views: number;
-        postTimeTracker: Date;
+        postTimeTracker: number;
     };
 }
 

diff --git a/src/pages/forum/pages/Threads/index.tsx b/src/pages/forum/pages/Threads/index.tsx
@@ -1,16 +1,20 @@
 import React, { useContext, useEffect } from 'react';
 
-import { ForumContext, ForumContextWrapper } from '../../context/forumContext';
+import { ForumContext } from '../../context/forumContext';
 import { ThreadsView } from '../../layout';
 import { mockedThreads } from '../../shared/mockData';
 
 export const Threads = () => {
     const { setThreads } = useContext(ForumContext);
 
     useEffect(() => {
-        setThreads(mockedThreads);
+        const sortedItems = mockedThreads.sort(
+            (item, newItem) => newItem.sideSection.postTimeTracker - item.sideSection.postTimeTracker
+        );
+
+        setThreads(sortedItems);
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, []);
+    }, [mockedThreads]);
 
     return <ThreadsView />;
 };
diff --git a/src/pages/forum/shared/mockData.ts b/src/pages/forum/shared/mockData.ts
@@ -13,7 +13,7 @@ export const mockedThreads: IThread[] = [
             lastName: 'Doe'
         },
         sideSection: {
-            postTimeTracker: new Date(1674153241555),
+            postTimeTracker: new Date('2020-05-15T10:30:00.000Z').getTime(),
             replies: Math.floor(Math.random() * 10000) + 1,
             views: Math.floor(Math.random() * 10000) + 1
         }
@@ -28,7 +28,7 @@ export const mockedThreads: IThread[] = [
             lastName: 'Smith'
         },
         sideSection: {
-            postTimeTracker: new Date(1674153241555),
+            postTimeTracker: new Date(1674153241555).getTime(),
             replies: Math.floor(Math.random() * 10000) + 1,
             views: Math.floor(Math.random() * 10000) + 1
         }
@@ -43,7 +43,7 @@ export const mockedThreads: IThread[] = [
             lastName: 'Smith'
         },
         sideSection: {
-            postTimeTracker: new Date(1624151241525),
+            postTimeTracker: new Date(1624151241525).getTime(),
             replies: Math.floor(Math.random() * 10000) + 1,
             views: Math.floor(Math.random() * 10000) + 1
         }
@@ -58,7 +58,7 @@ export const mockedThreads: IThread[] = [
             lastName: 'Johnson'
         },
         sideSection: {
-            postTimeTracker: new Date('2022-05-15T10:30:00.000Z'),
+            postTimeTracker: new Date('2022-05-15T10:30:00.000Z').getTime(),
             replies: Math.floor(Math.random() * 10000) + 1,
             views: Math.floor(Math.random() * 10000) + 1
         }
@@ -73,7 +73,7 @@ export const mockedThreads: IThread[] = [
             lastName: 'Garcia'
         },
         sideSection: {
-            postTimeTracker: new Date('2022-11-30T08:15:00.000Z'),
+            postTimeTracker: new Date('2022-11-30T08:15:00.000Z').getTime(),
             replies: Math.floor(Math.random() * 10000) + 1,
             views: Math.floor(Math.random() * 10000) + 1
         }
@@ -88,7 +88,7 @@ export const mockedThreads: IThread[] = [
             lastName: 'Lee'
         },
         sideSection: {
-            postTimeTracker: new Date('2022-07-10T16:20:00.000Z'),
+            postTimeTracker: new Date('2022-07-10T16:20:00.000Z').getTime(),
             replies: Math.floor(Math.random() * 10000) + 1,
             views: Math.floor(Math.random() * 10000) + 1
         }
@@ -103,22 +103,112 @@ export const mockedThreads: IThread[] = [
             lastName: 'Wilson'
         },
         sideSection: {
-            postTimeTracker: new Date('2022-12-05T11:55:00.000Z'),
+            postTimeTracker: new Date('2022-12-05T11:55:00.000Z').getTime(),
             replies: 932,
             views: 4620
         }
     },
     {
         avatar: faker.image.avatarGitHub(),
         title: 'JavaScript Frameworks Comparison',
-        subtitle: 'Analyzing the pros and cons of popular JS frameworks',
+        subtitle: 'Analyzing the pros and cons of JS frameworks',
         user: {
             id: 'userxyz',
             firstName: 'David',
             lastName: 'Thompson'
         },
         sideSection: {
-            postTimeTracker: new Date('2022-08-18T09:10:00.000Z'),
+            postTimeTracker: new Date('2022-08-18T09:10:00.000Z').getTime(),
+            replies: 1537,
+            views: 6241
+        }
+    },
+    {
+        avatar: faker.image.avatarGitHub(),
+        title: 'Typescript Comparison',
+        subtitle: 'Analyzing the pros and cons of TS',
+        user: {
+            id: 'userxyz',
+            firstName: 'David',
+            lastName: 'Thompson'
+        },
+        sideSection: {
+            postTimeTracker: new Date('2022-08-18T09:10:00.000Z').getTime(),
+            replies: 1537,
+            views: 6241
+        }
+    },
+    {
+        avatar: faker.image.avatarGitHub(),
+        title: 'Some Random Comparison',
+        subtitle: 'Analyzing the pros and cons of Randomness',
+        user: {
+            id: 'userxyz',
+            firstName: 'David',
+            lastName: 'Thompson'
+        },
+        sideSection: {
+            postTimeTracker: new Date('2022-08-18T09:10:00.000Z').getTime(),
+            replies: 1537,
+            views: 6241
+        }
+    },
+    {
+        avatar: faker.image.avatarGitHub(),
+        title: 'Artificial Intelligence in Healthcare',
+        subtitle: 'Applications of AI in the medical field',
+        user: {
+            id: 'userdef',
+            firstName: 'Olivia',
+            lastName: 'Wilson'
+        },
+        sideSection: {
+            postTimeTracker: new Date('2022-12-05T11:55:00.000Z').getTime(),
+            replies: 932,
+            views: 4620
+        }
+    },
+    {
+        avatar: faker.image.avatarGitHub(),
+        title: 'JavaScript Frameworks Comparison',
+        subtitle: 'Analyzing the pros and cons of JS frameworks',
+        user: {
+            id: 'userxyz',
+            firstName: 'David',
+            lastName: 'Thompson'
+        },
+        sideSection: {
+            postTimeTracker: new Date('2022-08-18T09:10:00.000Z').getTime(),
+            replies: 1537,
+            views: 6241
+        }
+    },
+    {
+        avatar: faker.image.avatarGitHub(),
+        title: 'Typescript Comparison',
+        subtitle: 'Analyzing the pros and cons of TS',
+        user: {
+            id: 'userxyz',
+            firstName: 'David',
+            lastName: 'Thompson'
+        },
+        sideSection: {
+            postTimeTracker: new Date('2022-08-18T09:10:00.000Z').getTime(),
+            replies: 1537,
+            views: 6241
+        }
+    },
+    {
+        avatar: faker.image.avatarGitHub(),
+        title: 'Some Random Comparison',
+        subtitle: 'Analyzing the pros and cons of Randomness',
+        user: {
+            id: 'userxyz',
+            firstName: 'David',
+            lastName: 'Thompson'
+        },
+        sideSection: {
+            postTimeTracker: new Date('2022-08-18T09:10:00.000Z').getTime(),
             replies: 1537,
             views: 6241
         }

diff --git a/yarn.lock b/yarn.lock
@@ -5527,9 +5527,9 @@ caniuse-api@^3.0.0:
     lodash.uniq "^4.5.0"
 
 caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001400, caniuse-lite@^1.0.30001407:
-  version "1.0.30001422"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001422.tgz#f2d7c6202c49a8359e6e35add894d88ef93edba1"
-  integrity sha512-hSesn02u1QacQHhaxl/kNMZwqVG35Sz/8DgvmgedxSH8z9UUpcDYSPYgsj3x5dQNRcNp6BwpSfQfVzYUTm+fog==
+  version "1.0.30001515"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001515.tgz"
+  integrity sha512-eEFDwUOZbE24sb+Ecsx3+OvNETqjWIdabMy52oOkIgcUtAsQifjUG9q4U9dgTHJM2mfk4uEPxc0+xuFdJ629QA==
 
 capital-case@^1.0.4:
   version "1.0.4"