Skip to content

Feat/replace table #398

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

Open
wants to merge 4 commits into
base: staged
Choose a base branch
from
Open

Feat/replace table #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a7b218
added a generic table component
Soumil221 Oct 10, 2025
d46443a
replaced tables in research page
Soumil221 Oct 15, 2025
f4396bc
replacing pages
Soumil221 Oct 15, 2025
195da82
Merge branch 'staged' into feat/replace-table
Soumil221 Oct 16, 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
123 changes: 51 additions & 72 deletions app/[locale]/academics/programmes/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,7 @@ import { Fragment } from 'react';

import Heading from '~/components/heading';
import ImageHeader from '~/components/image-header';
import {
Table,
TableBody,
TableCell,
TableHead,
TableHeader,
TableRow,
} from '~/components/ui';
import GenericTable from '~/components/ui/generic-table';
import { getTranslations } from '~/i18n/translations';

export default async function Programmes({
Expand Down Expand Up @@ -151,22 +144,16 @@ export default async function Programmes({
<strong>{text.courseOfStudy}</strong> {text.btechAbout}
</p>
<br />
<Table className="mt-4">
<TableHeader>
<TableRow>
<TableHead>{text.discipline}</TableHead>
<TableHead>{text.noOfSeats}</TableHead>
</TableRow>
</TableHeader>
<TableBody>
{btech.map((programme, i) => (
<TableRow key={i}>
<TableCell>{programme.name}</TableCell>
<TableCell>{programme.seats}</TableCell>
</TableRow>
))}
</TableBody>
</Table>
<GenericTable
headers={[
{ key: 'name', label: text.discipline },
{ key: 'seats', label: text.noOfSeats },
]}
tableData={btech}
currentPage={1}
itemsPerPage={btech.length}
getCount={Promise.resolve([{ count: btech.length }])}
/>
</article>

<article className="container mb-8">
Expand All @@ -182,28 +169,19 @@ export default async function Programmes({
<h4 className="mt-4 text-2xl font-semibold">
{text.secialization.toUpperCase()}
</h4>
<Table className="mt-2">
<TableHeader>
<TableRow>
<TableHead>{text.discipline}</TableHead>
<TableHead>{text.secialization}</TableHead>
</TableRow>
</TableHeader>
<TableBody>
{mtech.map((programme, i) => (
<TableRow key={i}>
<TableCell>{programme.name}</TableCell>
<TableCell>
<ul className="list-inside list-disc">
{programme.specializations.map((val, idx) => (
<li key={idx}>{val}</li>
))}
</ul>
</TableCell>
</TableRow>
))}
</TableBody>
</Table>
<GenericTable
headers={[
{ key: 'name', label: text.discipline },
{ key: 'specializations', label: text.secialization },
]}
tableData={mtech.map((programme) => ({
name: programme.name,
specializations: programme.specializations.join(', '),
}))}
currentPage={1}
itemsPerPage={mtech.length}
getCount={Promise.resolve([{ count: mtech.length }])}
/>
</article>

<article className="container mb-8">
Expand All @@ -212,32 +190,33 @@ export default async function Programmes({
heading="h2"
text={text.seatDistribution.toUpperCase()}
/>
<Table className="mt-2">
<TableHeader>
<TableRow>
<TableHead>{text.departmentAndSchools}</TableHead>
<TableHead>{text.secialization}</TableHead>
<TableHead>{text.noOfSeats}</TableHead>
</TableRow>
</TableHeader>
<TableBody>
{seatsMtech.map((programme, i) => (
<Fragment key={i}>
{programme.specialization.map((spec, index) => (
<TableRow key={index}>
{index === 0 && (
<TableCell rowSpan={programme.specialization.length}>
{programme.department}
</TableCell>
)}
<TableCell>{spec.name}</TableCell>
<TableCell>{spec.seats}</TableCell>
</TableRow>
))}
</Fragment>
))}
</TableBody>
</Table>
<GenericTable
headers={[
{ key: 'department', label: text.departmentAndSchools },
{ key: 'name', label: text.secialization },
{ key: 'seats', label: text.noOfSeats },
]}
tableData={seatsMtech.flatMap((programme) =>
programme.specialization.map((spec, index) => ({
department: index === 0 ? programme.department : '',
name: spec.name,
seats: spec.seats,
}))
)}
currentPage={1}
itemsPerPage={seatsMtech.reduce(
(acc, p) => acc + p.specialization.length,
0
)}
getCount={Promise.resolve([
{
count: seatsMtech.reduce(
(acc, p) => acc + p.specialization.length,
0
),
},
])}
/>
</article>
</>
);
Expand Down
141 changes: 16 additions & 125 deletions app/[locale]/institute/administration/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,8 @@ import Heading from '~/components/heading';
import ImageHeader from '~/components/image-header';
import ButtonGroup from '~/components/button-group';
import Loading from '~/components/loading';
import {
CardTitle,
Table,
TableBody,
TableCell,
TableHead,
TableHeader,
TableRow,
} from '~/components/ui';
import { CardTitle } from '~/components/ui';
import GenericTable from '~/components/ui/generic-table';
import { getTranslations } from '~/i18n/translations';
import { db } from '~/server/db';

Expand Down Expand Up @@ -106,21 +99,20 @@ export default async function Administration({
<CardTitle className="text-2xl text-primary-300">
{text.composition}
</CardTitle>
<Table
className="w-full"
scrollAreaClassName="md:max-h-96 sm:max-h-72 max-h-60"
>
<TableHeader>
<TableRow>
<TableHead>{text.sNo}</TableHead>
<TableHead>{text.name}</TableHead>
<TableHead>{text.servedAs}</TableHead>
</TableRow>
</TableHeader>
<TableBody>
<SenateMembers />
</TableBody>
</Table>
<GenericTable
headers={[
{ key: 'serial', label: text.sNo },
{ key: 'name', label: text.name },
{ key: 'servingAs', label: text.servedAs },
]}
tableData={await db.query.committeeMembers.findMany({
where: (member, { eq }) => eq(member.committeeType, 'senate'),
orderBy: (member, { asc }) => [asc(member.serial)],
})}
currentPage={1}
itemsPerPage={100}
getCount={Promise.resolve([{ count: 100 }])}
/>
</Suspense>
</section>
<ButtonGroup
Expand Down Expand Up @@ -261,104 +253,3 @@ export default async function Administration({
</>
);
}

const SenateMembers = async () => {
const members = await db.query.committeeMembers.findMany({
where: (member, { eq }) => eq(member.committeeType, 'senate'),
orderBy: (member, { asc }) => [asc(member.serial)],
});

return members.map(({ serial, name, servingAs }, index) => (
<TableRow key={index}>
<TableCell>{serial}</TableCell>
<TableCell>{name}</TableCell>
<TableCell>{servingAs}</TableCell>
</TableRow>
));
};
const Deans = () => {
const deans = [
{
id: 1,
name: 'Professor Pratibha Aggarwal',
designation: 'Dean of Student Welfare',
email: '[email protected]',
image: '/images/dean1.jpg', // replace with your actual dean image path
description: `India, the land of seekers, is at the cusp of becoming Vishwa Guru all
over again after 1100 years of subjugation, wars, annexures and humiliation.
It is again a free country due to the sacrifices made by our leaders, freedom fighters
and has learnt the art of standing tall in the midst of many a challenge of building
the nation with its rich diversity, cultures, languages all over again since the last
75 years. Unity in Diversity is our mantra while making our nation stronger in every sphere.`,
},
{
id: 2,
name: 'Professor Pratibha Aggarwal',
designation: 'Dean of Student Welfare',
email: '[email protected]',
image: '/images/dean1.jpg', // replace with your actual dean image path
description: `India, the land of seekers, is at the cusp of becoming Vishwa Guru all
over again after 1100 years of subjugation, wars, annexures and humiliation.
It is again a free country due to the sacrifices made by our leaders, freedom fighters
and has learnt the art of standing tall in the midst of many a challenge of building
the nation with its rich diversity, cultures, languages all over again since the last
75 years. Unity in Diversity is our mantra while making our nation stronger in every sphere.`,
},
];

return (
<section className="space-y-8">
{deans.map((dean) => (
<article
key={dean.id}
className="bg-white flex flex-col items-start gap-6 rounded-xl border border-neutral-200 p-6 shadow-md md:flex-row"
>
{/* Image + Email (left column) */}
<div className="flex flex-col items-start">
<Image
alt={dean.name}
className="size-32 rounded lg:size-36 xl:size-40 2xl:size-44"
height={0}
src={`persons/${dean.id}/image.png`}
width={0}
/>
<div className="mt-3 flex items-center gap-2 text-sm text-neutral-800">
<MdEmail className="text-[#C5291D]" />
<a
href={`mailto:${dean.email}`}
className="text-[#C5291D] hover:underline"
>
{dean.email}
</a>
</div>
</div>

{/* Content (right column) */}
<div className="flex-1">
<header className="mb-3">
<h3
className="text-xl font-bold"
style={{ color: '#C5291D', fontFamily: 'DM Serif Display' }}
>
{dean.name}
</h3>
<p
className="text-lg"
style={{ color: '#E13F32', fontFamily: 'DM Serif Display' }}
>
{dean.designation}
</p>
</header>

<p
className="text-sm leading-relaxed text-neutral-700"
style={{ color: '#000000', fontFamily: 'DM Sans' }}
>
{dean.description}
</p>
</div>
</article>
))}
</section>
);
};
Loading