Skip to content
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
8 changes: 4 additions & 4 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import Jobs from "./opportunities/pages/Jobs.js";
import Departments from "./staff/pages/Departments.tsx";
import StaffPage from "./staff/pages/Staff.tsx";
import Department from "./staff/pages/Department.tsx";
import CreatePost from "./staff/pages/CreatePost.js";
import CreatePost from "./staff/pages/CreatePost.tsx";
import IndividualPost from "./opportunities/pages/IndividualPost.js";
import ProfilePage from "./shared/pages/Profile.js";
import LoginRedirection from "./auth/Login.tsx";
Expand Down Expand Up @@ -44,10 +44,10 @@ function App() {
/>
<Route path="/staff" element={<Departments authenticated={authenticated} />} />
<Route path="/staff/:staffId" element={<StaffPage authenticated={authenticated} />} />
<Route path="/createPost" element={<CreatePost edit={false} />} />
<Route path="/create" element={<CreatePost edit={false} authenticated={authenticated} />} />
<Route
path="/editPost/:postID"
element={<CreatePost edit={true} />}
path="/edit/:postID"
element={<CreatePost edit={true} authenticated={authenticated} />}
/>
<Route path="/post/:postID" element={<IndividualPost />} />

Expand Down
2 changes: 1 addition & 1 deletion src/shared/components/Navigation/MainNavigation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export default function MainNavigation(authenticated) {
const routes = authenticated.authenticated[1]
? [
{ name: "Jobs", href: "/jobs", current: true },
{ name: "Create", href: "/createPost", current: false },
{ name: "Create", href: "/create", current: false },
{ name: "Staff", href: "/staff", current: false },
{ name: "Profile", href: "/profile", current: false },
{ name: "Sign Out", href: "/signout", current: false },
Expand Down
47 changes: 22 additions & 25 deletions src/shared/components/Navigation/StickyFooter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default function StickyFooter(authenticated) {
const routes = authenticated.authenticated[1]
? [
{ name: "Jobs", href: "/jobs", current: true },
{ name: "Create", href: "/createPost", current: false },
{ name: "Create", href: "/create", current: false },
{ name: "Staff", href: "/staff", current: false },
{ name: "Profile", href: "/profile", current: false },
{ name: "Sign Out", href: "/signout", current: false },
Expand All @@ -22,14 +22,13 @@ export default function StickyFooter(authenticated) {
RCOS
</Link>
</h1>
<br />
<div className="stickyfooter-info">
<div className="stickyfooter-info mt-5">
<div className="pb-3">
<img src={logo} alt="LabConnect" width="160" height="160 / (319/289)" />
<img src={logo} alt="LabConnect" width="160" height="160 / (319/289)" />
</div>

<div className="w-40">
<p>
<div>
<b>Contact Us</b>
<p className="text-base">
<Link
Expand All @@ -47,27 +46,25 @@ export default function StickyFooter(authenticated) {
</Link>
<br />
</p>
</p>
</div>
</div>
<div className="w-40 text-base">
<b>Additional Pages</b>
<p>
{routes.map((item) => (
<>
<Link
key={item.name}
to={item.href}
className="grey-link hover:text-neutral-950 focus:text-neutral-950"
aria-current={item.current}
>
{item.name}
</Link>
<br />
</>
))}
</p>
<div>
<b>Resources</b>
<br />
{routes.map((item) => (
<React.Fragment key={item.name}>
<Link
to={item.href}
className="grey-link hover:text-neutral-950 focus:text-neutral-950"
aria-current={item.current}
>
{item.name}
</Link>
<br />
</React.Fragment>
))}
</div>
</div>
</section>
</div >
</section >
);
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from "react";
import PropTypes from "prop-types";

const CheckBox = ({
formHook,
Expand All @@ -9,10 +10,6 @@ const CheckBox = ({
options,
type,
}) => {
// if (!formHook) {
// return <h1>FormHook Not Given</h1>;
// }

return (
<div>
<div className="check-input">
Expand Down Expand Up @@ -46,5 +43,14 @@ const CheckBox = ({
</div>
);
};
CheckBox.propTypes = {
formHook: PropTypes.object,
errors: PropTypes.object,
errorMessage: PropTypes.string,
name: PropTypes.string.isRequired,
label: PropTypes.string,
options: PropTypes.arrayOf(PropTypes.string),
type: PropTypes.string,
};

export default CheckBox;
Loading
Loading