Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Page 404 #192

Closed
wants to merge 10 commits into from
Closed
Show file tree
Hide file tree
Changes from 6 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
4 changes: 4 additions & 0 deletions webapp/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import Settings from './pages/Settings/Settings'
import Login from './pages/Login/Login'
import Logout from './pages/Logout/Logout'
import Register from './pages/Register/Register'
import PageNotFound from './pages/PageNotFound/PageNotFound';

import { ProtectedRoute } from './components/ProtectedRoute'

Expand All @@ -19,6 +20,7 @@ import { useState } from 'react'
import { useTranslation } from 'react-i18next'



function App() {

//State for the volume
Expand All @@ -39,6 +41,7 @@ function App() {
<Route path="/login" element={<Login />}></Route>
<Route path="/register" element={<Register />}></Route>
<Route path="/logout" element={<Logout />} />

<Route
path="game"
element={
Expand All @@ -58,6 +61,7 @@ function App() {
<Route path="leaderboard" element={<Leaderboard />}></Route>
<Route path="settings" element={<Settings volume={volume} handleVolumeChange={handleVolumeChange} />}></Route>
</Route>
<Route path="*" element={<PageNotFound />}></Route>
</Routes>
</AuthProvider>
</SettingsProvider>
Expand Down
1 change: 1 addition & 0 deletions webapp/src/assets/catanimation/asleep_cat.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions webapp/src/assets/catanimation/sleeping_cat.json

Large diffs are not rendered by default.

87 changes: 59 additions & 28 deletions webapp/src/pages/AppLayout.js
Original file line number Diff line number Diff line change
@@ -1,32 +1,63 @@
import { Outlet } from 'react-router-dom'
import {Outlet} from 'react-router-dom'
import Header from '../components/Header/Header'
import Nav from '../components/Nav/Nav'
import { useTheme } from '../hooks/useTheme'
import { useToggle } from '../hooks/useToggle'

const AppLayout = ({ volume }) => {
//State for opening and closing the navigation
const [nav, toggleNav] = useToggle(false)
//State for the theme
const { theme, changeThemeHandler } = useTheme()

return (
<div className={theme}>

<Header
onToggleNav={toggleNav}
onChangeTheme={changeThemeHandler}
theme={theme}
volume={volume}
/>

<Nav openNav={nav} onToggleNav={toggleNav} />

<main>
<Outlet />
</main>
</div>
)
import {useTheme} from '../hooks/useTheme'
import {useToggle} from '../hooks/useToggle'
import './animation.css'
import Lottie from 'react-lottie'
import darkAnimationData from '../assets/catanimation/sleeping_cat.json';
import lightAnimationData from '../assets/catanimation/asleep_cat.json';




const AppLayout = ({volume}) => {
const darkOptions = {
loop: true,
autoplay: true,
animationData: darkAnimationData,
rendererSettings: {
preserveAspectRatio: 'xMidYMid slice'
}
};

const lightOptions = {
loop: true,
autoplay: true,
animationData: lightAnimationData,
rendererSettings: {
preserveAspectRatio: 'xMidYMid slice'
}
};
//State for opening and closing the navigation
const [nav, toggleNav] = useToggle(false);
//State for the theme
const {theme, changeThemeHandler} = useTheme();

return (
<div className={theme}>


<Header
onToggleNav={toggleNav}
onChangeTheme={changeThemeHandler}
theme={theme}
volume={volume}
/>
<Nav openNav={nav} onToggleNav={toggleNav}/>
<main>
<Outlet/>
{theme === "dark" && (
<Lottie options={darkOptions} height={180} width={280} style={{ position: 'absolute', bottom: 20, right: 80 }} />
)}
{theme === "light" && (
<Lottie options={lightOptions} height={200} width={400} style={{ position: 'absolute', bottom: 12, right: 40 }} />
)}

</main>

</div>
)
}

export default AppLayout
export default AppLayout
Binary file added webapp/src/pages/Dark_Cursor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added webapp/src/pages/Light_Cursor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions webapp/src/pages/PageNotFound/PageNotFound.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
.container {
display: flex;
justify-content: center;
align-items: center;
height: 100vh;
}

.content {
text-align: center;
color: white;
}

.animation {
margin-top: 60px;
}

h1 {
font-size: 3em;
}

p {
font-size: 1.5em;
}
30 changes: 30 additions & 0 deletions webapp/src/pages/PageNotFound/PageNotFound.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
// NotFoundPage.js
import React from 'react';
import Lottie from 'react-lottie';
import errorAnimationData from './error.json';
import './PageNotFound.css';

const PageNotFound = () => {
const defaultOptions = {
loop: true,
autoplay: true,
animationData: errorAnimationData,
rendererSettings: {
preserveAspectRatio: 'xMidYMid slice'
}
};

return (
<div className="container">
<div className="content">
<h1>Oops...</h1>
<p>It seems you've reached a page that's lost in cyberspace</p>
<div className="animation">
<Lottie options={defaultOptions} height={455} width={674} />
</div>
</div>
</div>
);
};

export default PageNotFound;
1 change: 1 addition & 0 deletions webapp/src/pages/PageNotFound/error.json

Large diffs are not rendered by default.

Loading