Skip to content

Commit cc57389

Browse files
authored
Merge pull request #43 from esc-chula/develop
Develop
2 parents 2fe5c0e + 139c12e commit cc57389

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+387
-437
lines changed

.github/workflows/ci-prod.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,6 @@ jobs:
9292
with:
9393
commit_message: 'chore(release): prepare for ${{ github.event.inputs.target }}'
9494

95-
- name: Save Release Tag as Artifact
96-
run: echo "${{ github.event.inputs.target }}" > release_tag.txt
97-
98-
- name: Upload Release Tag Artifact
99-
uses: actions/upload-artifact@v4
100-
with:
101-
name: release-tag
102-
path: release_tag.txt
103-
10495
release_github:
10596
name: Create GitHub Release
10697
runs-on: ubuntu-latest

src/app/(app)/page.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ const Home: React.FC = () => {
77
<div className="flex w-full flex-col items-center gap-10 pb-24 pt-12">
88
<h1 className="hidden">ESC Technology Department Website</h1>
99
<Hero />
10-
<div className="flex w-full text-left text-2xl font-semibold lg:text-4xl lg:font-bold">
11-
Tools & Services
12-
</div>
1310
<section
1411
className="grid w-full gap-5 md:grid-cols-2 lg:grid-cols-3"
1512
id="tools-list"

src/app/(app)/tools/qr-code-generator/page.tsx

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import type { Metadata } from 'next';
22
import { Suspense } from 'react';
33

44
import BackButton from '~/components/common/button/back-button';
5-
import QRCodeCreateDialog from '~/components/tools/qr-code-generator/qr-code-create-dialog';
6-
import QRCodeCreateDialogTrigger from '~/components/tools/qr-code-generator/qr-code-create-dialog-trigger';
7-
import QRCodeLoading from '~/components/tools/qr-code-generator/qr-code-loading';
8-
import QRCodesContainer from '~/components/tools/qr-code-generator/qr-codes-container';
5+
import QrCodeCreateDialog from '~/components/tools/qr-code-generator/qr-code-create-dialog';
6+
import QrCodeCreateDialogTrigger from '~/components/tools/qr-code-generator/qr-code-create-dialog-trigger';
7+
import QrCodeLoading from '~/components/tools/qr-code-generator/qr-code-loading';
8+
import QrCodesContainer from '~/components/tools/qr-code-generator/qr-codes-container';
99

1010
export const metadata: Metadata = {
1111
title: 'Intania Tech - QR Code Generator',
@@ -16,18 +16,18 @@ const Page: React.FC = () => {
1616
<>
1717
<BackButton href="/" />
1818
<div className="flex w-full flex-col items-center gap-5 pb-10 pt-20 lg:gap-8">
19-
<QRCodeCreateDialog>
19+
<QrCodeCreateDialog>
2020
<div className="flex w-full items-center justify-between">
2121
<h2 className="text-2xl font-medium">Your QR Codes</h2>
22-
<QRCodeCreateDialogTrigger variant="button" />
22+
<QrCodeCreateDialogTrigger variant="button" />
2323
</div>
2424
<div className="grid w-full grid-cols-1 gap-5 md:grid-cols-2 lg:grid-cols-3 lg:gap-8">
25-
<QRCodeCreateDialogTrigger variant="card" />
26-
<Suspense fallback={<QRCodeLoading />}>
27-
<QRCodesContainer />
25+
<QrCodeCreateDialogTrigger variant="card" />
26+
<Suspense fallback={<QrCodeLoading />}>
27+
<QrCodesContainer />
2828
</Suspense>
2929
</div>
30-
</QRCodeCreateDialog>
30+
</QrCodeCreateDialog>
3131
</div>
3232
</>
3333
);

src/app/(events)/hackathon/_components/common/footer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const Footer: React.FC = () => {
1818
<>
1919
<footer
2020
ref={footerRef}
21-
className="w-full border-t-2 h-72 sm:h-64 px-3 sm:px-8 border-white/10 bg-hackathon-background z-40 absolute bottom-0"
21+
className="w-full border-y-2 h-72 sm:h-64 px-3 sm:px-8 border-white/10 bg-hackathon-background z-40 absolute bottom-0"
2222
>
2323
<div className="max-w-screen-xl mx-auto h-full flex flex-col text-center sm:text-left gap-5 sm:flex-row sm:items-center justify-center sm:justify-between">
2424
<HackathonTitle className="text-3xl sm:text-4xl md:text-5xl sm:pb-14" />

src/app/(events)/hackathon/_components/landing/objectives-section.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ const ObjectivesSection: React.FC = () => {
8585
</>
8686
}
8787
>
88-
<div className="flex flex-col pt-6 sm:pt-0 md:pt-5 px-0 md:px-5">
88+
<div className="flex flex-col pt-6 sm:pt-0 md:pt-5 px-0 md:px-5 gap-6 md:gap-8">
8989
<span className="font-ndot47 text-2xl md:text-4xl text-white/50 select-none">
9090
what the HACK?!
9191
</span>
@@ -132,7 +132,7 @@ const ObjectiveCard: React.FC<ObjectiveCardProps> = ({
132132
type="button"
133133
onClick={() => setIsCollapsed((prev) => !prev)}
134134
>
135-
<h3 className="font-ndot47 text-4xl md:text-6xl lowercase select-none duration-75 group-hover:text-hackathon-primary">
135+
<h3 className="font-ndot47 text-4xl md:text-6xl uppercase select-none duration-75 group-hover:text-hackathon-primary">
136136
{title}
137137
</h3>
138138
<span

src/app/(events)/hackathon/_components/landing/ticket-section.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ const TicketSection: React.FC = () => {
106106
key={content.title}
107107
className="flex flex-col gap-4 sm:gap-6"
108108
>
109-
<h3 className="font-ndot47 text-2xl md:text-4xl lowercase text-white/50 select-none">
109+
<h3 className="font-ndot47 text-2xl md:text-4xl uppercase text-white/50 select-none">
110110
{content.title}
111111
</h3>
112112
{content.children}

src/app/(events)/hackathon/_components/landing/timeline-section.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ const contents = [
5959
</p>
6060
</div>
6161
),
62-
date: '17 February 2025',
62+
date: '17 February 2025—Super Early Bird',
6363
},
6464
{
6565
title: 'HACK Day',

src/components/about/members-container.tsx

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
1-
import { api } from '~/trpc/server';
1+
import { getMembers } from '~/server/actions/about';
22

33
import MemberButton from './member-button';
44

55
const MemberContainer: React.FC = async () => {
6-
const response = await api.about.getMembers();
6+
const res = await getMembers();
77

8-
if (!response.success) {
9-
return null;
8+
if (!res.success) {
9+
console.error('MemberContainer, failed to load members: ', res.errors);
10+
return (
11+
<span className="aspect-[4/2] grid place-content-center text-white/20 select-none">
12+
Failed to load members. Please try again later.
13+
</span>
14+
);
1015
}
1116

1217
return (
1318
<div className="flex flex-wrap items-center justify-center gap-2">
14-
{response.data.map((member) => {
19+
{res.data.map((member) => {
1520
const avatarUrl = new URL(member.avatar_url);
1621

1722
return (

src/components/about/projects-container.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,14 @@ import ProjectCard from './project-card';
88
const ProjectsContainer: React.FC = async () => {
99
const res = await getProjects();
1010
if (!res.success) {
11-
return <div>Something went wrong ...</div>;
11+
console.error('ProjectsContainer, failed to load projects: ', res.errors);
12+
return (
13+
<span className="aspect-[4/2] grid place-content-center text-white/20 select-none">
14+
Failed to load projects. Please try again later.
15+
</span>
16+
);
1217
}
18+
1319
const projects = res.data;
1420
const years = [...new Set(projects.map((project) => project.year))];
1521

src/components/common/animation/scroll-revealer.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,14 @@ const ScrollRevealer: React.FC<ScrollRevealerProps> = ({
2626

2727
useEffect(() => {
2828
if (isInview) {
29-
controls.start('visible').catch((err: unknown) => console.error(err));
29+
controls
30+
.start('visible')
31+
.catch((err: unknown) =>
32+
console.error(
33+
'ScrollRevealer, animation controls failed to start: ',
34+
err,
35+
),
36+
);
3037
}
3138
}, [isInview, controls]);
3239

0 commit comments

Comments
 (0)