Skip to content

Commit 25723e7

Browse files
committed
remove Team-Github links and page; update layout and content sections for consistency
1 parent 1fc51c2 commit 25723e7

File tree

5 files changed

+66
-91
lines changed

5 files changed

+66
-91
lines changed

src/components/MobileNav.tsx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,6 @@ export default function MobileNav() {
4040
>
4141
Team
4242
</a>
43-
<a
44-
href={getInternalLink('/team_github')}
45-
className="flex w-full items-center rounded-md p-2 text-sm font-medium hover:underline"
46-
>
47-
Team-Github
48-
</a>
4943
<a
5044
href={getInternalLink('/software')}
5145
className="flex w-full items-center rounded-md p-2 text-sm font-medium hover:underline"

src/layouts/Layout.astro

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,6 @@ const { title } = Astro.props;
7777
<a class="transition-colors hover:text-foreground/80 text-foreground" href={getInternalLink('/team')}>
7878
Team
7979
</a>
80-
<a class="transition-colors hover:text-foreground/80 text-foreground" href={getInternalLink('/team_github')}>
81-
Team-Github
82-
</a>
8380
<a class="transition-colors hover:text-foreground/80 text-foreground" href={getInternalLink('/software')}>
8481
Software
8582
</a>

src/pages/index.astro

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ import { Card, CardContent, CardHeader, CardTitle } from '../components/ui/card'
1313

1414
<Layout title="Home">
1515
<div class="flex-1">
16-
<section class="space-y-6 py-8 md:py-12 lg:py-24">
16+
<section class="py-4 lg:py-12">
1717
<div class="mx-auto flex flex-col items-center max-w-6xl">
1818
<img src={getInternalLink('/banner.svg')} alt="Saez-Rodriguez Group Banner" class="w-full" />
1919
</div>
2020
</section>
2121

22-
<section class="container space-y-6 md:py-12 lg:py-24">
22+
<section class="container py-4">
2323
<div class="mx-auto flex max-w-[58rem] flex-col md:flex-row items-center gap-8">
2424
<Card className="flex-1">
2525
<CardContent className="flex flex-col md:flex-row items-center gap-8 p-6">
@@ -45,38 +45,40 @@ import { Card, CardContent, CardHeader, CardTitle } from '../components/ui/card'
4545
</div>
4646
</section>
4747

48-
<section class="container space-y-6 py-8 md:py-12 lg:py-24">
48+
<section class="container py-4">
4949
<Card className="mx-auto max-w-[58rem]">
5050
<CardContent>
5151
<CardHeader>
5252
<CardTitle className="text-2xl leading-[1.1] sm:text-2xl md:text-4xl text-center mb-4">
53-
Our Locations
53+
Research
5454
</CardTitle>
5555
</CardHeader>
56-
<div class="leading-normal text-muted-foreground sm:text-base sm:leading-6">
56+
<div class="leading-normal text-muted-foreground sm:text-lg sm:leading-7">
5757
<Prose>
58-
<LocationsContent />
58+
<ResearchContent />
5959
</Prose>
6060
</div>
6161
</CardContent>
6262
</Card>
6363
</section>
6464

65-
<section class="container space-y-6 py-8 md:py-12 lg:py-24">
65+
<section class="container py-4">
6666
<Card className="mx-auto max-w-[58rem]">
6767
<CardContent>
6868
<CardHeader>
6969
<CardTitle className="text-2xl leading-[1.1] sm:text-2xl md:text-4xl text-center mb-4">
70-
Research
70+
Our Locations
7171
</CardTitle>
7272
</CardHeader>
73-
<div class="leading-normal text-muted-foreground sm:text-lg sm:leading-7">
73+
<div class="leading-normal text-muted-foreground sm:text-base sm:leading-6">
7474
<Prose>
75-
<ResearchContent />
75+
<LocationsContent />
7676
</Prose>
7777
</div>
7878
</CardContent>
7979
</Card>
8080
</section>
81+
82+
8183
</div>
8284
</Layout>

src/pages/team.astro

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,36 @@ import teamData from '../content/team/team.json';
44
import TeamMemberCard from '../components/TeamMemberCard';
55
import AlumniCard from '../components/AlumniCard.astro';
66
import { getInternalLink } from '../lib/utils';
7+
import { getCollection } from 'astro:content';
8+
9+
// Interfaces for GitHub team data
10+
interface TeamMember {
11+
login: string;
12+
name: string | null;
13+
avatar_url: string;
14+
bio: string | null;
15+
email: string | null;
16+
location: string | null;
17+
html_url: string;
18+
}
19+
20+
interface Team {
21+
name: string;
22+
slug: string;
23+
members: TeamMember[];
24+
}
25+
26+
interface TeamData {
27+
teams: Team[];
28+
}
29+
30+
// Fetch GitHub team data
31+
const githubTeamsCollection = await getCollection('teams_loaded');
32+
const githubTeamData = githubTeamsCollection[0]?.data as unknown as TeamData | undefined;
33+
34+
// Find Interns and Visitors teams from GitHub data
35+
const internsAndVisitorsTeam = githubTeamData?.teams.find(team => team.slug.toLowerCase() === 'intern-visitor');
36+
737
---
838

939
<Layout title="Team">
@@ -164,6 +194,30 @@ import { getInternalLink } from '../lib/utils';
164194
</div>
165195
</div>
166196

197+
198+
{/* Interns & Visitors Section (from GitHub) */}
199+
{internsAndVisitorsTeam && internsAndVisitorsTeam.members.length > 0 && (
200+
<div class="mx-auto max-w-[980px] py-6 md:py-12">
201+
<h2 class="mb-8 text-2xl font-bold">Interns & Visitors</h2>
202+
<div class="grid gap-6 sm:grid-cols-2 lg:grid-cols-3">
203+
{internsAndVisitorsTeam.members.map((member: TeamMember) => (
204+
<TeamMemberCard
205+
client:load
206+
name={member.name || member.login}
207+
role="Intern / Visitor"
208+
image={member.avatar_url}
209+
bio={member.bio || ''}
210+
email={member.email || ''}
211+
github_url={member.html_url}
212+
research_interests=""
213+
professional_career={[]}
214+
education={[]}
215+
/>
216+
))}
217+
</div>
218+
</div>
219+
)}
220+
167221
<div class="mx-auto max-w-[980px] py-6 md:py-12">
168222
<h2 class="mb-8 text-2xl font-bold">Alumni</h2>
169223
<p class="mb-8 text-muted-foreground">The following people spent over 6 months with us:</p>

src/pages/team_github.astro

Lines changed: 0 additions & 72 deletions
This file was deleted.

0 commit comments

Comments
 (0)