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

routing and login/registration integration #12

Merged
merged 1 commit into from
Nov 26, 2024
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
122 changes: 0 additions & 122 deletions frontend/app/__snapshots__/page.test.tsx.snap

This file was deleted.

18 changes: 16 additions & 2 deletions frontend/app/form/frontend_form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,19 @@ import ResumeForm from "./resume_form";
import JobDescriptionForm from "./job_description_form";
import styles from "./frontend_form.module.css";
import { Card, CardContent } from "@mui/material";
import Link from "next/link";
import { useState } from "react";

export default function FrontendForm() {
const [jobDescriptionSubmitted, setJobDescriptionSubmitted] =
useState(false);
const [resumeSubmitted, setResumeSubmitted] = useState(false);
function onJobDescriptionSubmit() {
setJobDescriptionSubmitted(true);
}
function onResumeSubmit() {
setResumeSubmitted(true);
}
return (
<div className={styles.container}>
<Card className={styles.card}>
Expand All @@ -14,8 +25,11 @@ export default function FrontendForm() {
Resume and Job Description
</h1>

<ResumeForm />
<JobDescriptionForm />
<ResumeForm onSubmit={onResumeSubmit} />
<JobDescriptionForm onSubmit={onJobDescriptionSubmit} />
{jobDescriptionSubmitted && resumeSubmitted ? (
<Link href={"/dashboard"}>View Analysis</Link>
) : undefined}
</CardContent>
</Card>
</div>
Expand Down
7 changes: 5 additions & 2 deletions frontend/app/form/job_description_form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
TextField,
} from "@mui/material";

export default function JobDescriptionForm() {
export default function JobDescriptionForm(props: { onSubmit?: () => void }) {
const [description, setDescription] = useState<string>("");
const [message, setMessage] = useState<string | null>(null);

Expand All @@ -30,9 +30,12 @@ export default function JobDescriptionForm() {
}

// Submits job description
backendPost("api/job-description", { description })
backendPost("api/job-description", { jobDescription: description })
.then((data) => {
setMessage(data.message);
if (props.onSubmit) {
props.onSubmit();
}
})
.catch((error) => {
setMessage("" + error);
Expand Down
6 changes: 5 additions & 1 deletion frontend/app/form/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import FrontendForm from "./frontend_form";

export default function FormPage() {
return <FrontendForm />;
return (
<>
<FrontendForm />
</>
);
}
/**
* Used to see the visual of the /form
Expand Down
5 changes: 4 additions & 1 deletion frontend/app/form/resume_form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const VisuallyHiddenInput = styled("input")({
width: 1,
});

export default function ResumeForm() {
export default function ResumeForm(props: { onSubmit?: () => void }) {
const [message, setMessage] = useState<string | null>(null);

const handleSubmit = (event: React.FormEvent<HTMLFormElement>) => {
Expand Down Expand Up @@ -47,6 +47,9 @@ export default function ResumeForm() {
backendFormPost("api/resume-upload", formData)
.then((data) => {
setMessage(data.message);
if (props.onSubmit) {
props.onSubmit();
}
})
.catch((error) => {
setMessage("" + error);
Expand Down
16 changes: 16 additions & 0 deletions frontend/app/login/login.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,22 @@ jest.mock("../../util/fetching", () => {
backendPostMock(...args)) as typeof backendPost,
};
});

const useRouterMock = jest.fn(() => {
return {
push: (_route: string) => {},
};
});

jest.mock("next/navigation", () => {
const originalModule: object = jest.requireActual("next/navigation");
return {
__esModule: true,
...originalModule,
useRouter: () => useRouterMock(),
};
});

it("has an h2 that says login", () => {
render(<Page />);
expect(
Expand Down
3 changes: 3 additions & 0 deletions frontend/app/login/login.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
"use client";

import { Button, Card, CardContent, CardHeader, Input } from "@mui/material";
import { useRouter } from "next/navigation";
import { useState } from "react";
import { backendPost } from "util/fetching";

export function Login() {
const [postData, setPostData] = useState<string | undefined>();
const [blankMessage, setBlankMessage] = useState("");
const router = useRouter();
return (
<>
<Card>
Expand Down Expand Up @@ -47,6 +49,7 @@ export function Login() {
})
.then((data) => {
setPostData(data.message);
router.push("/form");
})
.catch((reason) => {
setPostData("" + reason);
Expand Down
70 changes: 0 additions & 70 deletions frontend/app/page.test.tsx

This file was deleted.

7 changes: 3 additions & 4 deletions frontend/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { BackendExample } from "./backend_example";
import Counter from "./counter";
import styles from "./page.module.css";
import Link from "next/link";

export const metadata = {
title: "resume analyser",
Expand All @@ -10,8 +9,8 @@ export default function Page() {
return (
<div className={styles.center}>
<h1>resume analyser!</h1>
<Counter />
<BackendExample />
<Link href={"login"}>Login</Link>
<Link href={"register"}>Register</Link>
</div>
);
}
15 changes: 15 additions & 0 deletions frontend/app/register/register.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,21 @@ jest.mock("../../util/fetching", () => {
};
});

const useRouterMock = jest.fn(() => {
return {
push: (_route: string) => {},
};
});

jest.mock("next/navigation", () => {
const originalModule: object = jest.requireActual("next/navigation");
return {
__esModule: true,
...originalModule,
useRouter: () => useRouterMock(),
};
});

it("has an h2 that says register", () => {
render(<Page />);
expect(
Expand Down
3 changes: 3 additions & 0 deletions frontend/app/register/register.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
"use client";

import { Button, Card, CardContent, CardHeader, Input } from "@mui/material";
import { useRouter } from "next/navigation";
import { useState } from "react";
import { backendPost } from "util/fetching";

export function Register() {
const [postData, setPostData] = useState<string | undefined>();
const [blankMessage, setBlankMessage] = useState("");
const [passMessage, setPassMessage] = useState("");
const router = useRouter();
return (
<>
<Card>
Expand Down Expand Up @@ -60,6 +62,7 @@ export function Register() {
backendPost("api/register", fields)
.then((data) => {
setPostData(data.message);
router.push("/login");
})
.catch((reason) => {
setPostData("" + reason);
Expand Down
Loading