diff options
Diffstat (limited to 'client/src')
-rw-r--r-- | client/src/App.css | 42 | ||||
-rw-r--r-- | client/src/App.jsx | 35 | ||||
-rw-r--r-- | client/src/assets/react.svg | 1 | ||||
-rw-r--r-- | client/src/components/entry.css | 44 | ||||
-rw-r--r-- | client/src/components/entry.jsx | 76 | ||||
-rw-r--r-- | client/src/index.css | 66 | ||||
-rw-r--r-- | client/src/main.jsx | 14 | ||||
-rw-r--r-- | client/src/routes/app/app.css | 9 | ||||
-rw-r--r-- | client/src/routes/app/app.jsx | 98 | ||||
-rw-r--r-- | client/src/routes/app/components/content/content.css | 20 | ||||
-rw-r--r-- | client/src/routes/app/components/content/content.jsx | 32 | ||||
-rw-r--r-- | client/src/routes/app/components/sidebar/sidebar.css | 24 | ||||
-rw-r--r-- | client/src/routes/app/components/sidebar/sidebar.jsx | 19 |
13 files changed, 335 insertions, 145 deletions
diff --git a/client/src/App.css b/client/src/App.css deleted file mode 100644 index b9d355d..0000000 --- a/client/src/App.css +++ /dev/null @@ -1,42 +0,0 @@ -#root { - max-width: 1280px; - margin: 0 auto; - padding: 2rem; - text-align: center; -} - -.logo { - height: 6em; - padding: 1.5em; - will-change: filter; - transition: filter 300ms; -} -.logo:hover { - filter: drop-shadow(0 0 2em #646cffaa); -} -.logo.react:hover { - filter: drop-shadow(0 0 2em #61dafbaa); -} - -@keyframes logo-spin { - from { - transform: rotate(0deg); - } - to { - transform: rotate(360deg); - } -} - -@media (prefers-reduced-motion: no-preference) { - a:nth-of-type(2) .logo { - animation: logo-spin infinite 20s linear; - } -} - -.card { - padding: 2em; -} - -.read-the-docs { - color: #888; -} diff --git a/client/src/App.jsx b/client/src/App.jsx deleted file mode 100644 index f67355a..0000000 --- a/client/src/App.jsx +++ /dev/null @@ -1,35 +0,0 @@ -import { useState } from 'react' -import reactLogo from './assets/react.svg' -import viteLogo from '/vite.svg' -import './App.css' - -function App() { - const [count, setCount] = useState(0) - - return ( - <> - <div> - <a href="https://vite.dev" target="_blank"> - <img src={viteLogo} className="logo" alt="Vite logo" /> - </a> - <a href="https://react.dev" target="_blank"> - <img src={reactLogo} className="logo react" alt="React logo" /> - </a> - </div> - <h1>Vite + React</h1> - <div className="card"> - <button onClick={() => setCount((count) => count + 1)}> - count is {count} - </button> - <p> - Edit <code>src/App.jsx</code> and save to test HMR - </p> - </div> - <p className="read-the-docs"> - Click on the Vite and React logos to learn more - </p> - </> - ) -} - -export default App diff --git a/client/src/assets/react.svg b/client/src/assets/react.svg deleted file mode 100644 index 6c87de9..0000000 --- a/client/src/assets/react.svg +++ /dev/null @@ -1 +0,0 @@ -<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>
\ No newline at end of file diff --git a/client/src/components/entry.css b/client/src/components/entry.css new file mode 100644 index 0000000..e76d6a9 --- /dev/null +++ b/client/src/components/entry.css @@ -0,0 +1,44 @@ +.entry { + display: flex; + width: 100%; + gap: 5px; + + button { + display: 0; + background: none; + border: none; + cursor: pointer; + font-weight: bold; + + opacity: 0; + } + + .text { + white-space: pre-wrap; + border: 0; + width: 100%; + padding: 5px; + } + .text:focus { + border: 0; + outline: 0; + + background-color: #f9f9f9; + } + + .text:empty:focus::before { + content: "write something..."; + opacity: .3; + font-style: italic; + } +} + +.entry:hover { + button { + opacity: .3; + } + + button:hover { + opacity: .5; + } +} diff --git a/client/src/components/entry.jsx b/client/src/components/entry.jsx new file mode 100644 index 0000000..637a696 --- /dev/null +++ b/client/src/components/entry.jsx @@ -0,0 +1,76 @@ +import {createElement, useLayoutEffect, useRef, useState} from 'react'; + +import './entry.css'; + +function TextField({ item, onEnter, onSelect, onRemove, ref }) { + const onKeyDown = e => { + if (e.keyCode === 38) { // up + onSelect(-1); + e.preventDefault(); + return; + } else if (e.keyCode === 40) { // down + onSelect(+1); + e.preventDefault(); + return; + } else if (e.keyCode === 8 && e.target.innerText.length === 0) { // backspace + onRemove(); + e.preventDefault(); + return; + } + + if (e.keyCode !== 13) { + return; + } else if (e.shiftKey) { + return; + } + + e.preventDefault(); + + onEnter(e.ctrlKey ? 'todo' : 'plain'); + }; + + useLayoutEffect(() => { + if (ref.current == null) { + return; + } + + ref.current.innerText = item.text; + }, [item.text]); + + return <div ref={ref} className='text' contentEditable="true" onKeyDown={onKeyDown} onClick={() => onSelect(0)}></div>; +} + +function Plain({ item, onEnter, onSelect, onRemove, ref }) { + return <TextField item={item} onEnter={onEnter} onSelect={onSelect} onRemove={onRemove} ref={ref} />; +} + +function Todo({ item, onEnter, onSelect, onRemove, ref }) { + return <> + <input type="checkbox" /> + <TextField item={item} onEnter={onEnter} onSelect={onSelect} onRemove={onRemove} ref={ref} /> + </>; +} + +export default function Entry({ item, onEnter, onSelect, onRemove, isFocused }) { + const ref = useRef(null); + useLayoutEffect(() => { + if (isFocused && ref.current != null && document.activeElement !== ref.current) { + ref.current.focus(); + document.execCommand('selectAll', false, null); + document.getSelection().collapseToEnd(); + } + }, [isFocused]); + + const child = createElement(item.type === 'plain' ? Plain : Todo, { + ref, + item, + onEnter, + onSelect, + onRemove: () => onRemove(true), + }); + + return <div className={`entry ${isFocused ? 'focus' : ''}`}> + <button onClick={() => onRemove(false)}>X</button> + {child} + </div> +} diff --git a/client/src/index.css b/client/src/index.css index 6119ad9..5edd4fc 100644 --- a/client/src/index.css +++ b/client/src/index.css @@ -1,68 +1,8 @@ :root { - font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif; - line-height: 1.5; - font-weight: 400; - - color-scheme: light dark; - color: rgba(255, 255, 255, 0.87); - background-color: #242424; - - font-synthesis: none; - text-rendering: optimizeLegibility; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -a { - font-weight: 500; - color: #646cff; - text-decoration: inherit; -} -a:hover { - color: #535bf2; + font-family: sans-serif; + font-size: 1.1em; } body { - margin: 0; - display: flex; - place-items: center; - min-width: 320px; - min-height: 100vh; -} - -h1 { - font-size: 3.2em; - line-height: 1.1; -} - -button { - border-radius: 8px; - border: 1px solid transparent; - padding: 0.6em 1.2em; - font-size: 1em; - font-weight: 500; - font-family: inherit; - background-color: #1a1a1a; - cursor: pointer; - transition: border-color 0.25s; -} -button:hover { - border-color: #646cff; -} -button:focus, -button:focus-visible { - outline: 4px auto -webkit-focus-ring-color; -} - -@media (prefers-color-scheme: light) { - :root { - color: #213547; - background-color: #ffffff; - } - a:hover { - color: #747bff; - } - button { - background-color: #f9f9f9; - } + padding: 0; } diff --git a/client/src/main.jsx b/client/src/main.jsx index b9a1a6d..6a23f95 100644 --- a/client/src/main.jsx +++ b/client/src/main.jsx @@ -1,10 +1,16 @@ import { StrictMode } from 'react' import { createRoot } from 'react-dom/client' import './index.css' -import App from './App.jsx' +import { BrowserRouter, Route, Routes } from 'react-router'; + +import App from './routes/app/app'; createRoot(document.getElementById('root')).render( - <StrictMode> - <App /> - </StrictMode>, + <StrictMode> + <BrowserRouter> + <Routes> + <Route path="/file/*" element={<App />} /> + </Routes> + </BrowserRouter> + </StrictMode>, ) diff --git a/client/src/routes/app/app.css b/client/src/routes/app/app.css new file mode 100644 index 0000000..bccae8f --- /dev/null +++ b/client/src/routes/app/app.css @@ -0,0 +1,9 @@ +.app { + display: flex; + + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; +} diff --git a/client/src/routes/app/app.jsx b/client/src/routes/app/app.jsx new file mode 100644 index 0000000..67dcd91 --- /dev/null +++ b/client/src/routes/app/app.jsx @@ -0,0 +1,98 @@ +import {useEffect, useRef, useState} from 'react'; +import { useLocation, useParams } from "react-router"; + +import './app.css'; + +import Sidebar from './components/sidebar/sidebar'; +import Content from './components/content/content'; + +const files = [ + { + id: '1', + title: 'kaas', + items: [ + { type: 'plain', text: 'kaas 1' }, + { type: 'plain', text: 'kaas 2' }, + { type: 'plain', text: 'kaas 3' }, + { type: 'plain', text: 'kaas 4' }, + { type: 'plain', text: 'kaas 5' }, + ], + }, + { + id: '2', + title: 'ham', + items: [ + { type: 'plain', text: 'ham 1' }, + { type: 'plain', text: 'ham 2' }, + { type: 'plain', text: 'ham 3' }, + { type: 'plain', text: 'ham 4' }, + { type: 'plain', text: 'ham 5' }, + ], + }, + { + id: '3', + title: 'vis', + items: [ + { type: 'plain', text: 'vis 1' }, + { type: 'plain', text: 'vis 2' }, + { type: 'plain', text: 'vis 3' }, + { type: 'plain', text: 'vis 4' }, + { type: 'plain', text: 'vis 5' }, + ], + }, + { + id: '4', + title: 'empty', + items: [ + { type: 'plain', text: '' }, + ], + + children: [{ + id: '4/5', + title: 'empty 2', + items: [ + { type: 'plain', text: '' }, + ], + }], + }, +] + +function splitOnce(str, sep) { + const idx = str.indexOf(sep); + if (idx === -1) return [str, '']; + + return [ str.slice(0, idx), str.slice(idx+1) ]; +} + +export default function App() { + const e = useLocation(); + const fullPath = e.pathname.replace('/file/', ''); + let path = fullPath; + + let cur = { children: files }; + let builtKey = ''; + while (path != '') { + let key; + [key, path] = splitOnce(path, '/'); + builtKey += `/${key}`; + + console.log(key, path, cur); + cur = (cur.children ?? []).find(p => p.id === builtKey.slice(1)); + } + + const file = cur; + const [title, setTitle] = useState(() => file.title); + const [items, setItems] = useState(() => file.items); + + useEffect(() => { + setTitle(() => file.title); + setItems(() => file.items); + + document.title = '🧀🥜 ' + file.title; + }, [fullPath]); + + return <div className='app'> + <Sidebar files={files} /> + <Content title={title} items={items} setTitle={setTitle} setItems={setItems} /> + </div> +} diff --git a/client/src/routes/app/components/content/content.css b/client/src/routes/app/components/content/content.css new file mode 100644 index 0000000..196fb96 --- /dev/null +++ b/client/src/routes/app/components/content/content.css @@ -0,0 +1,20 @@ +.content { + display: flex; + flex-direction: column; + + flex-grow: 1; + padding: 10px; + + overflow-y: scroll; + + .title { + border: 0; + padding: 10px; + margin-left: 15px; + margin-bottom: 50px; + } + .title:focus { + border: 0; + outline: 0; + } +} diff --git a/client/src/routes/app/components/content/content.jsx b/client/src/routes/app/components/content/content.jsx new file mode 100644 index 0000000..42ecb8a --- /dev/null +++ b/client/src/routes/app/components/content/content.jsx @@ -0,0 +1,32 @@ +import {useLayoutEffect, useRef, useState} from 'react'; + +import './content.css'; + +import Entry from '../../../../components/entry'; + +export default function Content({ title, setTitle, items, setItems }) { + const [focused, setFocused] = useState(null); + + const children = items.map((item, i) => { + return <Entry + item={item} + isFocused={i === focused} + onSelect={delta => setFocused(i + delta)} + onRemove={refocus => setItems(a => { + if (refocus) { + setFocused(i-1); + } + return [...a.slice(0, i), ...a.slice(i + 1)] + })} + onEnter={type => setItems(a => { + setFocused(i+1); + return a.toSpliced(i+1, 0, { type, text: '' }); + })} + />; + }); + + return <div className="content"> + <h1 className='title' contentEditable="true">{title}</h1> + {children} + </div>; +} diff --git a/client/src/routes/app/components/sidebar/sidebar.css b/client/src/routes/app/components/sidebar/sidebar.css new file mode 100644 index 0000000..515117a --- /dev/null +++ b/client/src/routes/app/components/sidebar/sidebar.css @@ -0,0 +1,24 @@ +.sidebar { + width: 200px; + background-color: #f2f2f2; + + flex-shrink: 0; + + h1 { + margin-left: 10px; + margin-top: 10px; + } + + .file { + display: block; + + color: black; + text-decoration: none; + + padding: 5px; + } + + .file:hover { + background-color: #e4e4e4; + } +} diff --git a/client/src/routes/app/components/sidebar/sidebar.jsx b/client/src/routes/app/components/sidebar/sidebar.jsx new file mode 100644 index 0000000..1ce7d2b --- /dev/null +++ b/client/src/routes/app/components/sidebar/sidebar.jsx @@ -0,0 +1,19 @@ +import { useNavigate } from "react-router"; +import { RichTreeView } from '@mui/x-tree-view/RichTreeView'; + +import './sidebar.css'; + + +export default function Sidebar({ files }) { + const navigate = useNavigate(); + + const onSelect = (_, i) => { + navigate(`/file/${i}`); + }; + + return <div className="sidebar"> + <h1>🧀🥜</h1> + <hr/> + <RichTreeView items={files} onItemClick={onSelect} getItemLabel={p => p.title} /> + </div>; +} |