Added some pages

pull/1/head
Antonio De Lucreziis 2 years ago
parent 92944167e7
commit 471fad6d61

@ -1,11 +1,14 @@
import { Link } from '../Router.jsx'
import { Markdown } from './Markdown.jsx' import { Markdown } from './Markdown.jsx'
export const Problem = ({ title, content }) => { export const Problem = ({ id, content }) => {
return ( return (
<div class="problem"> <div class="problem">
<div class="problem-header"> <div class="problem-header">
<div class="problem-title"> <div class="problem-title">
<Markdown source={title} /> <Link page={`/problem/:id`} params={{ id }}>
Problema {id}
</Link>
</div> </div>
</div> </div>
<div class="problem-content"> <div class="problem-content">

@ -0,0 +1,15 @@
import { useEffect, useState } from 'preact/hooks'
export const useUser = () => {
const [username, setUsername] = useState(null)
useEffect(async () => {
const res = await fetch(`/api/current-user`, {
credentials: 'include',
})
const username = await res.json()
setUsername(username)
}, [])
return { username }
}

@ -5,7 +5,6 @@ import { Router } from './Router.jsx'
import { HomePage } from './pages/Home.jsx' import { HomePage } from './pages/Home.jsx'
import { LoginPage } from './pages/Login.jsx' import { LoginPage } from './pages/Login.jsx'
import { ProblemPage } from './pages/Problem.jsx' import { ProblemPage } from './pages/Problem.jsx'
import { NewSolutionPage } from './pages/NewSolution.jsx'
render( render(
<Router <Router
@ -13,7 +12,6 @@ render(
'/': HomePage, '/': HomePage,
'/login': LoginPage, '/login': LoginPage,
'/problem/:id': ProblemPage, '/problem/:id': ProblemPage,
'/problem/:id/new-solution': NewSolutionPage,
}} }}
/>, />,
document.body document.body

@ -1,26 +1,45 @@
import { computed, useSignal } from '@preact/signals' import { Problem } from '../components/Problem.jsx'
import { Markdown } from '../components/Markdown.jsx' import { useUser } from '../hooks.jsx'
import { Link } from '../Router.jsx' import { Link } from '../Router.jsx'
export const HomePage = () => { export const HomePage = () => {
const { username } = useUser()
const logout = async () => {
await fetch(`/api/logout`, {
method: 'POST',
})
location.reload()
}
const problems = Array.from({ length: 20 }, (_, i) => ({
id: i + 1,
content:
`Lorem ipsum dolor sit amet, consectetur adipisicing elit. Architecto porro commodi cumque ratione sequi reiciendis corrupti a eius praesentium.\n`.repeat(
((i + 2) % 4) + 1
),
}))
return ( return (
<main class="home"> <main class="home">
<div class="logo">PHC / Problemi</div> <div class="logo">PHC / Problemi</div>
<div class="board"> <div class="subtitle">
{Array.from({ length: 20 }).map(({} = {}, i) => ( {username ? (
<div class="problem" style={{ '--size': ((7 * i) % 4) + 2 }}> <>
<div class="problem-header"> Logged in as {username} (
<div class="problem-title">Problema {i + 1}</div> <span class="link" onClick={() => logout()}>
</div> Logout
<div class="problem-content"> </span>
{Array.from({ length: ((7 * i) % 4) + 1 }).map(({} = {}) => ( )
<p> </>
Lorem ipsum dolor sit amet consectetur adipisicing elit. Nemo ) : (
minima doloremque nihil ducimus qui reiciendis. Provident, odit? <Link page={`/login`}>Login</Link>
</p> )}
))}
</div>
</div> </div>
<div class="board">
{problems.map(p => (
<Problem {...p} />
))} ))}
</div> </div>
</main> </main>

@ -1,9 +1,41 @@
import { useState } from 'preact/hooks'
import { Link } from '../Router.jsx' import { Link } from '../Router.jsx'
export const LoginPage = () => { export const LoginPage = () => {
const [username, setUsername] = useState('')
const login = async () => {
await fetch(`/api/login`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify({
username,
}),
})
location.href = '/#/'
}
return ( return (
<p> <main class="login">
Login Page or <Link page="/">go back home</Link> <div class="logo">PHC / Problemi</div>
</p> <div class="subtitle">Accedi</div>
<div class="form">
<label for="login-username">Username</label>
<input
id="login-username"
type="text"
value={username}
onInput={e => setUsername(e.target.value)}
/>
<div class="fill">
<button onClick={() => login()}>Accedi</button>
</div>
</div>
</main>
) )
} }

@ -1,61 +0,0 @@
import { useEffect, useRef, useState } from 'preact/hooks'
import { Markdown } from '../components/Markdown.jsx'
export const NewSolutionPage = ({ params: { id } }) => {
const [source, setSource] = useState('')
const editorRef = useRef()
const sendSolution = async () => {
const res = await fetch(`/api/problem/${id}/new-solution`, {
headers: {
'Content-Type': 'application/json',
},
credentials: 'include',
body: JSON.stringify({
source,
}),
})
console.log(await res.json())
}
useEffect(() => {
if (editorRef.current) {
editorRef.current.style.height = 'auto'
editorRef.current.style.height = editorRef.current.scrollHeight + 'px'
}
}, [source])
return (
<main class="new-solution">
<div class="logo">PHC / Problemi</div>
<div class="subtitle">Nuova soluzione per il problema #{id}</div>
<div class="solution-editor">
<div class="editor">
<h1>Editor</h1>
<textarea
onInput={e => setSource(e.target.value)}
value={source}
cols="60"
ref={editorRef}
placeholder="Scrivi una nuova soluzione..."
></textarea>
</div>
<div class="preview">
<h1>Preview</h1>
<div class="preview-content">
{source.length ? (
<Markdown source={source} />
) : (
<div class="placeholder">Scrivi una nuova soluzione...</div>
)}
</div>
</div>
</div>
<div class="submit-solution">
<button onClick={sendSolution}>Invia Soluzione</button>
</div>
</main>
)
}

@ -1,14 +1,74 @@
import { Link } from '../Router.jsx' import { useEffect, useRef, useState } from 'preact/hooks'
import { Markdown } from '../components/Markdown.jsx'
import { Problem } from '../components/Problem.jsx'
export const ProblemPage = ({ params: { id }, query }) => { export const ProblemPage = ({ params: { id }, query }) => {
const [source, setSource] = useState('')
const editorRef = useRef()
const sendSolution = async () => {
const res = await fetch(`/api/problem/${id}/new-solution`, {
headers: {
'Content-Type': 'application/json',
},
credentials: 'include',
body: JSON.stringify({
source,
}),
})
console.log(await res.json())
}
useEffect(() => {
if (editorRef.current) {
// settare questo ad "auto" toglie l'altezza al contenitore che passa alla sua
// dimensione minima iniziale, ciò serve per permettere all'autosize della textarea di
// crescere e ridursi ma ha il problema che resetta lo scroll della pagina che deve
// essere preservato a mano
const oldScrollY = window.scrollY
editorRef.current.style.height = 'auto'
editorRef.current.style.height = editorRef.current.scrollHeight + 'px'
window.scrollTo(0, oldScrollY)
}
}, [source])
return ( return (
<> <main class="problem">
<p> <div class="logo">PHC / Problemi</div>
Problem <code>{id}</code> with options <code>{JSON.stringify(query)}</code> <div class="subtitle">Testo del problema</div>
</p> <Problem
<p> id={id}
<Link page="/">Go back home</Link> content={`Lorem ipsum dolor sit amet, consectetur adipisicing elit. Architecto porro commodi cumque ratione sequi reiciendis corrupti a eius praesentium.\n\n`.repeat(
</p> 5
</> )}
/>
<div class="subtitle">Invia una soluzione al problema</div>
<div class="solution-editor">
<div class="editor">
<h1>Editor</h1>
<textarea
onInput={e => setSource(e.target.value)}
value={source}
cols="60"
ref={editorRef}
placeholder="Scrivi una nuova soluzione..."
></textarea>
</div>
<div class="preview">
<h1>Preview</h1>
<div class="preview-content">
{source.trim().length ? (
<Markdown source={source} />
) : (
<div class="placeholder">Scrivi una nuova soluzione...</div>
)}
</div>
</div>
</div>
<div class="submit-solution">
<button onClick={sendSolution}>Invia Soluzione</button>
</div>
</main>
) )
} }

@ -1,3 +1,6 @@
$device-s-width: 640px;
$device-m-width: 1200px;
// Normalize // Normalize
*, *,
@ -14,11 +17,85 @@ body {
margin: 0; margin: 0;
font-family: 'Lato', sans-serif; font-family: 'Lato', sans-serif;
font-weight: 300;
font-size: 20px; font-size: 20px;
line-height: 1; line-height: 1;
} }
textarea {
border: none;
outline: gray;
width: 100%;
padding: 1rem;
box-shadow: -2px 4px 8px 1px #00000020, -1px 1px 1px 0px #00000010;
border-radius: 0.25rem;
background: #ffffff;
}
label {
font-weight: 400;
}
input[type='text'] {
border: none;
outline: gray;
width: 100%;
padding: 0.5rem;
box-shadow: -2px 4px 4px 0 #00000020;
border-radius: 0.25rem;
background: #ffffff;
font-family: 'Lato';
font-weight: 400;
font-size: 18px;
color: #555;
}
button {
cursor: pointer;
font-family: 'Lato';
font-weight: 600;
font-size: 18px;
color: #555;
border: 1px solid #c8c8c8;
padding: 0.5rem 2rem;
box-shadow: -2px 4px 16px 0 #00000010, -2px 4px 4px 0 #00000010;
border-radius: 0.25rem;
background: linear-gradient(180deg, #f0f0f0, #dfdfdf 20%, #d8d8d8 80%, #c0c0c0);
transition: all 100ms ease-in;
&:hover {
border: 1px solid #c4c4c4;
box-shadow: -2px 4px 20px 4px #00000010, -2px 4px 6px 2px #00000010;
background: linear-gradient(180deg, #f8f8f8, #e4e4e4 20%, #e4e4e4 80%, #c8c8c8);
}
}
.link,
a,
a:visited {
cursor: pointer;
color: #3a9999;
text-decoration: none;
&:hover {
text-decoration: underline;
}
}
// Typography // Typography
p { p {
@ -60,18 +137,6 @@ $heading-scale: 1.25;
} }
} }
$device-s-width: 640px;
// Not on mobile
@media screen and (min-width: $device-s-width) and (pointer: fine) {
// ...
}
// On mobile
@media screen and (max-width: $device-s-width), (pointer: coarse) {
// ...
}
// //
// Components // Components
// //
@ -99,34 +164,75 @@ body {
align-items: center; align-items: center;
background: #f8f8f8; background: #f8f8f8;
}
main { main {
padding: 1rem; padding: 2rem 2rem 6rem;
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
}
}
.logo { gap: 2rem;
.logo {
// font-size: 42px; // font-size: 42px;
// font-family: 'EB Garamond'; // font-family: 'EB Garamond';
// font-weight: 600; // font-weight: 600;
font-size: 38px; font-size: 38px;
font-family: 'Lato'; font-family: 'Lato';
font-weight: 300; font-weight: 300;
}
.subtitle {
font-size: 24px;
}
} }
main.home { main.home {
padding-top: 2rem; .board {
width: 100%;
display: grid;
grid-template-columns: repeat(auto-fill, minmax(60ch, 1fr));
gap: 2rem; gap: 2rem;
}
} }
main.new-solution { //
padding-top: 2rem; // Components
gap: 2rem; //
main {
.problem {
padding: 1rem;
// border: 1px solid #ddd;
box-shadow: -2px 4px 8px 1px #00000020, -1px 1px 1px 0px #00000010;
border-radius: 0.5rem;
background: #ffffff;
display: grid;
grid-template-rows: auto 1fr;
gap: 0.5rem;
max-width: 80ch;
.problem-header {
display: grid;
grid-template-columns: auto;
.problem-title {
font-size: 24px;
font-weight: 700;
}
}
.problem-content {
@extend .text-body;
}
}
.solution-editor { .solution-editor {
display: grid; display: grid;
@ -154,21 +260,10 @@ main.new-solution {
font-family: 'DM Mono', monospace; font-family: 'DM Mono', monospace;
font-size: 18px; font-size: 18px;
border: none;
outline: gray;
width: 100%;
padding: 1rem;
box-shadow: -2px 4px 8px 1px #00000020, -1px 1px 1px 0px #00000010;
border-radius: 0.25rem;
background: #ffffff;
resize: none; resize: none;
overflow-y: hidden; overflow-y: hidden;
min-height: 10rem; min-height: 8rem;
} }
} }
@ -192,52 +287,63 @@ main.new-solution {
} }
} }
} }
}
.board { .form {
width: 100%; min-width: 50ch;
display: grid; display: grid;
grid-template-columns: repeat(auto-fill, minmax(50ch, 1fr)); grid-template-columns: auto 1fr;
grid-auto-rows: 3rem;
// border: 2px solid #ccc;
border-radius: 1rem;
box-shadow: -2px 4px 16px 4px #00000018, -2px 4px 4px 1px #00000018;
padding: 1.5rem 2rem 1rem;
gap: 1rem; gap: 1rem;
}
// align-items: center;
// Components
//
.problem { .fill {
padding: 1rem; grid-column: span 2;
// border: 1px solid #ddd; justify-self: center;
}
}
}
box-shadow: -2px 4px 8px 1px #00000020, -1px 1px 1px 0px #00000010; .math-inline {
border-radius: 0.25rem; font-size: 95%;
background: #ffffff; }
grid-row: span var(--size); //
// Mobile
//
overflow-y: auto; // Not on mobile
@media screen and (min-width: $device-s-width) and (pointer: fine) {
// ...
}
display: grid; // On mobile
grid-template-rows: auto 1fr; @media screen and (max-width: $device-s-width), (pointer: coarse) {
gap: 0.5rem; main {
.solution-editor {
grid-template-columns: auto;
grid-template-rows: auto auto;
}
}
}
.problem-header { @media screen and (max-width: $device-m-width), (pointer: coarse) {
display: grid; main {
.solution-editor {
grid-template-columns: auto; grid-template-columns: auto;
grid-template-rows: auto auto;
.problem-title { .preview,
font-size: 24px; .editor {
font-weight: 700; justify-self: center;
} }
} }
.problem-content {
@extend .text-body;
} }
} }
.math-inline {
font-size: 95%;
}

@ -6,7 +6,7 @@ export default defineConfig({
server: { server: {
port: 3000, port: 3000,
proxy: { proxy: {
'/api': 'localhost:4000/api', '/api': 'http://localhost:4000',
}, },
}, },
plugins: [preactPlugin()], plugins: [preactPlugin()],

@ -1,29 +1,60 @@
import express from 'express' import express from 'express'
import crypto from 'crypto'
// import serveStatic from 'serve-static' // import serveStatic from 'serve-static'
import bodyParser from 'body-parser' import bodyParser from 'body-parser'
import cookieParser from 'cookie-parser'
import { loggingMiddleware, PingRouter, StatusRouter } from './server/helpers.js' import { authMiddleware, loggingMiddleware, PingRouter, StatusRouter } from './server/helpers.js'
import { createDatabase, getUser, updateUser } from './db/database.js' import { createDatabase, getUser, updateUser } from './db/database.js'
const app = express() const app = express()
const sessions = {
store: {},
createSession(username) {
const sid = crypto.randomBytes(10).toString('hex')
this.store[sid] = username
return sid
},
getUserForSession(sid) {
return this.store[sid] ?? null
},
}
const db = createDatabase('./db.local.json', { const db = createDatabase('./db.local.json', {
users: { users: {
BachoSeven: { ['BachoSeven']: {},
email: 'foo@bar.com', ['aziis98']: {},
password: '123',
},
}, },
problems: {}, problems: {},
}) })
app.use(bodyParser.json()) app.use(bodyParser.json())
app.use(cookieParser())
app.use(loggingMiddleware) app.use(loggingMiddleware)
app.use(authMiddleware(sid => sessions.getUserForSession(sid)))
app.use('/api/status', new StatusRouter()) app.use('/api/status', new StatusRouter())
app.use('/api/ping', new PingRouter()) app.use('/api/ping', new PingRouter())
app.get('/api/current-user', (req, res) => {
res.json(sessions.getUserForSession(req.cookies.sid))
})
app.post('/api/login', (req, res) => {
const { username } = req.body
res.cookie('sid', sessions.createSession(username), { maxAge: 1000 * 60 * 60 * 24 * 7 })
res.json({ status: 'ok' })
})
app.post('/api/logout', (req, res) => {
res.cookie('sid', '', { expires: new Date() })
res.json({ status: 'ok' })
})
app.get('/api/user/:id', async (req, res) => { app.get('/api/user/:id', async (req, res) => {
const user = await getUser(db, req.params.id) const user = await getUser(db, req.params.id)

@ -13,6 +13,7 @@
"dependencies": { "dependencies": {
"body-parser": "^1.20.1", "body-parser": "^1.20.1",
"chalk": "^5.1.2", "chalk": "^5.1.2",
"cookie-parser": "^1.4.6",
"express": "^4.18.2" "express": "^4.18.2"
}, },
"devDependencies": { "devDependencies": {

@ -4,12 +4,14 @@ specifiers:
body-parser: ^1.20.1 body-parser: ^1.20.1
chalk: ^5.1.2 chalk: ^5.1.2
concurrently: ^7.5.0 concurrently: ^7.5.0
cookie-parser: ^1.4.6
express: ^4.18.2 express: ^4.18.2
npm-run-all: ^4.1.5 npm-run-all: ^4.1.5
dependencies: dependencies:
body-parser: 1.20.1 body-parser: 1.20.1
chalk: 5.1.2 chalk: 5.1.2
cookie-parser: 1.4.6
express: 4.18.2 express: 4.18.2
devDependencies: devDependencies:
@ -175,10 +177,23 @@ packages:
engines: {node: '>= 0.6'} engines: {node: '>= 0.6'}
dev: false dev: false
/cookie-parser/1.4.6:
resolution: {integrity: sha512-z3IzaNjdwUC2olLIB5/ITd0/setiaFMLYiZJle7xg5Fe9KWAceil7xszYfHHBtDFYLSgJduS2Ty0P1uJdPDJeA==}
engines: {node: '>= 0.8.0'}
dependencies:
cookie: 0.4.1
cookie-signature: 1.0.6
dev: false
/cookie-signature/1.0.6: /cookie-signature/1.0.6:
resolution: {integrity: sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==} resolution: {integrity: sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==}
dev: false dev: false
/cookie/0.4.1:
resolution: {integrity: sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==}
engines: {node: '>= 0.6'}
dev: false
/cookie/0.5.0: /cookie/0.5.0:
resolution: {integrity: sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==} resolution: {integrity: sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==}
engines: {node: '>= 0.6'} engines: {node: '>= 0.6'}

@ -41,3 +41,16 @@ export const loggingMiddleware = (req, res, next) => {
console.log(`${toLocalISO(new Date())} | ${req.method} ${req.originalUrl} ${coloredStatusCode}`) console.log(`${toLocalISO(new Date())} | ${req.method} ${req.originalUrl} ${coloredStatusCode}`)
} }
export const authMiddleware = getUserForSession => async (req, res, next) => {
if (req.cookies.sid) {
req.user = await getUserForSession(req.cookies.sid)
console.log('Request from user: ' + req.user)
}
next()
}
export const authenticatedMiddleware = (req, res, next) => {
req.user && next()
}

Loading…
Cancel
Save