Pagina admin con creazione problemi e pagina utente personale

pull/1/head
Antonio De Lucreziis 2 years ago
parent 484c21d606
commit 48d1b3b4ed

@ -22,3 +22,41 @@ $ npm run dev
$ npm run build $ npm run build
$ npm run serve $ npm run serve
``` ```
# TODO
- Pagina profilo utente
- Lista soluzioni inviate (con stato delle soluzioni: approvate o rifiutate)
- Pagina dell'admin
- Lista delle soluzioni non corrette
- Creazione nuovi problemi
- DBv2
```js
relations: [
{
from: 'Solution'
name: 'for'
to: 'Problem'
entries: [
['LRLAH2NoLFQAQHQgz', '1']
['JzyiDnwRCrkpzLL8W', '1']
['FFYMJjP2yr4ohdmdT', '2']
['VFHTb8fSrLOkPNVFx', '2']
]
}
{
from: 'User'
name: 'owns'
to: 'Solution'
entries: [
['aziis98', 'LRLAH2NoLFQAQHQgz']
['aziis98', 'JzyiDnwRCrkpzLL8W']
['BachoSeven', 'FFYMJjP2yr4ohdmdT']
['BachoSeven', 'VFHTb8fSrLOkPNVFx']
]
}
]
```

@ -1,10 +1,12 @@
import Router from 'preact-router' import Router from 'preact-router'
import { route } from 'preact-router' import { route } from 'preact-router'
import { useEffect } from 'preact/hooks' import { useEffect } from 'preact/hooks'
import { AdminPage } from './pages/Admin.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 { ProfilePage } from './pages/Profile.jsx'
const Redirect = ({ to }) => { const Redirect = ({ to }) => {
useEffect(() => { useEffect(() => {
@ -23,7 +25,9 @@ export const App = ({ url }) => {
<Router url={url}> <Router url={url}>
<HomePage path="/" /> <HomePage path="/" />
<LoginPage path="/login" /> <LoginPage path="/login" />
<ProfilePage path="/profile" />
<ProblemPage path="/problem/:id" /> <ProblemPage path="/problem/:id" />
<AdminPage path="/admin" />
<Redirect default to="/" /> <Redirect default to="/" />
</Router> </Router>
) )

@ -0,0 +1,18 @@
export const server = {
async get(url) {
const res = await fetch(url, { credentials: 'include' })
return await res.json()
},
async post(url, body) {
const res = await fetch(url, {
method: 'POST',
credentials: 'include',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify(body),
})
return await res.json()
},
}

@ -0,0 +1,39 @@
import { Link } from 'preact-router/match'
const ROLE_LABEL = {
admin: 'Admin',
moderator: 'Moderatore',
}
export const Header = ({ user, noLogin }) => (
<header>
<div class="logo">
<a href="/">PHC / Problemi</a>
</div>
<nav>
{user ? (
<>
{user.role !== 'student' && (
<div class="nav-item">
<Link activeClassName="active" href="/admin">
Pannello Admin
</Link>
</div>
)}
<div class="nav-item">
<Link activeClassName="active" href="/profile">
@{user.username}
{user.role !== 'student' && <> ({ROLE_LABEL[user.role]})</>}
</Link>
</div>
</>
) : (
!noLogin && (
<div class="nav-item">
<Link href="/login">Login</Link>
</div>
)
)}
</nav>
</header>
)

@ -7,20 +7,34 @@ import remarkRehype from 'remark-rehype'
import rehypeKatex from 'rehype-katex' import rehypeKatex from 'rehype-katex'
import rehypeStringify from 'rehype-stringify' import rehypeStringify from 'rehype-stringify'
async function renderMarkdownAsync(source) {
return await unified()
.use(remarkParse)
.use(remarkMath)
.use(remarkRehype)
.use(rehypeKatex, { throwOnError: false, errorColor: '#c60' })
.use(rehypeStringify)
.process(source)
}
// function renderMarkdownSync(source) {
// console.warn(`[Markdown] Rendering ${source.length} characters of markdown in sync mode`)
// return unified()
// .use(remarkParse)
// .use(remarkMath)
// .use(remarkRehype)
// .use(rehypeKatex, { throwOnError: false, errorColor: '#c60' })
// .use(rehypeStringify)
// .processSync(source)
// }
export const Markdown = ({ source }) => { export const Markdown = ({ source }) => {
const elementRef = useRef() const elementRef = useRef()
useEffect(async () => { useEffect(async () => {
const renderedHtml = await unified()
.use(remarkParse)
.use(remarkMath)
.use(remarkRehype)
.use(rehypeKatex, { throwOnError: false, errorColor: '#c60' })
.use(rehypeStringify)
.process(source)
if (elementRef.current) { if (elementRef.current) {
elementRef.current.innerHTML = renderedHtml elementRef.current.innerHTML = await renderMarkdownAsync(source)
} }
}, [source]) }, [source])

@ -0,0 +1,44 @@
import { useEffect, useRef } from 'preact/hooks'
import { Markdown } from './Markdown.jsx'
export const MarkdownEditor = ({ source, setSource }) => {
const editorRef = useRef()
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 (
<div class="markdown-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>
)
}

@ -7,7 +7,6 @@ export const Problem = ({ id, content, createdBy }) => {
<div class="problem-title"> <div class="problem-title">
<a href={`/problem/${id}`}>Problema {id}</a> <a href={`/problem/${id}`}>Problema {id}</a>
</div> </div>
{createdBy && <div class="problem-author">Creato da @{createdBy}</div>}
</div> </div>
<div class="problem-content"> <div class="problem-content">
<Markdown source={content} /> <Markdown source={content} />

@ -0,0 +1,12 @@
export const Select = ({ options, value, setValue }) => (
<div class="input-select">
<select onInput={e => setValue?.(e.target.value)}>
{Object.entries(options).map(([k, v]) => (
<option value={k} selected={value === k}>
{v}
</option>
))}
</select>
<span class="material-symbols-outlined">expand_more</span>
</div>
)

@ -1,10 +1,24 @@
import { Markdown } from './Markdown.jsx' import { Markdown } from './Markdown.jsx'
export const Solution = ({ userId, content }) => { export const Solution = ({ userId, problemId, content }) => {
return ( return (
<div class="solution"> <div class="solution">
<div class="solution-header"> <div class="solution-header">
<div>@{userId}</div> <div>
Soluzione
{userId && (
<>
{' '}
di <a href={`/user/${userId}`}>@{userId}</a>
</>
)}
{problemId && (
<>
{' '}
per il <a href={`/problem/${problemId}`}>Problema {problemId}</a>
</>
)}
</div>
</div> </div>
<div class="solution-content"> <div class="solution-content">
<Markdown source={content} /> <Markdown source={content} />

@ -2,11 +2,3 @@ import { hydrate } from 'preact'
import { App } from './App.jsx' import { App } from './App.jsx'
hydrate(<App />, document.body) hydrate(<App />, document.body)
window.fetchServer = url => {
fetch(url, { credentials: 'include' })
.then(res => res.ok && res.json())
.then(data => {
console.log(data)
})
}

@ -1,32 +1,24 @@
import { useEffect, useState } from 'preact/hooks' import { useEffect, useState } from 'preact/hooks'
import { createContext } from 'preact' import { createContext } from 'preact'
import { server } from './api.jsx'
export const MetadataContext = createContext({}) export const MetadataContext = createContext({})
export const useCurrentUser = onLoaded => { export const useCurrentUser = onLoaded => {
const [user, setUser] = useState(null) const [user, setUser] = useState(null)
const logout = () => { const logout = async () => {
await server.post('/api/logout')
setUser(null) setUser(null)
} }
useEffect(async () => { useEffect(async () => {
const res = await fetch(`/api/current-user`, { const user = await server.get('/api/current-user')
credentials: 'include',
})
const user = await res.json()
setUser(user) setUser(user)
console.log(`Current user is`, user)
onLoaded?.(user) onLoaded?.(user)
}, []) }, [])
useEffect(() => {
console.log(user)
}, [user])
return [user, logout] return [user, logout]
} }
@ -35,8 +27,8 @@ export const useReadResource = (url, initialValue) => {
function refresh() { function refresh() {
const controller = new AbortController() const controller = new AbortController()
const realUrl = typeof url === 'function' ? url() : url
fetch(url, { signal: controller.signal }) fetch(realUrl, { signal: controller.signal })
.then(res => { .then(res => {
if (res.ok) { if (res.ok) {
return res.json() return res.json()

@ -1,26 +1,46 @@
import { route } from 'preact-router' import { route } from 'preact-router'
import { useEffect } from 'preact/hooks' import { useEffect, useState } from 'preact/hooks'
import { server } from '../api.jsx'
import { Header } from '../components/Header.jsx'
import { MarkdownEditor } from '../components/MarkdownEditor.jsx'
import { useCurrentUser } from '../hooks.jsx' import { useCurrentUser } from '../hooks.jsx'
export const Admin = ({}) => { const CreateProblem = ({}) => {
const [source, setSource] = useState('')
const createProblem = async () => {
const id = await server.post('/api/problem', {
content: source,
})
route(`/problem/${id}`)
}
return (
<>
<MarkdownEditor {...{ source, setSource }} />
<button onClick={createProblem}>Aggiungi Problema</button>
</>
)
}
export const AdminPage = ({}) => {
const [user] = useCurrentUser(user => { const [user] = useCurrentUser(user => {
if (!user || user.role !== 'admin') { if (!user) {
route('/login', true)
} else if (user.role !== 'admin' && user.role !== 'moderator') {
route('/', true) route('/', true)
} }
}) })
return ( return (
<main class="admin"> user && (
<div class="logo">PHC / Problemi</div> <main class="page-admin">
<div class="subtitle"> <Header {...{ user }} />
{user ? ( <div class="subtitle">Nuovo problema</div>
<> <CreateProblem />
Logged in as {user.role} @{user.username} <div class="subtitle">Soluzioni ancora da approvare/rifiutare</div>
</> ...
) : ( </main>
<a href="/login">Login</a> )
)}
</div>
</main>
) )
} }

@ -1,39 +1,33 @@
import { route } from 'preact-router' import { route } from 'preact-router'
import { useEffect, useState } from 'preact/hooks' import { useEffect, useState } from 'preact/hooks'
import { Header } from '../components/Header.jsx'
import { Problem } from '../components/Problem.jsx' import { Problem } from '../components/Problem.jsx'
import { Select } from '../components/Select.jsx'
import { useReadResource, useCurrentUser } from '../hooks.jsx' import { useReadResource, useCurrentUser } from '../hooks.jsx'
export const HomePage = () => { export const HomePage = () => {
const [user, logout] = useCurrentUser() const [user] = useCurrentUser()
const handleLogout = async () => {
await fetch(`/api/logout`, {
method: 'POST',
})
logout()
}
const [problems] = useReadResource('/api/problems', []) const [problems] = useReadResource('/api/problems', [])
return ( return (
<main class="home"> <main class="page-home">
<div class="logo">PHC / Problemi</div> <Header {...{ user }} />
<div class="subtitle">
{user ? (
<>
Logged in as {user.role} @{user.username} (
<span class="link" onClick={handleLogout}>
Logout
</span>
)
</>
) : (
<a href="/login">Login</a>
)}
</div>
<div class="board"> <div class="board">
<div class="fill-row board-controls">
<div class="sort-order">
<Select
value="oldest"
options={{
'latest': 'Prima più recenti',
'oldest': 'Prima più antichi',
'top-solved': 'Prima più risolti',
'least-solved': 'Prima meno risolti',
}}
/>
</div>
</div>
{problems.map(p => ( {problems.map(p => (
<Problem {...p} /> <Problem {...p} />
))} ))}

@ -1,6 +1,7 @@
import { route } from 'preact-router' import { route } from 'preact-router'
import { useState } from 'preact/hooks' import { useState } from 'preact/hooks'
import { Header } from '../components/Header.jsx'
export const LoginPage = () => { export const LoginPage = () => {
const [username, setUsername] = useState('') const [username, setUsername] = useState('')
@ -20,10 +21,9 @@ export const LoginPage = () => {
} }
return ( return (
<main class="login"> <main class="page-login">
<div class="logo">PHC / Problemi</div> <Header noLogin />
<div class="subtitle">Accedi</div> <div class="subtitle">Accedi</div>
<div class="form"> <div class="form">
<label for="login-username">Username</label> <label for="login-username">Username</label>
<input <input

@ -1,5 +1,7 @@
import { useContext, useEffect, useRef, useState } from 'preact/hooks' import { useContext, useEffect, useRef, useState } from 'preact/hooks'
import { Markdown } from '../components/Markdown.jsx' import { server } from '../api.jsx'
import { Header } from '../components/Header.jsx'
import { MarkdownEditor } from '../components/MarkdownEditor.jsx'
import { Problem } from '../components/Problem.jsx' import { Problem } from '../components/Problem.jsx'
import { Solution } from '../components/Solution.jsx' import { Solution } from '../components/Solution.jsx'
import { MetadataContext, useCurrentUser, useReadResource } from '../hooks.jsx' import { MetadataContext, useCurrentUser, useReadResource } from '../hooks.jsx'
@ -11,49 +13,23 @@ export const ProblemPage = ({ id }) => {
const [user] = useCurrentUser() const [user] = useCurrentUser()
const [source, setSource] = useState('') const [source, setSource] = useState('')
const editorRef = useRef()
const [{ content }] = useReadResource(`/api/problem/${id}`, { content: '' }) const [{ content }] = useReadResource(`/api/problem/${id}`, { content: '' })
const [solutions] = useReadResource(`/api/solutions?problem=${id}`, []) const [solutions] = useReadResource(`/api/solutions?problem=${id}`, [])
const sendSolution = async () => { const sendSolution = async () => {
const res = await fetch(`/api/solution`, { await server.post('/api/solution', {
method: 'POST', problemId: id,
credentials: 'include', content: source,
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify({
problemId: id,
content: source,
}),
}) })
location.reload() location.reload()
} }
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"> <main class="page-problem">
<div class="logo">PHC / Problemi</div> <Header {...{ user }} />
{user && (
<div class="subtitle">
Logged in as {user.role} @{user.username}
</div>
)}
<div class="subtitle">Testo del problema</div> <div class="subtitle">Testo del problema</div>
<Problem id={id} content={content} /> <Problem id={id} content={content} />
{solutions.length > 0 && ( {solutions.length > 0 && (
@ -66,39 +42,12 @@ export const ProblemPage = ({ id }) => {
</div> </div>
</details> </details>
)} )}
{user ? ( {user && (
<> <>
<div class="subtitle">Invia una soluzione al problema</div> <div class="subtitle">Invia una soluzione al problema</div>
<div class="solution-editor"> <MarkdownEditor {...{ source, setSource }} />
<div class="editor"> <button onClick={sendSolution}>Invia Soluzione</button>
<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>
</> </>
) : (
<div class="subtitle">
<a href="/login">Accedi</a> per inviare una soluzione
</div>
)} )}
</main> </main>
) )

@ -0,0 +1,39 @@
import { route } from 'preact-router'
import { useState } from 'preact/hooks'
import { server } from '../api.jsx'
import { Header } from '../components/Header.jsx'
import { Solution } from '../components/Solution.jsx'
import { useCurrentUser, useReadResource } from '../hooks.jsx'
export const ProfilePage = ({}) => {
const [solutions, setSolutions] = useState([])
const [user, logout] = useCurrentUser(async user => {
if (!user) {
route('/login', true)
}
setSolutions(await server.get(`/api/solutions?user=${user.username}`))
})
const handleLogout = () => {
logout()
route('/')
}
return (
user && (
<main class="page-profile">
<Header {...{ user }} />
<div class="subtitle">Le tue soluzioni</div>
<div class="solution-list">
{solutions.map(({ problemId, content }) => (
<Solution {...{ problemId, content }} />
))}
</div>
<div class="subtitle">Altro</div>
<button onClick={handleLogout}>Logout</button>
</main>
)
)
}

@ -1,6 +1,10 @@
$device-s-width: 640px; $device-s-width: 640px;
$device-m-width: 1200px; $device-m-width: 1200px;
:root {
--accent: #7b3a99;
}
// Normalize // Normalize
*, *,
@ -58,6 +62,51 @@ input[type='text'] {
color: #555; color: #555;
} }
.input-select {
display: inline-flex;
align-items: center;
justify-content: space-between;
cursor: pointer;
font-family: 'Lato';
font-weight: 600;
font-size: 18px;
color: #555;
border: 1px solid #c8c8c8;
padding: 0 0.5rem;
margin: 0;
box-shadow: -2px 2px 16px 0 #00000010;
border-radius: 0.25rem;
background: linear-gradient(180deg, #f0f0f0, #e8e8e8 20%, #e0e0e0 90%, #cdcdcd);
&:hover {
border: 1px solid #c4c4c4;
box-shadow: -2px 2px 20px 0 #00000010;
background: linear-gradient(180deg, #fff, #ededed 20%, #e8e8e8 90%, #c0c0c0);
}
select {
cursor: pointer;
height: 100%;
appearance: none;
padding: 0.5rem 0;
margin: 0;
border: none;
outline: none;
background: none;
font-family: 'Lato';
font-weight: 600;
font-size: 18px;
color: #555;
}
}
button { button {
cursor: pointer; cursor: pointer;
@ -88,7 +137,7 @@ a,
a:visited { a:visited {
cursor: pointer; cursor: pointer;
color: #3a9999; color: var(--accent);
text-decoration: none; text-decoration: none;
&:hover { &:hover {
@ -96,7 +145,13 @@ a:visited {
} }
} }
//
// Typography // Typography
//
.math-inline {
font-size: 95%;
}
p { p {
margin: 0; margin: 0;
@ -176,21 +231,12 @@ main {
gap: 2rem; gap: 2rem;
.logo {
// font-size: 42px;
// font-family: 'EB Garamond';
// font-weight: 600;
font-size: 38px;
font-family: 'Lato';
font-weight: 300;
}
.subtitle { .subtitle {
font-size: 24px; font-size: 24px;
} }
} }
main.home { main.page-home {
.board { .board {
width: 100%; width: 100%;
// min-width: 0; // min-width: 0;
@ -200,171 +246,208 @@ main.home {
gap: 2rem; gap: 2rem;
justify-content: center; justify-content: center;
.fill-row {
grid-column: 1 / -1;
}
.board-controls {
justify-self: start;
}
} }
} }
main.problem { main.page-problem {
summary { summary {
padding: 1rem; padding: 1rem;
text-align: center; text-align: center;
user-select: none; user-select: none;
} }
.solution-list {
display: flex;
flex-direction: column;
gap: 1rem;
}
} }
// //
// Components // Components
// //
main { .solution-list {
.problem { display: flex;
padding: 1rem; flex-direction: column;
gap: 1rem;
}
max-width: 80ch; header {
display: grid;
place-content: center;
box-shadow: -2px 4px 8px 1px #00000020, -1px 1px 1px 0px #00000010; width: 100%;
border-radius: 0.5rem; position: relative;
background: #ffffff;
display: grid; .logo {
grid-template-rows: auto 1fr; font-size: 42px;
gap: 0.5rem; font-family: 'Lato';
font-weight: 300;
.problem-header { a:hover {
display: grid; text-decoration: none;
grid-template-columns: auto; border-bottom: 3px solid var(--accent);
gap: 0.25rem; }
}
.problem-title { nav {
font-size: 24px; position: absolute;
font-weight: 700; right: 0;
}
display: flex;
gap: 1rem;
.problem-author { .nav-item {
grid-row: 2; font-size: 24px;
font-weight: 300;
font-size: 16px; a.active {
color: #000000dd; border-bottom: 1px solid var(--accent);
// font-weight: 400;
} }
}
.problem-content { a:hover {
@extend .text-body; text-decoration: none;
border-bottom: 2px solid var(--accent);
}
} }
} }
}
.solution { .problem {
padding: 1rem; padding: 1rem;
max-width: 80ch; max-width: 80ch;
box-shadow: -2px 4px 8px 1px #00000020, -1px 1px 1px 0px #00000010; box-shadow: -2px 4px 8px 1px #00000020, -1px 1px 1px 0px #00000010;
border-radius: 0.5rem; border-radius: 0.5rem;
background: #ffffff; background: #ffffff;
display: grid;
grid-template-rows: auto 1fr;
gap: 0.5rem;
.problem-header {
display: grid; display: grid;
grid-template-rows: auto 1fr; grid-template-columns: auto;
gap: 0.5rem; gap: 0.25rem;
.solution-header { .problem-title {
display: grid; font-size: 24px;
grid-template-columns: auto; font-weight: 400;
gap: 0.25rem;
} }
}
.solution-content { .problem-content {
@extend .text-body; @extend .text-body;
}
} }
}
.solution-editor { .solution {
display: grid; padding: 1rem;
width: 100%;
grid-template-columns: repeat(2, 1fr);
gap: 1rem; max-width: 80ch;
.editor, box-shadow: -2px 4px 8px 1px #00000020, -1px 1px 1px 0px #00000010;
.preview { border-radius: 0.5rem;
width: 100%; background: #ffffff;
max-width: 70ch;
display: flex; display: grid;
flex-direction: column; grid-template-rows: auto 1fr;
align-items: center; gap: 0.5rem;
gap: 1rem; .solution-header {
} display: grid;
grid-template-columns: auto;
gap: 0.25rem;
.editor { font-size: 18px;
justify-self: end; }
textarea { .solution-content {
font-family: 'DM Mono', monospace; @extend .text-body;
font-size: 18px; }
}
resize: none; .form {
overflow-y: hidden; min-width: 50ch;
min-height: 8rem; background: #e0e0e0;
}
}
.preview { display: grid;
justify-self: start; grid-template-columns: auto 1fr;
.placeholder { border: 1px solid #c0c0c0;
color: #444; border-radius: 1rem;
}
.preview-content { // box-shadow: -2px 4px 16px 4px #00000018, -2px 4px 4px 1px #00000018;
@extend .text-body;
width: 100%; padding: 1.5rem 2rem 1rem;
gap: 1rem;
padding: 1rem; align-items: center;
box-shadow: -2px 4px 8px 1px #00000020, -1px 1px 1px 0px #00000010; .fill {
border-radius: 0.25rem; grid-column: span 2;
background: #ffffff; justify-self: center;
}
}
} }
}
.form { .markdown-editor {
min-width: 50ch; display: grid;
width: 100%;
background: #e0e0e0; grid-template-columns: repeat(2, 1fr);
display: grid; gap: 1rem;
grid-template-columns: auto 1fr;
border: 1px solid #c0c0c0; .editor,
border-radius: 1rem; .preview {
width: 100%;
max-width: 70ch;
// box-shadow: -2px 4px 16px 4px #00000018, -2px 4px 4px 1px #00000018; display: flex;
flex-direction: column;
align-items: center;
padding: 1.5rem 2rem 1rem;
gap: 1rem; gap: 1rem;
}
align-items: center; .editor {
justify-self: end;
.fill { textarea {
grid-column: span 2; font-family: 'DM Mono', monospace;
justify-self: center; font-size: 18px;
resize: none;
overflow-y: hidden;
min-height: 8rem;
} }
} }
}
.math-inline { .preview {
font-size: 95%; justify-self: start;
.placeholder {
color: #666;
}
.preview-content {
@extend .text-body;
width: 100%;
padding: 1rem;
box-shadow: -2px 4px 8px 1px #00000020, -1px 1px 1px 0px #00000010;
border-radius: 0.25rem;
background: #ffffff;
}
}
} }
// //
@ -379,23 +462,69 @@ main {
// On mobile // On mobile
@media screen and (max-width: $device-s-width), (pointer: coarse) { @media screen and (max-width: $device-s-width), (pointer: coarse) {
main { main {
.solution-editor { padding: 1rem 1rem 6rem;
grid-template-columns: auto;
grid-template-rows: auto auto; &.page-home {
.board {
gap: 1rem;
}
}
}
header {
display: flex;
flex-direction: column;
align-items: center;
gap: 2rem;
nav {
position: relative;
right: unset;
display: flex;
flex-direction: column;
align-items: center;
}
}
.problem {
padding: 0.75rem;
}
.markdown-editor {
grid-template-columns: auto;
grid-template-rows: auto auto;
}
.form {
width: 100%;
padding: 1rem;
min-width: unset;
display: flex;
flex-direction: column;
label {
align-self: start;
} }
} }
textarea,
.markdown-editor .preview .preview-content {
padding: 0.75rem;
}
} }
@media screen and (max-width: $device-m-width), (pointer: coarse) { @media screen and (max-width: $device-m-width), (pointer: coarse) {
main { .markdown-editor {
.solution-editor { grid-template-columns: auto;
grid-template-columns: auto; grid-template-rows: auto auto;
grid-template-rows: auto auto;
.preview, .preview,
.editor { .editor {
justify-self: center; justify-self: center;
}
} }
} }
} }

@ -17,6 +17,10 @@
href="https://fonts.googleapis.com/css2?family=DM+Mono&display=swap" href="https://fonts.googleapis.com/css2?family=DM+Mono&display=swap"
rel="stylesheet" rel="stylesheet"
/> />
<link
href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined"
rel="stylesheet"
/>
<link rel="stylesheet" href="/node_modules/katex/dist/katex.css" /> <link rel="stylesheet" href="/node_modules/katex/dist/katex.css" />
<link rel="stylesheet" href="/client/styles/main.scss" /> <link rel="stylesheet" href="/client/styles/main.scss" />

@ -8,7 +8,7 @@ import { createServer as createViteServer } from 'vite'
import { createApiRouter } from './server/routes.js' import { createApiRouter } from './server/routes.js'
const HTML_ROUTES = ['/', '/login', '/problem/:id', '/admin'] const HTML_ROUTES = ['/', '/login', '/problem/:id', '/admin', '/profile']
const config = { const config = {
isDevelopment: process.env.MODE === 'development', isDevelopment: process.env.MODE === 'development',

@ -112,6 +112,24 @@ export const getUser = (db, id) =>
// Problems // Problems
// //
export const createProblem = (db, { content, createdBy }) =>
withDatabase(db, state => {
const nextId = (
Object.keys(state.problems)
.map(k => parseInt(k))
.reduce((acc, id) => Math.max(acc, id)) + 1
).toString()
state.problems[nextId] = {
id: nextId,
content,
createdBy,
createdAt: new Date().toJSON(),
}
return nextId
})
export const getProblem = (db, id) => export const getProblem = (db, id) =>
withDatabase(db, state => { withDatabase(db, state => {
return state.problems[id] return state.problems[id]

@ -8,6 +8,7 @@ import express from 'express'
import { createStatusRouter, PingRouter } from './middlewares.js' import { createStatusRouter, PingRouter } from './middlewares.js'
import { import {
createDatabase, createDatabase,
createProblem,
createSolution, createSolution,
getProblem, getProblem,
getProblems, getProblems,
@ -92,6 +93,25 @@ export async function createApiRouter() {
res.json(await getProblem(db, req.params.id)) res.json(await getProblem(db, req.params.id))
}) })
r.post('/api/problem', async (req, res) => {
const user = await getRequestUser(req)
if (!user) {
res.sendStatus(401)
return
}
if (user.role !== 'admin' && user.role !== 'moderator') {
res.sendStatus(401)
return
}
const id = await createProblem(db, {
content: req.body.content,
createBy: user.username,
})
res.json(id)
})
r.get('/api/solutions', async (req, res) => { r.get('/api/solutions', async (req, res) => {
let queryUserId = req.query.user let queryUserId = req.query.user
let queryProblemId = req.query.problem let queryProblemId = req.query.problem
@ -146,10 +166,5 @@ export async function createApiRouter() {
res.json(requestedUser) res.json(requestedUser)
}) })
// r.post('/api/user/:id', async (req, res) => {
// await updateUser(db, req.params.id, req.body)
// res.sendStatus(200)
// })
return r return r
} }

Loading…
Cancel
Save