Merge branch 'master' of ssh://host.jeynes.uk:222/jill/UXHack26
This commit is contained in:
William Jeynes
@@ -1,4 +1,6 @@
|
||||
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
|
||||
dist/*
|
||||
.parcel-cache/*
|
||||
|
||||
# dependencies
|
||||
/node_modules
|
||||
|
||||
Generated
+2792
-908
File diff suppressed because it is too large
Load Diff
+5
-7
@@ -3,10 +3,8 @@
|
||||
"version": "0.1.0",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"dev": "next dev",
|
||||
"build": "next build",
|
||||
"start": "next start",
|
||||
"lint": "eslint"
|
||||
"dev": "cp -r public/* dist && parcel src/index.html",
|
||||
"build": "parcel build src/index.html"
|
||||
},
|
||||
"dependencies": {
|
||||
"class-variance-authority": "^0.7.1",
|
||||
@@ -16,10 +14,9 @@
|
||||
"framer-motion": "^12.34.3",
|
||||
"i18next": "^25.8.13",
|
||||
"lucide-react": "^0.575.0",
|
||||
"next": "16.1.6",
|
||||
"radix-ui": "^1.4.3",
|
||||
"react": "19.2.3",
|
||||
"react-dom": "19.2.3",
|
||||
"react": "^19.2.3",
|
||||
"react-dom": "^19.2.3",
|
||||
"react-i18next": "^16.5.4",
|
||||
"tailwind-merge": "^3.5.0"
|
||||
},
|
||||
@@ -30,6 +27,7 @@
|
||||
"@types/react-dom": "^19",
|
||||
"eslint": "^9",
|
||||
"eslint-config-next": "16.1.6",
|
||||
"parcel": "^2.16.4",
|
||||
"shadcn": "^3.8.5",
|
||||
"tailwindcss": "^4",
|
||||
"tw-animate-css": "^1.4.0",
|
||||
|
||||
@@ -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>
|
||||
|
||||
+2
-19
@@ -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,13 +19,7 @@ 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">
|
||||
@@ -47,7 +31,6 @@ export default function RootLayout({
|
||||
<Footer />
|
||||
</div>
|
||||
<Glasses setNudgeOpen={setNudgeOpen} size={200} />
|
||||
</body>
|
||||
</html>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -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">
|
||||
@@ -21,7 +21,7 @@ const TitleBar: React.FC = () => {
|
||||
<a href="/#testimonies" className="hover:text-gray-600 transition-colors">
|
||||
{t('navigation.testimonies')}
|
||||
</a>
|
||||
<a href="/careers" className="hover:text-gray-600 transition-colors">
|
||||
<a href="#careers" className="hover:text-gray-600 transition-colors">
|
||||
{t('navigation.jobs')}
|
||||
</a>
|
||||
</nav>
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<title>Evil Inc. | Providing Security Solutions Inaccessibly</title>
|
||||
</head>
|
||||
<body>
|
||||
<div id="root"></div>
|
||||
|
||||
<script type="module" src="./main.jsx"></script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,42 @@
|
||||
import React, { useEffect, useState } from "react";
|
||||
import ReactDOM from "react-dom/client";
|
||||
|
||||
import App from "./app/layout";
|
||||
import Home from "./app/page";
|
||||
import Careers from "./app/careers/page";
|
||||
import Apply from "./app/apply/page";
|
||||
import Submitted from "./app/submitted/page";
|
||||
|
||||
|
||||
function Router() {
|
||||
const [hash, setHash] = useState(window.location.hash);
|
||||
|
||||
useEffect(() => {
|
||||
const onHashChange = () => setHash(window.location.hash);
|
||||
|
||||
window.addEventListener("hashchange", onHashChange);
|
||||
|
||||
return () => {
|
||||
window.removeEventListener("hashchange", onHashChange);
|
||||
};
|
||||
}, []);
|
||||
|
||||
|
||||
if (hash === "#careers") {
|
||||
return <Careers />;
|
||||
}
|
||||
|
||||
if (hash === "#apply") {
|
||||
return <Apply />;
|
||||
}
|
||||
|
||||
if (hash === "#submitted") {
|
||||
return <Submitted />;
|
||||
}
|
||||
|
||||
return <Home />
|
||||
}
|
||||
|
||||
ReactDOM.createRoot(
|
||||
document.getElementById("root")
|
||||
).render(<App><Router /></App>);
|
||||
Reference in New Issue
Block a user