Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions src/app/(main)/events/_components/EventsRoadmap.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import Image from "next/image";
import { EmptyListPlaceholder } from "@/components/misc/EmptyListPlaceholder";

type EventsRoadmapProps = {
title: string;
image: {
image?: {
src: string;
alt: string;
};
Expand All @@ -12,7 +13,11 @@ export default function EventsRoadmap({ title, image }: EventsRoadmapProps) {
return (
<div className="py-20" id="roadmap">
<h2 className="py-10 text-3xl font-bold">{title}</h2>
<Image className="w-full rounded-2xl" src={image.src} alt={image.alt} width="4000" height="3000" />
{image ? (
<Image className="w-full rounded-2xl" src={image.src} alt={image.alt} width="4000" height="3000" />
) : (
<EmptyListPlaceholder>Roadmap coming soon for 2026</EmptyListPlaceholder>
)}
</div>
);
}
9 changes: 5 additions & 4 deletions src/app/(main)/events/_data/events.data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,11 @@ export const eventsData = {
title: "Events Roadmap",
description:
"Our events are planned well in advance, so you can always know what's coming up. Check out our roadmap below to see what's in store for the next few semesters.",
image: {
src: "/event-roadmap-s1-pixel-abbey.svg",
alt: "Events Roadmap",
},
image: undefined,
// {
// src: "/event-roadmap-s1-pixel-abbey.svg",
// alt: "Events Roadmap",
// },
},
eventsGrid: {
title: "Recent Events",
Expand Down
2 changes: 2 additions & 0 deletions src/app/(payload)/admin/importMap.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { CollectionCards as CollectionCards_f9c02e79a4aed9a3924487c0cd4cafb1 } from "@payloadcms/next/rsc";
import { S3ClientUploadHandler as S3ClientUploadHandler_f97aa6c64367fa259c5bc0567239ef24 } from "@payloadcms/storage-s3/client";

export const importMap = {
"@payloadcms/storage-s3/client#S3ClientUploadHandler": S3ClientUploadHandler_f97aa6c64367fa259c5bc0567239ef24,
"@payloadcms/next/rsc#CollectionCards": CollectionCards_f9c02e79a4aed9a3924487c0cd4cafb1,
};
2 changes: 1 addition & 1 deletion src/components/layout/navbar/NavigationBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ export default function NavigationBar({ variant = { color: "light" } }: NavbarPr
</Button>
<Button
variant={{ style: "primary", color: "blue" }}
href="https://docs.google.com/forms/d/e/1FAIpQLSf9p1n1GpuuFxXbhx_7iWDQkDqRpxVDAjUOeyyzYeavC6d48A/viewform?usp=sharing"
href="https://docs.google.com/forms/d/e/1FAIpQLScJbNOt3G583BetdEkQ56o2VJX9VTvD-_X0PdBYpCaucO27Uw/viewform?usp=header"
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's make an issue to add ts to payload

className="hidden items-center leading-none md:flex"
newTab
>
Expand Down
68 changes: 0 additions & 68 deletions src/payload/globals/execspage/ExecsPageGlobal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,74 +28,6 @@ export const ExecsPageGlobal: GlobalConfig = {
placeholder: "Please type the page's description here.",
},
},
{
//maybe execs could be a collection and this could reference that collection instead.
name: "teams",
type: "array",
required: true,
fields: [
{
name: "teamName",
type: "text",
required: true,
admin: {
placeholder: "Please type the team's name here.",
},
},
{
name: "teamDescription",
type: "textarea",
required: true,
admin: {
placeholder: "Please type the team's description here.",
},
},
{
name: "execs",
type: "array",
fields: [
{
name: "name",
type: "text",
required: true,
admin: {
placeholder: "Please type the exec's name here.",
},
},
{
name: "role",
type: "text",
required: true,
admin: {
placeholder: "Please type the exec's role here. e.g Tech Director",
},
},
{
name: "image",
type: "upload",
relationTo: "media",
},
{
name: "description",
type: "textarea",
required: true,
admin: {
placeholder:
"Please type the exec's description here. e.g BE(Hons) - Software Engineering The University of Auckland",
},
},
{
name: "joined",
type: "text",
required: true,
admin: {
placeholder: "Please type the exec's join date here. In the format Joined Jan 2023",
},
},
],
},
],
},
],
};

Expand Down
32 changes: 0 additions & 32 deletions src/payload/payload-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -643,21 +643,6 @@ export interface ExecsPage {
id: number;
title: string;
description: string;
teams: {
teamName: string;
teamDescription: string;
execs?:
| {
name: string;
role: string;
image?: (number | null) | Media;
description: string;
joined: string;
id?: string | null;
}[]
| null;
id?: string | null;
}[];
updatedAt?: string | null;
createdAt?: string | null;
}
Expand Down Expand Up @@ -824,23 +809,6 @@ export interface HeroPage {
export interface ExecsPageSelect<T extends boolean = true> {
title?: T;
description?: T;
teams?:
| T
| {
teamName?: T;
teamDescription?: T;
execs?:
| T
| {
name?: T;
role?: T;
image?: T;
description?: T;
joined?: T;
id?: T;
};
id?: T;
};
updatedAt?: T;
createdAt?: T;
globalType?: T;
Expand Down