0
0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-08 20:23:39 +00:00

Merge branch 'master' into addDBCheckMiddleware

This commit is contained in:
G.Ambatte
2025-09-27 22:00:30 +12:00
committed by GitHub
9 changed files with 680 additions and 708 deletions

View File

@@ -0,0 +1,35 @@
import React from 'react';
import dedent from 'dedent-tabs';
import Nav from 'naturalcrit/nav/nav.jsx';
const getShareId = (brew)=>(
brew.googleId && !brew.stubbed
? brew.googleId + brew.shareId
: brew.shareId
);
const getRedditLink = (brew)=>{
const text = dedent`
Hey guys! I've been working on this homebrew. I'd love your feedback. Check it out.
**[Homebrewery Link](${global.config.baseUrl}/share/${getShareId(brew)})**`;
return `https://www.reddit.com/r/UnearthedArcana/submit?title=${encodeURIComponent(brew.title.toWellFormed())}&text=${encodeURIComponent(text)}`;
};
export default ({brew}) => (
<Nav.dropdown>
<Nav.item color='teal' icon='fas fa-share-alt'>
share
</Nav.item>
<Nav.item color='blue' href={`/share/${getShareId(brew)}`}>
view
</Nav.item>
<Nav.item color='blue' onClick={()=>{navigator.clipboard.writeText(`${global.config.baseUrl}/share/${getShareId(brew)}`);}}>
copy url
</Nav.item>
<Nav.item color='blue' href={getRedditLink(brew)} newTab rel='noopener noreferrer'>
post to reddit
</Nav.item>
</Nav.dropdown>
);

View File

@@ -1,536 +1,418 @@
/* eslint-disable max-lines */ /* eslint-disable max-lines */
require('./editPage.less'); import './editPage.less';
const React = require('react');
const _ = require('lodash');
const createClass = require('create-react-class');
import {makePatches, applyPatches, stringifyPatches, parsePatches} from '@sanity/diff-match-patch';
import { md5 } from 'hash-wasm';
import { gzipSync, strToU8 } from 'fflate';
import request from '../../utils/request-middleware.js'; import React, { useState, useEffect, useRef, useCallback } from 'react';
const { Meta } = require('vitreum/headtags'); import request from '../../utils/request-middleware.js';
import Markdown from 'naturalcrit/markdown.js';
const Nav = require('naturalcrit/nav/nav.jsx'); import _ from 'lodash';;
const Navbar = require('../../navbar/navbar.jsx'); import { makePatches, stringifyPatches } from '@sanity/diff-match-patch';
import { md5 } from 'hash-wasm';
import { gzipSync, strToU8 } from 'fflate';
import { Meta } from 'vitreum/headtags';
const NewBrew = require('../../navbar/newbrew.navitem.jsx'); import Nav from 'naturalcrit/nav/nav.jsx';
const HelpNavItem = require('../../navbar/help.navitem.jsx'); import Navbar from '../../navbar/navbar.jsx';
const PrintNavItem = require('../../navbar/print.navitem.jsx'); import NewBrewItem from '../../navbar/newbrew.navitem.jsx';
const ErrorNavItem = require('../../navbar/error-navitem.jsx'); import AccountNavItem from '../../navbar/account.navitem.jsx';
const Account = require('../../navbar/account.navitem.jsx'); import ShareNavItem from '../../navbar/share.navitem.jsx';
const RecentNavItem = require('../../navbar/recent.navitem.jsx').both; import ErrorNavItem from '../../navbar/error-navitem.jsx';
const VaultNavItem = require('../../navbar/vault.navitem.jsx'); import HelpNavItem from '../../navbar/help.navitem.jsx';
import VaultNavItem from '../../navbar/vault.navitem.jsx';
import PrintNavItem from '../../navbar/print.navitem.jsx';
import { both as RecentNavItem } from '../../navbar/recent.navitem.jsx';
const SplitPane = require('client/components/splitPane/splitPane.jsx'); import SplitPane from 'client/components/splitPane/splitPane.jsx';
const Editor = require('../../editor/editor.jsx'); import Editor from '../../editor/editor.jsx';
const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx'); import BrewRenderer from '../../brewRenderer/brewRenderer.jsx';
const LockNotification = require('./lockNotification/lockNotification.jsx'); import LockNotification from './lockNotification/lockNotification.jsx';
import Markdown from 'naturalcrit/markdown.js'; import { DEFAULT_BREW_LOAD } from '../../../../server/brewDefaults.js';
import { printCurrentBrew, fetchThemeBundle } from '../../../../shared/helpers.js';
const { DEFAULT_BREW_LOAD } = require('../../../../server/brewDefaults.js');
const { printCurrentBrew, fetchThemeBundle } = require('../../../../shared/helpers.js');
import { updateHistory, versionHistoryGarbageCollection } from '../../utils/versionHistory.js'; import { updateHistory, versionHistoryGarbageCollection } from '../../utils/versionHistory.js';
const googleDriveIcon = require('../../googleDrive.svg'); import googleDriveIcon from '../../googleDrive.svg';
const SAVE_TIMEOUT = 10000; const SAVE_TIMEOUT = 10000;
const UNSAVED_WARNING_TIMEOUT = 900000; //Warn user afer 15 minutes of unsaved changes
const UNSAVED_WARNING_POPUP_TIMEOUT = 4000; //Show the warning for 4 seconds
const EditPage = createClass({ const EditPage = (props)=>{
displayName : 'EditPage', props = {
getDefaultProps : function() { brew : DEFAULT_BREW_LOAD,
return { ...props
brew : DEFAULT_BREW_LOAD };
};
},
getInitialState : function() { const [currentBrew , setCurrentBrew ] = useState(props.brew);
return { const [isSaving , setIsSaving ] = useState(false);
brew : this.props.brew, const [lastSavedTime , setLastSavedTime ] = useState(new Date());
isSaving : false, const [saveGoogle , setSaveGoogle ] = useState(!!props.brew.googleId);
unsavedChanges : false, const [error , setError ] = useState(null);
alertTrashedGoogleBrew : this.props.brew.trashed, const [HTMLErrors , setHTMLErrors ] = useState(Markdown.validate(props.brew.text));
alertLoginToTransfer : false, const [currentEditorViewPageNum , setCurrentEditorViewPageNum ] = useState(1);
saveGoogle : this.props.brew.googleId ? true : false, const [currentEditorCursorPageNum, setCurrentEditorCursorPageNum] = useState(1);
confirmGoogleTransfer : false, const [currentBrewRendererPageNum, setCurrentBrewRendererPageNum] = useState(1);
error : null, const [themeBundle , setThemeBundle ] = useState({});
htmlErrors : Markdown.validate(this.props.brew.text), const [unsavedChanges , setUnsavedChanges ] = useState(false);
url : '', const [alertTrashedGoogleBrew , setAlertTrashedGoogleBrew ] = useState(props.brew.trashed);
autoSave : true, const [alertLoginToTransfer , setAlertLoginToTransfer ] = useState(false);
autoSaveWarning : false, const [confirmGoogleTransfer , setConfirmGoogleTransfer ] = useState(false);
unsavedTime : new Date(), const [autoSaveEnabled , setAutoSaveEnabled ] = useState(true);
currentEditorViewPageNum : 1, const [warnUnsavedChanges , setWarnUnsavedChanges ] = useState(true);
currentEditorCursorPageNum : 1,
currentBrewRendererPageNum : 1,
displayLockMessage : this.props.brew.lock || false,
themeBundle : {}
};
},
editor : React.createRef(null), const editorRef = useRef(null);
savedBrew : null, const lastSavedBrew = useRef(_.cloneDeep(props.brew));
const saveTimeout = useRef(null);
const warnUnsavedTimeout = useRef(null);
const trySaveRef = useRef(trySave); // CTRL+S listener lives outside React and needs ref to use trySave with latest copy of brew
const unsavedChangesRef = useRef(unsavedChanges); // Similarly, onBeforeUnload lives outside React and needs ref to unsavedChanges
componentDidMount : function(){ useEffect(()=>{
this.setState({ const autoSavePref = JSON.parse(localStorage.getItem('AUTOSAVE_ON') ?? true);
url : window.location.href setAutoSaveEnabled(autoSavePref);
}); setWarnUnsavedChanges(!autoSavePref);
setHTMLErrors(Markdown.validate(currentBrew.text));
fetchThemeBundle(setError, setThemeBundle, currentBrew.renderer, currentBrew.theme);
this.savedBrew = JSON.parse(JSON.stringify(this.props.brew)); //Deep copy const handleControlKeys = (e)=>{
if(!(e.ctrlKey || e.metaKey)) return;
this.setState({ autoSave: JSON.parse(localStorage.getItem('AUTOSAVE_ON')) ?? true }, ()=>{ if(e.keyCode === 83) trySaveRef.current(true);
if(this.state.autoSave){ if(e.keyCode === 80) printCurrentBrew();
this.trySave(); if([83, 80].includes(e.keyCode)) {
} else { e.stopPropagation();
this.setState({ autoSaveWarning: true }); e.preventDefault();
} }
}); };
document.addEventListener('keydown', handleControlKeys);
window.onbeforeunload = ()=>{ window.onbeforeunload = ()=>{
if(this.state.isSaving || this.state.unsavedChanges){ if(unsavedChangesRef.current)
return 'You have unsaved changes!'; return 'You have unsaved changes!';
}
}; };
return ()=>{
document.removeEventListener('keydown', handleControlKeys);
window.onBeforeUnload = null;
};
}, []);
this.setState((prevState)=>({ useEffect(()=>{
htmlErrors : Markdown.validate(prevState.brew.text) trySaveRef.current = trySave;
})); unsavedChangesRef.current = unsavedChanges;
});
fetchThemeBundle((err)=>{this.setState({ error: err })}, (theme)=>{this.setState({ themeBundle: theme })}, this.props.brew.renderer, this.props.brew.theme); useEffect(()=>{
const hasChange = !_.isEqual(currentBrew, lastSavedBrew.current);
setUnsavedChanges(hasChange);
document.addEventListener('keydown', this.handleControlKeys); if(autoSaveEnabled) trySave(false, hasChange);
}, }, [currentBrew]);
componentWillUnmount : function() {
window.onbeforeunload = function(){};
document.removeEventListener('keydown', this.handleControlKeys);
},
componentDidUpdate : function(){
const hasChange = this.hasChanges();
if(this.state.unsavedChanges != hasChange){
this.setState({
unsavedChanges : hasChange
});
}
},
handleControlKeys : function(e){ const handleSplitMove = ()=>{
if(!(e.ctrlKey || e.metaKey)) return; editorRef.current?.update();
const S_KEY = 83; };
const P_KEY = 80;
if(e.keyCode == S_KEY) this.trySave(true);
if(e.keyCode == P_KEY) printCurrentBrew();
if(e.keyCode == P_KEY || e.keyCode == S_KEY){
e.stopPropagation();
e.preventDefault();
}
},
handleSplitMove : function(){ const handleEditorViewPageChange = (pageNumber)=>{
this.editor.current.update(); setCurrentEditorViewPageNum(pageNumber);
}, };
handleEditorViewPageChange : function(pageNumber){ const handleEditorCursorPageChange = (pageNumber)=>{
this.setState({ currentEditorViewPageNum: pageNumber }); setCurrentEditorCursorPageNum(pageNumber);
}, };
handleEditorCursorPageChange : function(pageNumber){ const handleBrewRendererPageChange = (pageNumber)=>{
this.setState({ currentEditorCursorPageNum: pageNumber }); setCurrentBrewRendererPageNum(pageNumber);
}, };
handleBrewRendererPageChange : function(pageNumber){ const handleTextChange = (text)=>{
this.setState({ currentBrewRendererPageNum: pageNumber }); //If there are HTML errors, run the validator on every change to give quick feedback
}, if(HTMLErrors.length)
setHTMLErrors(Markdown.validate(text));
setCurrentBrew((prevBrew)=>({ ...prevBrew, text }));
};
handleTextChange : function(text){ const handleStyleChange = (style)=>{
//If there are errors, run the validator on every change to give quick feedback setCurrentBrew((prevBrew)=>({ ...prevBrew, style }));
let htmlErrors = this.state.htmlErrors; };
if(htmlErrors.length) htmlErrors = Markdown.validate(text);
this.setState((prevState)=>({ const handleSnipChange = (snippet)=>{
brew : { ...prevState.brew, text: text }, //If there are HTML errors, run the validator on every change to give quick feedback
htmlErrors : htmlErrors, if(HTMLErrors.length)
}), ()=>{if(this.state.autoSave) this.trySave();}); setHTMLErrors(Markdown.validate(snippet));
}, setCurrentBrew((prevBrew)=>({ ...prevBrew, snippets: snippet }));
};
handleSnipChange : function(snippet){ const handleMetaChange = (metadata, field = undefined)=>{
//If there are errors, run the validator on every change to give quick feedback if(field === 'theme' || field === 'renderer')
let htmlErrors = this.state.htmlErrors; fetchThemeBundle(setError, setThemeBundle, metadata.renderer, metadata.theme);
if(htmlErrors.length) htmlErrors = Markdown.validate(snippet);
this.setState((prevState)=>({ setCurrentBrew((prev)=>({ ...prev, ...metadata }));
brew : { ...prevState.brew, snippets: snippet }, };
unsavedChanges : true,
htmlErrors : htmlErrors,
}), ()=>{if(this.state.autoSave) this.trySave();});
},
handleStyleChange : function(style){ const updateBrew = (newData)=>setCurrentBrew((prevBrew)=>({
this.setState((prevState)=>({ ...prevBrew,
brew : { ...prevState.brew, style: style } style : newData.style,
}), ()=>{if(this.state.autoSave) this.trySave();}); text : newData.text,
}, snippets : newData.snippets
}));
handleMetaChange : function(metadata, field=undefined){ const resetWarnUnsavedTimer = ()=>{
if(field == 'theme' || field == 'renderer') // Fetch theme bundle only if theme or renderer was changed setTimeout(()=>setWarnUnsavedChanges(false), UNSAVED_WARNING_POPUP_TIMEOUT); // Hide the warning after 4 seconds
fetchThemeBundle((err)=>{this.setState({ error: err })}, (theme)=>{this.setState({ themeBundle: theme })}, metadata.renderer, metadata.theme); clearTimeout(warnUnsavedTimeout.current);
warnUnsavedTimeout.current = setTimeout(()=>setWarnUnsavedChanges(true), UNSAVED_WARNING_TIMEOUT); // 15 minutes between unsaved work warnings
};
this.setState((prevState)=>({ const handleGoogleClick = ()=>{
brew : {
...prevState.brew,
...metadata
}
}), ()=>{if(this.state.autoSave) this.trySave();});
},
hasChanges : function(){
return !_.isEqual(this.state.brew, this.savedBrew);
},
updateBrew : function(newData){
this.setState((prevState)=>({
brew : {
...prevState.brew,
style : newData.style,
text : newData.text,
snippets : newData.snippets
}
}));
},
trySave : function(immediate=false){
if(!this.debounceSave) this.debounceSave = _.debounce(this.save, SAVE_TIMEOUT);
if(this.state.isSaving)
return;
if(immediate) {
this.debounceSave();
this.debounceSave.flush();
return;
}
if(this.hasChanges())
this.debounceSave();
else
this.debounceSave.cancel();
},
handleGoogleClick : function(){
if(!global.account?.googleId) { if(!global.account?.googleId) {
this.setState({ setAlertLoginToTransfer(true);
alertLoginToTransfer : true
});
return; return;
} }
this.setState((prevState)=>({
confirmGoogleTransfer : !prevState.confirmGoogleTransfer
}));
this.setState({
error : null
});
},
closeAlerts : function(event){ setConfirmGoogleTransfer((prev)=>!prev);
event.stopPropagation(); //Only handle click once so alert doesn't reopen setError(null);
this.setState({ };
alertTrashedGoogleBrew : false,
alertLoginToTransfer : false,
confirmGoogleTransfer : false
});
},
toggleGoogleStorage : function(){ const closeAlerts = (e)=>{
this.setState((prevState)=>({ e.stopPropagation(); //Only handle click once so alert doesn't reopen
saveGoogle : !prevState.saveGoogle, setAlertTrashedGoogleBrew(false);
error : null setAlertLoginToTransfer(false);
}), ()=>this.trySave(true)); setConfirmGoogleTransfer(false);
}, };
save : async function(){ const toggleGoogleStorage = ()=>{
if(this.debounceSave && this.debounceSave.cancel) this.debounceSave.cancel(); setSaveGoogle((prev)=>!prev);
setError(null);
trySave(true);
};
const brewState = this.state.brew; // freeze the current state const trySave = (immediate = false, hasChanges = true)=>{
const preSaveSnapshot = { ...brewState }; clearTimeout(saveTimeout.current);
if(isSaving) return;
if(!hasChanges && !immediate) return;
const newTimeout = immediate ? 0 : SAVE_TIMEOUT;
this.setState((prevState)=>({ saveTimeout.current = setTimeout(async ()=>{
isSaving : true, setIsSaving(true);
error : null, setError(null);
htmlErrors : Markdown.validate(prevState.brew.text) await save(currentBrew, saveGoogle)
})); .catch((err)=>{
setError(err);
});
setIsSaving(false);
setLastSavedTime(new Date());
if(!autoSaveEnabled) resetWarnUnsavedTimer();
}, newTimeout);
};
await updateHistory(this.state.brew).catch(console.error); const save = async (brew, saveToGoogle)=>{
setHTMLErrors(Markdown.validate(brew.text));
await updateHistory(brew).catch(console.error);
await versionHistoryGarbageCollection().catch(console.error); await versionHistoryGarbageCollection().catch(console.error);
//Prepare content to send to server //Prepare content to send to server
const brew = { ...brewState }; const brewToSave = {
brew.text = brew.text.normalize('NFC'); ...brew,
this.savedBrew.text = this.savedBrew.text.normalize('NFC'); text : brew.text.normalize('NFC'),
brew.pageCount = ((brew.renderer=='legacy' ? brew.text.match(/\\page/g) : brew.text.match(/^\\page$/gm)) || []).length + 1; pageCount : ((brew.renderer === 'legacy' ? brew.text.match(/\\page/g) : brew.text.match(/^\\page$/gm)) || []).length + 1,
brew.patches = stringifyPatches(makePatches(encodeURI(this.savedBrew.text), encodeURI(brew.text))); patches : stringifyPatches(makePatches(encodeURI(lastSavedBrew.current.text.normalize('NFC')), encodeURI(brew.text.normalize('NFC')))),
brew.hash = await md5(this.savedBrew.text); hash : await md5(lastSavedBrew.current.text),
//brew.text = undefined; - Temporary parallel path textBin : undefined,
brew.textBin = undefined; version : lastSavedBrew.current.version
};
const compressedBrew = gzipSync(strToU8(JSON.stringify(brew))); const compressedBrew = gzipSync(strToU8(JSON.stringify(brewToSave)));
const transfer = saveToGoogle === _.isNil(brew.googleId);
const params = transfer ? `?${saveToGoogle ? 'saveToGoogle' : 'removeFromGoogle'}=true` : '';
const transfer = this.state.saveGoogle == _.isNil(this.state.brew.googleId);
const params = `${transfer ? `?${this.state.saveGoogle ? 'saveToGoogle' : 'removeFromGoogle'}=true` : ''}`;
const res = await request const res = await request
.put(`/api/update/${brew.editId}${params}`) .put(`/api/update/${brewToSave.editId}${params}`)
.set('Content-Encoding', 'gzip') .set('Content-Encoding', 'gzip')
.set('Content-Type', 'application/json') .set('Content-Type', 'application/json')
.send(compressedBrew) .send(compressedBrew)
.catch((err)=>{ .catch((err)=>{
console.log('Error Updating Local Brew'); console.error('Error Updating Local Brew');
this.setState({ error: err }); setError(err);
}); });
if(!res) return; if(!res) return;
this.savedBrew = { const updatedFields = {
...preSaveSnapshot, googleId : res.body.googleId ?? null,
googleId : res.body.googleId ? res.body.googleId : null, editId : res.body.editId,
editId : res.body.editId,
shareId : res.body.shareId, shareId : res.body.shareId,
version : res.body.version version : res.body.version
}; };
this.setState((prevState) => ({ lastSavedBrew.current = {
brew: { ...brew,
...prevState.brew, ...updatedFields
googleId : res.body.googleId ? res.body.googleId : null, };
editId : res.body.editId,
shareId : res.body.shareId,
version : res.body.version
},
isSaving : false,
unsavedTime : new Date()
}), ()=>{
this.setState({ unsavedChanges : this.hasChanges() });
});
history.replaceState(null, null, `/edit/${this.savedBrew.editId}`); setCurrentBrew((prevBrew)=>({
}, ...prevBrew,
...updatedFields
}));
renderGoogleDriveIcon : function(){ history.replaceState(null, null, `/edit/${res.body.editId}`);
return <Nav.item className='googleDriveStorage' onClick={this.handleGoogleClick}> };
<img src={googleDriveIcon} className={this.state.saveGoogle ? '' : 'inactive'} alt='Google Drive icon'/>
{this.state.confirmGoogleTransfer && const renderGoogleDriveIcon = ()=>(
<div className='errorContainer' onClick={this.closeAlerts}> <Nav.item className='googleDriveStorage' onClick={handleGoogleClick}>
{ this.state.saveGoogle <img src={googleDriveIcon} className={saveGoogle ? '' : 'inactive'} alt='Google Drive icon' />
? `Would you like to transfer this brew from your Google Drive storage back to the Homebrewery?`
: `Would you like to transfer this brew from the Homebrewery to your personal Google Drive storage?` {confirmGoogleTransfer && (
} <div className='errorContainer' onClick={closeAlerts}>
{saveGoogle
? 'Would you like to transfer this brew from your Google Drive storage back to the Homebrewery?'
: 'Would you like to transfer this brew from the Homebrewery to your personal Google Drive storage?'}
<br /> <br />
<div className='confirm' onClick={this.toggleGoogleStorage}> <div className='confirm' onClick={toggleGoogleStorage}> Yes </div>
Yes <div className='deny'> No </div>
</div>
<div className='deny'>
No
</div>
</div> </div>
} )}
{this.state.alertLoginToTransfer && {alertLoginToTransfer && (
<div className='errorContainer' onClick={this.closeAlerts}> <div className='errorContainer' onClick={closeAlerts}>
You must be signed in to a Google account to transfer You must be signed in to a Google account to transfer between the homebrewery and Google Drive!
between the homebrewery and Google Drive! <a target='_blank' rel='noopener noreferrer' href={`https://www.naturalcrit.com/login?redirect=${window.location.href}`}>
<a target='_blank' rel='noopener noreferrer' <div className='confirm'> Sign In </div>
href={`https://www.naturalcrit.com/login?redirect=${this.state.url}`}>
<div className='confirm'>
Sign In
</div>
</a> </a>
<div className='deny'> <div className='deny'> Not Now </div>
Not Now
</div>
</div> </div>
} )}
{this.state.alertTrashedGoogleBrew && {alertTrashedGoogleBrew && (
<div className='errorContainer' onClick={this.closeAlerts}> <div className='errorContainer' onClick={closeAlerts}>
This brew is currently in your Trash folder on Google Drive!<br />If you want to keep it, make sure to move it before it is deleted permanently!<br /> This brew is currently in your Trash folder on Google Drive!<br />
<div className='confirm'> If you want to keep it, make sure to move it before it is deleted permanently!<br />
OK <div className='confirm'> OK </div>
</div>
</div> </div>
} )}
</Nav.item>; </Nav.item>
}, );
renderSaveButton : function(){
const renderSaveButton = ()=>{
// #1 - Currently saving, show SAVING // #1 - Currently saving, show SAVING
if(this.state.isSaving){ if(isSaving)
return <Nav.item className='save' icon='fas fa-spinner fa-spin'>saving...</Nav.item>; return <Nav.item className='save' icon='fas fa-spinner fa-spin'>saving...</Nav.item>;
}
// #2 - Unsaved changes exist, autosave is OFF and warning timer has expired, show AUTOSAVE WARNING // #2 - Unsaved changes exist, autosave is OFF and warning timer has expired, show AUTOSAVE WARNING
if(this.state.unsavedChanges && this.state.autoSaveWarning){ if(unsavedChanges && warnUnsavedChanges) {
this.setAutosaveWarning(); resetWarnUnsavedTimer();
const elapsedTime = Math.round((new Date() - this.state.unsavedTime) / 1000 / 60); const elapsedTime = Math.round((new Date() - lastSavedTime) / 1000 / 60);
const text = elapsedTime == 0 ? 'Autosave is OFF.' : `Autosave is OFF, and you haven't saved for ${elapsedTime} minutes.`; const text = elapsedTime === 0
? 'Autosave is OFF.'
: `Autosave is OFF, and you haven't saved for ${elapsedTime} minutes.`;
return <Nav.item className='save error' icon='fas fa-exclamation-circle'> return <Nav.item className='save error' icon='fas fa-exclamation-circle'>
Reminder... Reminder...
<div className='errorContainer'> <div className='errorContainer'>{text}</div>
{text}
</div>
</Nav.item>; </Nav.item>;
} }
// #3 - Unsaved changes exist, click to save, show SAVE NOW // #3 - Unsaved changes exist, click to save, show SAVE NOW
// Use trySave(true) instead of save() to use debounced save function if(unsavedChanges)
if(this.state.unsavedChanges){ return <Nav.item className='save' onClick={()=>trySave(true)} color='blue' icon='fas fa-save'>Save Now</Nav.item>;
return <Nav.item className='save' onClick={()=>this.trySave(true)} color='blue' icon='fas fa-save'>Save Now</Nav.item>;
}
// #4 - No unsaved changes, autosave is ON, show AUTO-SAVED // #4 - No unsaved changes, autosave is ON, show AUTO-SAVED
if(this.state.autoSave){ if(autoSaveEnabled)
return <Nav.item className='save saved'>auto-saved.</Nav.item>; return <Nav.item className='save saved'>auto-saved.</Nav.item>;
}
// DEFAULT - No unsaved changes, show SAVED // DEFAULT - No unsaved changes, show SAVED
return <Nav.item className='save saved'>saved.</Nav.item>; return <Nav.item className='save saved'>saved.</Nav.item>;
}, };
handleAutoSave : function(){ const toggleAutoSave = ()=>{
if(this.warningTimer) clearTimeout(this.warningTimer); clearTimeout(warnUnsavedTimeout.current);
this.setState((prevState)=>({ clearTimeout(saveTimeout.current);
autoSave : !prevState.autoSave, localStorage.setItem('AUTOSAVE_ON', JSON.stringify(!autoSaveEnabled));
autoSaveWarning : prevState.autoSave setAutoSaveEnabled(!autoSaveEnabled);
}), ()=>{ setWarnUnsavedChanges(autoSaveEnabled);
localStorage.setItem('AUTOSAVE_ON', JSON.stringify(this.state.autoSave)); };
});
},
setAutosaveWarning : function(){ const renderAutoSaveButton = ()=>(
setTimeout(()=>this.setState({ autoSaveWarning: false }), 4000); // 4 seconds to display <Nav.item onClick={toggleAutoSave}>
this.warningTimer = setTimeout(()=>{this.setState({ autoSaveWarning: true });}, 900000); // 15 minutes between warnings Autosave <i className={autoSaveEnabled ? 'fas fa-power-off active' : 'fas fa-power-off'}></i>
this.warningTimer; </Nav.item>
}, );
errorReported : function(error) { const clearError = ()=>{
this.setState({ setError(null);
error setIsSaving(false);
}); };
},
renderAutoSaveButton : function(){
return <Nav.item onClick={this.handleAutoSave}>
Autosave <i className={this.state.autoSave ? 'fas fa-power-off active' : 'fas fa-power-off'}></i>
</Nav.item>;
},
processShareId : function() {
return this.state.brew.googleId && !this.state.brew.stubbed ?
this.state.brew.googleId + this.state.brew.shareId :
this.state.brew.shareId;
},
getRedditLink : function(){
const shareLink = this.processShareId();
const systems = this.props.brew.systems.length > 0 ? ` [${this.props.brew.systems.join(' - ')}]` : '';
const title = `${this.props.brew.title} ${systems}`;
const text = `Hey guys! I've been working on this homebrew. I'd love your feedback. Check it out.
**[Homebrewery Link](${global.config.baseUrl}/share/${shareLink})**`;
return `https://www.reddit.com/r/UnearthedArcana/submit?title=${encodeURIComponent(title.toWellFormed())}&text=${encodeURIComponent(text)}`;
},
clearError : function(){
setState({
error : null,
isSaving : false
})
},
renderNavbar : function(){
const shareLink = this.processShareId();
const renderNavbar = ()=>{
return <Navbar> return <Navbar>
<Nav.section> <Nav.section>
<Nav.item className='brewTitle'>{this.state.brew.title}</Nav.item> <Nav.item className='brewTitle'>{currentBrew.title}</Nav.item>
</Nav.section> </Nav.section>
<Nav.section> <Nav.section>
{this.renderGoogleDriveIcon()} {renderGoogleDriveIcon()}
{this.state.error ? {error
<ErrorNavItem error={this.state.error} clearError={this.clearError}></ErrorNavItem> : ? <ErrorNavItem error={error} clearError={clearError} />
<Nav.dropdown className='save-menu'> : <Nav.dropdown className='save-menu'>
{this.renderSaveButton()} {renderSaveButton()}
{this.renderAutoSaveButton()} {renderAutoSaveButton()}
</Nav.dropdown> </Nav.dropdown>}
} <NewBrewItem/>
<NewBrew />
<HelpNavItem/> <HelpNavItem/>
<Nav.dropdown> <ShareNavItem brew={currentBrew} />
<Nav.item color='teal' icon='fas fa-share-alt'>
share
</Nav.item>
<Nav.item color='blue' href={`/share/${shareLink}`}>
view
</Nav.item>
<Nav.item color='blue' onClick={()=>{navigator.clipboard.writeText(`${global.config.baseUrl}/share/${shareLink}`);}}>
copy url
</Nav.item>
<Nav.item color='blue' href={this.getRedditLink()} newTab={true} rel='noopener noreferrer'>
post to reddit
</Nav.item>
</Nav.dropdown>
<PrintNavItem /> <PrintNavItem />
<VaultNavItem /> <VaultNavItem />
<RecentNavItem brew={this.state.brew} storageKey='edit' /> <RecentNavItem brew={currentBrew} storageKey='edit' />
<Account /> <AccountNavItem/>
</Nav.section> </Nav.section>
</Navbar>; </Navbar>;
}, };
render : function(){ return (
return <div className='editPage sitePage'> <div className='editPage sitePage'>
<Meta name='robots' content='noindex, nofollow' /> <Meta name='robots' content='noindex, nofollow' />
{this.renderNavbar()}
{this.props.brew.lock && <LockNotification shareId={this.props.brew.shareId} message={this.props.brew.lock.editMessage} reviewRequested={this.props.brew.lock.reviewRequested} />} {renderNavbar()}
{currentBrew.lock && <LockNotification shareId={currentBrew.shareId} message={currentBrew.lock.editMessage} reviewRequested={currentBrew.lock.reviewRequested}/>}
<div className='content'> <div className='content'>
<SplitPane onDragFinish={this.handleSplitMove}> <SplitPane onDragFinish={handleSplitMove}>
<Editor <Editor
ref={this.editor} ref={editorRef}
brew={this.state.brew} brew={currentBrew}
onTextChange={this.handleTextChange} onTextChange={handleTextChange}
onStyleChange={this.handleStyleChange} onStyleChange={handleStyleChange}
onSnipChange={this.handleSnipChange} onSnipChange={handleSnipChange}
onMetaChange={this.handleMetaChange} onMetaChange={handleMetaChange}
reportError={this.errorReported} reportError={setError}
renderer={this.state.brew.renderer} renderer={currentBrew.renderer}
userThemes={this.props.userThemes} userThemes={props.userThemes}
themeBundle={this.state.themeBundle} themeBundle={themeBundle}
updateBrew={this.updateBrew} updateBrew={updateBrew}
onCursorPageChange={this.handleEditorCursorPageChange} onCursorPageChange={handleEditorCursorPageChange}
onViewPageChange={this.handleEditorViewPageChange} onViewPageChange={handleEditorViewPageChange}
currentEditorViewPageNum={this.state.currentEditorViewPageNum} currentEditorViewPageNum={currentEditorViewPageNum}
currentEditorCursorPageNum={this.state.currentEditorCursorPageNum} currentEditorCursorPageNum={currentEditorCursorPageNum}
currentBrewRendererPageNum={this.state.currentBrewRendererPageNum} currentBrewRendererPageNum={currentBrewRendererPageNum}
/> />
<BrewRenderer <BrewRenderer
text={this.state.brew.text} text={currentBrew.text}
style={this.state.brew.style} style={currentBrew.style}
renderer={this.state.brew.renderer} renderer={currentBrew.renderer}
theme={this.state.brew.theme} theme={currentBrew.theme}
themeBundle={this.state.themeBundle} themeBundle={themeBundle}
errors={this.state.htmlErrors} errors={HTMLErrors}
lang={this.state.brew.lang} lang={currentBrew.lang}
onPageChange={this.handleBrewRendererPageChange} onPageChange={handleBrewRendererPageChange}
currentEditorViewPageNum={this.state.currentEditorViewPageNum} currentEditorViewPageNum={currentEditorViewPageNum}
currentEditorCursorPageNum={this.state.currentEditorCursorPageNum} currentEditorCursorPageNum={currentEditorCursorPageNum}
currentBrewRendererPageNum={this.state.currentBrewRendererPageNum} currentBrewRendererPageNum={currentBrewRendererPageNum}
allowPrint={true} allowPrint={true}
/> />
</SplitPane> </SplitPane>
</div> </div>
</div>; </div>
} );
}); };
module.exports = EditPage; module.exports = EditPage;

570
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -138,16 +138,16 @@
"devDependencies": { "devDependencies": {
"@stylistic/stylelint-plugin": "^4.0.0", "@stylistic/stylelint-plugin": "^4.0.0",
"babel-plugin-transform-import-meta": "^2.3.3", "babel-plugin-transform-import-meta": "^2.3.3",
"eslint": "^9.34.0", "eslint": "^9.35.0",
"eslint-plugin-jest": "^29.0.1", "eslint-plugin-jest": "^29.0.1",
"eslint-plugin-react": "^7.37.5", "eslint-plugin-react": "^7.37.5",
"globals": "^16.3.0", "globals": "^16.3.0",
"jest": "^30.0.5", "jest": "^30.1.3",
"jest-expect-message": "^1.1.3", "jest-expect-message": "^1.1.3",
"jsdom-global": "^3.0.2", "jsdom-global": "^3.0.2",
"postcss-less": "^6.0.0", "postcss-less": "^6.0.0",
"stylelint": "^16.23.1", "stylelint": "^16.24.0",
"stylelint-config-recess-order": "^7.2.0", "stylelint-config-recess-order": "^7.3.0",
"stylelint-config-recommended": "^17.0.0", "stylelint-config-recommended": "^17.0.0",
"supertest": "^7.1.4" "supertest": "^7.1.4"
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 137 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 236 B

View File

@@ -0,0 +1,6 @@
{
"name" : "UnearthedArcana",
"renderer" : "V3",
"baseTheme" : false,
"baseSnippets" : false
}

View File

@@ -0,0 +1,38 @@
@import (less) './themes/fonts/5e/fonts.less';
@import (less) './themes/assets/assets.less';
:root {
//Colors
--HB_Color_Background : #FFFFFF; // White
--HB_Color_WatercolorStain : #000000; // Black
}
.page {
font-family: Cambria,Georgia,serif;
font-size: 14px;
h1, h2, h3, h4 {
font-variant: small-caps;
font-weight: normal;
}
h1 {
column-span: all;
-webkit-column-span: all;
font-size: 40px;
}
h2 {
font-size: 26px;
}
h3 {
font-size: 20px;
border-bottom: 2px solid black;
}
h4 {
font-size: 18px;
}
h5 {
font-size: 16px;
}
h6 {
font-size: 14px;
}
}

View File

@@ -35,6 +35,13 @@
"baseTheme": "Blank", "baseTheme": "Blank",
"baseSnippets": "5ePHB", "baseSnippets": "5ePHB",
"path": "Journal" "path": "Journal"
},
"UnearthedArcana": {
"name": "UnearthedArcana",
"renderer": "V3",
"baseTheme": false,
"baseSnippets": false,
"path": "UnearthedArcana"
} }
} }
} }