Skip to content

Commit

Permalink
Merge pull request #368 from Keshav-Aneja/404Page
Browse files Browse the repository at this point in the history
404 Page Added #256
  • Loading branch information
ArslanYM authored Oct 6, 2023
2 parents 813ac04 + c39bb34 commit 4774b01
Show file tree
Hide file tree
Showing 4 changed files with 84 additions and 26 deletions.
32 changes: 16 additions & 16 deletions web/src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
// 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, NotFound } from './pages';
import MasterLayout from './layouts';
import { IssueList } from './pages/Issues/IssuesPage/IssueList';
import ScrollTop from './components/ScrollTop';
function App() {
return (
<BrowserRouter>
<MasterLayout>
<ScrollTop>
<Routes>
<Route path="/" element={<Home />} />
<Route path="/contributors" element={<Contributors />} />
<Route path="/Docs" element={<Guide />} />
<Route path="/projects" element={<ProjectList />} />
<Route path="/issues" element={<IssueList />} />
</Routes>
</ScrollTop>
<ScrollTop>
<Routes>
<Route path="/" element={<Home />} />
<Route path="/contributors" element={<Contributors />} />
<Route path="/Docs" element={<Guide />} />
<Route path="/projects" element={<ProjectList />} />
<Route path="/issues" element={<IssueList />} />
<Route path="*" element={<NotFound />} />
</Routes>
</ScrollTop>
</MasterLayout>
</BrowserRouter>
);
Expand Down
13 changes: 7 additions & 6 deletions web/src/index.css
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
}
}
56 changes: 56 additions & 0 deletions web/src/pages/NotFound/NotFound.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
const NotFound = () => {
return (
<div className="w-full h-[90vh] bg-gradient-to-b from-[#343E4E] to-[#010102] flex flex-col justify-center items-center font-OpenSans text-white gap-4 md:gap-32">
<div className="main-content flex flex-col items-center md:flex-row w-full justify-center gap-10 md:gap-20">
<div className="mascot flex flex-col justify-center items-center relative">
<div
className="mascot-hat w-[6rem] h-[4.5rem] bg-[#FE8C05] flex justify-center border-4 border-black relative top-8"
style={{
borderRadius: '20px',
borderTopLeftRadius: '50%',
borderTopRightRadius: '50%',
}}
>
<div className="hat-line bg-[#FEB31E] w-[1.5rem] h-[4.5rem] border-2 border-black rounded-lg relative -top-1"></div>
</div>
<div className="hat-base bg-[#FFB31F] w-[8rem] h-[1.5rem] rounded-t-lg rounded-b-2xl relative top-2 z-10 border-4 border-black"></div>
<div className="mascot-body w-[10rem] aspect-square border-4 border-black flex flex-col items-center gap-2 bg-[#FFFFFF] rounded-xl p-6 relative z-10">
<div className="eyes flex justify-center gap-6">
<div className="eye-l w-[2rem] h-[3rem] bg-black rounded-full">
<div className="eye-ball bg-white w-[0.6rem] aspect-square rounded-full relative left-4 top-2"></div>
</div>
<div className="eye-r w-[2rem] h-[2rem] bg-black rounded-t-full">
<div className="eye-ball bg-white w-[0.6rem] aspect-square rounded-full relative left-4 top-2"></div>
</div>
</div>
<div className="mouth w-[4.5rem] h-[3rem] bg-black rounded-t-full relative border-4 border-black overflow-hidden">
<div className="teeth w-[80%] h-[40%] bg-white rounded-t-full absolute bottom-0 left-2"></div>
<div className="teeth w-[80%] h-[60%] bg-white rounded-b-full absolute -top-2 left-2"></div>
</div>
<div className="spots">
<div className="spot-a w-4 h-4 bg-[#D9D2CA] rounded-full absolute top-2 left-4"></div>
<div className="spot-b w-8 h-8 bg-[#D9D2CA] rounded-full absolute bottom-12 left-2"></div>
<div className="spot-c w-6 h-6 bg-[#D9D2CA] rounded-full absolute top-10 right-1"></div>
<div className="spot-d w-2 h-2 bg-[#D9D2CA] rounded-full absolute bottom-12 right-2"></div>
</div>
</div>
<div className="hand-l bg-[#D9D2CA] w-[5rem] h-[1.5rem] rounded-l-full absolute -left-12 -rotate-45 z-0 bottom-24"></div>
<div className="hand-r bg-[#D9D2CA] w-[5rem] h-[1.5rem] rounded-r-full absolute -right-12 rotate-45 z-0 bottom-24"></div>
<div className="feet-l w-[1.8rem] h-[4rem] z-0 bg-[#d9d2ca] rounded-b-full rotate-12 absolute -bottom-6 left-8 border-4 border-black"></div>
<div className="feet-r w-[1.8rem] h-[4rem] z-0 bg-[#d9d2ca] rounded-b-full -rotate-12 absolute -bottom-6 right-8 border-4 border-black"></div>
<div className="shadow bg-[#CCCCCC] w-[9rem] h-[1rem] rounded-[100%] relative top-12 "></div>
</div>
<div className="heading-main text-[6rem] md:text-[12rem] font-extrabold">
404
</div>
</div>

<div className="sub-heading md:text-2xl text-center w-[90%]">
Oops! We couldn&apos;t find the page that you&apos;re looking.
<br />
Please check the address and try again.
</div>
</div>
);
};
export default NotFound;
9 changes: 5 additions & 4 deletions web/src/pages/index.js
Original file line number Diff line number Diff line change
@@ -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';

1 comment on commit 4774b01

@vercel
Copy link

@vercel vercel bot commented on 4774b01 Oct 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

starter-hive – ./

starter-hive-arslanym.vercel.app
starter-hive-git-main-arslanym.vercel.app
starter-hive.vercel.app

Please sign in to comment.