Skip to content

Commit

Permalink
first round of live tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
EwanLyon committed Jul 12, 2023
1 parent 54dc434 commit e66495f
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 11 deletions.
2 changes: 2 additions & 0 deletions apps/keystone/admin/pages/incentives-dashboard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ function renderIncentive(
case "war":
return (
<War
key={incentive.id}
incentive={incentive}
incentiveUpdate={updateIncentiveMutation}
refetchData={refetchData}
Expand All @@ -139,6 +140,7 @@ function renderIncentive(
case "goal":
return (
<Goal
key={incentive.id}
incentive={incentive}
incentiveUpdate={updateIncentiveMutation}
refetchData={refetchData}
Expand Down
29 changes: 19 additions & 10 deletions apps/nextjs/components/Navbar/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
faTiktok,
// faFacebook,
} from "@fortawesome/free-brands-svg-icons";
import { faBars, faTimes, faCalendar, faShirt } from "@fortawesome/free-solid-svg-icons";
import { faBars, faTimes, faCalendar, faShirt, faMoneyBillWave } from "@fortawesome/free-solid-svg-icons";
import { globals } from "../../globals";
import Button from "../Button/Button";
import { useAuth } from "../auth";
Expand Down Expand Up @@ -149,20 +149,29 @@ const Navbar = ({ events = [], live = false }: NavbarProps) => {
</li>
<li>
{/* @ts-ignore */}
{mobileWidth ? (
<FontAwesomeIcon width={20} className={styles.icon} icon={faShirt} />
) : (
""
)}
<Link href={`/merch`} passHref className={styles.text}>
{mobileWidth ? <FontAwesomeIcon width={20} className={styles.icon} icon={faShirt} /> : ""}
<Link href={`https://ausspeedruns.com/merch`} passHref className={styles.text}>
Merch
</Link>
</li>

{live && (
<li>
<Button actionText="Donate" link="/donate" colorScheme={"orange"} />
</li>
<>
<li>
{/* @ts-ignore */}
{mobileWidth ? (
<FontAwesomeIcon width={20} className={styles.icon} icon={faMoneyBillWave} />
) : (
""
)}
<Link href={`https://ausspeedruns.com/ASM2023/incentives`} passHref className={styles.text}>
Incentives
</Link>
</li>
<li>
<Button actionText="Donate" link="/donate" colorScheme={"orange"} />
</li>
</>
)}

<li>
Expand Down
2 changes: 1 addition & 1 deletion apps/nextjs/pages/prizes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ const PoliciesPage = () => {
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">
<a href="https://ausspeedruns.sharepoint.com/:w:/s/Main/ESjl4LUolJFAuZwXyzuwtTAB7cGd6_IfYLi0sxn5iTvPSQ?e=zrRFGO" target="_blank" rel="noopener noreferrer">
Prizes Terms and Conditions
</a>
</main>
Expand Down

0 comments on commit e66495f

Please sign in to comment.