Skip to content

refactor/polishing edits #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
utcjcao merged 10 commits into from
Dec 1, 2025
Merged

refactor/polishing edits #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ea3c167
remove broken link in laptop loan
utcjcao Dec 1, 2025
80e9b75
fix borken link in services and resources
utcjcao Dec 1, 2025
8e3f94c
fix broken link in get-involved page
utcjcao Dec 1, 2025
b0571b7
remove unused contact us functions
utcjcao Dec 1, 2025
4711583
added all course unions, fixed course-unions css
utcjcao Dec 1, 2025
49e82f0
fix broken links in grants page
utcjcao Dec 1, 2025
5da2a83
fix links in awards
utcjcao Dec 1, 2025
d70bc03
rest of changes
utcjcao Dec 1, 2025
d315b73
fix lint issue
utcjcao Dec 1, 2025
110d981
fixing build error by temporarily removing unused page
utcjcao Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
273 changes: 133 additions & 140 deletions app/about/executives/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,99 @@
import React from "react";
import Text from "@/components/common/Text";
// import AssuImage from "@/components/common/AssuImage";
import Divider from "@/components/common/Divider";
import Link from "@/components/common/Link";
import fs from "fs/promises";
import path from "path";
import Image from "next/image";
import { fetchExecutivesData } from "@/lib/executives";

export async function generateStaticParams() {
try {
const executives = await fetchExecutivesData();
console.log(`Fetched ${executives.length} executives at build time`);
return [{}];
} catch (error) {
console.error("Error in generateStaticParams:", error);
return [{}];
import Divider from "@/components/common/Divider";
import Text from "@/components/common/Text";
import HeroText from "@/components/sections/HeroText";

type ExecutiveRow = {
name: string;
image?: string;
bio: string;
};

type Executive = {
name: string;
title?: string;
image?: string;
bio: string;
};

function parseCsvLine(line: string): string[] {
const result: string[] = [];
let current = "";
let inQuotes = false;

for (let i = 0; i < line.length; i++) {
const char = line[i];
const next = line[i + 1];

if (char === '"' && inQuotes && next === '"') {
current += '"';
i++; // skip escaped quote
continue;
}

if (char === '"') {
inQuotes = !inQuotes;
continue;
}

if (char === "," && !inQuotes) {
result.push(current.trim());
current = "";
continue;
}

current += char;
}

result.push(current.trim());
return result;
}

async function loadExecutives(): Promise<Executive[]> {
const csvPath = path.join(process.cwd(), "info", "executives.csv");
const content = await fs.readFile(csvPath, "utf-8");
const lines = content.trim().split(/\r?\n/);

const header = parseCsvLine(lines.shift() ?? "");
const rows: ExecutiveRow[] = lines
.map(parseCsvLine)
.filter((cols) => cols.length >= 1)
.map((cols) => {
const row: Record<string, string> = {};
header.forEach((key, idx) => {
row[key] = cols[idx] ?? "";
});
return {
name: row.name || "",
image: row.image || undefined,
bio: row.bio || "",
};
});

return rows.map((row) => {
const [namePart, ...titleParts] = row.name.split(",");
const name = namePart?.trim() ?? "";
const title = titleParts.join(",").trim() || undefined;

return {
name,
title,
image: row.image?.trim() || undefined,
bio: row.bio?.trim() || "",
};
});
}

export default async function Executives() {
// Fetch executives data at build time
const executives = await fetchExecutivesData();
const executives = await loadExecutives();

return (
<div className="min-h-screen bg-gray-lighter">
{/* Header Section */}
<div className="max-w-6xl mx-auto px-4 py-12 md:py-20">
<div className="text-center mb-16">
<Divider className="mb-8" width="100%" maxWidth="100%" />

<Text
as="h1"
className="text-4xl md:text-5xl font-bold text-[var(--color-text-primary)] mb-4"
>
Our Team
</Text>

<Divider className="mb-6" width="100%" maxWidth="100%" />
<div className="text-center mb-16 max max-w-3xl mx-auto">
<HeroText text="Our Team"></HeroText>

<Text
as="p"
Expand All @@ -46,124 +105,58 @@ export default async function Executives() {
<div className="w-full h-px bg-black opacity-25"></div>
</div>

{/* Executives Section */}
<div className="relative">
<div className="hidden md:block absolute left-1/2 top-0 bottom-0 w-px bg-black opacity-25 transform -translate-x-1/2"></div>

<div className="space-y-16 md:space-y-24">
{executives.map((executive, index) => (
<div key={executive.name} className="bg-gray-lighter">
<div className="relative">
<div
className={`grid gap-8 md:gap-12 items-start ${
executive.image ? "md:grid-cols-2" : "md:grid-cols-1"
<div className="max-w-3xl mx-auto grid grid-cols-1 md:grid-cols-2 gap-8 md:gap-12">
{executives.map((executive, index) => (
<div
key={`${executive.name}-${index}`}
className="bg-white rounded-lg shadow-sm p-6 md:p-8 flex flex-col space-y-6"
>
<div className="relative w-full aspect-[4/5] rounded-lg overflow-hidden bg-gray-200">
{executive.image ? (
<Image
src={executive.image}
alt={`${executive.name}${
executive.title ? ` - ${executive.title}` : ""
}`}
>
{/* Image Section - Alternating sides */}
{executive.image && (
<div
className={`order-2 ${
index % 2 === 0 ? "md:order-1" : "md:order-2"
}`}
>
<div className="relative w-full aspect-[4/5] rounded-lg overflow-hidden shadow-lg">
<Image
src={executive.image}
alt={`${executive.name} - ${executive.title}`}
fill
sizes="(max-width: 768px) 100vw, 50vw"
className="object-cover"
/>
</div>
</div>
)}

{/* Content Section - Alternating sides */}
<div
className={`order-1 ${
executive.image
? index % 2 === 0
? "md:order-2"
: "md:order-1"
: ""
}`}
>
<div className="space-y-6 flex flex-col justify-end h-full">
<div>
<Text
as="h2"
className="text-3xl md:text-4xl font-bold text-[var(--color-text-primary)] mb-2"
>
{executive.name}
</Text>
<Text
as="h3"
className="text-xl md:text-2xl text-[var(--color-text-primary)]"
>
{executive.title}
</Text>
</div>

{/* Bio */}
<div>
<Text
as="p"
className="text-[var(--color-text-secondary)] leading-relaxed text-base md:text-lg whitespace-pre-line"
>
{executive.bio}
</Text>
</div>

<div className="flex flex-wrap gap-4 pt-4">
<Link href={`mailto:${executive.email}`}>
<span className="inline-flex items-center gap-2">
<span>📧</span>
<span>{executive.email}</span>
</span>
</Link>

{executive.linkedin && (
<Link href={`https://${executive.linkedin}`}>
<span className="inline-flex items-center gap-2">
<span>❤️</span>
<span>{executive.linkedin}</span>
</span>
</Link>
)}

{executive.instagram && (
<Link
href={`https://instagram.com/${executive.instagram.replace(
"@",
""
)}`}
>
<span className="inline-flex items-center gap-2">
<span>❤️</span>
<span>{executive.instagram}</span>
</span>
</Link>
)}
</div>
</div>
</div>
fill
sizes="(max-width: 768px) 100vw, 50vw"
className="object-cover"
/>
) : (
<div className="absolute inset-0 flex items-center justify-center text-gray-400 text-sm">
No image available
</div>
)}
</div>

{/* Horizontal line below each executive section */}
{index < executives.length - 1 && (
<div className="flex justify-between mt-8 gap-8 md:gap-12">
<div className="w-[calc(50%-1rem)] md:w-[calc(50%-1.5rem)] h-px bg-black opacity-25"></div>
<div className="w-[calc(50%-1rem)] md:w-[calc(50%-1.5rem)] h-px bg-black opacity-25"></div>
</div>
)}
</div>
<div className="space-y-3">
<Text
as="h2"
className="text-3xl md:text-4xl font-bold text-[var(--color-text-primary)]"
>
{executive.name}
</Text>
{executive.title && (
<Text
as="h3"
className="text-xl md:text-2xl text-[var(--color-text-primary)]"
>
{executive.title}
</Text>
)}
</div>
))}
</div>

<Text
as="p"
className="text-[var(--color-text-secondary)] leading-relaxed text-base md:text-lg whitespace-pre-line"
>
{executive.bio}
</Text>
</div>
))}
</div>
</div>

{/* Bottom divider */}
<div className="max-w-6xl mx-auto px-4 -mt-8">
<Divider width="100%" maxWidth="100%" />
</div>
Expand Down
Loading
Loading