0
0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-05 03:42:38 +00:00

Merge branch 'master' into fixUserPageLinks-#807

This commit is contained in:
G.Ambatte
2025-09-20 20:23:58 +12:00
committed by GitHub
10 changed files with 835 additions and 897 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,415 @@
/* 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 [saveGoogle , setSaveGoogle ] = useState(!!props.brew.googleId);
isSaving : false, const [error , setError ] = useState(null);
unsavedChanges : false, const [HTMLErrors , setHTMLErrors ] = useState(Markdown.validate(props.brew.text));
alertTrashedGoogleBrew : this.props.brew.trashed, const [currentEditorViewPageNum , setCurrentEditorViewPageNum ] = useState(1);
alertLoginToTransfer : false, const [currentEditorCursorPageNum, setCurrentEditorCursorPageNum] = useState(1);
saveGoogle : this.props.brew.googleId ? true : false, const [currentBrewRendererPageNum, setCurrentBrewRendererPageNum] = useState(1);
confirmGoogleTransfer : false, const [themeBundle , setThemeBundle ] = useState({});
error : null, const [unsavedChanges , setUnsavedChanges ] = useState(false);
htmlErrors : Markdown.validate(this.props.brew.text), const [alertTrashedGoogleBrew , setAlertTrashedGoogleBrew ] = useState(props.brew.trashed);
url : '', const [alertLoginToTransfer , setAlertLoginToTransfer ] = useState(false);
autoSave : true, const [confirmGoogleTransfer , setConfirmGoogleTransfer ] = useState(false);
autoSaveWarning : false, const [url , setUrl ] = useState('');
unsavedTime : new Date(), const [autoSaveEnabled , setAutoSaveEnabled ] = useState(true);
currentEditorViewPageNum : 1, const [autoSaveWarning , setAutoSaveWarning ] = useState(true);
currentEditorCursorPageNum : 1, const [unsavedTime , setUnsavedTime ] = useState(new Date());
currentBrewRendererPageNum : 1,
displayLockMessage : this.props.brew.lock || false,
themeBundle : {}
};
},
editor : React.createRef(null), const editorRef = useRef(null);
savedBrew : null, const savedBrew = useRef(_.cloneDeep(props.brew));
const warningTimer = useRef(null);
const debounceSave = useCallback(_.debounce((brew, saveToGoogle)=>save(brew, saveToGoogle), SAVE_TIMEOUT), []);
componentDidMount : function(){ useEffect(()=>{
this.setState({ setUrl(window.location.href);
url : window.location.href
});
this.savedBrew = JSON.parse(JSON.stringify(this.props.brew)); //Deep copy const autoSavePref = JSON.parse(localStorage.getItem('AUTOSAVE_ON') ?? true);
setAutoSaveEnabled(autoSavePref);
this.setState({ autoSave: JSON.parse(localStorage.getItem('AUTOSAVE_ON')) ?? true }, ()=>{ setAutoSaveWarning(!autoSavePref);
if(this.state.autoSave){ setHTMLErrors(Markdown.validate(currentBrew.text));
this.trySave(); fetchThemeBundle(setError, setThemeBundle, currentBrew.renderer, currentBrew.theme);
} else {
this.setState({ autoSaveWarning: true });
}
});
document.addEventListener('keydown', handleControlKeys);
window.onbeforeunload = ()=>{ window.onbeforeunload = ()=>{
if(this.state.isSaving || this.state.unsavedChanges){ if(isSaving || unsavedChanges)
return 'You have unsaved changes!'; return 'You have unsaved changes!';
}
}; };
this.setState((prevState)=>({ return ()=>{
htmlErrors : Markdown.validate(prevState.brew.text) document.removeEventListener('keydown', handleControlKeys);
})); window.onbeforeunload = null;
};
}, []);
fetchThemeBundle((err)=>{this.setState({ error: err })}, (theme)=>{this.setState({ themeBundle: theme })}, this.props.brew.renderer, this.props.brew.theme); useEffect(()=>{
const hasChange = !_.isEqual(currentBrew, savedBrew.current);
setUnsavedChanges(hasChange);
document.addEventListener('keydown', this.handleControlKeys); if(hasChange && autoSaveEnabled) trySave();
}, }, [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 handleControlKeys = (e)=>{
if(!(e.ctrlKey || e.metaKey)) return; if(!(e.ctrlKey || e.metaKey)) return;
const S_KEY = 83; const S_KEY = 83;
const P_KEY = 80; const P_KEY = 80;
if(e.keyCode == S_KEY) this.trySave(true); if(e.keyCode === S_KEY) trySave(true);
if(e.keyCode == P_KEY) printCurrentBrew(); if(e.keyCode === P_KEY) printCurrentBrew();
if(e.keyCode == P_KEY || e.keyCode == S_KEY){ if(e.keyCode === S_KEY || e.keyCode === P_KEY) {
e.stopPropagation(); e.stopPropagation();
e.preventDefault(); e.preventDefault();
} }
}, };
handleSplitMove : function(){ const handleSplitMove = ()=>{
this.editor.current.update(); editorRef.current?.update();
}, };
handleEditorViewPageChange : function(pageNumber){ const handleEditorViewPageChange = (pageNumber)=>{
this.setState({ currentEditorViewPageNum: pageNumber }); setCurrentEditorViewPageNum(pageNumber);
}, };
handleEditorCursorPageChange : function(pageNumber){ const handleEditorCursorPageChange = (pageNumber)=>{
this.setState({ currentEditorCursorPageNum: pageNumber }); setCurrentEditorCursorPageNum(pageNumber);
}, };
handleBrewRendererPageChange : function(pageNumber){ const handleBrewRendererPageChange = (pageNumber)=>{
this.setState({ currentBrewRendererPageNum: pageNumber }); setCurrentBrewRendererPageNum(pageNumber);
}, };
handleTextChange : function(text){ const handleTextChange = (text)=>{
//If there are errors, run the validator on every change to give quick feedback //If there are HTML errors, run the validator on every change to give quick feedback
let htmlErrors = this.state.htmlErrors; if(HTMLErrors.length)
if(htmlErrors.length) htmlErrors = Markdown.validate(text); setHTMLErrors(Markdown.validate(text));
setCurrentBrew((prevBrew)=>({ ...prevBrew, text }));
};
this.setState((prevState)=>({ const handleStyleChange = (style)=>{
brew : { ...prevState.brew, text: text }, setCurrentBrew((prevBrew)=>({ ...prevBrew, style }));
htmlErrors : htmlErrors, };
}), ()=>{if(this.state.autoSave) this.trySave();});
},
handleSnipChange : function(snippet){ const handleSnipChange = (snippet)=>{
//If there are errors, run the validator on every change to give quick feedback //If there are HTML errors, run the validator on every change to give quick feedback
let htmlErrors = this.state.htmlErrors; if(HTMLErrors.length)
if(htmlErrors.length) htmlErrors = Markdown.validate(snippet); setHTMLErrors(Markdown.validate(snippet));
setCurrentBrew((prevBrew)=>({ ...prevBrew, snippets: snippet }));
};
this.setState((prevState)=>({ const handleMetaChange = (metadata, field = undefined)=>{
brew : { ...prevState.brew, snippets: snippet }, if(field === 'theme' || field === 'renderer')
unsavedChanges : true, fetchThemeBundle(setError, setThemeBundle, metadata.renderer, metadata.theme);
htmlErrors : htmlErrors,
}), ()=>{if(this.state.autoSave) this.trySave();});
},
handleStyleChange : function(style){ setCurrentBrew((prev)=>({ ...prev, ...metadata }));
this.setState((prevState)=>({ };
brew : { ...prevState.brew, style: style }
}), ()=>{if(this.state.autoSave) this.trySave();});
},
handleMetaChange : function(metadata, field=undefined){ const updateBrew = (newData)=>setCurrentBrew((prevBrew)=>({
if(field == 'theme' || field == 'renderer') // Fetch theme bundle only if theme or renderer was changed ...prevBrew,
fetchThemeBundle((err)=>{this.setState({ error: err })}, (theme)=>{this.setState({ themeBundle: theme })}, metadata.renderer, metadata.theme); style : newData.style,
text : newData.text,
snippets : newData.snippets
}));
this.setState((prevState)=>({ const trySave = (immediate = false)=>{
brew : { //debounceSave = _.debounce(save, SAVE_TIMEOUT);
...prevState.brew, if(isSaving) return;
...metadata
}
}), ()=>{if(this.state.autoSave) this.trySave();});
},
hasChanges : function(){ const hasChange = !_.isEqual(currentBrew, savedBrew.current);
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) { if(immediate) {
this.debounceSave(); debounceSave(currentBrew, saveGoogle);
this.debounceSave.flush(); debounceSave.flush?.();
return; return;
} }
if(this.hasChanges()) if(hasChange)
this.debounceSave(); debounceSave(currentBrew, saveGoogle);
else else
this.debounceSave.cancel(); debounceSave.cancel?.();
}, };
handleGoogleClick : function(){ const handleGoogleClick = ()=>{
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 save = async (brew, saveToGoogle)=>{
const preSaveSnapshot = { ...brewState }; debounceSave?.cancel?.();
this.setState((prevState)=>({ setIsSaving(true);
isSaving : true, setError(null);
error : null, setHTMLErrors(Markdown.validate(brew.text));
htmlErrors : Markdown.validate(prevState.brew.text)
}));
await updateHistory(this.state.brew).catch(console.error); 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(savedBrew.current.text.normalize('NFC')), encodeURI(brew.text.normalize('NFC')))),
brew.hash = await md5(this.savedBrew.text); hash : await md5(savedBrew.current.text),
//brew.text = undefined; - Temporary parallel path textBin : undefined
brew.textBin = undefined; };
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 { googleId, editId, shareId, version } = res.body;
...preSaveSnapshot,
googleId : res.body.googleId ? res.body.googleId : null, savedBrew.current = {
editId : res.body.editId, ...brew,
shareId : res.body.shareId, googleId : googleId ?? null,
version : res.body.version editId,
shareId,
version
}; };
this.setState((prevState) => ({ setCurrentBrew(savedBrew.current);
brew: {
...prevState.brew,
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}`); setIsSaving(false);
}, setUnsavedTime(new Date());
renderGoogleDriveIcon : function(){ history.replaceState(null, null, `/edit/${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=${url}`}>
<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 && autoSaveWarning) {
this.setAutosaveWarning(); resetAutoSaveWarning();
const elapsedTime = Math.round((new Date() - this.state.unsavedTime) / 1000 / 60); const elapsedTime = Math.round((new Date() - unsavedTime) / 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} </Nav.item>
</div>
</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); if(warningTimer.current) clearTimeout(warningTimer.current);
this.setState((prevState)=>({ localStorage.setItem('AUTOSAVE_ON', JSON.stringify(!autoSaveEnabled));
autoSave : !prevState.autoSave, setAutoSaveWarning(autoSaveWarning);
autoSaveWarning : prevState.autoSave setAutoSaveEnabled(!autoSaveEnabled);
}), ()=>{ };
localStorage.setItem('AUTOSAVE_ON', JSON.stringify(this.state.autoSave));
});
},
setAutosaveWarning : function(){ const resetAutoSaveWarning = ()=>{
setTimeout(()=>this.setState({ autoSaveWarning: false }), 4000); // 4 seconds to display setTimeout(()=>setAutoSaveWarning(false), UNSAVED_WARNING_POPUP_TIMEOUT); // Hide the warning after 4 seconds
this.warningTimer = setTimeout(()=>{this.setState({ autoSaveWarning: true });}, 900000); // 15 minutes between warnings warningTimer.current = setTimeout(()=>setAutoSaveWarning(true), UNSAVED_WARNING_TIMEOUT); // 15 minutes between unsaved changes warnings
this.warningTimer; };
},
errorReported : function(error) { const renderAutoSaveButton = ()=>(
this.setState({ <Nav.item onClick={toggleAutoSave}>
error Autosave <i className={autoSaveEnabled ? 'fas fa-power-off active' : 'fas fa-power-off'}></i>
}); </Nav.item>
}, );
renderAutoSaveButton : function(){ const clearError = ()=>{
return <Nav.item onClick={this.handleAutoSave}> setError(null);
Autosave <i className={this.state.autoSave ? 'fas fa-power-off active' : 'fas fa-power-off'}></i> setIsSaving(false);
</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;

View File

@@ -1,282 +1,251 @@
/*eslint max-lines: ["warn", {"max": 300, "skipBlankLines": true, "skipComments": true}]*/ /*eslint max-lines: ["warn", {"max": 300, "skipBlankLines": true, "skipComments": true}]*/
require('./newPage.less'); import './newPage.less';
const React = require('react');
const createClass = require('create-react-class');
import request from '../../utils/request-middleware.js';
import Markdown from 'naturalcrit/markdown.js'; import React, { useState, useEffect, useRef } from 'react';
import request from '../../utils/request-middleware.js';
import Markdown from 'naturalcrit/markdown.js';
const Nav = require('naturalcrit/nav/nav.jsx'); import Nav from 'naturalcrit/nav/nav.jsx';
const PrintNavItem = require('../../navbar/print.navitem.jsx'); import Navbar from '../../navbar/navbar.jsx';
const Navbar = require('../../navbar/navbar.jsx'); import AccountNavItem from '../../navbar/account.navitem.jsx';
const AccountNavItem = require('../../navbar/account.navitem.jsx'); import ErrorNavItem from '../../navbar/error-navitem.jsx';
const ErrorNavItem = require('../../navbar/error-navitem.jsx'); import HelpNavItem from '../../navbar/help.navitem.jsx';
const RecentNavItem = require('../../navbar/recent.navitem.jsx').both; import PrintNavItem from '../../navbar/print.navitem.jsx';
const HelpNavItem = require('../../navbar/help.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 { DEFAULT_BREW } = require('../../../../server/brewDefaults.js'); import { DEFAULT_BREW } from '../../../../server/brewDefaults.js';
const { printCurrentBrew, fetchThemeBundle } = require('../../../../shared/helpers.js'); import { printCurrentBrew, fetchThemeBundle, splitTextStyleAndMetadata } from '../../../../shared/helpers.js';
const BREWKEY = 'homebrewery-new'; const BREWKEY = 'homebrewery-new';
const STYLEKEY = 'homebrewery-new-style'; const STYLEKEY = 'homebrewery-new-style';
const METAKEY = 'homebrewery-new-meta'; const METAKEY = 'homebrewery-new-meta';
let SAVEKEY; const SAVEKEY = `HOMEBREWERY-DEFAULT-SAVE-LOCATION-${global.account?.username || ''}`;
const NewPage = (props) => {
props = {
brew: DEFAULT_BREW,
...props
};
const NewPage = createClass({ const [currentBrew , setCurrentBrew ] = useState(props.brew);
displayName : 'NewPage', const [isSaving , setIsSaving ] = useState(false);
getDefaultProps : function() { const [saveGoogle , setSaveGoogle ] = useState(global.account?.googleId ? true : false);
return { const [error , setError ] = useState(null);
brew : DEFAULT_BREW const [HTMLErrors , setHTMLErrors ] = useState(Markdown.validate(props.brew.text));
const [currentEditorViewPageNum , setCurrentEditorViewPageNum ] = useState(1);
const [currentEditorCursorPageNum, setCurrentEditorCursorPageNum] = useState(1);
const [currentBrewRendererPageNum, setCurrentBrewRendererPageNum] = useState(1);
const [themeBundle , setThemeBundle ] = useState({});
const editorRef = useRef(null);
useEffect(() => {
document.addEventListener('keydown', handleControlKeys);
loadBrew();
fetchThemeBundle(setError, setThemeBundle, currentBrew.renderer, currentBrew.theme);
return () => {
document.removeEventListener('keydown', handleControlKeys);
}; };
}, }, []);
getInitialState : function() { const loadBrew = ()=>{
const brew = this.props.brew; const brew = { ...currentBrew };
if(!brew.shareId && typeof window !== 'undefined') { //Load from localStorage if in client browser
return {
brew : brew,
isSaving : false,
saveGoogle : (global.account && global.account.googleId ? true : false),
error : null,
htmlErrors : Markdown.validate(brew.text),
currentEditorViewPageNum : 1,
currentEditorCursorPageNum : 1,
currentBrewRendererPageNum : 1,
themeBundle : {}
};
},
editor : React.createRef(null),
componentDidMount : function() {
document.addEventListener('keydown', this.handleControlKeys);
const brew = this.state.brew;
if(!this.props.brew.shareId && typeof window !== 'undefined') { //Load from localStorage if in client browser
const brewStorage = localStorage.getItem(BREWKEY); const brewStorage = localStorage.getItem(BREWKEY);
const styleStorage = localStorage.getItem(STYLEKEY); const styleStorage = localStorage.getItem(STYLEKEY);
const metaStorage = JSON.parse(localStorage.getItem(METAKEY)); const metaStorage = JSON.parse(localStorage.getItem(METAKEY));
brew.text = brewStorage ?? brew.text; brew.text = brewStorage ?? brew.text;
brew.style = styleStorage ?? brew.style; brew.style = styleStorage ?? brew.style;
// brew.title = metaStorage?.title || this.state.brew.title;
// brew.description = metaStorage?.description || this.state.brew.description;
brew.renderer = metaStorage?.renderer ?? brew.renderer; brew.renderer = metaStorage?.renderer ?? brew.renderer;
brew.theme = metaStorage?.theme ?? brew.theme; brew.theme = metaStorage?.theme ?? brew.theme;
brew.lang = metaStorage?.lang ?? brew.lang; brew.lang = metaStorage?.lang ?? brew.lang;
} }
SAVEKEY = `HOMEBREWERY-DEFAULT-SAVE-LOCATION-${global.account?.username || ''}`;
const saveStorage = localStorage.getItem(SAVEKEY) || 'HOMEBREWERY'; const saveStorage = localStorage.getItem(SAVEKEY) || 'HOMEBREWERY';
this.setState({ setCurrentBrew(brew);
brew : brew, setSaveGoogle(saveStorage == 'GOOGLE-DRIVE' && saveGoogle);
saveGoogle : (saveStorage == 'GOOGLE-DRIVE' && this.state.saveGoogle)
});
fetchThemeBundle((err)=>{this.setState({ error: err })}, (theme)=>{this.setState({ themeBundle: theme })}, this.props.brew.renderer, this.props.brew.theme);
localStorage.setItem(BREWKEY, brew.text); localStorage.setItem(BREWKEY, brew.text);
if(brew.style) if(brew.style)
localStorage.setItem(STYLEKEY, brew.style); localStorage.setItem(STYLEKEY, brew.style);
localStorage.setItem(METAKEY, JSON.stringify({ 'renderer': brew.renderer, 'theme': brew.theme, 'lang': brew.lang })); localStorage.setItem(METAKEY, JSON.stringify({ renderer: brew.renderer, theme: brew.theme, lang: brew.lang }));
if(window.location.pathname != '/new') { if(window.location.pathname !== '/new')
window.history.replaceState({}, window.location.title, '/new/'); window.history.replaceState({}, window.location.title, '/new/');
} };
},
componentWillUnmount : function() {
document.removeEventListener('keydown', this.handleControlKeys);
},
handleControlKeys : function(e){ const handleControlKeys = (e) => {
if(!(e.ctrlKey || e.metaKey)) return; if (!(e.ctrlKey || e.metaKey)) return;
const S_KEY = 83; const S_KEY = 83;
const P_KEY = 80; const P_KEY = 80;
if(e.keyCode == S_KEY) this.save(); if (e.keyCode === S_KEY) save();
if(e.keyCode == P_KEY) printCurrentBrew(); if (e.keyCode === P_KEY) printCurrentBrew();
if(e.keyCode == P_KEY || e.keyCode == S_KEY){ if (e.keyCode === S_KEY || e.keyCode === P_KEY) {
e.stopPropagation();
e.preventDefault(); e.preventDefault();
e.stopPropagation();
} }
}, };
handleSplitMove : function(){ const handleSplitMove = ()=>{
this.editor.current.update(); editorRef.current.update();
}, };
handleEditorViewPageChange : function(pageNumber){ const handleEditorViewPageChange = (pageNumber)=>{
this.setState({ currentEditorViewPageNum: pageNumber }); setCurrentEditorViewPageNum(pageNumber);
}, };
const handleEditorCursorPageChange = (pageNumber)=>{
setCurrentEditorCursorPageNum(pageNumber);
};
const handleBrewRendererPageChange = (pageNumber)=>{
setCurrentBrewRendererPageNum(pageNumber);
};
handleEditorCursorPageChange : function(pageNumber){ const handleTextChange = (text)=>{
this.setState({ currentEditorCursorPageNum: pageNumber }); //If there are HTML errors, run the validator on every change to give quick feedback
}, if(HTMLErrors.length)
HTMLErrors = Markdown.validate(text);
handleBrewRendererPageChange : function(pageNumber){ setHTMLErrors(HTMLErrors);
this.setState({ currentBrewRendererPageNum: pageNumber }); setCurrentBrew((prevBrew) => ({ ...prevBrew, text }));
},
handleTextChange : function(text){
//If there are errors, run the validator on every change to give quick feedback
let htmlErrors = this.state.htmlErrors;
if(htmlErrors.length) htmlErrors = Markdown.validate(text);
this.setState((prevState)=>({
brew : { ...prevState.brew, text: text },
htmlErrors : htmlErrors,
}));
localStorage.setItem(BREWKEY, text); localStorage.setItem(BREWKEY, text);
}, };
handleStyleChange : function(style){ const handleStyleChange = (style) => {
this.setState((prevState)=>({ setCurrentBrew(prevBrew => ({ ...prevBrew, style }));
brew : { ...prevState.brew, style: style },
}));
localStorage.setItem(STYLEKEY, style); localStorage.setItem(STYLEKEY, style);
}, };
handleSnipChange : function(snippet){ const handleSnipChange = (snippet)=>{
//If there are errors, run the validator on every change to give quick feedback //If there are HTML errors, run the validator on every change to give quick feedback
let htmlErrors = this.state.htmlErrors; if(HTMLErrors.length)
if(htmlErrors.length) htmlErrors = Markdown.validate(snippet); HTMLErrors = Markdown.validate(snippet);
this.setState((prevState)=>({ setHTMLErrors(HTMLErrors);
brew : { ...prevState.brew, snippets: snippet }, setCurrentBrew((prevBrew) => ({ ...prevBrew, snippets: snippet }));
htmlErrors : htmlErrors, };
}), ()=>{if(this.state.autoSave) this.trySave();});
},
handleMetaChange : function(metadata, field=undefined){ const handleMetaChange = (metadata, field = undefined) => {
if(field == 'theme' || field == 'renderer') // Fetch theme bundle only if theme or renderer was changed if (field === 'theme' || field === 'renderer')
fetchThemeBundle((err)=>{this.setState({ error: err })}, (theme)=>{this.setState({ themeBundle: theme })}, metadata.renderer, metadata.theme); fetchThemeBundle(setError, setThemeBundle, metadata.renderer, metadata.theme);
this.setState((prevState)=>({ setCurrentBrew(prev => ({ ...prev, ...metadata }));
brew : { ...prevState.brew, ...metadata }, localStorage.setItem(METAKEY, JSON.stringify({
}), ()=>{ renderer : metadata.renderer,
localStorage.setItem(METAKEY, JSON.stringify({ theme : metadata.theme,
// 'title' : this.state.brew.title, lang : metadata.lang
// 'description' : this.state.brew.description, }));
'renderer' : this.state.brew.renderer, };
'theme' : this.state.brew.theme,
'lang' : this.state.brew.lang
}));
});
;
},
save : async function(){ const save = async () => {
this.setState({ setIsSaving(true);
isSaving : true
});
let brew = this.state.brew; let updatedBrew = { ...currentBrew };
// Split out CSS to Style if CSS codefence exists splitTextStyleAndMetadata(updatedBrew);
if(brew.text.startsWith('```css') && brew.text.indexOf('```\n\n') > 0) {
const index = brew.text.indexOf('```\n\n'); const pageRegex = updatedBrew.renderer === 'legacy' ? /\\page/g : /^\\page$/gm;
brew.style = `${brew.style ? `${brew.style}\n` : ''}${brew.text.slice(7, index - 1)}`; updatedBrew.pageCount = (updatedBrew.text.match(pageRegex) || []).length + 1;
brew.text = brew.text.slice(index + 5);
}
brew.pageCount=((brew.renderer=='legacy' ? brew.text.match(/\\page/g) : brew.text.match(/^\\page$/gm)) || []).length + 1;
const res = await request const res = await request
.post(`/api${this.state.saveGoogle ? '?saveToGoogle=true' : ''}`) .post(`/api${saveGoogle ? '?saveToGoogle=true' : ''}`)
.send(brew) .send(updatedBrew)
.catch((err)=>{ .catch((err) => {
this.setState({ isSaving: false, error: err }); setIsSaving(false);
setError(err);
}); });
if(!res) return;
brew = res.body; setIsSaving(false)
if (!res) return;
const savedBrew = res.body;
localStorage.removeItem(BREWKEY); localStorage.removeItem(BREWKEY);
localStorage.removeItem(STYLEKEY); localStorage.removeItem(STYLEKEY);
localStorage.removeItem(METAKEY); localStorage.removeItem(METAKEY);
window.location = `/edit/${brew.editId}`; window.location = `/edit/${savedBrew.editId}`;
}, };
renderSaveButton : function(){ const renderSaveButton = ()=>{
if(this.state.isSaving){ if(isSaving){
return <Nav.item icon='fas fa-spinner fa-spin' className='save'> return <Nav.item icon='fas fa-spinner fa-spin' className='save'>
save... save...
</Nav.item>; </Nav.item>;
} else { } else {
return <Nav.item icon='fas fa-save' className='save' onClick={this.save}> return <Nav.item icon='fas fa-save' className='save' onClick={save}>
save save
</Nav.item>; </Nav.item>;
} }
}, };
clearError : function(){ const clearError = ()=>{
setState({ setError(null);
error : null, setIsSaving(false);
isSaving : false };
})
},
renderNavbar : function(){
return <Navbar>
const renderNavbar = () => (
<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.state.error ? {error
<ErrorNavItem error={this.state.error} clearError={this.clearError}></ErrorNavItem> : ? <ErrorNavItem error={error} clearError={clearError} />
this.renderSaveButton() : renderSaveButton()}
}
<PrintNavItem /> <PrintNavItem />
<HelpNavItem /> <HelpNavItem />
<RecentNavItem /> <RecentNavItem />
<AccountNavItem /> <AccountNavItem />
</Nav.section> </Nav.section>
</Navbar>; </Navbar>
}, );
render : function(){ return (
return <div className='newPage sitePage'> <div className='newPage sitePage'>
{this.renderNavbar()} {renderNavbar()}
<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}
onMetaChange={this.handleMetaChange} onMetaChange={handleMetaChange}
onSnipChange={this.handleSnipChange} onSnipChange={handleSnipChange}
renderer={this.state.brew.renderer} renderer={currentBrew.renderer}
userThemes={this.props.userThemes} userThemes={props.userThemes}
themeBundle={this.state.themeBundle} themeBundle={themeBundle}
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 = NewPage; module.exports = NewPage;

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"
} }
} }
} }