initial files

This commit is contained in:
Erik 2022-11-17 14:33:59 +02:00
parent bed533161f
commit 0bb6559c82
Signed by untrusted user: Navy.gif
GPG Key ID: 811EC0CD80E7E5FB
21 changed files with 427 additions and 74 deletions

View File

@ -1,38 +0,0 @@
.App {
text-align: center;
}
.App-logo {
height: 40vmin;
pointer-events: none;
}
@media (prefers-reduced-motion: no-preference) {
.App-logo {
animation: App-logo-spin infinite 20s linear;
}
}
.App-header {
background-color: #282c34;
min-height: 100vh;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
font-size: calc(10px + 2vmin);
color: white;
}
.App-link {
color: #61dafb;
}
@keyframes App-logo-spin {
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
}

View File

@ -1,23 +1,62 @@
import logo from './logo.svg'; import React, { useEffect } from 'react';
import './App.css'; import { BrowserRouter, Route, Routes} from 'react-router-dom';
import './css/App.css';
import Home from './pages/Home';
import ErrorBoundary from './util/ErrorBoundary';
import Sidebar, { SidebarMenu } from './components/Sidebar';
import UserControls from './components/UserControls';
import { useLoginContext } from './structures/UserContext';
import Login from './pages/Login';
import { fetchUser } from './util/Util';
function App() { function App() {
const [user] = useLoginContext();
useEffect(() => {
fetchUser();
}, []);
const menuItems = [
{ to: '/', label: 'Home' },
{ to: '/users', label: 'Users' },
{ to: '/admin', label: 'Admin' }
];
return ( return (
<div className="App"> <div className='app'>
<header className="App-header">
<img src={logo} className="App-logo" alt="logo" /> <header>
<p> <UserControls />
Edit <code>src/App.js</code> and save to reload.
</p>
<a
className="App-link"
href="https://reactjs.org"
target="_blank"
rel="noopener noreferrer"
>
Learn React
</a>
</header> </header>
{user ?
<div className='background'>
<BrowserRouter>
<Sidebar>
SIDEBAR
<SidebarMenu menuItems={menuItems}>
</SidebarMenu>
</Sidebar>
<div className='main-content'>
<ErrorBoundary>
<Routes>
<Route exact path='/' element={<Home />} />
</Routes>
</ErrorBoundary>
</div>
</BrowserRouter>
</div>
: <Login />}
</div> </div>
); );
} }

29
src/components/Sidebar.js Normal file
View File

@ -0,0 +1,29 @@
import React from 'react';
import '../css/components/Sidebar.css';
import NavLink from '../structures/NavLink';
const Sidebar = ({children}) => {
return <div className='sidebar'>
{children}
</div>;
};
// Nav menu
const SidebarMenu = ({menuItems, children}) => {
let key = 0;
return <div className='sidebar-menu'>
{menuItems.map(link => {
const { label, ...rest } = link;
return <NavLink activeClassName='active' className='sidebar-menu-item' key={key++} {...rest}>{ label}</NavLink>;
})}
{children}
</div>;
};
export {SidebarMenu, Sidebar};
export default Sidebar;

View File

@ -0,0 +1,18 @@
import React from "react";
import '../css/components/UserControls.css';
import { useLoginContext } from "../structures/UserContext";
const UserControls = () => {
const [user] = useLoginContext();
console.log(user);
if (!user) return;
return <div className='user-controls'>
Hello {user.displayName}
</div>;
};
export default UserControls;

26
src/css/App.css Normal file
View File

@ -0,0 +1,26 @@
.app {
width: 100vw;
height: 100vh;
background-color: var(--background-primary);
}
header {
display: flex;
flex-direction: row;
text-align: center;
height: var(--header-height);
background-color: var(--background-tertiary);
}
.background {
display: flex;
height: 100%;
width: 100%;
}
.main-content {
width: 100%;
height: 91%;
margin: 20px;
background-color: var(--background-secondary);
}

View File

@ -0,0 +1,25 @@
.sidebar {
min-width: 200px;
height: 100%;
background-color: var(--background-secondary);
}
.sidebar-menu {
display: flex;
flex-direction: column;
}
.sidebar-menu-item {
margin: 5px;
margin-right: 10px;
padding: 10px;
background-color: var(--dark-blue);
color: var(--text-primary);
border-radius: 6px;
text-decoration: none;
font-weight: bold;
}
.active {
background-color: var(--light-blue);
}

View File

@ -0,0 +1,3 @@
.user-controls {
}

48
src/css/index.css Normal file
View File

@ -0,0 +1,48 @@
:root {
--background-primary: #1e1e1e;
--background-secondary: #323232;
--background-tertiary: #272727;
--lighter-blue: rgb(129, 196, 250);
--light-blue:rgb(88, 164, 226);
--dark-blue:rgb(27, 76, 117);
--darker-blue: rgb(25, 54, 78);
--text-primary: #ffffff;
--header-height: 40px
}
body {
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
color: rgb(223, 223, 223);
overflow: hidden;
text-align: center;
}
code {
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
monospace;
}
* {
outline: 1px dashed red;
}
button {
cursor: pointer;
background-color: var(--dark-blue);
border: 0;
border-radius: 10px;
padding: 5px;
padding-left: 10px;
padding-right: 10px;
font-weight: bold;
color: var(--lighter-blue)
}
button:hover {
background-color: var(--darker-blue);
}

6
src/css/pages/Home.css Normal file
View File

@ -0,0 +1,6 @@
.home {
/* width: 100%; */
/* height: 100%; */
margin: 10px;
background-color: var(--background-secondary);
}

18
src/css/pages/Login.css Normal file
View File

@ -0,0 +1,18 @@
.login {
background-color: var(--background-secondary);
width: 20vw;
border-radius: 25px;
margin: auto;
}
.login > div > * {
margin: 5px;
}
.login > * {
margin: 25px;
}
.third-party-login:hover {
cursor: pointer;
}

View File

@ -1,13 +0,0 @@
body {
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
code {
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
monospace;
}

View File

@ -1,17 +1,18 @@
import React from 'react'; import React from 'react';
import ReactDOM from 'react-dom/client'; import ReactDOM from 'react-dom/client';
import './index.css'; import './css/index.css';
import App from './App'; import App from './App';
import reportWebVitals from './reportWebVitals'; import reportWebVitals from './reportWebVitals';
import { UserContext } from './structures/UserContext';
const root = ReactDOM.createRoot(document.getElementById('root')); const root = ReactDOM.createRoot(document.getElementById('root'));
root.render( root.render(<React.StrictMode>
<React.StrictMode> <UserContext>
<App /> <App />
</React.StrictMode> </UserContext>
); </React.StrictMode>);
// If you want to start measuring performance in your app, pass a function // If you want to start measuring performance in your app, pass a function
// to log results (for example: reportWebVitals(console.log)) // to log results (for example: reportWebVitals(console.log))
// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals // or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
reportWebVitals(); reportWebVitals(console.log);

View File

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3"><g fill="#61DAFB"><path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/><circle cx="420.9" cy="296.5" r="45.7"/><path d="M520.5 78.1z"/></g></svg>

Before

Width:  |  Height:  |  Size: 2.6 KiB

12
src/pages/Home.js Normal file
View File

@ -0,0 +1,12 @@
import React from "react";
import '../css/pages/Home.css';
const Home = () => {
return <div className='home'>
HOME
</div>;
};
export default Home;

50
src/pages/Login.js Normal file
View File

@ -0,0 +1,50 @@
import React from "react";
import '../css/pages/Login.css';
import { post } from "../util/Util";
const loginMethods = [
{
name: 'Discord',
img: 'https://assets-global.website-files.com/6257adef93867e50d84d30e2/636e0a69f118df70ad7828d4_icon_clyde_blurple_RGB.svg'
}
];
const Login = () => {
const loginClick = async () => {
const username = document.getElementById('username').value;
const password = document.getElementById('password').value;
if (!username.length || !password.length) return;
await post('/api/login', {username, password});
};
return <div className='login'>
<div>
<h2>Log in</h2>
<input autoComplete='off' placeholder='Username' required id='username' type='text' autoFocus /><br />
<input autoComplete='off' placeholder='Password' required id='password' type='password' /><br />
<button onClick={loginClick}>Enter</button>
</div>
<div>
<b>Alternate login methods</b> <br />
{loginMethods.map(method => <img
className='third-party-login'
key={method.name}
alt={method.name}
src={method.img}
width={48} height={48}
onClick={() => { window.location.pathname = `/api/login/${method.name}`; }}
/>)}
</div>
</div>;
};
export default Login;

11
src/setupProxy.js Normal file
View File

@ -0,0 +1,11 @@
const { createProxyMiddleware } = require('http-proxy-middleware');
module.exports = (app) => {
app.use(
'/api',
createProxyMiddleware({
target: 'http://localhost:4000',
changeOrigin: true
})
);
};

19
src/structures/NavLink.js Normal file
View File

@ -0,0 +1,19 @@
import React from 'react';
import { NavLink as BaseNavLink } from 'react-router-dom';
// eslint-disable-next-line react/display-name
const NavLink = React.forwardRef(({ activeClassName, activeStyle, ...props }, ref) => {
return <BaseNavLink
ref={ref}
{...props}
className={({ isActive }) => [props.className, isActive ? activeClassName : null].filter(Boolean).join(' ')}
style={({ isActive }) => ({
...props.style,
...isActive ? activeStyle : null
})}>
{props?.children}
</BaseNavLink>;
});
export default NavLink;

View File

@ -0,0 +1,12 @@
import React from 'react';
import { Navigate, useLocation } from "react-router-dom";
import { getUser } from "../util/Util";
const PrivateRoute = ({ children }) => {
const user = getUser();
const location = useLocation();
if (!user) return <Navigate to='/login' replace state={{ from: location }} />;
return children;
};
export default PrivateRoute;

View File

@ -0,0 +1,28 @@
import React, { useContext, useState } from 'react';
import { getUser } from '../util/Util';
const LoginContext = React.createContext();
const LoginUpdateContext = React.createContext();
// Hook
export const useLoginContext = () => {
return [useContext(LoginContext), useContext(LoginUpdateContext)];
};
// Component
export const UserContext = ({ children }) => {
const [user, setLoginState] = useState(getUser());
const updateLoginState = () => {
setLoginState(getUser());
};
return (
<LoginContext.Provider value={user}>
<LoginUpdateContext.Provider value={updateLoginState}>
{children}
</LoginUpdateContext.Provider>
</LoginContext.Provider>
);
};

22
src/util/ErrorBoundary.js Normal file
View File

@ -0,0 +1,22 @@
import React from "react";
class ErrorBoundary extends React.Component {
constructor(props) {
super(props);
this.state = { error: null };
}
componentDidCatch(error, errorInfo) {
this.sate.error = true;
console.log(error, errorInfo);
}
render() {
if (this.state.error) return <h1>Something went wrong :(</h1>;
return this.props.children;
}
}
export default ErrorBoundary;

38
src/util/Util.js Normal file
View File

@ -0,0 +1,38 @@
export const getUser = () => {
const data = sessionStorage.getItem('user');
if (data) return JSON.parse(data);
return null;
};
export const getToken = () => {
return getUser()?.token || null;
};
export const clearSession = () => {
sessionStorage.removeItem('user');
};
export const setSession = (user) => {
sessionStorage.setItem('user', JSON.stringify(user));
};
export const fetchUser = async () => {
const result = await fetch('/api/user');
if (result.status === 200) {
const data = await result.json();
setSession(data);
return data;
}
};
export const post = (url, body) => {
return fetch(url, {
method: 'post',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify(body)
});
};