prototype for command entry and sidebar

client/src/App.jsx

@@ -2,6 +2,7 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { BrowserRouter, Routes, Route } from 'react-router-dom';
 import Landing from '/src/landing/Landing.jsx';
 import Page from '/src/page/Page.jsx';
+import PageWithSidebar from '/src/page/PageWithSidebar.jsx';
 import HistoryView from '/src/page/HistoryView.jsx';
 import LogIn from '/src/login/LogIn.jsx';
 import Register from '/src/login/Register.jsx';
@@ -22,8 +23,8 @@ function App() {
             <Route path="/" element={<Landing/>}/>
             <Route path="/login" element={<LogIn/>}/>
             <Route path="/register" element={<Register/>}/>
-            <Route path="/:pagenumber" element={<Page/>}/>
+            <Route path="/:pagenumber" element={<PageWithSidebar/>}/>
-            <Route path="/:pagenumber/edit" element={<Page editing="true"/>}/>
+            <Route path="/:pagenumber/edit" element={<PageWithSidebar editing="true"/>}/>
             <Route path="/:pagenumber/history" element={<HistoryView/>}/>
             <Route path="/:pagenumber/:editid" element={<Page/>}/>
             <Route path="/profile" element={<Profile/>}/>

client/src/logo.svg

@@ -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>

client/src/page/CommandEntry.css

@@ -0,0 +1,21 @@
+.commandline {
+	margin-top: 2rem;
+	margin-bottom: 2rem;
+	margin-left: auto;
+	margin-right: auto;
+	background: lightblue;
+	position: fixed;
+	bottom: 0;
+	left: 20%;
+	right: 20%;
+
+}
+.commandline input {
+	font-size: 16pt;
+	border: none;
+	padding: 1rem;
+	width: calc(100% - 2rem);
+	margin-left: 0;
+	margin-right: 0;
+	background: transparent;
+}

client/src/page/CommandEntry.jsx

@@ -0,0 +1,13 @@
+import { useState } from 'react';
+
+import './CommandEntry.css';
+
+function CommandEntry({command, onChange}) {
+	return (
+		<div className="commandline">
+			<input type="text" placeholder="Enter a command!" value={command} onChange={onChange}/>
+		</div>
+		);
+}
+
+export default CommandEntry;

client/src/page/Page.jsx

@@ -63,7 +63,7 @@ function Page({ editing }) {
       <header>
         <h1>
           <a href="/" {...noLoad}>🌳</a>
-          {pagenumber}.
+          {pagenumber}.&nbsp;
           <span 
               contentEditable={editing} 
               dangerouslySetInnerHTML={{__html: readyToShow ? title : "..." }} />

client/src/page/PageWithSidebar.jsx

@@ -0,0 +1,128 @@
+import { useState } from 'react';
+import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
+import { useParams, useNavigate } from 'react-router-dom';
+import { apiUrl, fetchPage, fetchPageAtEdit, postPage, deletePage } from '../apiTools.jsx';
+import { useFixLinks } from '../clientStuff.jsx';
+import { useLoggedIn } from '../AuthProvider.jsx';
+import Sidebar from './Sidebar.jsx';
+import CommandEntry from './CommandEntry.jsx';
+
+import './Pages.css';
+
+function PageWithSidebar({ editing }) {
+  const queryClient = useQueryClient();
+  const navigate = useNavigate();
+  const { pagenumber, editid } = useParams();
+  const loggedIn = useLoggedIn();
+  const noLoad = useFixLinks();
+  const [command, setCommand] = useState("");
+
+  const fetchQuery = useQuery({ // fetch the currrent values
+    queryKey: ['page', pagenumber, editid],
+    queryFn: () => editid ? fetchPageAtEdit(pagenumber, editid) : fetchPage(pagenumber)
+  })
+
+  const postMutation = useMutation({ // for changing the value when we're done with it
+    mutationFn: ({id, title, description}) => postPage({id, title, description}),
+    onSettled: async (data, error, variables) => {
+      // Invalidate and refetch
+      await queryClient.invalidateQueries({ queryKey: ['page', variables.id, undefined] })
+    },
+  });
+
+  const deleteMutation = useMutation({ // for changing the value when we're done with it
+    mutationFn: (id) => deletePage(id),
+    onSettled: async (data, error, variables) => {
+      // Invalidate and refetch
+      await queryClient.invalidateQueries({ queryKey: ['pages'] })
+    },
+  });
+
+  const readyToShow = !(fetchQuery.error || fetchQuery.isPending);
+
+  let {id, title, description, html, time, author} = fetchQuery.data || {};
+  if (!title) title = "[no title]";
+  if (!html) html = "[body missing]";
+  if (!description) description = "[body missing]";
+
+  function submitChanges(e) {
+    const newTitle = document.querySelector('span').innerHTML;
+    const newText = document.querySelector('pre').innerHTML;
+    postMutation.mutate({
+      id: pagenumber, 
+      title: newTitle, 
+      description: newText
+    });
+    navigate(`/${pagenumber}`, {replace: true})
+  }
+
+  function submitDelete(e) {
+    e.preventDefault();
+    deleteMutation.mutate(pagenumber);
+    navigate(`/`);
+  }
+
+  return (
+    <>
+      <div className="main-column">
+        <header>
+          <h1>
+            <a href="/" {...noLoad}>🌳</a>
+            {pagenumber}.&nbsp;
+            <span 
+                contentEditable={editing} 
+                dangerouslySetInnerHTML={{__html: readyToShow ? title : "..." }} />
+          </h1>
+          {readyToShow && editid && `saved at ${time} by user #${author}`}
+          <hr/>
+        </header>
+        <section className="page-contents">
+          { readyToShow ? 
+            (
+              editing ?
+                <pre 
+                  contentEditable="true"
+                  dangerouslySetInnerHTML={{__html: description}} />
+                :
+                <div
+                  dangerouslySetInnerHTML={{__html: html}} 
+                  {...noLoad} />
+            )
+            :
+            "..."
+          }
+        </section>
+        <button
+          onClick={() => navigate(`/${pagenumber}/history`)}>
+          History
+        </button>
+        {editing && (
+          <button 
+            disabled={postMutation.isPending}
+            onClick={submitChanges}>
+            {postMutation.isPending ? "Updating..." : "Update"}
+          </button>)}
+        {!editing && !editid && (
+          <button
+            disabled={!loggedIn}
+            onClick={() => navigate(`/${pagenumber}/edit`)}>
+            Edit Page 
+          </button>)}
+        {loggedIn && ( 
+          <button
+            disabled={deleteMutation.isPending}
+            onClick={submitDelete}>
+            {deleteMutation.isPending ? "Deleting..." : "Delete this page and entire edit history (no backsies)"}
+          </button>)}
+      </div>
+      <Sidebar pagenumber={pagenumber} hidden="true" sendWord={(word) => setCommand((command + " " + word).trim())}>
+        {!editing && <li><button onClick={() => navigate(`/${pagenumber}/edit`)}>edit</button></li>}
+        {editing && <li><button disabled={postMutation.isPending} onClick={submitChanges}>save</button></li>}
+        {editing && <li><button onClick={() => navigate(`/${pagenumber}`)}>return</button></li>}
+      </Sidebar>
+      <CommandEntry command={command} onChange={(e) => setCommand(e.target.value)}/>
+    </>
+  );
+}
+
+export default PageWithSidebar;

client/src/page/Sidebar.css

@@ -0,0 +1,25 @@
+.sidebar {
+	transition: all 0.1s linear;
+	margin: 0;
+	background: lightblue;
+	position: fixed;
+	width: 30ch;
+	height: 100%;
+	right: 0;
+	top: 0;
+}
+.sidebar-hidden {
+	transform: translateX(20ch);
+}
+
+.sidebar li {
+	list-style: none;
+}
+
+.sidebar li button {
+	text-transform: uppercase;
+}
+
+.sidebar-hidden li {
+	display: none;
+}

client/src/page/Sidebar.jsx

@@ -0,0 +1,29 @@
+import { useState } from 'react';
+import { useLoggedIn } from '../AuthProvider.jsx';
+
+import './Sidebar.css';
+
+function Sidebar({children, pagenumber, hidden=false, sendWord=(()=>null)}) {
+	const [open, setOpen] = useState(!hidden);
+	const loggedIn = useLoggedIn();
+
+	const verbs = ["go", "take"];
+
+	return (
+		<div className={`sidebar ${!open && "sidebar-hidden"}`}>
+			<button onClick={() => setOpen(!open)}>{open ? "hide" : "show"}</button>
+			<ul>
+				{verbs.map(  (name) => (
+					<li key={name}>
+						<button onClick={() => sendWord(name)}>
+							{name}
+						</button>
+					</li> 
+					) )}
+				{children}
+			</ul>
+		</div>
+		);
+}
+
+export default Sidebar;