diff --git a/client/src/components/Header.js b/client/src/components/Header.js index 3dffca6d..0b74238e 100644 --- a/client/src/components/Header.js +++ b/client/src/components/Header.js @@ -1,6 +1,6 @@ import React from "react"; import { useLocation } from "react-router-dom"; -export default function Header({ editLearningObjectives, back }) { +export default function Header({ editLearningObjectives, back, logout }) { const location = useLocation(); let logoLink = ""; diff --git a/client/src/components/SignupForm.js b/client/src/components/SignupForm.js index 1a4916b6..af603c57 100644 --- a/client/src/components/SignupForm.js +++ b/client/src/components/SignupForm.js @@ -5,12 +5,9 @@ import "../App.css"; import validate from "./SignupValidation"; import Footer from "./Footer"; import Header from "./Header"; -<<<<<<< HEAD import useQuery from "../components/useQuery"; -======= import CityDropDownOptions from "./CityDropDownOptions"; ->>>>>>> 7c3c1bcab0817973d3b9ac1bf454d2c710ab4cf8 const SignupForm = () => { const [hasRegistered, setHasRegistered] = useState(false); const [serverError, setServerError] = useState(""); @@ -115,52 +112,7 @@ const SignupForm = () => { {errors.userEmail && (

*{errors.userEmail}

)} -<<<<<<< HEAD - - - {errors.cyfCity &&

*{errors.cyfCity}

} - - - {errors.userClassId && ( -

*{errors.userClassId}

- )} -======= - - - {errors.userPassword && ( -

*{errors.userPassword}

- )} - - - {errors.confirmPassword && ( -

*{errors.confirmPassword}

- )} ->>>>>>> 7c3c1bcab0817973d3b9ac1bf454d2c710ab4cf8 -<<<<<<< HEAD - - - - - CYF Knowledge Checklist - - - - - - - - - - -======= @@ -40,7 +23,6 @@ > ->>>>>>> dev