Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Production 2024-02-19_05 #87

Merged
merged 5 commits into from
Feb 19, 2024
Merged

Production 2024-02-19_05 #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bdb207e
feat(home): Add join us button at end of page
rayokamoto Feb 19, 2024
efae946
fix(home): Center sponsors on screen resize
rayokamoto Feb 19, 2024
73214f9
feat(home): Use join us link instead of button
rayokamoto Feb 19, 2024
7ea7201
Merge pull request #85 from compsci-adl/feat/home-page
rayokamoto Feb 19, 2024
d16f2b1
chore: spelling and grammar fixes (#86)
rayokamoto Feb 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 33 additions & 26 deletions src/app/(home)/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import Title from '@/components/Title';
import { CAROUSEL_IMAGES } from '@/data/home';
import { SPONSOR_TYPES, getSponsors } from '@/data/sponsors';
import Image from 'next/image';
import Link from 'next/link';
import { Fragment } from 'react';

export default function HomePage() {
Expand Down Expand Up @@ -189,7 +190,7 @@ export default function HomePage() {

<div>
<h3>Supported By </h3>
<div className="flex flex-col md:flex-row">
<div className="flex flex-col smr:flex-row">
<h3 className="mb-2 mr-2 md:mb-0">Industry&apos;s </h3>
<FancyRectangle colour="orange" offset="6" filled={false}>
<div className="w-fit bg-orange px-2">
Expand All @@ -205,10 +206,10 @@ export default function HomePage() {
if (sponsors.length === 0) return;
return (
<Fragment key={type}>
<h3 className="text-2xl font-black capitalize lg:text-3xl">
<h3 className="text-center text-2xl font-black capitalize smr:text-left lg:text-3xl">
{type} Sponsors
</h3>
<div className="flex flex-wrap gap-6 pb-2">
<div className="flex flex-wrap justify-center gap-6 pb-2 smr:justify-start">
{sponsors.map(({ image, website, name }, i) => (
<a href={website} key={i} className="block" target="_blank">
<FancyRectangle colour="white" offset="10">
Expand All @@ -230,41 +231,47 @@ export default function HomePage() {
</section>

{/* CTA part 2 */}
<section>
<section className="mb-[1em] lg:mb-[6em] xl:mb-[10em]">
<div className="h-24"></div>
<div className="mb-[3em] md:mb-[8.75em] lg:md:mb-[11.3em]">
<div className="mb-[3em] md:mb-[8em] lg:mb-[6em]">
{/* <Grid /> */}
<Image
src="/images/rectangle-grid.svg"
alt="Rectangle Grid"
width={500}
height={500}
className="absolute -z-10 mt-12 w-[20em] md:w-[35em] lg:w-[35em]"
className="absolute -z-10 mt-10 w-[25em] md:w-[40em] lg:w-[45em]"
/>
</div>

<div className="relative z-10 ml-[2.5em] flex w-fit flex-col md:ml-[4.4em]">
<div className="relative mb-2 flex flex-row justify-end space-x-4 *:h-8 md:*:h-10">
<Duck colour="white" outline />
<Duck colour="white" outline />
<Duck colour="white" />
<Duck colour="white" />
<Duck colour="white" />
</div>
<div className="relative z-10 flex flex-row">
<div className="h-auto w-10 bg-orange"></div>
<div className="relative flex flex-col">
<span className="relative bg-white px-4 py-2 text-2xl font-black text-black lg:text-3xl">
Thinking about <span className="text-orange"> Joining?</span>
</span>
<p className="border-2 border-white bg-grey px-4 py-2 text-lg lg:text-xl">
New members are always welcome!
</p>
<div className="z-10">
<div className="relative z-10 w-fit xl:ml-12">
<div className="relative mb-2 flex flex-row justify-end space-x-4 *:h-8 md:*:h-10">
<Duck colour="white" outline />
<Duck colour="white" outline />
<Duck colour="white" />
<Duck colour="white" />
<Duck colour="white" />
</div>
<div className="relative z-10 flex flex-row">
<div className="h-auto w-16 bg-orange"></div>
<div className="relative flex flex-col">
<span className="relative bg-white py-8 pl-4 pr-16 text-3xl font-black text-black lg:pr-32 lg:text-6xl">
Thinking about <span className="text-orange">Joining?</span>
</span>
<p className="border-2 border-white bg-grey py-6 pl-4 pr-16 text-lg lg:pr-32 lg:text-2xl">
New members are always welcome.{' '}
<Link
className="font-bold underline hover:text-yellow"
href={'/join'}
>
Join us today!
</Link>
</p>
</div>
</div>
</div>{' '}
</div>
</div>

<div className="h-16 smr:h-24 md:h-32 lg:h-20"></div>
</section>
</main>
);
Expand Down
24 changes: 13 additions & 11 deletions src/app/about/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export default function AboutUs() {
The University of Adelaide Computer Science Club is a student-run
club for those with an interest in computer science or computing in
general. Although we&apos;re a university club, we welcome anyone
interested in computer science and/or socializing to join!
interested in computer science and/or socialising to join!
</p>
</div>
</div>
Expand All @@ -87,7 +87,7 @@ export default function AboutUs() {
<li>
The{' '}
<span className="font-bold text-yellow">Duck Lounge</span>{' '}
(located at EM110)
(located at Engineering and Maths EM110)
</li>
<li>
Frequent computer science talks on a diverse range of topics
Expand Down Expand Up @@ -118,9 +118,9 @@ export default function AboutUs() {
throughout the year
</li>
<li>
Lest not forget, a{' '}
And let&apos;s not forget, a{' '}
<span className=" font-bold text-yellow">pub crawl</span>{' '}
each semester to celebrate our studies
each year to celebrate our studies
</li>
</ul>
</Paragraph>
Expand All @@ -147,7 +147,7 @@ export default function AboutUs() {
width={30}
height={30}
/>
<p className="my-4 text-lg">
<p className="my-4 text-lg lg:text-xl">
The club runs various competitions throughout the year, offering members
a chance to have fun and win prizes. These have included programming and
video game competitions. The club also coordinates projects among club
Expand Down Expand Up @@ -295,9 +295,9 @@ export default function AboutUs() {
<div>
<p>
Members will have access to the Duck Lounge, a diverse
range of educational talks and workshops, social nights,
and a wide network of other computer science students
and graduates.
range of educational talks, workshops and resources,
social nights, and a wide network of other computer
science students and graduates.
</p>
</div>
}
Expand All @@ -309,7 +309,8 @@ export default function AboutUs() {
<p>
Club membership costs $10 for the full year. You can pay for
membership either online on our website, or in person at a
club event or the duck lounge.
club event or the Duck Lounge by speaking to one of the
committee members.
</p>
}
colour={'purple'}
Expand All @@ -319,8 +320,9 @@ export default function AboutUs() {
answer={
<p>
The Duck Lounge is located at EM110 in the Engineering and
Mathematics Building. It has a study space with power
outlets and couches, along with a Nintendo Switch for games.
Maths building. It has a study space with power outlets and
couches, along with a Nintendo Switch for games. We also
sell snacks and drinks at affordable prices.
</p>
}
colour={'orange'}
Expand Down
4 changes: 2 additions & 2 deletions src/app/events/FridayNight.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@ function Details() {
<li>Need to blow off some steam from a long week of studying?</li>
<li>Wanna hang out with like-minded students?</li>
<li>
Want to be the final boss on Super Smash Bro&apos;s? or would just like some
Want to beat the final boss on Super Smash Bros? Or do you just want some
free food every now and then?
</li>
</ul>
<p>
Come down to the{' '}
<span className="font-bold text-yellow">Duck Lounge (EM110)</span> in the
Engineering and Mathematics Building for some games!
Engineering and Maths building for some games!
</p>
<p className="font-bold">
NOTE: Free food will be provided on the last Friday of every month. One free
Expand Down
4 changes: 2 additions & 2 deletions src/app/sponsors/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ export default function SponsorsPage() {
<div className="max-w-3xl border-x-4 border-white p-2 text-center text-lg md:p-5 md:text-2xl">
The <b>University of Adelaide Computer Science Club</b> are proudly supported by our{' '}
<b>generous sponsors</b>. Their unwavering support make events and workshops
possible, fostering an environment for aspiring tech enthusiastic to excel within
our community.
possible, fostering an environment for aspiring tech enthusiasts to excel within our
community.
</div>
<Sponsors />
<Paragraph>
Expand Down
5 changes: 3 additions & 2 deletions src/components/Button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ interface ButtonProps {
type?: 'button' | 'submit' | 'reset';
width?: string;
loading?: boolean;
font?: string;
}

const Button = ({ children, colour, href, onClick, width, type, loading }: ButtonProps) => {
const Button = ({ children, colour, href, onClick, width, type, loading, font }: ButtonProps) => {
const isAnchor = !!href;
const Component = isAnchor ? 'a' : 'button';

Expand All @@ -23,7 +24,7 @@ const Button = ({ children, colour, href, onClick, width, type, loading }: Butto
href={isAnchor ? href : undefined}
onClick={onClick}
type={isAnchor ? undefined : type}
className={`${width} ${BG_COLOURS[colour]} ${isAnchor ? 'hover:bg-yellow' : 'hover:enabled:bg-yellow'} whitespace-nowrap border-2 border-black px-12 py-4 text-lg font-bold transition-colors duration-300 disabled:cursor-wait disabled:grayscale md:px-2 md:py-1 md:text-base lg:px-6 lg:py-2`}
className={`${width} ${font ?? 'text-lg md:text-base'} ${BG_COLOURS[colour]} ${isAnchor ? 'hover:bg-yellow' : 'hover:enabled:bg-yellow'} whitespace-nowrap border-2 border-black px-12 py-4 font-bold transition-colors duration-300 disabled:cursor-wait disabled:grayscale md:px-2 md:py-1 lg:px-6 lg:py-2`}
disabled={loading}
>
{children}
Expand Down
Loading