Skip to content

Commit

Permalink
feat: update team
Browse files Browse the repository at this point in the history
 style: fix announcement toggle
  • Loading branch information
elphabetsoop committed Apr 10, 2024
1 parent 56e67c8 commit aacb6b9
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 82 deletions.
55 changes: 3 additions & 52 deletions .astro/types.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ declare module 'astro:content' {
}

declare module 'astro:content' {
export { z } from 'astro/zod';

type Flatten<T> = T extends { [K: string]: infer U } ? U : never;

export type CollectionKey = keyof AnyEntryMap;
Expand All @@ -19,53 +17,6 @@ declare module 'astro:content' {
export type ContentCollectionKey = keyof ContentEntryMap;
export type DataCollectionKey = keyof DataEntryMap;

// This needs to be in sync with ImageMetadata
export type ImageFunction = () => import('astro/zod').ZodObject<{
src: import('astro/zod').ZodString;
width: import('astro/zod').ZodNumber;
height: import('astro/zod').ZodNumber;
format: import('astro/zod').ZodUnion<
[
import('astro/zod').ZodLiteral<'png'>,
import('astro/zod').ZodLiteral<'jpg'>,
import('astro/zod').ZodLiteral<'jpeg'>,
import('astro/zod').ZodLiteral<'tiff'>,
import('astro/zod').ZodLiteral<'webp'>,
import('astro/zod').ZodLiteral<'gif'>,
import('astro/zod').ZodLiteral<'svg'>,
import('astro/zod').ZodLiteral<'avif'>,
]
>;
}>;

type BaseSchemaWithoutEffects =
| import('astro/zod').AnyZodObject
| import('astro/zod').ZodUnion<[BaseSchemaWithoutEffects, ...BaseSchemaWithoutEffects[]]>
| import('astro/zod').ZodDiscriminatedUnion<string, import('astro/zod').AnyZodObject[]>
| import('astro/zod').ZodIntersection<BaseSchemaWithoutEffects, BaseSchemaWithoutEffects>;

type BaseSchema =
| BaseSchemaWithoutEffects
| import('astro/zod').ZodEffects<BaseSchemaWithoutEffects>;

export type SchemaContext = { image: ImageFunction };

type DataCollectionConfig<S extends BaseSchema> = {
type: 'data';
schema?: S | ((context: SchemaContext) => S);
};

type ContentCollectionConfig<S extends BaseSchema> = {
type?: 'content';
schema?: S | ((context: SchemaContext) => S);
};

type CollectionConfig<S> = ContentCollectionConfig<S> | DataCollectionConfig<S>;

export function defineCollection<S extends BaseSchema>(
input: CollectionConfig<S>
): CollectionConfig<S>;

type AllValuesOf<T> = T extends any ? T[keyof T] : never;
type ValidContentEntrySlug<C extends keyof ContentEntryMap> = AllValuesOf<
ContentEntryMap[C]
Expand Down Expand Up @@ -155,11 +106,11 @@ declare module 'astro:content' {
? {
collection: C;
slug: ValidContentEntrySlug<C>;
}
}
: {
collection: C;
id: keyof DataEntryMap[C];
}
}
>;
// Allow generic `string` to avoid excessive type errors in the config
// if `dev` is not running to update as you edit.
Expand All @@ -183,5 +134,5 @@ declare module 'astro:content' {

type AnyEntryMap = ContentEntryMap & DataEntryMap;

type ContentConfig = never;
export type ContentConfig = never;
}
2 changes: 1 addition & 1 deletion src/components/TheAnnouncementBar.astro
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const { description, url } = Astro.props;
<div
class="flex justify-between align-center flex-col gap-3 lg:flex-row border-primary border-2 p-3 rounded-lg"
>
<span class="text-lg text-white">
<span class="text-lg text-black dark:text-white">
{description}
</span>
{
Expand Down
2 changes: 1 addition & 1 deletion src/content/_meta.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
announcement:
enabled: true
description: >-
If you're stopping by Ngee Ann Poly's Open House, welcome! Feel free to ask us any questions you have about our club, or just say hi! 👋
If you're stopping by ICT's SIG Fiesta, welcome! Feel free to ask us any questions you have about our club, or just say hi! 👋
# url: https://forms.office.com/r/46tigKSLzz

navbar:
Expand Down
64 changes: 36 additions & 28 deletions src/content/_team.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,45 +7,53 @@ departments:
title: Lecturer-in-charge
- title: P/VP
members:
- name: Arash Nur Iman
- name: Lee Guang Le Jeffrey
title: President
- name: Ang Jeyvian
title: Vice-President, Head of Technology
- name: Xu Jiawei
title: Vice-President, Head of Operations
- title: Tech-Ops
- name: Chew Ming Hong Ethan
title: Vice-President
- title: Technology
members:
- name: Ang Jeyvian
title: Vice-President, Head of Technology
- name: Xu Jiawei
title: Vice-President, Head of Operations
- name: Lakshminarayanan Karthik Nagaraj
title: Tech-Ops Lead
- name: Koh Kai Chun Samuel
title: Tech-Ops Lead
- name: Lim Hui Xiang
title: Tech-Ops Lead
- name: Tan Syn Kit
title: Head of Technology
- name: Alfred Kang Jing Rui
title: Technology Lead
- name: Brandon Koh Ziheng
title: Technology Lead
- name: Darius Koh Kai Keat
title: Technology Lead
- name: Hoh Jun Gi
title: Technology Lead
- name: Lee Jia Yu
title: Technology Lead
- title: Operations
members:
- name: Tay King Yu Galen
title: Head of Operations
- title: Publicity
members:
- name: Kee Bing Heng
- name: Sung Yeji
title: Head of Publicity
- name: Koh Kai Chun Samuel
- name: Loh Sze Kye
title: Publicity Lead
- title: Secretaries
- name: Quek Tsun Yang
title: Publicity Lead
- title: Secretary-Operations
members:
- name: Reginald Tan
title: Head Secretary
- name: Ong Xin Yin
title: Assistant Secretary
- name: Brayden Ziyang Saga
title: Head of Sec-Ops
- name: Danial Nurhakim Razali
title: Sec-Ops Lead
- name: Yong Yun Kai Louis
title: Sec-Ops Lead
- title: Student Advisors
members:
- name: Qin Guan
- name: Arash Nur Iman
title: Student Advisor
- name: Lai Wai Hang
- name: Xu Jiawei
title: Student Advisor
- name: Jimmy Lew Kwong Yi
- name: Ang Jeyvian
title: Student Advisor
- name: Yong Zong Han Ryan
- name: Kee Bing Heng
title: Student Advisor
- name: Chua Jie Yi Addison
- name: Koh Kai Chun Samuel
title: Student Advisor

0 comments on commit aacb6b9

Please sign in to comment.