fix 404

SearchForSunnyD · Jul 28, 2024 · 8b9d4b2 · 8b9d4b2
1 parent 831d721
commit 8b9d4b2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/dnd-app/frontend/src/404.jsx b/dnd-app/frontend/src/404.jsx
@@ -1,6 +1,6 @@
 export function NotFound() {
 	return (
-		<div className="container d-flex flex-column align-items-center justify-content-center">
+		<div className="container d-flex flex-column p-2 align-items-center justify-content-center bisque rounded">
 			<h1 className="display-1 border-bottom">ERROR 404</h1>
 			<p className="h4">
 				<span className="text-danger">Oops!</span> Page not found.

diff --git a/dnd-app/frontend/src/DetailRoutes/Monster.jsx b/dnd-app/frontend/src/DetailRoutes/Monster.jsx
@@ -18,6 +18,7 @@ import {
 } from "reactstrap";
 import DndApi from "../api";
 import { getScore } from "../tools";
+import ReactMarkdown from "react-markdown";
 
 import("../assets/styles/Details.css");
 
@@ -63,7 +64,7 @@ export function Monster() {
 							<Col>
 								<CardBody>
 									<CardTitle tag="h3">{data.name}</CardTitle>
-									{!data.desc && !data.legendary_desc ? "" : <CardSubtitle>{data.desc || data.legendary_desc}</CardSubtitle>}
+									{!data.desc && !data.legendary_desc ? "" : <ReactMarkdown>{data.desc || data.legendary_desc}</ReactMarkdown>}
 									<hr />
 									<Row>
 										<CardText className="col-3">

diff --git a/dnd-app/frontend/src/RouteList.jsx b/dnd-app/frontend/src/RouteList.jsx
@@ -1,6 +1,7 @@
-import { Navigate, Route, Routes } from "react-router-dom";
+import { Route, Routes } from "react-router-dom";
 import { Container } from "reactstrap";
 
+import { NotFound } from "./404";
 import { DetailRoutes } from "./DetailRoutes/DetailRoutes";
 import { Home } from "./Home";
 import { SearchResult } from "./SearchResults";
@@ -18,8 +19,8 @@ export function RouteList() {
 					<Route path="/" element={<Home />} />
 					{UserRoutes()}
 					{DetailRoutes()}
-					<Route path="/*" element={<Navigate to="/" />} />
 					<Route path="/search-results" element={<SearchResult />} />
+					<Route path="/*" element={<NotFound />} />
 				</Routes>
 			</Container>
 		</main>

diff --git a/dnd-app/frontend/src/UserRoutes/UserRoutes.jsx b/dnd-app/frontend/src/UserRoutes/UserRoutes.jsx
@@ -1,8 +1,8 @@
 import { Navigate, Route } from "react-router-dom";
 
+import { PrivateRoute } from "../PrivateRoute";
 import { LoginSignup } from "./LoginSignup";
 import { Logout } from "./Logout";
-import { PrivateRoute } from "../PrivateRoute";
 import { Profile } from "./Profile";
 
 /**
@@ -13,14 +13,8 @@ export function UserRoutes() {
 	return (
 		<>
 			<Route path="/login/signup" element={<LoginSignup />} />
-			<Route
-				path="/profile"
-				element={<PrivateRoute element={<Profile />} />}
-			/>
-			<Route
-				path="/logout"
-				element={<PrivateRoute element={<Logout />} />}
-			/>
+			<Route path="/profile" element={<PrivateRoute element={<Profile />} />} />
+			<Route path="/logout" element={<PrivateRoute element={<Logout />} />} />
 			<Route path="/login" element={<Navigate to="/" />} />
 			<Route path="/signup" element={<Navigate to="/" />} />
 		</>