From c68b87cd8f134a62e4d7d432941fe3b463232319 Mon Sep 17 00:00:00 2001
From: Jesse Paterson <jesse.r.pat@gmail.com>
Date: Wed, 1 May 2024 16:01:59 -0700
Subject: [PATCH 1/6] Added basic structure

---
 src/common/ui/templates/home/index.tsx   | 26 +++++++++++-------------
 src/common/ui/templates/space/index.tsx  | 25 +++++++++++++++++++++++
 src/fidgets/layout/grids/defaultGrid.tsx |  0
 src/pages/homebase/homebase.tsx          | 20 ++++++++++++++++++
 4 files changed, 57 insertions(+), 14 deletions(-)
 create mode 100644 src/common/ui/templates/space/index.tsx
 create mode 100644 src/fidgets/layout/grids/defaultGrid.tsx
 create mode 100644 src/pages/homebase/homebase.tsx

diff --git a/src/common/ui/templates/home/index.tsx b/src/common/ui/templates/home/index.tsx
index d9e37eb5..489c69e4 100644
--- a/src/common/ui/templates/home/index.tsx
+++ b/src/common/ui/templates/home/index.tsx
@@ -24,7 +24,7 @@ import {
 } from "@heroicons/react/24/solid";
 import { useRouter } from "next/router";
 import { ThemeToggle } from "@/common/ui/components/ThemeToggle";
-import herocastImg from "@public/images/logo.png";
+import logo from "@public/images/logo.png";
 import {
   TooltipProvider,
 } from "@/common/ui/atoms/tooltip";
@@ -64,6 +64,13 @@ const Home = ({ children }: { children: React.ReactNode }) => {
   };
 
   const navigation: NavigationItemType[] = [
+    {
+      name: "Homebase",
+      router: "/homebase",
+      icon: <NewspaperIcon className="h-6 w-6 shrink-0" aria-hidden="true" />,
+      getTitle: getFeedTitle,
+      shortcut: "Shift + F",
+    },
     {
       name: "Feed",
       router: "/feed",
@@ -280,12 +287,12 @@ const Home = ({ children }: { children: React.ReactNode }) => {
         <div className="flex grow flex-col min-h-full gap-y-5 overflow-y-auto bg-background px-6 ring-1 ring-white/5">
           <div className="flex h-16 shrink-0 items-center">
             <h2 className="text-2xl font-bold leading-7 text-white sm:truncate sm:tracking-tight">
-              herocast
+              nounspace
             </h2>
             <img
               className="h-8 w-auto"
-              src={herocastImg.src}
-              alt="herocast"
+              src={logo.src}
+              alt="nounspace"
             />
           </div>
           <div className="h-full min-h-full flex flex-col justify-between">
@@ -339,16 +346,7 @@ const Home = ({ children }: { children: React.ReactNode }) => {
           </h1>
         </div>*/}
         <main>
-              <div className="p-8 grid grid-cols-4 md:grid-cols-8 lg:grid-cols-12 grid-rows-4 md:grid-rows-6 lg:grid-rows-8 gap-4 lg:gap-8 h-screen max-h-screen">
-                <div className="p-4 border-2 row-span-8 col-span-6 max-h-full overflow-scroll rounded-md">{children}</div>
-                <div className="p-4 bg-slate-300 row-span-4 col-span-4 rounded-md flex items-center justify-center"></div>
-                <div className="p-4 bg-slate-300 row-span-2 col-span-2 rounded-md flex items-center justify-center"></div>
-                <div className="p-4 bg-slate-300 row-span-2 col-span-2 rounded-md flex items-center justify-center"></div>
-                <div className="p-4 bg-slate-300 row-span-2 col-span-4 rounded-md flex items-center justify-center"></div>
-                <div className="p-4 bg-slate-300 row-span-2 col-span-4 rounded-md flex items-center justify-center"></div>
-                <div className="p-4 bg-slate-300 row-span-2 col-span-2 rounded-md flex items-center justify-center"></div>
-              </div>
-          {/*{renderRightSidebar()}*/}
+              
         </main>
       </div>
       <Toaster theme="system" position="bottom-right" />
diff --git a/src/common/ui/templates/space/index.tsx b/src/common/ui/templates/space/index.tsx
new file mode 100644
index 00000000..6db7f931
--- /dev/null
+++ b/src/common/ui/templates/space/index.tsx
@@ -0,0 +1,25 @@
+
+
+type SpaceArgs = {
+  config: {
+    fidgetConfigs: {
+      [key: string]: any
+    }
+    layoutID: string;
+    layoutConfig: {
+      [key: string]: any
+    }
+    layoutID: string;
+  };
+  isEditable: boolean;
+}
+
+const Space = ({ config, isEditable }: SpaceArgs) => {
+  return (
+    <>
+      
+    </>
+  );
+};
+
+export default Space;
\ No newline at end of file
diff --git a/src/fidgets/layout/grids/defaultGrid.tsx b/src/fidgets/layout/grids/defaultGrid.tsx
new file mode 100644
index 00000000..e69de29b
diff --git a/src/pages/homebase/homebase.tsx b/src/pages/homebase/homebase.tsx
new file mode 100644
index 00000000..7dd37203
--- /dev/null
+++ b/src/pages/homebase/homebase.tsx
@@ -0,0 +1,20 @@
+import Space from "@/common/ui/templates/space";
+import { useAccountStore } from "@/common/data/stores/useAccountStore";
+
+function retrieveConfig(user, space){
+    const fidgets = {};
+    const layoutConfig = {}
+    const layoutID = "";
+
+    return ({fidgets, layoutConfig, layoutID})
+}
+
+export default function Homebase(spaceID) {
+
+    const { getCurrentUser } = useAccountStore();
+    const user = getCurrentUser()
+
+    return (
+        <Space config={retrieveConfig(user, spaceID)} isEditable={true}></Space>
+    )
+}
\ No newline at end of file

From 01b36e098e013a306b9b70735f943b8e8585d31d Mon Sep 17 00:00:00 2001
From: Jesse Paterson <jesse.r.pat@gmail.com>
Date: Fri, 3 May 2024 13:05:01 -0700
Subject: [PATCH 2/6] minor changes

---
 src/common/ui/templates/home/index.tsx  | 2 +-
 src/common/ui/templates/space/index.tsx | 1 -
 src/pages/homebase/homebase.tsx         | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/common/ui/templates/home/index.tsx b/src/common/ui/templates/home/index.tsx
index 489c69e4..78970170 100644
--- a/src/common/ui/templates/home/index.tsx
+++ b/src/common/ui/templates/home/index.tsx
@@ -69,7 +69,7 @@ const Home = ({ children }: { children: React.ReactNode }) => {
       router: "/homebase",
       icon: <NewspaperIcon className="h-6 w-6 shrink-0" aria-hidden="true" />,
       getTitle: getFeedTitle,
-      shortcut: "Shift + F",
+      shortcut: "Shift + H",
     },
     {
       name: "Feed",
diff --git a/src/common/ui/templates/space/index.tsx b/src/common/ui/templates/space/index.tsx
index 6db7f931..402b47bc 100644
--- a/src/common/ui/templates/space/index.tsx
+++ b/src/common/ui/templates/space/index.tsx
@@ -9,7 +9,6 @@ type SpaceArgs = {
     layoutConfig: {
       [key: string]: any
     }
-    layoutID: string;
   };
   isEditable: boolean;
 }
diff --git a/src/pages/homebase/homebase.tsx b/src/pages/homebase/homebase.tsx
index 7dd37203..7e5a715d 100644
--- a/src/pages/homebase/homebase.tsx
+++ b/src/pages/homebase/homebase.tsx
@@ -2,7 +2,7 @@ import Space from "@/common/ui/templates/space";
 import { useAccountStore } from "@/common/data/stores/useAccountStore";
 
 function retrieveConfig(user, space){
-    const fidgets = {};
+    const fidgetConfigs = {};
     const layoutConfig = {}
     const layoutID = "";
 

From 96c7ba60048591b93a4c2f1e773ac484750bfccd Mon Sep 17 00:00:00 2001
From: Jesse Paterson <jesse.r.pat@gmail.com>
Date: Fri, 3 May 2024 13:42:25 -0700
Subject: [PATCH 3/6] get account bandaid

---
 src/common/ui/templates/home/index.tsx | 2 +-
 src/pages/homebase/homebase.tsx        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/common/ui/templates/home/index.tsx b/src/common/ui/templates/home/index.tsx
index 78970170..cb0a736c 100644
--- a/src/common/ui/templates/home/index.tsx
+++ b/src/common/ui/templates/home/index.tsx
@@ -237,7 +237,7 @@ const Home = ({ children }: { children: React.ReactNode }) => {
                   <div className="flex h-16 shrink-0 items-center">
                     <img
                       className="h-8 w-auto"
-                      src={herocastImg.src}
+                      src={logo.src}
                       alt="herocast"
                     />
                     <h2 className="text-2xl font-bold leading-7 text-foreground sm:truncate sm:tracking-tight">
diff --git a/src/pages/homebase/homebase.tsx b/src/pages/homebase/homebase.tsx
index 7e5a715d..2c8b4be3 100644
--- a/src/pages/homebase/homebase.tsx
+++ b/src/pages/homebase/homebase.tsx
@@ -6,13 +6,13 @@ function retrieveConfig(user, space){
     const layoutConfig = {}
     const layoutID = "";
 
-    return ({fidgets, layoutConfig, layoutID})
+    return ({fidgetConfigs, layoutConfig, layoutID})
 }
 
 export default function Homebase(spaceID) {
 
-    const { getCurrentUser } = useAccountStore();
-    const user = getCurrentUser()
+   //const { getCurrentUser } = useAccountStore();
+    const user = useAccountStore.getState().accounts[0];
 
     return (
         <Space config={retrieveConfig(user, spaceID)} isEditable={true}></Space>

From 3df561ee49b5dd95708dbc808d6f26dd741a3047 Mon Sep 17 00:00:00 2001
From: Jesse Paterson <jesse.r.pat@gmail.com>
Date: Fri, 3 May 2024 13:54:26 -0700
Subject: [PATCH 4/6] updated home to include hardcoded grid again

---
 src/common/ui/templates/home/index.tsx | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/common/ui/templates/home/index.tsx b/src/common/ui/templates/home/index.tsx
index cb0a736c..dc9eb258 100644
--- a/src/common/ui/templates/home/index.tsx
+++ b/src/common/ui/templates/home/index.tsx
@@ -346,7 +346,17 @@ const Home = ({ children }: { children: React.ReactNode }) => {
           </h1>
         </div>*/}
         <main>
-              
+        <main>
+          <div className="p-8 grid grid-cols-4 md:grid-cols-8 lg:grid-cols-12 grid-rows-4 md:grid-rows-6 lg:grid-rows-8 gap-4 lg:gap-8 h-screen max-h-screen">
+            <div className="p-4 border-2 row-span-8 col-span-6 max-h-full overflow-scroll rounded-md">{children}</div>
+            <div className="p-4 bg-slate-300 row-span-4 col-span-4 rounded-md flex items-center justify-center"></div>
+            <div className="p-4 bg-slate-300 row-span-2 col-span-2 rounded-md flex items-center justify-center"></div>
+            <div className="p-4 bg-slate-300 row-span-2 col-span-2 rounded-md flex items-center justify-center"></div>
+            <div className="p-4 bg-slate-300 row-span-2 col-span-4 rounded-md flex items-center justify-center"></div>
+            <div className="p-4 bg-slate-300 row-span-2 col-span-4 rounded-md flex items-center justify-center"></div>
+            <div className="p-4 bg-slate-300 row-span-2 col-span-2 rounded-md flex items-center justify-center"></div>
+          </div>
+        </main>
         </main>
       </div>
       <Toaster theme="system" position="bottom-right" />

From efeb73a54c0f0f76dc2f18c62b424fe9bea7d7c6 Mon Sep 17 00:00:00 2001
From: Jesse Paterson <jesse.r.pat@gmail.com>
Date: Fri, 3 May 2024 14:00:12 -0700
Subject: [PATCH 5/6] removed homebase until more functionality is added

---
 src/common/ui/templates/home/index.tsx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/common/ui/templates/home/index.tsx b/src/common/ui/templates/home/index.tsx
index dc9eb258..3430e9bc 100644
--- a/src/common/ui/templates/home/index.tsx
+++ b/src/common/ui/templates/home/index.tsx
@@ -64,13 +64,13 @@ const Home = ({ children }: { children: React.ReactNode }) => {
   };
 
   const navigation: NavigationItemType[] = [
-    {
-      name: "Homebase",
-      router: "/homebase",
-      icon: <NewspaperIcon className="h-6 w-6 shrink-0" aria-hidden="true" />,
-      getTitle: getFeedTitle,
-      shortcut: "Shift + H",
-    },
+    // {
+    //   name: "Homebase",
+    //   router: "/homebase",
+    //   icon: <NewspaperIcon className="h-6 w-6 shrink-0" aria-hidden="true" />,
+    //   getTitle: getFeedTitle,
+    //   shortcut: "Shift + H",
+    // },
     {
       name: "Feed",
       router: "/feed",

From cddca406916421838dc6c9f7e5d46c59a77cffca Mon Sep 17 00:00:00 2001
From: Julian Early <jearly@berkeley.edu>
Date: Fri, 3 May 2024 14:11:46 -0700
Subject: [PATCH 6/6] fix: merge conflict adding herocast text back in

---
 src/common/ui/templates/home/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/ui/templates/home/index.tsx b/src/common/ui/templates/home/index.tsx
index bbf41f23..4e462f51 100644
--- a/src/common/ui/templates/home/index.tsx
+++ b/src/common/ui/templates/home/index.tsx
@@ -238,7 +238,7 @@ const Home = ({ children }: { children: React.ReactNode }) => {
                     <img
                       className="h-8 w-auto"
                       src={logo.src}
-                      alt="herocast"
+                      alt="Nounspace"
                     />
                     <h2 className="text-2xl font-bold leading-7 text-foreground sm:truncate sm:tracking-tight">
                       Nounspace