Merge branch 'master' of ssh://host.jeynes.uk:222/jill/UXHack26

2026-06-23 12:42:41 +01:00
parent 6538d99b6c 5bb94d4714
commit b17a0c1c16
10 changed files with 2870 additions and 960 deletions
@@ -15,13 +15,11 @@ import {
 } from "@/components/ui/select";
 import { Spinner } from "@/components/ui/spinner";
 import { getRandomThirdPartyCount, getRandomUsername } from "@/lib/utils";
-import Link from "next/link";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";

-export default function Page() {
+export default function Apply() {
  const { t } = useTranslation("common");
-
  const [password, setPassword] = useState("");
  const [email, setEmail] = useState("");
  const [email2, setEmail2] = useState("");
@@ -312,12 +310,7 @@ export default function Page() {
        </Section>

        <Button type="submit" className="self-center text-4xl p-6">
-          <Link
-            href="/careers/apply/submitted/"
-            onClick={() => setSubmitSpinner(true)}
-          >
-            {t("application.submit.button")}
-          </Link>
+          <a href="#submitted" onClick={() => setSubmitSpinner(true)}>t("application.submit.button")</a>
          {submitSpinner && <Spinner data-icon="inline-start" />}
        </Button>
      </form>
@@ -2,10 +2,9 @@

 import { Button } from "@/components/ui/button";
 import Section from "@/components/ui/section";
-import Link from "next/link";
 import { useTranslation } from "react-i18next";

-export default function Page() {
+export default function Careers() {
  const { t } = useTranslation("common");

  return (
@@ -53,9 +52,7 @@ export default function Page() {
        </ul>

        <Button className="bg-blue-500 text-white px-4 py-2 rounded mt-4" asChild>
-          <Link href="/careers/apply/">
-            {t("jobPage.apply")}
-          </Link>
+          <a href="#apply">t("jobPage.apply")</a>
        </Button>

      </Section>
@@ -1,6 +1,5 @@
 "use client";

-import { Geist, Geist_Mono } from "next/font/google";
 import "./globals.css";
 import "../i18n";
 import TitleBar from "@/components/titlebar";
@@ -11,15 +10,6 @@ import CookieConsent from "@/components/cookie-consent";
 import Nudge from "@/components/inacessability/nudge";
 import { useState } from "react";

-const geistSans = Geist({
-  variable: "--font-geist-sans",
-  subsets: ["latin"],
-});
-
-const geistMono = Geist_Mono({
-  variable: "--font-geist-mono",
-  subsets: ["latin"],
-});

 export default function RootLayout({
  children,
@@ -29,25 +19,18 @@ export default function RootLayout({
  const [nudgeOpen, setNudgeOpen] = useState(false);

  return (
-    <html lang="en">
-      <head>
-        <title>Evil Inc. | Providing Security Solutions Inaccessibly</title>
-      </head>
-      <body
-        className={`${geistSans.variable} ${geistMono.variable} antialiased`}
-      >
-        <CookieConsent />
-        <Nudge open={nudgeOpen} setOpen={setNudgeOpen} />
-        <div className="main">
-          <TitleBar />
+        <>
+          <CookieConsent />
+          <Nudge open={nudgeOpen} setOpen={setNudgeOpen} />
+          <div className="main">
+            <TitleBar />

-          <div>
-            {children}
+            <div>
+              {children}
+            </div>
+            <Footer />
          </div>
-          <Footer />
-        </div>
-        <Glasses setNudgeOpen={setNudgeOpen} size={200} />
-      </body>
-    </html>
+          <Glasses setNudgeOpen={setNudgeOpen} size={200} />
+        </>
  );
 }
@@ -2,9 +2,8 @@

 import { useTranslation } from "react-i18next";

-export default function Page() {
+export default function Submitted() {
  const { t } = useTranslation("common");
-
  return (
    <div className="flex flex-col items-center min-h-screen gap-6 mt-8 mb-8">
      <h1 className="text-3xl mb-3">