From 15f66b1055b7e7d3379e4eecdc60fb5f765447fb Mon Sep 17 00:00:00 2001 From: Keshav-Aneja Date: Wed, 4 Oct 2023 00:09:40 +0530 Subject: [PATCH 1/3] 404 Page Added --- web/src/index.css | 13 +++---- web/src/pages/NotFound/NotFound.jsx | 55 +++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 6 deletions(-) create mode 100644 web/src/pages/NotFound/NotFound.jsx diff --git a/web/src/index.css b/web/src/index.css index 2e44c57..f8a428d 100644 --- a/web/src/index.css +++ b/web/src/index.css @@ -1,3 +1,4 @@ +@import url('https://fonts.googleapis.com/css2?family=Open+Sans:wght@600;700;800&display=swap'); @tailwind base; @tailwind components; @tailwind utilities; @@ -17,16 +18,16 @@ body { background: #000000; } -::-webkit-scrollbar{ - width:10px; - height:10px; +::-webkit-scrollbar { + width: 10px; + height: 10px; } -::-webkit-scrollbar-track{ +::-webkit-scrollbar-track { background-color: #000000f0; } -::-webkit-scrollbar-thumb{ +::-webkit-scrollbar-thumb { background-color: #facc17; border-radius: 5px; -} \ No newline at end of file +} diff --git a/web/src/pages/NotFound/NotFound.jsx b/web/src/pages/NotFound/NotFound.jsx new file mode 100644 index 0000000..b88bd80 --- /dev/null +++ b/web/src/pages/NotFound/NotFound.jsx @@ -0,0 +1,55 @@ +export default function NotFound() { + return ( +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 404 +
+
+ +
+ Oops! We couldn't find the page that you're looking. +
+ Please check the address and try again. +
+
+ ); +} From 1ec608aea7147039b26f190d89adc0b26210d851 Mon Sep 17 00:00:00 2001 From: Keshav-Aneja Date: Wed, 4 Oct 2023 21:15:12 +0530 Subject: [PATCH 2/3] Added Route for 404 Page --- web/src/App.jsx | 33 +++++++++++++++-------------- web/src/pages/NotFound/NotFound.jsx | 2 +- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/web/src/App.jsx b/web/src/App.jsx index ae63d4a..14043ce 100644 --- a/web/src/App.jsx +++ b/web/src/App.jsx @@ -1,24 +1,25 @@ // eslint-disable-next-line no-unused-vars -import React from "react"; -import { BrowserRouter, Routes, Route } from "react-router-dom"; -import { Home, Contributors, Guide, ProjectList } from "./pages"; -import MasterLayout from "./layouts"; -import { IssueList } from "./pages/Issues/IssuesPage/IssueList"; -import ScrollTop from "./components/ScrollTop"; - +import React from 'react'; +import { BrowserRouter, Routes, Route } from 'react-router-dom'; +import { Home, Contributors, Guide, ProjectList } from './pages'; +import MasterLayout from './layouts'; +import { IssueList } from './pages/Issues/IssuesPage/IssueList'; +import ScrollTop from './components/ScrollTop'; +import NotFound from './pages/NotFound/NotFound'; function App() { return ( - - - } /> - } /> - } /> - } /> - } /> - - + + + } /> + } /> + } /> + } /> + } /> + } /> + + ); diff --git a/web/src/pages/NotFound/NotFound.jsx b/web/src/pages/NotFound/NotFound.jsx index b88bd80..d26109f 100644 --- a/web/src/pages/NotFound/NotFound.jsx +++ b/web/src/pages/NotFound/NotFound.jsx @@ -1,6 +1,6 @@ export default function NotFound() { return ( -
+
Date: Wed, 4 Oct 2023 21:26:40 +0530 Subject: [PATCH 3/3] NotFound Page imported correctly --- web/src/App.jsx | 3 +-- web/src/pages/NotFound/NotFound.jsx | 5 +++-- web/src/pages/index.js | 9 +++++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/web/src/App.jsx b/web/src/App.jsx index 14043ce..a10f463 100644 --- a/web/src/App.jsx +++ b/web/src/App.jsx @@ -1,11 +1,10 @@ // eslint-disable-next-line no-unused-vars import React from 'react'; import { BrowserRouter, Routes, Route } from 'react-router-dom'; -import { Home, Contributors, Guide, ProjectList } from './pages'; +import { Home, Contributors, Guide, ProjectList, NotFound } from './pages'; import MasterLayout from './layouts'; import { IssueList } from './pages/Issues/IssuesPage/IssueList'; import ScrollTop from './components/ScrollTop'; -import NotFound from './pages/NotFound/NotFound'; function App() { return ( diff --git a/web/src/pages/NotFound/NotFound.jsx b/web/src/pages/NotFound/NotFound.jsx index d26109f..57a8bb3 100644 --- a/web/src/pages/NotFound/NotFound.jsx +++ b/web/src/pages/NotFound/NotFound.jsx @@ -1,4 +1,4 @@ -export default function NotFound() { +const NotFound = () => { return (
@@ -52,4 +52,5 @@ export default function NotFound() {
); -} +}; +export default NotFound; diff --git a/web/src/pages/index.js b/web/src/pages/index.js index bcf32f4..566d4d2 100644 --- a/web/src/pages/index.js +++ b/web/src/pages/index.js @@ -1,6 +1,7 @@ /** use this file to export whatever is needed outside the pages folder */ -export { default as Home } from "./Home/Home"; -export { default as Contributors } from "./Contributors/Contributors"; -export { default as Guide } from "./Docs/Guide"; -export { default as ProjectList } from "./Issues/ProjectList"; +export { default as Home } from './Home/Home'; +export { default as Contributors } from './Contributors/Contributors'; +export { default as Guide } from './Docs/Guide'; +export { default as ProjectList } from './Issues/ProjectList'; +export { default as NotFound } from './NotFound/NotFound';