Skip to content

Commit

Permalink
consolidate config jsons
Browse files Browse the repository at this point in the history
  • Loading branch information
ericrobskyhuntley committed Feb 28, 2024
1 parent 1a5fb49 commit 6f08475
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 37 deletions.
16 changes: 8 additions & 8 deletions src/components/Footer.astro
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ interface Props {
}[];
}
import comp from "../config.json";
import data from "../config.json";
const { navItems } = Astro.props;
---
Expand All @@ -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>
))
}
Expand All @@ -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>
Expand Down
25 changes: 24 additions & 1 deletion src/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -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."
}
]
}
}
9 changes: 4 additions & 5 deletions src/pages/about.astro
Original file line number Diff line number Diff line change
Expand Up @@ -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>
23 changes: 0 additions & 23 deletions src/people.json

This file was deleted.

0 comments on commit 6f08475

Please sign in to comment.