From 79d18f959be4b8d39c5ab5756f97161c94f38480 Mon Sep 17 00:00:00 2001 From: Desmond Grealy Date: Wed, 4 Jan 2023 02:52:46 -0800 Subject: [PATCH 1/3] Fix 'two children with same key' error. Remove superflous key on link --- website/src/components/Widgets/LeaderboardWidget.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/src/components/Widgets/LeaderboardWidget.tsx b/website/src/components/Widgets/LeaderboardWidget.tsx index 5f680179..6e0d105f 100644 --- a/website/src/components/Widgets/LeaderboardWidget.tsx +++ b/website/src/components/Widgets/LeaderboardWidget.tsx @@ -54,7 +54,7 @@ export function LeaderboardWidget() {
Top 5 Contributors - + View All -> @@ -74,8 +74,8 @@ export function LeaderboardWidget() {

Score

- {leaderInfo.map((item) => ( -
+ {leaderInfo.map((item, itemIndex) => ( +
Profile Picture

{item.name}

From ab4142032745c1689a09ab41f9650bb35b422deb Mon Sep 17 00:00:00 2001 From: Desmond Grealy Date: Wed, 4 Jan 2023 03:09:40 -0800 Subject: [PATCH 2/3] Moving the dashboard-related components out of the 'widgets' folder and into a 'dashboard' components folder. --- .../LeaderboardWidget.tsx => Dashboard/LeaderboardTable.tsx} | 2 +- website/src/components/{Widgets => Dashboard}/SideMenu.tsx | 0 website/src/components/{Widgets => Dashboard}/TaskOption.tsx | 0 website/src/components/{Widgets => Dashboard}/index.ts | 2 +- website/src/pages/dashboard.tsx | 4 ++-- 5 files changed, 4 insertions(+), 4 deletions(-) rename website/src/components/{Widgets/LeaderboardWidget.tsx => Dashboard/LeaderboardTable.tsx} (98%) rename website/src/components/{Widgets => Dashboard}/SideMenu.tsx (100%) rename website/src/components/{Widgets => Dashboard}/TaskOption.tsx (100%) rename website/src/components/{Widgets => Dashboard}/index.ts (58%) diff --git a/website/src/components/Widgets/LeaderboardWidget.tsx b/website/src/components/Dashboard/LeaderboardTable.tsx similarity index 98% rename from website/src/components/Widgets/LeaderboardWidget.tsx rename to website/src/components/Dashboard/LeaderboardTable.tsx index 6e0d105f..b958d4b7 100644 --- a/website/src/components/Widgets/LeaderboardWidget.tsx +++ b/website/src/components/Dashboard/LeaderboardTable.tsx @@ -1,6 +1,6 @@ import { Badge, Box, Image, Link, Stack, StackDivider, Text, useColorModeValue } from "@chakra-ui/react"; -export function LeaderboardWidget() { +export function LeaderboardTable() { const backgroundColor = useColorModeValue("white", "gray.700"); const accentColor = useColorModeValue("gray.200", "gray.900"); diff --git a/website/src/components/Widgets/SideMenu.tsx b/website/src/components/Dashboard/SideMenu.tsx similarity index 100% rename from website/src/components/Widgets/SideMenu.tsx rename to website/src/components/Dashboard/SideMenu.tsx diff --git a/website/src/components/Widgets/TaskOption.tsx b/website/src/components/Dashboard/TaskOption.tsx similarity index 100% rename from website/src/components/Widgets/TaskOption.tsx rename to website/src/components/Dashboard/TaskOption.tsx diff --git a/website/src/components/Widgets/index.ts b/website/src/components/Dashboard/index.ts similarity index 58% rename from website/src/components/Widgets/index.ts rename to website/src/components/Dashboard/index.ts index 48a40e74..0b4ff49a 100644 --- a/website/src/components/Widgets/index.ts +++ b/website/src/components/Dashboard/index.ts @@ -1,3 +1,3 @@ -export { LeaderboardWidget } from "./LeaderboardWidget"; +export { LeaderboardTable } from "./LeaderboardTable"; export { SideMenu } from "./SideMenu"; export { TaskOption } from "./TaskOption"; diff --git a/website/src/pages/dashboard.tsx b/website/src/pages/dashboard.tsx index 018227af..dfc5cb03 100644 --- a/website/src/pages/dashboard.tsx +++ b/website/src/pages/dashboard.tsx @@ -1,7 +1,7 @@ import { Box, useColorMode } from "@chakra-ui/react"; import Head from "next/head"; import { Header } from "src/components/Header"; -import { LeaderboardWidget, SideMenu, TaskOption } from "src/components/Widgets"; +import { LeaderboardTable, SideMenu, TaskOption } from "src/components/Dashboard"; import { colors } from "styles/Theme/colors"; const Dashboard = () => { @@ -19,7 +19,7 @@ const Dashboard = () => { - + From 87a6628ee22f314b5dd0fa4045e63f35f25b7300 Mon Sep 17 00:00:00 2001 From: Desmond Grealy Date: Wed, 4 Jan 2023 03:23:38 -0800 Subject: [PATCH 3/3] Fix a few more key errors --- website/src/components/Dashboard/SideMenu.tsx | 6 +++--- website/src/components/Dashboard/TaskOption.tsx | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/website/src/components/Dashboard/SideMenu.tsx b/website/src/components/Dashboard/SideMenu.tsx index 8b21b71f..30a45777 100644 --- a/website/src/components/Dashboard/SideMenu.tsx +++ b/website/src/components/Dashboard/SideMenu.tsx @@ -37,15 +37,15 @@ export function SideMenu() { className="grid grid-cols-4 gap-2 sm:flex sm:flex-col sm:justify-between p-4 h-full" >