Skip to content

Commit 564dc21

Browse files
authored
Merge pull request #90 from esc-chula/develop
Develop
2 parents 4bba544 + 1e84d91 commit 564dc21

16 files changed

Lines changed: 75 additions & 49 deletions

File tree

348 KB
Binary file not shown.
295 KB
Binary file not shown.

src/app/(events)/hackathon/(game)/jackpot/page.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { type Metadata } from 'next'
22
import React from 'react'
33

44
// import BackButton from '../../_components/common/back-button'
5+
import { TicketRandomConsoleLog } from '../../(ticket-releasing)/ticket-releasing'
56
import BirdsBackground from '../../_components/common/birds-background'
67
import SlotMachine from '../../_components/jackpot/slot-machine'
78

@@ -12,6 +13,7 @@ export const metadata: Metadata = {
1213
const HackathonJackpotPage: React.FC = () => {
1314
return (
1415
<div className='flex h-screen flex-col items-center justify-center'>
16+
<TicketRandomConsoleLog tickets={["There's 8.88% chance to win."]} />
1517
<p className='hidden'>{`FYI: There's 1.5% chance to win the full ticket, and 15% chance to win per character.`}</p>
1618
{/* <BackButton /> */}
1719
<SlotMachine />

src/app/(events)/hackathon/(registration)/ticket/page.tsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,15 @@ export const metadata: Metadata = {
1919
title: 'Intania Hackathon - Ticket',
2020
}
2121

22-
const Page: React.FC = async () => {
22+
const Page: React.FC<{ searchParams: { code?: string } }> = async ({
23+
searchParams,
24+
}) => {
25+
//TICKET_HERE
26+
//Origin does not have searchParams
27+
if (!searchParams.code) {
28+
redirect('/hackathon/ticket?code=GEN_KZQX05NWAL')
29+
}
30+
2331
const resMyTeamTicket = await findMyTeamTicket()
2432
const resMyActiveClaim = await getMyActiveClaim()
2533

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import { type Metadata } from 'next'
2+
import React from 'react'
3+
4+
export const metadata: Metadata = {
5+
title: 'Intania Hackathon - Doonee',
6+
}
7+
8+
const DooNeePage: React.FC = () => {
9+
return (
10+
<div className='flex h-screen flex-col items-center justify-center font-ndot47'>
11+
<p className='text-center font-semibold text-white'>
12+
ลองไปดูที่ <br />
13+
&quot;<span className='text-3xl'>/about</span>&quot;
14+
</p>
15+
</div>
16+
)
17+
}
18+
19+
export default DooNeePage

src/app/(events)/hackathon/(ticket-releasing)/ticket-releasing.tsx

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,15 @@ export const TicketSetLocalStorage: React.FC<TicketSetLocalStorageProps> = ({
5353

5454
return null
5555
}
56+
57+
interface TicketConsolePathfindingProps {
58+
pathway: string
59+
}
60+
61+
export const TicketConsolePathfinding: React.FC<
62+
TicketConsolePathfindingProps
63+
> = ({ pathway }) => {
64+
console.log(pathway)
65+
66+
return null
67+
}

src/app/(events)/hackathon/TICKET.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@
66
- tae eia: `src\app\(events)\hackathon\page.tsx`
77
- slotmachine: `src\constants\hackathon.ts`
88
- share story phrase `src\app\(events)\hackathon\_components\success\share-story.tsx`
9+
- query searchParams: `src\app\(events)\hackathon\(registration)\ticket\page.tsx`

src/app/(events)/hackathon/_components/common/hackathon-title.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ const HackathonTitle: React.FC<HackathonTitleProps> = ({ className }) => {
1010
INTANIA
1111
<br />
1212
HACKATH<span className='text-hackathon-primary'>0</span>N
13+
{/* TICKET_HERE PATHFINDING BELOW*/}
14+
<p className='text-left text-xs text-white/20'>ลองไปดูที่ Impressive</p>
15+
{/* TICKET_HERE PATHFINDING ABOVE*/}
1316
</span>
1417
)
1518
}

src/app/(events)/hackathon/_components/common/how-to-get-ticket-dialog.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ const HowToGetTicketDialog: React.FC = () => {
1717
<button
1818
className='flex rounded-full border-2 border-white/10 bg-white/10 px-4 py-2 text-xs font-medium tracking-tighter text-white/70 backdrop-blur-md hover:bg-white/15 sm:text-base'
1919
type='button'
20-
onClick={() => {
21-
console.log('DEV_3AUO70434N')
22-
}}
2320
>
2421
<MessageCircleQuestion className='mr-0.5 size-3.5 sm:mr-1.5 sm:size-6' />
2522
How to Get Tickets?

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
'use client'
22

3+
import Link from 'next/link'
34
import { useEffect, useRef, useState } from 'react'
45

56
import ScrollRevealer from '~/components/common/animation/scroll-revealer'
@@ -69,7 +70,15 @@ const objectives = [
6970
memorable
7071
</span>{' '}
7172
tech event ever. This isn’t just about winning—it’s about the
72-
experience, and the community.
73+
experience, and the community
74+
{/* TICKET_HERE PATHFINDING DOT REMOVED TOO*/}{' '}
75+
<Link
76+
className='font-bold text-hackathon-primary underline'
77+
href='/hackathon/doonee'
78+
>
79+
here
80+
</Link>
81+
.
7382
</p>
7483
</>
7584
),

0 commit comments

Comments
 (0)