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.

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

Fixes to site before signup #120

Merged
merged 8 commits into from
Feb 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions src/app/_components/CompanyRegistrationButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,19 @@ import Link from "next/link"

export async function CompanyRegistrationButton() {
const { fr } = await fetchDates()
const signUpDate = DateTime.local(2025, 3, 3, { zone: "Europe/Stockholm" })
const isAfterFr = DateTime.now() > DateTime.fromISO(fr.end)
const isBeforeSignUpDate = DateTime.now() < signUpDate

if (isAfterFr) {
return <P>{DateTime.now().year} signup is closed</P>
} else if (isBeforeSignUpDate) {
return (
<P>
{DateTime.now().year} signup opens {signUpDate.monthLong}{" "}
{signUpDate.day}
</P>
)
}

return (
Expand Down
4 changes: 2 additions & 2 deletions src/app/exhibitor/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@ export default function ForExhibitorsPage() {

<div className="flex flex-col space-y-4 py-6">
<div className="mt-2 flex flex-row flex-wrap justify-stretch gap-4 ">
<Link href="https://register.armada.nu/register">
{/*<Link href="https://register.armada.nu/register">
<Button>Signup to Armada</Button>
</Link>
<Link href="/exhibitor/packages">
<Button variant={"secondary"} className="dark:bg-liqorice-700">
Packages
</Button>
</Link>
</Link>*/}
<Link href="/exhibitor/timeline">
<Button variant={"secondary"} className="dark:bg-liqorice-700">
Timeline
Expand Down
4 changes: 2 additions & 2 deletions src/app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,14 @@ export default async function HomePage() {
{today < fr_end ? (
<>
<CompanyRegistrationButton />
<Link href="/exhibitor/packages">
{/*<Link href="/exhibitor/packages">
<Button
variant={"secondary"}
className="dark:bg-liqorice-700">
This Year&apos;s Packages
<ArrowRightIcon className="ml-2 h-4 w-4" />
</Button>
</Link>
</Link>>*/}
</>
) : (
<>
Expand Down
4 changes: 2 additions & 2 deletions src/components/shared/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ export function Footer() {
<p>
<b>EXHIBITORS</b>
</p>
<a href="https://register.armada.nu/register">Registration</a>
{/*<a href="https://register.armada.nu/register">Registration</a>
<br />
<a href="/exhibitor/packages">Packages</a>
<br />
<br />*/}
<a href="/exhibitor">Why Armada</a>
<br />
<a href="/exhibitor/timeline">Timeline</a>
Expand Down
6 changes: 3 additions & 3 deletions src/components/shared/NavigationMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ const companyLinks: NavigationLink[] = [
title: "Registration",
href: "https://register.armada.nu/register",
description: `Signup as an exhibitor for the fair ${DateTime.now().year}`,
enabled: true
enabled: false
},
{
title: "Packages",
href: "/exhibitor/packages",
description: "See what we have to offer",
enabled: true
enabled: false
},
{
title: "Why Armada",
Expand Down Expand Up @@ -79,7 +79,7 @@ const studentLinks: NavigationLink[] = [
title: "Map",
href: "/student/map",
description: "Find your way around the fair",
enabled: true
enabled: false
},
{
title: "At the Fair",
Expand Down