From bdb207e0b18bd86014da68ae37ced453333bb69c Mon Sep 17 00:00:00 2001 From: Ray <22254748+rayokamoto@users.noreply.github.com> Date: Mon, 19 Feb 2024 21:01:26 +1030 Subject: [PATCH 1/4] feat(home): Add join us button at end of page --- src/app/(home)/page.tsx | 58 ++++++++++++++++++++++++--------------- src/components/Button.tsx | 5 ++-- 2 files changed, 39 insertions(+), 24 deletions(-) diff --git a/src/app/(home)/page.tsx b/src/app/(home)/page.tsx index a11d102a..912d92a8 100644 --- a/src/app/(home)/page.tsx +++ b/src/app/(home)/page.tsx @@ -1,3 +1,4 @@ +import Button from '@/components/Button'; import Duck from '@/components/Duck'; import FancyRectangle from '@/components/FancyRectangle'; import ImageCarousel from '@/components/ImageCarousel'; @@ -230,41 +231,54 @@ export default function HomePage() { {/* CTA part 2 */} -
+
-
+
{/* */} Rectangle Grid
-
-
- - - - - +
+
+
+ + + + + +
+
+
+
+ + Thinking about Joining? + +

+ New members are always welcome! +

+
+
{' '}
-
-
-
- - Thinking about Joining? - -

- New members are always welcome! -

+ +
+
+
-
{' '} +
- -
); diff --git a/src/components/Button.tsx b/src/components/Button.tsx index 73c1f249..ba12f1ec 100644 --- a/src/components/Button.tsx +++ b/src/components/Button.tsx @@ -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'; @@ -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} From efae9463786258cf529d7c2c6af9a7e656bfb7ac Mon Sep 17 00:00:00 2001 From: Ray <22254748+rayokamoto@users.noreply.github.com> Date: Mon, 19 Feb 2024 21:12:53 +1030 Subject: [PATCH 2/4] fix(home): Center sponsors on screen resize --- src/app/(home)/page.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/(home)/page.tsx b/src/app/(home)/page.tsx index 912d92a8..855c5117 100644 --- a/src/app/(home)/page.tsx +++ b/src/app/(home)/page.tsx @@ -190,7 +190,7 @@ export default function HomePage() {

Supported By

-
+

Industry's

@@ -206,10 +206,10 @@ export default function HomePage() { if (sponsors.length === 0) return; return ( -

+

{type} Sponsors

-
+
{sponsors.map(({ image, website, name }, i) => ( From 73214f98a8d3e8e3df59f1f9c57862c13918bd58 Mon Sep 17 00:00:00 2001 From: Ray <22254748+rayokamoto@users.noreply.github.com> Date: Mon, 19 Feb 2024 21:38:11 +1030 Subject: [PATCH 3/4] feat(home): Use join us link instead of button --- src/app/(home)/page.tsx | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/app/(home)/page.tsx b/src/app/(home)/page.tsx index 855c5117..a47e8463 100644 --- a/src/app/(home)/page.tsx +++ b/src/app/(home)/page.tsx @@ -6,6 +6,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() { @@ -244,8 +245,8 @@ export default function HomePage() { />
-
-
+
+
@@ -259,23 +260,16 @@ export default function HomePage() { Thinking about Joining? -

- New members are always welcome! +

+ New members are always welcome.{' '} + + Join us today! +

-
{' '} -
- -
-
-
From d16f2b1c7f7c646c1ec5532a68f8faaae660873a Mon Sep 17 00:00:00 2001 From: Ray Okamoto <22254748+rayokamoto@users.noreply.github.com> Date: Mon, 19 Feb 2024 21:58:04 +1030 Subject: [PATCH 4/4] chore: spelling and grammar fixes (#86) --- src/app/(home)/page.tsx | 1 - src/app/about/page.tsx | 24 +++++++++++++----------- src/app/events/FridayNight.tsx | 4 ++-- src/app/sponsors/page.tsx | 4 ++-- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/app/(home)/page.tsx b/src/app/(home)/page.tsx index a47e8463..8b321096 100644 --- a/src/app/(home)/page.tsx +++ b/src/app/(home)/page.tsx @@ -1,4 +1,3 @@ -import Button from '@/components/Button'; import Duck from '@/components/Duck'; import FancyRectangle from '@/components/FancyRectangle'; import ImageCarousel from '@/components/ImageCarousel'; diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx index 5e657dde..39809bd4 100644 --- a/src/app/about/page.tsx +++ b/src/app/about/page.tsx @@ -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'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!

@@ -87,7 +87,7 @@ export default function AboutUs() {
  • The{' '} Duck Lounge{' '} - (located at EM110) + (located at Engineering and Maths EM110)
  • Frequent computer science talks on a diverse range of topics @@ -118,9 +118,9 @@ export default function AboutUs() { throughout the year
  • - Lest not forget, a{' '} + And let's not forget, a{' '} pub crawl{' '} - each semester to celebrate our studies + each year to celebrate our studies
    • @@ -147,7 +147,7 @@ export default function AboutUs() { width={30} height={30} /> -

    +

    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 @@ -295,9 +295,9 @@ export default function AboutUs() {

    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.

    } @@ -309,7 +309,8 @@ export default function AboutUs() {

    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.

    } colour={'purple'} @@ -319,8 +320,9 @@ export default function AboutUs() { answer={

    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.

    } colour={'orange'} diff --git a/src/app/events/FridayNight.tsx b/src/app/events/FridayNight.tsx index 65ba46b2..674ee31c 100644 --- a/src/app/events/FridayNight.tsx +++ b/src/app/events/FridayNight.tsx @@ -58,14 +58,14 @@ function Details() {
  • Need to blow off some steam from a long week of studying?
  • Wanna hang out with like-minded students?
  • - Want to be the final boss on Super Smash Bro'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?

    • Come down to the{' '} Duck Lounge (EM110) in the - Engineering and Mathematics Building for some games! + Engineering and Maths building for some games!

    NOTE: Free food will be provided on the last Friday of every month. One free diff --git a/src/app/sponsors/page.tsx b/src/app/sponsors/page.tsx index b9fad1ed..3835f624 100644 --- a/src/app/sponsors/page.tsx +++ b/src/app/sponsors/page.tsx @@ -15,8 +15,8 @@ export default function SponsorsPage() {

    The University of Adelaide Computer Science Club are proudly supported by our{' '} generous sponsors. 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.