Skip to content

Commit

Permalink
more changes
Browse files Browse the repository at this point in the history
  • Loading branch information
EwanLyon committed Jul 11, 2023
1 parent ad01ad2 commit 54dc434
Show file tree
Hide file tree
Showing 6 changed files with 103 additions and 173 deletions.
4 changes: 2 additions & 2 deletions apps/keystone/admin/pages/incentives-dashboard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,8 @@ function renderIncentive(

export default function RunsManager() {
const [selectedEvent, setSelectedEvent] = useState({
label: "ASGX2023",
value: "ASGX2023",
label: "ASM2023",
value: "ASM2023",
});
const [selectedIncentiveIndex, setSelectedIncentiveIndex] = useState(0);

Expand Down
15 changes: 13 additions & 2 deletions apps/nextjs/components/Navbar/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ import {
faTiktok,
// faFacebook,
} from "@fortawesome/free-brands-svg-icons";
import { faBars, faTimes, faCalendar } from "@fortawesome/free-solid-svg-icons";
import { faBars, faTimes, faCalendar, faShirt } from "@fortawesome/free-solid-svg-icons";
import { globals } from "../../globals";
import Button from "../Button/Button";
import { useAuth } from "../auth";
import Link from "next/link";

import { useMediaQuery } from "@mui/material";
import { IconProp } from '@fortawesome/fontawesome-svg-core';
import { IconProp } from "@fortawesome/fontawesome-svg-core";

const asrAusSpeedrunsLogo = {
prefix: "asr",
Expand Down Expand Up @@ -147,6 +147,17 @@ const Navbar = ({ events = [], live = false }: NavbarProps) => {
Past Events
</Link>
</li>
<li>
{/* @ts-ignore */}
{mobileWidth ? (
<FontAwesomeIcon width={20} className={styles.icon} icon={faShirt} />
) : (
""
)}
<Link href={`/merch`} passHref className={styles.text}>
Merch
</Link>
</li>

{live && (
<li>
Expand Down
163 changes: 0 additions & 163 deletions apps/nextjs/components/UnusedPages/prizes.tsx

This file was deleted.

16 changes: 10 additions & 6 deletions apps/nextjs/next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,16 @@ const nextConfig = {
destination: "/ASM2023/schedule",
permanent: false,
},
// {
// source: "/ASGX2023/schedule",
// destination: "https://horaro.org/asgx2023/schedule",
// permanent: false,
// basePath: false,
// },
{
source: "/clip-challenge",
destination: "https://forms.office.com/pages/responsepage.aspx?id=SSVHd61AgEyxiztkrL3zddpHgDqcDVdBoabbjZyhxhZUMTc4UkowSU5XSzRYVklFRUNKWVJRWk9PRSQlQCN0PWcu",
permanent: false,
},
{
source: "/merch",
destination: "http://ausspeedruns.theprintbar.com/",
permanent: true,
},
];
},
};
Expand Down
4 changes: 4 additions & 0 deletions apps/nextjs/pages/asmm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,10 @@ export default function ASMM() {
.
</p>

<p>
Your pledge will grant you entry into our prizes once paid.
</p>

<p style={{ display: "flex", justifyContent: "center", alignItems: "center" }}>
{eligible ? <CheckCircle /> : <Cancel />} Have a paid ticket to ASM2023
</p>
Expand Down
74 changes: 74 additions & 0 deletions apps/nextjs/pages/prizes.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
import Head from "next/head";

import styles from "../styles/Prizes.module.scss";
import DiscordEmbed from "../components/DiscordEmbed";
import Button from "../components/Button/Button";

const PoliciesPage = () => {
return (
<div className={styles.app}>
<Head>
<title>ASM2023 Prizes - AusSpeedruns</title>
<DiscordEmbed
title="ASM2023 Prizes - AusSpeedruns"
description="AusSpeedruns's Prizes"
pageUrl="/prizes"
/>
</Head>
<main className={styles.content}>
<h2>Prizes</h2>
<p>
<Button actionText="Donate to be in the running!" link="/donate" />
<br />
<br />
<h3>Elgato Streamer Pack</h3>
<p>
Minimum $100 Donation, 3 to give away! Consisting of an Elgato Stream Deck Mk2, and an Elgato
Wave:3 Microphone, this streamer pack is perfect for any content creator get started, or upgrade
their setup on any platform! To go in the running to win this streamer pack, all you need to do
is donate at least $100 during ASM2023.
</p>
<h3>A night at Adelaide's Rockford Hotel</h3>
<p>
Minimum $50 Donation, 1 to give away! Win a night in a Superior King Room at Adelaide's Rockford
Hotel, complete with a Full Buffet Breakfast for 2, and Car Parking for 1 vehicle. The winner
will receive a digital coupon that can be used anytime before July 12th, 2024. To go in the
running for this room at Adelaide's Rockford hotel all you need to do is donate at least $50
during ASM2023.
</p>
<h3>Sonic Origins Plus - Physical Copy</h3>
<p>
Minimum $30 Donation, 3 to give away! Comprising of 16 classic Sonic games, this ultimate
collection is a must have for any Sonic fan. With the 12 Game Gear titles added, along with the
4 classic titles of Sonic 1, 2, CD, and 3 & Knuckles all revitalised in a new engine, with all
of Sonic, Tails, Knuckles, and for the first time Amy playable in all these games, these games
have everything a classic Sonic fan could ask for and more! This prize is available for both PS5
and Switch consoles, winners will be contacted for their preference. To go in the running to win
one of these copies all you need to do is donate at least $30 during ASM2023.
</p>
<h3>Heavenly Bodies Steam Code</h3>
<p>
Minimum $10 Donation, 3 to give away! This space based adventure game by 2pt Interactive will
have you pull and twist your way through an increasingly precarious range of physically
simulated stellar scenarios, where without gravity, nothing is still, nothing is secure, and
nothing is simple. To go in the running to win this game you need to do is donate at least $10
during ASM2023.
</p>
<h3>Speaking Simulator Steam Code</h3>
<p>
Minimum $5 Donation, 3 to give away! You'll be in stitches from this game by Affable Games, as
you learn about the complexity of conversation, as you convince a world of trusting humans that
you are definitely NOT a robot. Moving you tongue and lips to try and make words come out might
be a bit more difficult than you thought, hopefully your face doesn't explode along the way. To
go in the running to win this game all you need to do is donate at least $5 during ASM2023.
</p>
</p>
<a href="http://" target="_blank" rel="noopener noreferrer">
Prizes Terms and Conditions
</a>
</main>
</div>
);
};

export default PoliciesPage;

0 comments on commit 54dc434

Please sign in to comment.