Skip to content

Commit aacb6b9

Browse files
committed
feat: update team
style: fix announcement toggle
1 parent 56e67c8 commit aacb6b9

File tree

4 files changed

+41
-82
lines changed

4 files changed

+41
-82
lines changed

.astro/types.d.ts

Lines changed: 3 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ declare module 'astro:content' {
99
}
1010

1111
declare module 'astro:content' {
12-
export { z } from 'astro/zod';
13-
1412
type Flatten<T> = T extends { [K: string]: infer U } ? U : never;
1513

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

22-
// This needs to be in sync with ImageMetadata
23-
export type ImageFunction = () => import('astro/zod').ZodObject<{
24-
src: import('astro/zod').ZodString;
25-
width: import('astro/zod').ZodNumber;
26-
height: import('astro/zod').ZodNumber;
27-
format: import('astro/zod').ZodUnion<
28-
[
29-
import('astro/zod').ZodLiteral<'png'>,
30-
import('astro/zod').ZodLiteral<'jpg'>,
31-
import('astro/zod').ZodLiteral<'jpeg'>,
32-
import('astro/zod').ZodLiteral<'tiff'>,
33-
import('astro/zod').ZodLiteral<'webp'>,
34-
import('astro/zod').ZodLiteral<'gif'>,
35-
import('astro/zod').ZodLiteral<'svg'>,
36-
import('astro/zod').ZodLiteral<'avif'>,
37-
]
38-
>;
39-
}>;
40-
41-
type BaseSchemaWithoutEffects =
42-
| import('astro/zod').AnyZodObject
43-
| import('astro/zod').ZodUnion<[BaseSchemaWithoutEffects, ...BaseSchemaWithoutEffects[]]>
44-
| import('astro/zod').ZodDiscriminatedUnion<string, import('astro/zod').AnyZodObject[]>
45-
| import('astro/zod').ZodIntersection<BaseSchemaWithoutEffects, BaseSchemaWithoutEffects>;
46-
47-
type BaseSchema =
48-
| BaseSchemaWithoutEffects
49-
| import('astro/zod').ZodEffects<BaseSchemaWithoutEffects>;
50-
51-
export type SchemaContext = { image: ImageFunction };
52-
53-
type DataCollectionConfig<S extends BaseSchema> = {
54-
type: 'data';
55-
schema?: S | ((context: SchemaContext) => S);
56-
};
57-
58-
type ContentCollectionConfig<S extends BaseSchema> = {
59-
type?: 'content';
60-
schema?: S | ((context: SchemaContext) => S);
61-
};
62-
63-
type CollectionConfig<S> = ContentCollectionConfig<S> | DataCollectionConfig<S>;
64-
65-
export function defineCollection<S extends BaseSchema>(
66-
input: CollectionConfig<S>
67-
): CollectionConfig<S>;
68-
6920
type AllValuesOf<T> = T extends any ? T[keyof T] : never;
7021
type ValidContentEntrySlug<C extends keyof ContentEntryMap> = AllValuesOf<
7122
ContentEntryMap[C]
@@ -155,11 +106,11 @@ declare module 'astro:content' {
155106
? {
156107
collection: C;
157108
slug: ValidContentEntrySlug<C>;
158-
}
109+
}
159110
: {
160111
collection: C;
161112
id: keyof DataEntryMap[C];
162-
}
113+
}
163114
>;
164115
// Allow generic `string` to avoid excessive type errors in the config
165116
// if `dev` is not running to update as you edit.
@@ -183,5 +134,5 @@ declare module 'astro:content' {
183134

184135
type AnyEntryMap = ContentEntryMap & DataEntryMap;
185136

186-
type ContentConfig = never;
137+
export type ContentConfig = never;
187138
}

src/components/TheAnnouncementBar.astro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const { description, url } = Astro.props;
1010
<div
1111
class="flex justify-between align-center flex-col gap-3 lg:flex-row border-primary border-2 p-3 rounded-lg"
1212
>
13-
<span class="text-lg text-white">
13+
<span class="text-lg text-black dark:text-white">
1414
{description}
1515
</span>
1616
{

src/content/_meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
announcement:
22
enabled: true
33
description: >-
4-
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! 👋
4+
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! 👋
55
# url: https://forms.office.com/r/46tigKSLzz
66

77
navbar:

src/content/_team.yaml

Lines changed: 36 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,45 +7,53 @@ departments:
77
title: Lecturer-in-charge
88
- title: P/VP
99
members:
10-
- name: Arash Nur Iman
10+
- name: Lee Guang Le Jeffrey
1111
title: President
12-
- name: Ang Jeyvian
13-
title: Vice-President, Head of Technology
14-
- name: Xu Jiawei
15-
title: Vice-President, Head of Operations
16-
- title: Tech-Ops
12+
- name: Chew Ming Hong Ethan
13+
title: Vice-President
14+
- title: Technology
1715
members:
18-
- name: Ang Jeyvian
19-
title: Vice-President, Head of Technology
20-
- name: Xu Jiawei
21-
title: Vice-President, Head of Operations
22-
- name: Lakshminarayanan Karthik Nagaraj
23-
title: Tech-Ops Lead
24-
- name: Koh Kai Chun Samuel
25-
title: Tech-Ops Lead
26-
- name: Lim Hui Xiang
27-
title: Tech-Ops Lead
16+
- name: Tan Syn Kit
17+
title: Head of Technology
18+
- name: Alfred Kang Jing Rui
19+
title: Technology Lead
20+
- name: Brandon Koh Ziheng
21+
title: Technology Lead
22+
- name: Darius Koh Kai Keat
23+
title: Technology Lead
24+
- name: Hoh Jun Gi
25+
title: Technology Lead
26+
- name: Lee Jia Yu
27+
title: Technology Lead
28+
- title: Operations
29+
members:
30+
- name: Tay King Yu Galen
31+
title: Head of Operations
2832
- title: Publicity
2933
members:
30-
- name: Kee Bing Heng
34+
- name: Sung Yeji
3135
title: Head of Publicity
32-
- name: Koh Kai Chun Samuel
36+
- name: Loh Sze Kye
3337
title: Publicity Lead
34-
- title: Secretaries
38+
- name: Quek Tsun Yang
39+
title: Publicity Lead
40+
- title: Secretary-Operations
3541
members:
36-
- name: Reginald Tan
37-
title: Head Secretary
38-
- name: Ong Xin Yin
39-
title: Assistant Secretary
42+
- name: Brayden Ziyang Saga
43+
title: Head of Sec-Ops
44+
- name: Danial Nurhakim Razali
45+
title: Sec-Ops Lead
46+
- name: Yong Yun Kai Louis
47+
title: Sec-Ops Lead
4048
- title: Student Advisors
4149
members:
42-
- name: Qin Guan
50+
- name: Arash Nur Iman
4351
title: Student Advisor
44-
- name: Lai Wai Hang
52+
- name: Xu Jiawei
4553
title: Student Advisor
46-
- name: Jimmy Lew Kwong Yi
54+
- name: Ang Jeyvian
4755
title: Student Advisor
48-
- name: Yong Zong Han Ryan
56+
- name: Kee Bing Heng
4957
title: Student Advisor
50-
- name: Chua Jie Yi Addison
58+
- name: Koh Kai Chun Samuel
5159
title: Student Advisor

0 commit comments

Comments
 (0)