From 6f08475bfc64aabb6a259f29e237950caf5a90cd Mon Sep 17 00:00:00 2001
From: Eric Robsky Huntley <ericrobskyhuntley@gmail.com>
Date: Tue, 27 Feb 2024 23:35:55 -0500
Subject: [PATCH] consolidate config jsons

---
 src/components/Footer.astro | 16 ++++++++--------
 src/config.json             | 25 ++++++++++++++++++++++++-
 src/pages/about.astro       |  9 ++++-----
 src/people.json             | 23 -----------------------
 4 files changed, 36 insertions(+), 37 deletions(-)
 delete mode 100644 src/people.json

diff --git a/src/components/Footer.astro b/src/components/Footer.astro
index cc57f23..8231b09 100644
--- a/src/components/Footer.astro
+++ b/src/components/Footer.astro
@@ -8,7 +8,7 @@ interface Props {
   }[];
 }
 
-import comp from "../config.json";
+import data from "../config.json";
 
 const { navItems } = Astro.props;
 ---
@@ -18,12 +18,12 @@ const { navItems } = Astro.props;
   <div class="columns">
     <div class="column is-one-third">
       <div class="block">
-        <p class="title is-6 has-text-white">{comp.name}{comp.corp_form && ", ".concat(comp.corp_form)}</p>
-        <p class="subtitle is-6 has-text-white">{comp.subtitle}</p>
+        <p class="title is-6 has-text-white">{data.name}{data.corp_form && ", ".concat(data.corp_form)}</p>
+        <p class="subtitle is-6 has-text-white">{data.subtitle}</p>
       </div>
       <div class="block">
           {
-            comp.socials.map((platform) => (
+            data.socials.map((platform) => (
                 <span><a href={platform.url} class="has-text-white"><Icon name={"mdi:".concat(platform.name.toLowerCase())} size={28} /></a></span>
             ))
           }
@@ -40,10 +40,10 @@ const { navItems } = Astro.props;
     </div>
     <div class="column is-one-third">
       <ul>
-        <li>{comp.email && <a href={"mailto:".concat(comp.email)} class="has-text-white">{comp.email}</a>}</li>
-        <li>{comp.phone && <a href={"tel:".concat(comp.phone)} class="has-text-white">{comp.phone}</a>}</li>
-        <li class="has-text-white">{comp.office.address}</li>
-        <li class="has-text-white">{comp.office.city}, {comp.office.state} {comp.office.postal}</li>
+        <li>{data.email && <a href={"mailto:".concat(data.email)} class="has-text-white">{data.email}</a>}</li>
+        <li>{data.phone && <a href={"tel:".concat(data.phone)} class="has-text-white">{data.phone}</a>}</li>
+        <li class="has-text-white">{data.office.address}</li>
+        <li class="has-text-white">{data.office.city}, {data.office.state} {data.office.postal}</li>
       </ul>
     </div>
   </div>
diff --git a/src/config.json b/src/config.json
index 5d77684..d2f2b28 100644
--- a/src/config.json
+++ b/src/config.json
@@ -19,5 +19,28 @@
             "name": "Linkedin",
             "url": "https://www.linkedin.com/company/ographiesresearch"
         }
-    ]
+    ],
+    "people": {
+        "leadership": [
+            {
+                "name": "Eric Robsky Huntley",
+                "creds": ["PhD"],
+                "pronouns": "they/them",
+                "roles": ["Founder", "Principal"],
+                "email": "eric@ographiesresearch.com",
+                "socials": [
+                    {
+                        "name": "Github",
+                        "url": "https://github.com/ericrobskyhuntley/"
+                    },
+                    {
+                        "name": "Linkedin",
+                        "url": "https://www.linkedin.com/in/ericrobskyhuntley/"
+                    }
+                ],
+                "skills": ["spatial analysis", "GIS"],
+                "bio": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse faucibus enim ut risus bibendum rhoncus. Nunc vitae leo congue, porta nunc ultricies, imperdiet turpis. Proin convallis eu felis non bibendum. Nunc enim tortor, ullamcorper consequat facilisis sit amet, imperdiet a nulla. Donec lobortis lobortis imperdiet. Phasellus malesuada mollis ullamcorper. Proin non ante eu ex volutpat suscipit. In faucibus dictum ligula aliquet pretium. Mauris at turpis bibendum, placerat ex eget, vehicula nisl. Suspendisse in ex aliquet, elementum elit a, iaculis erat. Fusce ornare ac ante id interdum. Curabitur tincidunt elit a congue vulputate."
+            }
+        ]
+    }
 }
\ No newline at end of file
diff --git a/src/pages/about.astro b/src/pages/about.astro
index 0780d46..0d80007 100644
--- a/src/pages/about.astro
+++ b/src/pages/about.astro
@@ -3,16 +3,15 @@ import ContentLayout from '@layouts/ContentLayout.astro'
 import People from '@components/People.astro'
 import Organization from '@components/Organization.astro'
 
-import people from "../people.json";
-import comp from "../config.json";
+import data from "../config.json";
 ---
-<ContentLayout name={comp.name}>
+<ContentLayout name={data.name}>
   <div class="columns">
     <div class="column is-one-half">
-        <Organization org={comp}/>
+        <Organization org={data}/>
     </div>
     <div class="column is-one-half">
-      <People people={people.leadership} />
+      <People people={data.people.leadership} />
     </div>
   </div>
 </ContentLayout>
\ No newline at end of file
diff --git a/src/people.json b/src/people.json
deleted file mode 100644
index 40240c1..0000000
--- a/src/people.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "leadership": [
-        {
-            "name": "Eric Robsky Huntley",
-            "creds": ["PhD"],
-            "pronouns": "they/them",
-            "roles": ["Founder", "Principal"],
-            "email": "eric@ographiesresearch.com",
-            "socials": [
-                {
-                    "name": "Github",
-                    "url": "https://github.com/ericrobskyhuntley/"
-                },
-                {
-                    "name": "Linkedin",
-                    "url": "https://www.linkedin.com/in/ericrobskyhuntley/"
-                }
-            ],
-            "skills": ["spatial analysis", "GIS"],
-            "bio": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse faucibus enim ut risus bibendum rhoncus. Nunc vitae leo congue, porta nunc ultricies, imperdiet turpis. Proin convallis eu felis non bibendum. Nunc enim tortor, ullamcorper consequat facilisis sit amet, imperdiet a nulla. Donec lobortis lobortis imperdiet. Phasellus malesuada mollis ullamcorper. Proin non ante eu ex volutpat suscipit. In faucibus dictum ligula aliquet pretium. Mauris at turpis bibendum, placerat ex eget, vehicula nisl. Suspendisse in ex aliquet, elementum elit a, iaculis erat. Fusce ornare ac ante id interdum. Curabitur tincidunt elit a congue vulputate."
-        }
-    ]
-}
\ No newline at end of file