From f3ad802b429a9e656d405391190190efe7c45b1d Mon Sep 17 00:00:00 2001
From: William Tran <william.tran1@uwaterloo.ca>
Date: Mon, 31 May 2021 02:45:29 -0400
Subject: [PATCH] Refactor content given to OrganizedContent

---
 components/playground.tsx | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/components/playground.tsx b/components/playground.tsx
index 96d2c910..1d318680 100644
--- a/components/playground.tsx
+++ b/components/playground.tsx
@@ -56,15 +56,15 @@ const events = [
 ];
 
 const constitution = [
-  { Content: ReadAll, metadata: readAllOrganizedContentMetadata },
-  { Content: Name, metadata: nameOrganizedContentMetadata },
-  { Content: Purpose, metadata: purposeOrganizedContentMetadata },
-  { Content: Membership, metadata: membershipOrganizedContentMetadata },
-  { Content: Officers, metadata: officersOrganizedContentMetadata },
-  { Content: Duties, metadata: dutiesOrganizedContentMetadata },
+  { content: <ReadAll />, ...readAllOrganizedContentMetadata },
+  { content: <Name />, ...nameOrganizedContentMetadata },
+  { content: <Purpose />, ...purposeOrganizedContentMetadata },
+  { content: <Membership />, ...membershipOrganizedContentMetadata },
+  { content: <Officers />, ...officersOrganizedContentMetadata },
+  { content: <Duties />, ...dutiesOrganizedContentMetadata },
   {
-    Content: ExecutiveCouncil,
-    metadata: executiveCouncilOrganizedContentMetadata,
+    content: <ExecutiveCouncil />,
+    ...executiveCouncilOrganizedContentMetadata,
   },
 ];
 
@@ -163,10 +163,7 @@ export function TeamMemberCardDemo() {
 }
 
 export function OrganizedContentDemo() {
-  const sections = constitution.map(({ Content, metadata }) => ({
-    ...metadata,
-    content: <Content />,
-  }));
+  const sections = constitution;
 
   const [index, setIndex] = useState(0);