Skip to content

Commit f8499b7

Browse files
avsomers25avsomers25
authored
Merge pull request #248 from HackRU/main
dev up to date with main
2 parents 41b6a0a + bc048a6 commit f8499b7

Some content is hidden

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

46 files changed

+474
-439
lines changed

‎app/(pre-dashboard)/(landing)/page.tsx‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ArrowRightIcon } from '@heroicons/react/24/outline';
22
import Link from 'next/link';
3-
import { fuzzy } from '@/app/ui/fonts';
3+
import { brush } from '@/app/ui/fonts';
44
import Image from 'next/image';
55
import Hero from './sections/Hero/Hero';
66
import Schedule from './sections/Schedule';
@@ -16,16 +16,13 @@ import React from 'react';
1616
import { redirect } from 'next/navigation';
1717

1818
export default async function Page() {
19-
redirect('/offseason');
2019
return (
2120
<main
22-
className={`relative flex h-fit flex-col ${fuzzy.className} text-blue-200`}
21+
className={`relative flex h-fit flex-col ${brush.className} text-s2025black-100 bg-gradient-to-b from-tan_2-100 to-off_white-100`}
2322
>
2423
<div className="overflow-x-hidden overflow-y-hidden">
2524
<Hero />
26-
<h1 className={`text-center bg-blue-500 ${fuzzy.className}`} style={{ fontSize: '96px' }}>
27-
ABOUT
28-
</h1>
25+
2926

3027
<About />
3128
{/**
@@ -38,16 +35,16 @@ export default async function Page() {
3835
<Schedule />
3936
</Suspense>
4037
</GenericSection>
41-
<GenericSection title="Sponsors">{<Sponsors /> }</GenericSection>
38+
{/* <GenericSection title="Sponsors">{<Sponsors />}</GenericSection> */}
4239
<GenericSection title="FAQ" color="from-blue-500">
4340
<FAQ />
4441
</GenericSection>
4542
{/* <GenericSection title="Team">
4643
<Team />
4744
</GenericSection> */}
48-
<div className="bg-gradient-to-b from-blue-500 to-blue-500">
45+
<div className="">
4946
<Image
50-
src="/landing/machine.png"
47+
src="/landing/S2025/bottomofpage.png"
5148
alt="bottom image"
5249
object-fit="cover"
5350
style={{

‎app/(pre-dashboard)/(landing)/sections/About.tsx‎

Lines changed: 42 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
import Image from 'next/image';
33
import clsx from 'clsx';
44
import { useWindowSize } from '@/app/lib/useWindowSize';
5-
import GenericSection from './GenericSection';
6-
import SectionTitle from './SectionTitle';
7-
import { longCang, fuzzy } from '@/app/ui/fonts';
5+
import { longCang, brush } from '@/app/ui/fonts';
86

97
const animalQuality = 100;
108

@@ -38,13 +36,13 @@ function AboutInfo({
3836
)}
3937
>
4038
<h1
41-
className={clsx('text-3xl md:text-5xl', fuzzy.className)}
39+
className={clsx('text-3xl md:text-5xl', brush.className)}
4240
style={{ color: titleColor }}
4341
>
4442
{title}
4543

4644
</h1>
47-
<div className={clsx('text-2xl', fuzzy.className)}>
45+
<div className={clsx('text-2xl', brush.className)}>
4846
{children}
4947
</div>
5048

@@ -64,7 +62,7 @@ function AboutInfo({
6462
src={imageSrc}
6563
width="400"
6664
height="400"
67-
className="w-[600px] lg:w-[800px]"
65+
className="w-[600px] lg:w-[700px]"
6866
alt={alt}
6967
quality={animalQuality}
7068
/>
@@ -104,22 +102,33 @@ function AboutInfo({
104102
export default function About() {
105103
return (
106104
<>
105+
<div className='flex justify-center items-center p-4'>
106+
<Image
107+
src={"/landing/S2025/aboutbanner.png"}
108+
width="300"
109+
height="300"
110+
className="w-[400px] z-30"
111+
alt={'about'}
112+
quality={50}
113+
/>
114+
</div>
115+
107116
<div
108117
className="from-dark_blue_figma relative flex h-fit w-full
109-
flex-col flex-wrap
118+
flex-col flex-wrap
110119
pb-20 text-base
111-
md:flex-row md:px-4 md:text-lg xl:text-xl 2xl:text-2xl bg-blue-500"
120+
md:flex-row md:px-4 md:text-lg xl:text-xl 2xl:text-2xl"
112121

113122
id="About"
114123
>
115124
<div>
116125

117126

118127
</div>
119-
<AboutInfo title="WHAT" imageSrc="/landing/catPawn.png" alt="Python" reverse titleColor='#C3557D'>
120-
<div className="pt-6">
128+
<AboutInfo title="WHAT" imageSrc="/landing/S2025/lumpia.png" alt="Python" reverse titleColor='s2025black'>
129+
<div className="pt-6 border-t-8 border-cyan-100">
121130
<p className="inline">HackRU is a</p>
122-
<p className="inline text-blue-100"> 24-hour hackathon </p>
131+
<p className="inline "> 24-hour hackathon </p>
123132
<p className="inline">at Rutgers University. We welcome</p>
124133
<p className="inline"> hundreds of students </p>
125134
<p className="inline">to join us in building</p>
@@ -130,14 +139,14 @@ export default function About() {
130139
<p className="inline"> help foster an atmosphere of</p>
131140
<p className="inline"> learning</p>
132141
<p className="inline"> through</p>
133-
<p className="inline text-blue-100"> tech-talks</p>
142+
<p className="inline "> tech-talks</p>
134143
<p className="inline"> and</p>
135-
<p className="inline text-blue-100">
144+
<p className="inline ">
136145
{' '}
137146
one-on-one guidance.
138147
</p>
139148
<p className='inline '> We encourage</p>
140-
<p className="inline text-blue-100"> all students,</p>
149+
<p className="inline "> all students,</p>
141150
<p className="inline">
142151
{' '}
143152
no matter their experience level or educational background, to
@@ -153,67 +162,68 @@ export default function About() {
153162

154163
<AboutInfo
155164
title="TRACKS"
156-
imageSrc="/landing/catQueenKing.png"
165+
imageSrc="/landing/S2025/sushiAsset 1.png"
157166
alt="Python"
158-
titleColor="#EC9655"
167+
titleColor="s2025black"
159168
>
160-
<div className="pt-6">
161-
<p className="inline text-pink-100">Social Good:</p>
169+
<div className="pt-6 border-t-8 border-cyan-100">
170+
<p className="inline ">Social Good:</p>
162171
<p className="inline pb-4 pt-4">
163172
{' '}
164173
Hacks that betters the community.
165174
</p>
166175

167176
<div className="pt-6">
168-
<p className="inline text-pink-100">NeuroTech presented by NTICe:</p>
177+
<p className="inline ">NeuroTech presented by NTICe:</p>
169178
<p className="inline pb-4">
170179
{' '}
171180
Hacks that advance technology for treating brain dysfunction.
172181
</p>
173182
</div>
174183

175184
<div className="pt-6">
176-
<p className="inline text-pink-100">Education:</p>
185+
<p className="inline ">Education:</p>
177186
<p className="inline pb-4">
178187
{' '}
179188
Hacks that focus on building an educated community.
180189
</p>
181190
</div>
182191

183192
<div className="pt-6">
184-
<p className="inline text-pink-100">Maverick:</p>
193+
<p className="inline ">Maverick:</p>
185194
<p className="inline pb-4"> Any other hack! The opportunities are limitless.</p>
186195
</div>
187196

188197
<div className="pt-6">
189198
<p className="inline">And more</p>
190-
<p className="inline text-blue-100"> sponsor prizes!</p>
199+
<p className="inline "> sponsor prizes!</p>
191200
</div>
192201
</div>
193202
</AboutInfo>
194203

195204
<AboutInfo
196205
title="JOIN US"
197-
imageSrc="/landing/catKnight.png"
206+
imageSrc="/landing/S2025/ratatoullie.png"
198207
alt="Python"
199208
reverse
200-
titleColor="#1ED4FE"
209+
titleColor="s2025black"
210+
201211
>
202-
<div className="pb-6 pt-6">
203-
<p className="inline text-pink-100">Apply</p>
212+
<div className="pb-6 pt-6 border-t-8 border-cyan-100">
213+
<p className="inline ">Apply</p>
204214
<p className="inline"> to attend our </p>
205-
<p className="inline text-pink-100">Fall 2024 HackRU!</p>
215+
<p className="inline ">Fall 2024 HackRU!</p>
206216
<p className="inline"> The event will be on</p>
207-
<p className="inline text-pink-100"> October 26th-27th</p>
217+
<p className="inline "> October 26th-27th</p>
208218
<p className="inline"> at the</p>
209-
<p className="inline text-pink-100"> College Ave Student Center.</p>
219+
<p className="inline "> College Ave Student Center.</p>
210220
</div>
211221

212222
<div className="pb-6">
213223
<p className="inline">Want to help? Sign up to</p>
214-
<p className="inline text-pink-100"> volunteer</p>
224+
<p className="inline "> volunteer</p>
215225
<p className="inline"> and/or</p>
216-
<p className="inline text-pink-100"> mentor!</p>
226+
<p className="inline "> mentor!</p>
217227
<p className="inline">
218228
{' '}
219229
To know when organizer applications open subscribe to our
@@ -224,7 +234,7 @@ export default function About() {
224234
<p className="inline">Want to receive updates? </p>
225235
<a
226236
href="https://hackru.us3.list-manage.com/subscribe?u=457c42db47ebf530a0fc733fb&id=fb01885829"
227-
className="inline text-pink-100 underline"
237+
className="inline underline"
228238
target="_blank"
229239
>
230240
Subscribe here!

‎app/(pre-dashboard)/(landing)/sections/FAQ/Accordion.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export default function Accordion(props: propType) {
5353
</svg>
5454
</button>
5555
<div
56-
className={`pb-3 grid overflow-hidden text-sm text-orange-100 transition-all duration-300 ease-in-out ${
56+
className={`pb-3 grid overflow-hidden text-sm text-s2025black-100 transition-all duration-300 ease-in-out ${
5757
props.active
5858
? 'grid-rows-[1fr] opacity-100'
5959
: 'grid-rows-[0fr] opacity-0'

‎app/(pre-dashboard)/(landing)/sections/FAQ/FAQ.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ function QuestionContainer() {
1717
setActiveAccordion={setActiveAccordion}
1818
index={i}
1919
answer={Object.values(hackRUFAQ)[i]}
20-
textcolor={['text-[#1ED4FE]', 'text-[#C3557D]', 'text-[#EC9655]'][i%3]}
20+
textcolor={'text-s2025black-100'}
2121
/>
2222
))}
2323
</div>

‎app/(pre-dashboard)/(landing)/sections/GenericSection.tsx‎

Lines changed: 44 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import SectionTitle from './SectionTitle';
22
import { ReactNode } from 'react';
3+
import Image from 'next/image';
34

45
type GenericSectionProps = {
56
children: ReactNode;
@@ -8,16 +9,55 @@ type GenericSectionProps = {
89
};
910

1011
export default function GenericSection(props: GenericSectionProps) {
11-
const defaultColor = 'bg-blue-500';
12+
const defaultColor = 'yellow-100';
1213
const bgColorNew = props.color ? `${props.color}` : defaultColor;
1314
return (
1415
<div
1516
id={props.title}
16-
className={'flex w-full flex-col items-center bg-blue-500 sections'}
17+
className={'flex w-full flex-col items-center sections'}
1718
>
18-
<SectionTitle title={props.title} />
19+
{/* <SectionTitle title={props.title} /> */}
20+
{props.title == "Sponsors" ?
21+
<div className='flex justify-center items-center p-4'>
22+
<Image
23+
src={"/landing/S2025/sponsorsflag.png"}
24+
width="300"
25+
height="300"
26+
className="w-[400px] z-30"
27+
alt={'about'}
28+
quality={50}
29+
/>
30+
</div>
31+
:
32+
<div>
33+
{props.title == "Schedule" ?
34+
<div className='flex justify-center items-center p-4'>
35+
<Image
36+
src={"/landing/S2025/schedulebanner.png"}
37+
width="300"
38+
height="300"
39+
className="w-[400px] z-30"
40+
alt={'about'}
41+
quality={50}
42+
/>
43+
</div>
44+
:
45+
<div className='flex justify-center items-center p-4'>
46+
<Image
47+
src={"/landing/S2025/faqflag.png"}
48+
width="300"
49+
height="300"
50+
className="w-[400px] z-30"
51+
alt={'about'}
52+
quality={50}
53+
/>
54+
</div>
55+
}
56+
</div>
57+
}
58+
1959
<div className="w-full h-fit sections relative">
20-
<div className="absolute bg-blue-500 top-0 w-full h-full " />
60+
<div className="absolute top-0 w-full h-full " />
2161
{props.children}
2262
</div>
2363
<div className={`h-[15vh] w-full ${bgColorNew}`}></div>

0 commit comments

Comments
 (0)