mirror of
https://github.com/naturalcrit/homebrewery.git
synced 2026-01-27 18:13:08 +00:00
Compare commits
1 Commits
vitreum-to
...
dependabot
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9f62e85ee8 |
30
changelog.md
30
changelog.md
@@ -83,40 +83,12 @@ pre {
|
|||||||
.page .exampleTable td,th {
|
.page .exampleTable td,th {
|
||||||
border:1px dashed #00000030;
|
border:1px dashed #00000030;
|
||||||
}
|
}
|
||||||
|
|
||||||
.page .df {
|
|
||||||
font-size: 2em;
|
|
||||||
vertical-align: middle;
|
|
||||||
}
|
|
||||||
```
|
```
|
||||||
|
|
||||||
## changelog
|
## changelog
|
||||||
For a full record of development, visit our [Github Page](https://github.com/naturalcrit/homebrewery).
|
For a full record of development, visit our [Github Page](https://github.com/naturalcrit/homebrewery).
|
||||||
|
|
||||||
### Friday 1/11/2026 - v3.20.1
|
### Friday 11/14/2025 - v13.20.0
|
||||||
|
|
||||||
{{taskList
|
|
||||||
##### calculuschild
|
|
||||||
* [x] Add D100 "ball" dice icons `:d100:` :df_d100_05:
|
|
||||||
|
|
||||||
##### G-Ambatte
|
|
||||||
* [x] Fix transparent edge on back cover image
|
|
||||||
|
|
||||||
Fixes issue [#4551](https://github.com/naturalcrit/homebrewery/issues/4551)
|
|
||||||
|
|
||||||
* [x] Fix "Out of sync" error when document contains extended unicode characters
|
|
||||||
|
|
||||||
Fixes issue [#4583](https://github.com/naturalcrit/homebrewery/issues/4583)
|
|
||||||
|
|
||||||
##### 5e-Cleric
|
|
||||||
* [x] Fix page count error on Vault
|
|
||||||
|
|
||||||
* [x] Fix cover page footnote set to all-caps
|
|
||||||
|
|
||||||
Fixes issue [#4559](https://github.com/naturalcrit/homebrewery/issues/4559)
|
|
||||||
}}
|
|
||||||
|
|
||||||
### Friday 11/14/2025 - v3.20.0
|
|
||||||
|
|
||||||
{{taskList
|
{{taskList
|
||||||
##### calculuschild
|
##### calculuschild
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import './admin.less';
|
import './admin.less';
|
||||||
import React, { useEffect, useState } from 'react';
|
import React, { useEffect, useState } from 'react';
|
||||||
import BrewUtils from './brewUtils/brewUtils.jsx';
|
const BrewUtils = require('./brewUtils/brewUtils.jsx');
|
||||||
import NotificationUtils from './notificationUtils/notificationUtils.jsx';
|
const NotificationUtils = require('./notificationUtils/notificationUtils.jsx');
|
||||||
import AuthorUtils from './authorUtils/authorUtils.jsx';
|
import AuthorUtils from './authorUtils/authorUtils.jsx';
|
||||||
import LockTools from './lockTools/lockTools.jsx';
|
import LockTools from './lockTools/lockTools.jsx';
|
||||||
|
|
||||||
@@ -49,4 +49,4 @@ const Admin = ()=>{
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default Admin;
|
module.exports = Admin;
|
||||||
|
|||||||
@@ -1,10 +1,12 @@
|
|||||||
@import './shared/naturalcrit/styles/reset.less';
|
@import 'naturalcrit/styles/reset.less';
|
||||||
@import './shared/naturalcrit/styles/elements.less';
|
@import 'naturalcrit/styles/elements.less';
|
||||||
@import './shared/naturalcrit/styles/animations.less';
|
@import 'naturalcrit/styles/animations.less';
|
||||||
@import './shared/naturalcrit/styles/colors.less';
|
@import 'naturalcrit/styles/colors.less';
|
||||||
@import './shared/naturalcrit/styles/tooltip.less';
|
@import 'naturalcrit/styles/tooltip.less';
|
||||||
@import './themes/fonts/iconFonts/fontAwesome.less';
|
@import './themes/fonts/iconFonts/fontAwesome.less';
|
||||||
|
|
||||||
|
@import 'font-awesome/css/font-awesome.css';
|
||||||
|
|
||||||
html,body, #reactContainer, .naturalCrit { min-height : 100%; }
|
html,body, #reactContainer, .naturalCrit { min-height : 100%; }
|
||||||
|
|
||||||
@sidebarWidth : 250px;
|
@sidebarWidth : 250px;
|
||||||
|
|||||||
@@ -84,4 +84,4 @@ const authorLookup = ()=>{
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default authorLookup;
|
module.exports = authorLookup;
|
||||||
|
|||||||
@@ -10,4 +10,4 @@ const authorUtils = ()=>{
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default authorUtils;
|
module.exports = authorUtils;
|
||||||
@@ -1,8 +1,9 @@
|
|||||||
import React from 'react';
|
const React = require('react');
|
||||||
import createReactClass from 'create-react-class';
|
const createClass = require('create-react-class');
|
||||||
import request from 'superagent';
|
|
||||||
|
|
||||||
const BrewCleanup = createReactClass({
|
const request = require('superagent');
|
||||||
|
|
||||||
|
const BrewCleanup = createClass({
|
||||||
displayName : 'BrewCleanup',
|
displayName : 'BrewCleanup',
|
||||||
getDefaultProps(){
|
getDefaultProps(){
|
||||||
return {};
|
return {};
|
||||||
@@ -68,4 +69,4 @@ const BrewCleanup = createReactClass({
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
export default BrewCleanup;
|
module.exports = BrewCleanup;
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
import React from 'react';
|
const React = require('react');
|
||||||
import createReactClass from 'create-react-class';
|
const createClass = require('create-react-class');
|
||||||
import request from 'superagent';
|
const request = require('superagent');
|
||||||
|
|
||||||
const BrewCompress = createReactClass({
|
const BrewCompress = createClass({
|
||||||
displayName : 'BrewCompress',
|
displayName : 'BrewCompress',
|
||||||
getDefaultProps(){
|
getDefaultProps(){
|
||||||
return {};
|
return {};
|
||||||
@@ -85,4 +85,4 @@ const BrewCompress = createReactClass({
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
export default BrewCompress;
|
module.exports = BrewCompress;
|
||||||
|
|||||||
@@ -1,11 +1,12 @@
|
|||||||
import React from 'react';
|
const React = require('react');
|
||||||
import createReactClass from 'create-react-class';
|
const createClass = require('create-react-class');
|
||||||
import request from 'superagent';
|
const cx = require('classnames');
|
||||||
import cx from 'classnames';
|
|
||||||
|
|
||||||
import Moment from 'moment';
|
const request = require('superagent');
|
||||||
|
const Moment = require('moment');
|
||||||
|
|
||||||
const BrewLookup = createReactClass({
|
|
||||||
|
const BrewLookup = createClass({
|
||||||
getDefaultProps() {
|
getDefaultProps() {
|
||||||
return {};
|
return {};
|
||||||
},
|
},
|
||||||
@@ -109,4 +110,4 @@ const BrewLookup = createReactClass({
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
export default BrewLookup;
|
module.exports = BrewLookup;
|
||||||
|
|||||||
@@ -1,14 +1,15 @@
|
|||||||
import React from 'react';
|
const React = require('react');
|
||||||
import './brewUtils.less';
|
const createClass = require('create-react-class');
|
||||||
|
require('./brewUtils.less');
|
||||||
|
|
||||||
import BrewCleanup from './brewCleanup/brewCleanup.jsx';
|
const BrewCleanup = require('./brewCleanup/brewCleanup.jsx');
|
||||||
import BrewLookup from './brewLookup/brewLookup.jsx';
|
const BrewLookup = require('./brewLookup/brewLookup.jsx');
|
||||||
import BrewCompress from './brewCompress/brewCompress.jsx';
|
const BrewCompress = require ('./brewCompress/brewCompress.jsx');
|
||||||
import Stats from './stats/stats.jsx';
|
const Stats = require('./stats/stats.jsx');
|
||||||
|
|
||||||
const BrewUtils = ()=>{
|
const BrewUtils = createClass({
|
||||||
return (
|
render : function(){
|
||||||
<>
|
return <>
|
||||||
<Stats />
|
<Stats />
|
||||||
<hr />
|
<hr />
|
||||||
<BrewLookup />
|
<BrewLookup />
|
||||||
@@ -16,7 +17,8 @@ const BrewUtils = ()=>{
|
|||||||
<BrewCleanup />
|
<BrewCleanup />
|
||||||
<hr />
|
<hr />
|
||||||
<BrewCompress />
|
<BrewCompress />
|
||||||
</>
|
</>;
|
||||||
);
|
}
|
||||||
};
|
});
|
||||||
export default BrewUtils;
|
|
||||||
|
module.exports = BrewUtils;
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
@import '../../../shared/naturalcrit/styles/colors.less';
|
|
||||||
|
|
||||||
.brewUtil {
|
.brewUtil {
|
||||||
.result {
|
.result {
|
||||||
margin-top : 20px;
|
margin-top : 20px;
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
import React from 'react';
|
const React = require('react');
|
||||||
import createReactClass from 'create-react-class';
|
const createClass = require('create-react-class');
|
||||||
import request from 'superagent';
|
|
||||||
|
|
||||||
const Stats = createReactClass({
|
const request = require('superagent');
|
||||||
|
|
||||||
|
const Stats = createClass({
|
||||||
displayName : 'Stats',
|
displayName : 'Stats',
|
||||||
getDefaultProps(){
|
getDefaultProps(){
|
||||||
return {};
|
return {};
|
||||||
@@ -42,4 +43,4 @@ const Stats = createReactClass({
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
export default Stats;
|
module.exports = Stats;
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
/*eslint max-lines: ["warn", {"max": 500, "skipBlankLines": true, "skipComments": true}]*/
|
/*eslint max-lines: ["warn", {"max": 500, "skipBlankLines": true, "skipComments": true}]*/
|
||||||
import './lockTools.less';
|
require('./lockTools.less');
|
||||||
import React from 'react';
|
const React = require('react');
|
||||||
import createReactClass from 'create-react-class';
|
const createClass = require('create-react-class');
|
||||||
|
|
||||||
import request from '../../homebrew/utils/request-middleware.js';
|
import request from '../../homebrew/utils/request-middleware.js';
|
||||||
|
|
||||||
const LockTools = createReactClass({
|
const LockTools = createClass({
|
||||||
displayName : 'LockTools',
|
displayName : 'LockTools',
|
||||||
getInitialState : function() {
|
getInitialState : function() {
|
||||||
return {
|
return {
|
||||||
@@ -55,7 +55,7 @@ const LockTools = createReactClass({
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
const LockBrew = createReactClass({
|
const LockBrew = createClass({
|
||||||
displayName : 'LockBrew',
|
displayName : 'LockBrew',
|
||||||
getInitialState : function() {
|
getInitialState : function() {
|
||||||
// Default values
|
// Default values
|
||||||
@@ -183,7 +183,7 @@ const LockBrew = createReactClass({
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
const LockTable = createReactClass({
|
const LockTable = createClass({
|
||||||
displayName : 'LockTable',
|
displayName : 'LockTable',
|
||||||
getDefaultProps : function() {
|
getDefaultProps : function() {
|
||||||
return {
|
return {
|
||||||
@@ -273,7 +273,7 @@ const LockTable = createReactClass({
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
const LockLookup = createReactClass({
|
const LockLookup = createClass({
|
||||||
displayName : 'LockLookup',
|
displayName : 'LockLookup',
|
||||||
getDefaultProps : function() {
|
getDefaultProps : function() {
|
||||||
return {
|
return {
|
||||||
@@ -339,4 +339,4 @@ const LockLookup = createReactClass({
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
export default LockTools;
|
module.exports = LockTools;
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
import './notificationAdd.less';
|
require('./notificationAdd.less');
|
||||||
import React, { useState, useRef } from 'react';
|
const React = require('react');
|
||||||
import request from 'superagent';
|
const { useState, useRef } = require('react');
|
||||||
|
const request = require('superagent');
|
||||||
|
|
||||||
const NotificationAdd = ()=>{
|
const NotificationAdd = ()=>{
|
||||||
const [notificationResult, setNotificationResult] = useState(null);
|
const [notificationResult, setNotificationResult] = useState(null);
|
||||||
@@ -105,4 +106,4 @@ const NotificationAdd = ()=>{
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default NotificationAdd;
|
module.exports = NotificationAdd;
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
import './notificationLookup.less';
|
require('./notificationLookup.less');
|
||||||
import React, { useState } from 'react';
|
|
||||||
import request from 'superagent';
|
const React = require('react');
|
||||||
import Moment from 'moment';
|
const { useState } = require('react');
|
||||||
|
const request = require('superagent');
|
||||||
|
const Moment = require('moment');
|
||||||
|
|
||||||
const NotificationDetail = ({ notification, onDelete })=>(
|
const NotificationDetail = ({ notification, onDelete })=>(
|
||||||
<>
|
<>
|
||||||
@@ -100,4 +102,4 @@ const NotificationLookup = ()=>{
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default NotificationLookup;
|
module.exports = NotificationLookup;
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import React from 'react';
|
const React = require('react');
|
||||||
import NotificationLookup from './notificationLookup/notificationLookup.jsx';
|
|
||||||
import NotificationAdd from './notificationAdd/notificationAdd.jsx';
|
const NotificationLookup = require('./notificationLookup/notificationLookup.jsx');
|
||||||
|
const NotificationAdd = require('./notificationAdd/notificationAdd.jsx');
|
||||||
|
|
||||||
const NotificationUtils = ()=>{
|
const NotificationUtils = ()=>{
|
||||||
return (
|
return (
|
||||||
@@ -11,4 +12,4 @@ const NotificationUtils = ()=>{
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default NotificationUtils;
|
module.exports = NotificationUtils;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import diceFont from '../../../themes/fonts/iconFonts/diceFont.js';
|
import diceFont from 'themes/fonts/iconFonts/diceFont.js';
|
||||||
import elderberryInn from '../../../themes/fonts/iconFonts/elderberryInn.js';
|
import elderberryInn from 'themes/fonts/iconFonts/elderberryInn.js';
|
||||||
import fontAwesome from '../../../themes/fonts/iconFonts/fontAwesome.js';
|
import fontAwesome from 'themes/fonts/iconFonts/fontAwesome.js';
|
||||||
import gameIcons from '../../../themes/fonts/iconFonts/gameIcons.js';
|
import gameIcons from 'themes/fonts/iconFonts/gameIcons.js';
|
||||||
|
|
||||||
const emojis = {
|
const emojis = {
|
||||||
...diceFont,
|
...diceFont,
|
||||||
@@ -79,6 +79,6 @@ const showAutocompleteEmoji = function(CodeMirror, editor) {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
export default {
|
module.exports = {
|
||||||
showAutocompleteEmoji
|
showAutocompleteEmoji
|
||||||
};
|
};
|
||||||
@@ -38,11 +38,11 @@ const autoCloseCurlyBraces = function(CodeMirror, cm, typingClosingBrace) {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
export default {
|
module.exports = {
|
||||||
autoCloseCurlyBraces : function(CodeMirror, codeMirror) {
|
autoCloseCurlyBraces : function(CodeMirror, codeMirror) {
|
||||||
const map = { name: 'autoCloseCurlyBraces' };
|
const map = { name: 'autoCloseCurlyBraces' };
|
||||||
map[`'{'`] = function(cm) { return autoCloseCurlyBraces(CodeMirror, cm); };
|
map[`'{'`] = function(cm) { return autoCloseCurlyBraces(CodeMirror, cm); };
|
||||||
map[`'}'`] = function(cm) { return autoCloseCurlyBraces(CodeMirror, cm, true); };
|
map[`'}'`] = function(cm) { return autoCloseCurlyBraces(CodeMirror, cm, true); };
|
||||||
codeMirror?.addKeyMap(map);
|
codeMirror.addKeyMap(map);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -1,13 +1,51 @@
|
|||||||
/* eslint-disable max-lines */
|
/* eslint-disable max-lines */
|
||||||
import './codeEditor.less';
|
require('./codeEditor.less');
|
||||||
import React from 'react';
|
const React = require('react');
|
||||||
import createReactClass from 'create-react-class';
|
const createClass = require('create-react-class');
|
||||||
import _ from 'lodash';
|
const _ = require('lodash');
|
||||||
import closeTag from './close-tag';
|
const closeTag = require('./close-tag');
|
||||||
import autoCompleteEmoji from './autocompleteEmoji';
|
const autoCompleteEmoji = require('./autocompleteEmoji');
|
||||||
let CodeMirror;
|
|
||||||
|
|
||||||
const CodeEditor = createReactClass({
|
let CodeMirror;
|
||||||
|
if(typeof window !== 'undefined'){
|
||||||
|
CodeMirror = require('codemirror');
|
||||||
|
|
||||||
|
//Language Modes
|
||||||
|
require('codemirror/mode/gfm/gfm.js'); //Github flavoured markdown
|
||||||
|
require('codemirror/mode/css/css.js');
|
||||||
|
require('codemirror/mode/javascript/javascript.js');
|
||||||
|
|
||||||
|
//Addons
|
||||||
|
//Code folding
|
||||||
|
require('codemirror/addon/fold/foldcode.js');
|
||||||
|
require('codemirror/addon/fold/foldgutter.js');
|
||||||
|
//Search and replace
|
||||||
|
require('codemirror/addon/search/search.js');
|
||||||
|
require('codemirror/addon/search/searchcursor.js');
|
||||||
|
require('codemirror/addon/search/jump-to-line.js');
|
||||||
|
require('codemirror/addon/search/match-highlighter.js');
|
||||||
|
require('codemirror/addon/search/matchesonscrollbar.js');
|
||||||
|
require('codemirror/addon/dialog/dialog.js');
|
||||||
|
//Trailing space highlighting
|
||||||
|
// require('codemirror/addon/edit/trailingspace.js');
|
||||||
|
//Active line highlighting
|
||||||
|
// require('codemirror/addon/selection/active-line.js');
|
||||||
|
//Scroll past last line
|
||||||
|
require('codemirror/addon/scroll/scrollpastend.js');
|
||||||
|
//Auto-closing
|
||||||
|
//XML code folding is a requirement of the auto-closing tag feature and is not enabled
|
||||||
|
require('codemirror/addon/fold/xml-fold.js');
|
||||||
|
require('codemirror/addon/edit/closetag.js');
|
||||||
|
//Autocompletion
|
||||||
|
require('codemirror/addon/hint/show-hint.js');
|
||||||
|
|
||||||
|
const foldPagesCode = require('./fold-pages');
|
||||||
|
foldPagesCode.registerHomebreweryHelper(CodeMirror);
|
||||||
|
const foldCSSCode = require('./fold-css');
|
||||||
|
foldCSSCode.registerHomebreweryHelper(CodeMirror);
|
||||||
|
}
|
||||||
|
|
||||||
|
const CodeEditor = createClass({
|
||||||
displayName : 'CodeEditor',
|
displayName : 'CodeEditor',
|
||||||
getDefaultProps : function() {
|
getDefaultProps : function() {
|
||||||
return {
|
return {
|
||||||
@@ -28,54 +66,23 @@ const CodeEditor = createReactClass({
|
|||||||
|
|
||||||
editor : React.createRef(null),
|
editor : React.createRef(null),
|
||||||
|
|
||||||
async componentDidMount() {
|
componentDidMount : function() {
|
||||||
CodeMirror = (await import('codemirror')).default;
|
|
||||||
this.CodeMirror = CodeMirror;
|
|
||||||
|
|
||||||
await import('codemirror/mode/gfm/gfm.js');
|
|
||||||
await import('codemirror/mode/css/css.js');
|
|
||||||
await import('codemirror/mode/javascript/javascript.js');
|
|
||||||
|
|
||||||
// addons
|
|
||||||
await import('codemirror/addon/fold/foldcode.js');
|
|
||||||
await import('codemirror/addon/fold/foldgutter.js');
|
|
||||||
await import('codemirror/addon/fold/xml-fold.js');
|
|
||||||
await import('codemirror/addon/search/search.js');
|
|
||||||
await import('codemirror/addon/search/searchcursor.js');
|
|
||||||
await import('codemirror/addon/search/jump-to-line.js');
|
|
||||||
await import('codemirror/addon/search/match-highlighter.js');
|
|
||||||
await import('codemirror/addon/search/matchesonscrollbar.js');
|
|
||||||
await import('codemirror/addon/dialog/dialog.js');
|
|
||||||
await import('codemirror/addon/scroll/scrollpastend.js');
|
|
||||||
await import('codemirror/addon/edit/closetag.js');
|
|
||||||
await import('codemirror/addon/hint/show-hint.js');
|
|
||||||
// import 'codemirror/addon/selection/active-line.js';
|
|
||||||
// import 'codemirror/addon/edit/trailingspace.js';
|
|
||||||
|
|
||||||
|
|
||||||
// register helpers dynamically as well
|
|
||||||
const foldPagesCode = (await import('./fold-pages')).default;
|
|
||||||
const foldCSSCode = (await import('./fold-css')).default;
|
|
||||||
foldPagesCode.registerHomebreweryHelper(CodeMirror);
|
|
||||||
foldCSSCode.registerHomebreweryHelper(CodeMirror);
|
|
||||||
|
|
||||||
this.buildEditor();
|
this.buildEditor();
|
||||||
const newDoc = CodeMirror?.Doc(this.props.value, this.props.language);
|
const newDoc = CodeMirror.Doc(this.props.value, this.props.language);
|
||||||
this.codeMirror?.swapDoc(newDoc);
|
this.codeMirror.swapDoc(newDoc);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
componentDidUpdate : function(prevProps) {
|
componentDidUpdate : function(prevProps) {
|
||||||
if(prevProps.view !== this.props.view){ //view changed; swap documents
|
if(prevProps.view !== this.props.view){ //view changed; swap documents
|
||||||
let newDoc;
|
let newDoc;
|
||||||
|
|
||||||
if(!this.state.docs[this.props.view]) {
|
if(!this.state.docs[this.props.view]) {
|
||||||
newDoc = CodeMirror?.Doc(this.props.value, this.props.language);
|
newDoc = CodeMirror.Doc(this.props.value, this.props.language);
|
||||||
} else {
|
} else {
|
||||||
newDoc = this.state.docs[this.props.view];
|
newDoc = this.state.docs[this.props.view];
|
||||||
}
|
}
|
||||||
|
|
||||||
const oldDoc = { [prevProps.view]: this.codeMirror?.swapDoc(newDoc) };
|
const oldDoc = { [prevProps.view]: this.codeMirror.swapDoc(newDoc) };
|
||||||
|
|
||||||
this.setState((prevState)=>({
|
this.setState((prevState)=>({
|
||||||
docs : _.merge({}, prevState.docs, oldDoc)
|
docs : _.merge({}, prevState.docs, oldDoc)
|
||||||
@@ -83,17 +90,17 @@ const CodeEditor = createReactClass({
|
|||||||
|
|
||||||
this.props.rerenderParent();
|
this.props.rerenderParent();
|
||||||
} else if(this.codeMirror?.getValue() != this.props.value) { //update editor contents if brew.text is changed from outside
|
} else if(this.codeMirror?.getValue() != this.props.value) { //update editor contents if brew.text is changed from outside
|
||||||
this.codeMirror?.setValue(this.props.value);
|
this.codeMirror.setValue(this.props.value);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(this.props.enableFolding) {
|
if(this.props.enableFolding) {
|
||||||
this.codeMirror?.setOption('foldOptions', this.foldOptions(this.codeMirror));
|
this.codeMirror.setOption('foldOptions', this.foldOptions(this.codeMirror));
|
||||||
} else {
|
} else {
|
||||||
this.codeMirror?.setOption('foldOptions', false);
|
this.codeMirror.setOption('foldOptions', false);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(prevProps.editorTheme !== this.props.editorTheme){
|
if(prevProps.editorTheme !== this.props.editorTheme){
|
||||||
this.codeMirror?.setOption('theme', this.props.editorTheme);
|
this.codeMirror.setOption('theme', this.props.editorTheme);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -181,8 +188,8 @@ const CodeEditor = createReactClass({
|
|||||||
closeTag.autoCloseCurlyBraces(CodeMirror, this.codeMirror);
|
closeTag.autoCloseCurlyBraces(CodeMirror, this.codeMirror);
|
||||||
autoCompleteEmoji.showAutocompleteEmoji(CodeMirror, this.codeMirror);
|
autoCompleteEmoji.showAutocompleteEmoji(CodeMirror, this.codeMirror);
|
||||||
|
|
||||||
// Note: codeMirror passes a copy of itself in this callback. cm === this.codeMirror?. Either one works.
|
// Note: codeMirror passes a copy of itself in this callback. cm === this.codeMirror. Either one works.
|
||||||
this.codeMirror?.on('change', (cm)=>{this.props.onChange(cm.getValue());});
|
this.codeMirror.on('change', (cm)=>{this.props.onChange(cm.getValue());});
|
||||||
this.updateSize();
|
this.updateSize();
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -196,84 +203,84 @@ const CodeEditor = createReactClass({
|
|||||||
},
|
},
|
||||||
|
|
||||||
dedent : function () {
|
dedent : function () {
|
||||||
this.codeMirror?.execCommand('indentLess');
|
this.codeMirror.execCommand('indentLess');
|
||||||
},
|
},
|
||||||
|
|
||||||
makeHeader : function (number) {
|
makeHeader : function (number) {
|
||||||
const selection = this.codeMirror?.getSelection();
|
const selection = this.codeMirror.getSelection();
|
||||||
const header = Array(number).fill('#').join('');
|
const header = Array(number).fill('#').join('');
|
||||||
this.codeMirror?.replaceSelection(`${header} ${selection}`, 'around');
|
this.codeMirror.replaceSelection(`${header} ${selection}`, 'around');
|
||||||
const cursor = this.codeMirror?.getCursor();
|
const cursor = this.codeMirror.getCursor();
|
||||||
this.codeMirror?.setCursor({ line: cursor.line, ch: cursor.ch + selection.length + number + 1 });
|
this.codeMirror.setCursor({ line: cursor.line, ch: cursor.ch + selection.length + number + 1 });
|
||||||
},
|
},
|
||||||
|
|
||||||
makeBold : function() {
|
makeBold : function() {
|
||||||
const selection = this.codeMirror?.getSelection(), t = selection.slice(0, 2) === '**' && selection.slice(-2) === '**';
|
const selection = this.codeMirror.getSelection(), t = selection.slice(0, 2) === '**' && selection.slice(-2) === '**';
|
||||||
this.codeMirror?.replaceSelection(t ? selection.slice(2, -2) : `**${selection}**`, 'around');
|
this.codeMirror.replaceSelection(t ? selection.slice(2, -2) : `**${selection}**`, 'around');
|
||||||
if(selection.length === 0){
|
if(selection.length === 0){
|
||||||
const cursor = this.codeMirror?.getCursor();
|
const cursor = this.codeMirror.getCursor();
|
||||||
this.codeMirror?.setCursor({ line: cursor.line, ch: cursor.ch - 2 });
|
this.codeMirror.setCursor({ line: cursor.line, ch: cursor.ch - 2 });
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
makeItalic : function() {
|
makeItalic : function() {
|
||||||
const selection = this.codeMirror?.getSelection(), t = selection.slice(0, 1) === '*' && selection.slice(-1) === '*';
|
const selection = this.codeMirror.getSelection(), t = selection.slice(0, 1) === '*' && selection.slice(-1) === '*';
|
||||||
this.codeMirror?.replaceSelection(t ? selection.slice(1, -1) : `*${selection}*`, 'around');
|
this.codeMirror.replaceSelection(t ? selection.slice(1, -1) : `*${selection}*`, 'around');
|
||||||
if(selection.length === 0){
|
if(selection.length === 0){
|
||||||
const cursor = this.codeMirror?.getCursor();
|
const cursor = this.codeMirror.getCursor();
|
||||||
this.codeMirror?.setCursor({ line: cursor.line, ch: cursor.ch - 1 });
|
this.codeMirror.setCursor({ line: cursor.line, ch: cursor.ch - 1 });
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
makeSuper : function() {
|
makeSuper : function() {
|
||||||
const selection = this.codeMirror?.getSelection(), t = selection.slice(0, 1) === '^' && selection.slice(-1) === '^';
|
const selection = this.codeMirror.getSelection(), t = selection.slice(0, 1) === '^' && selection.slice(-1) === '^';
|
||||||
this.codeMirror?.replaceSelection(t ? selection.slice(1, -1) : `^${selection}^`, 'around');
|
this.codeMirror.replaceSelection(t ? selection.slice(1, -1) : `^${selection}^`, 'around');
|
||||||
if(selection.length === 0){
|
if(selection.length === 0){
|
||||||
const cursor = this.codeMirror?.getCursor();
|
const cursor = this.codeMirror.getCursor();
|
||||||
this.codeMirror?.setCursor({ line: cursor.line, ch: cursor.ch - 1 });
|
this.codeMirror.setCursor({ line: cursor.line, ch: cursor.ch - 1 });
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
makeSub : function() {
|
makeSub : function() {
|
||||||
const selection = this.codeMirror?.getSelection(), t = selection.slice(0, 2) === '^^' && selection.slice(-2) === '^^';
|
const selection = this.codeMirror.getSelection(), t = selection.slice(0, 2) === '^^' && selection.slice(-2) === '^^';
|
||||||
this.codeMirror?.replaceSelection(t ? selection.slice(2, -2) : `^^${selection}^^`, 'around');
|
this.codeMirror.replaceSelection(t ? selection.slice(2, -2) : `^^${selection}^^`, 'around');
|
||||||
if(selection.length === 0){
|
if(selection.length === 0){
|
||||||
const cursor = this.codeMirror?.getCursor();
|
const cursor = this.codeMirror.getCursor();
|
||||||
this.codeMirror?.setCursor({ line: cursor.line, ch: cursor.ch - 2 });
|
this.codeMirror.setCursor({ line: cursor.line, ch: cursor.ch - 2 });
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
makeNbsp : function() {
|
makeNbsp : function() {
|
||||||
this.codeMirror?.replaceSelection(' ', 'end');
|
this.codeMirror.replaceSelection(' ', 'end');
|
||||||
},
|
},
|
||||||
|
|
||||||
makeSpace : function() {
|
makeSpace : function() {
|
||||||
const selection = this.codeMirror?.getSelection();
|
const selection = this.codeMirror.getSelection();
|
||||||
const t = selection.slice(0, 8) === '{{width:' && selection.slice(0 -4) === '% }}';
|
const t = selection.slice(0, 8) === '{{width:' && selection.slice(0 -4) === '% }}';
|
||||||
if(t){
|
if(t){
|
||||||
const percent = parseInt(selection.slice(8, -4)) + 10;
|
const percent = parseInt(selection.slice(8, -4)) + 10;
|
||||||
this.codeMirror?.replaceSelection(percent < 90 ? `{{width:${percent}% }}` : '{{width:100% }}', 'around');
|
this.codeMirror.replaceSelection(percent < 90 ? `{{width:${percent}% }}` : '{{width:100% }}', 'around');
|
||||||
} else {
|
} else {
|
||||||
this.codeMirror?.replaceSelection(`{{width:10% }}`, 'around');
|
this.codeMirror.replaceSelection(`{{width:10% }}`, 'around');
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
removeSpace : function() {
|
removeSpace : function() {
|
||||||
const selection = this.codeMirror?.getSelection();
|
const selection = this.codeMirror.getSelection();
|
||||||
const t = selection.slice(0, 8) === '{{width:' && selection.slice(0 -4) === '% }}';
|
const t = selection.slice(0, 8) === '{{width:' && selection.slice(0 -4) === '% }}';
|
||||||
if(t){
|
if(t){
|
||||||
const percent = parseInt(selection.slice(8, -4)) - 10;
|
const percent = parseInt(selection.slice(8, -4)) - 10;
|
||||||
this.codeMirror?.replaceSelection(percent > 10 ? `{{width:${percent}% }}` : '', 'around');
|
this.codeMirror.replaceSelection(percent > 10 ? `{{width:${percent}% }}` : '', 'around');
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
newColumn : function() {
|
newColumn : function() {
|
||||||
this.codeMirror?.replaceSelection('\n\\column\n\n', 'end');
|
this.codeMirror.replaceSelection('\n\\column\n\n', 'end');
|
||||||
},
|
},
|
||||||
|
|
||||||
newPage : function() {
|
newPage : function() {
|
||||||
this.codeMirror?.replaceSelection('\n\\page\n\n', 'end');
|
this.codeMirror.replaceSelection('\n\\page\n\n', 'end');
|
||||||
},
|
},
|
||||||
|
|
||||||
injectText : function(injectText, overwrite=true) {
|
injectText : function(injectText, overwrite=true) {
|
||||||
@@ -286,29 +293,29 @@ const CodeEditor = createReactClass({
|
|||||||
},
|
},
|
||||||
|
|
||||||
makeUnderline : function() {
|
makeUnderline : function() {
|
||||||
const selection = this.codeMirror?.getSelection(), t = selection.slice(0, 3) === '<u>' && selection.slice(-4) === '</u>';
|
const selection = this.codeMirror.getSelection(), t = selection.slice(0, 3) === '<u>' && selection.slice(-4) === '</u>';
|
||||||
this.codeMirror?.replaceSelection(t ? selection.slice(3, -4) : `<u>${selection}</u>`, 'around');
|
this.codeMirror.replaceSelection(t ? selection.slice(3, -4) : `<u>${selection}</u>`, 'around');
|
||||||
if(selection.length === 0){
|
if(selection.length === 0){
|
||||||
const cursor = this.codeMirror?.getCursor();
|
const cursor = this.codeMirror.getCursor();
|
||||||
this.codeMirror?.setCursor({ line: cursor.line, ch: cursor.ch - 4 });
|
this.codeMirror.setCursor({ line: cursor.line, ch: cursor.ch - 4 });
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
makeSpan : function() {
|
makeSpan : function() {
|
||||||
const selection = this.codeMirror?.getSelection(), t = selection.slice(0, 2) === '{{' && selection.slice(-2) === '}}';
|
const selection = this.codeMirror.getSelection(), t = selection.slice(0, 2) === '{{' && selection.slice(-2) === '}}';
|
||||||
this.codeMirror?.replaceSelection(t ? selection.slice(2, -2) : `{{ ${selection}}}`, 'around');
|
this.codeMirror.replaceSelection(t ? selection.slice(2, -2) : `{{ ${selection}}}`, 'around');
|
||||||
if(selection.length === 0){
|
if(selection.length === 0){
|
||||||
const cursor = this.codeMirror?.getCursor();
|
const cursor = this.codeMirror.getCursor();
|
||||||
this.codeMirror?.setCursor({ line: cursor.line, ch: cursor.ch - 2 });
|
this.codeMirror.setCursor({ line: cursor.line, ch: cursor.ch - 2 });
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
makeDiv : function() {
|
makeDiv : function() {
|
||||||
const selection = this.codeMirror?.getSelection(), t = selection.slice(0, 2) === '{{' && selection.slice(-2) === '}}';
|
const selection = this.codeMirror.getSelection(), t = selection.slice(0, 2) === '{{' && selection.slice(-2) === '}}';
|
||||||
this.codeMirror?.replaceSelection(t ? selection.slice(2, -2) : `{{\n${selection}\n}}`, 'around');
|
this.codeMirror.replaceSelection(t ? selection.slice(2, -2) : `{{\n${selection}\n}}`, 'around');
|
||||||
if(selection.length === 0){
|
if(selection.length === 0){
|
||||||
const cursor = this.codeMirror?.getCursor();
|
const cursor = this.codeMirror.getCursor();
|
||||||
this.codeMirror?.setCursor({ line: cursor.line - 1, ch: cursor.ch }); // set to -2? if wanting to enter classes etc. if so, get rid of first \n when replacing selection
|
this.codeMirror.setCursor({ line: cursor.line - 1, ch: cursor.ch }); // set to -2? if wanting to enter classes etc. if so, get rid of first \n when replacing selection
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -316,7 +323,7 @@ const CodeEditor = createReactClass({
|
|||||||
let regex;
|
let regex;
|
||||||
let cursorPos;
|
let cursorPos;
|
||||||
let newComment;
|
let newComment;
|
||||||
const selection = this.codeMirror?.getSelection();
|
const selection = this.codeMirror.getSelection();
|
||||||
if(this.props.language === 'gfm'){
|
if(this.props.language === 'gfm'){
|
||||||
regex = /^\s*(<!--\s?)(.*?)(\s?-->)\s*$/gs;
|
regex = /^\s*(<!--\s?)(.*?)(\s?-->)\s*$/gs;
|
||||||
cursorPos = 4;
|
cursorPos = 4;
|
||||||
@@ -326,44 +333,44 @@ const CodeEditor = createReactClass({
|
|||||||
cursorPos = 3;
|
cursorPos = 3;
|
||||||
newComment = `/* ${selection} */`;
|
newComment = `/* ${selection} */`;
|
||||||
}
|
}
|
||||||
this.codeMirror?.replaceSelection(regex.test(selection) == true ? selection.replace(regex, '$2') : newComment, 'around');
|
this.codeMirror.replaceSelection(regex.test(selection) == true ? selection.replace(regex, '$2') : newComment, 'around');
|
||||||
if(selection.length === 0){
|
if(selection.length === 0){
|
||||||
const cursor = this.codeMirror?.getCursor();
|
const cursor = this.codeMirror.getCursor();
|
||||||
this.codeMirror?.setCursor({ line: cursor.line, ch: cursor.ch - cursorPos });
|
this.codeMirror.setCursor({ line: cursor.line, ch: cursor.ch - cursorPos });
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
makeLink : function() {
|
makeLink : function() {
|
||||||
const isLink = /^\[(.*)\]\((.*)\)$/;
|
const isLink = /^\[(.*)\]\((.*)\)$/;
|
||||||
const selection = this.codeMirror?.getSelection().trim();
|
const selection = this.codeMirror.getSelection().trim();
|
||||||
let match;
|
let match;
|
||||||
if(match = isLink.exec(selection)){
|
if(match = isLink.exec(selection)){
|
||||||
const altText = match[1];
|
const altText = match[1];
|
||||||
const url = match[2];
|
const url = match[2];
|
||||||
this.codeMirror?.replaceSelection(`${altText} ${url}`);
|
this.codeMirror.replaceSelection(`${altText} ${url}`);
|
||||||
const cursor = this.codeMirror?.getCursor();
|
const cursor = this.codeMirror.getCursor();
|
||||||
this.codeMirror?.setSelection({ line: cursor.line, ch: cursor.ch - url.length }, { line: cursor.line, ch: cursor.ch });
|
this.codeMirror.setSelection({ line: cursor.line, ch: cursor.ch - url.length }, { line: cursor.line, ch: cursor.ch });
|
||||||
} else {
|
} else {
|
||||||
this.codeMirror?.replaceSelection(`[${selection || 'alt text'}](url)`);
|
this.codeMirror.replaceSelection(`[${selection || 'alt text'}](url)`);
|
||||||
const cursor = this.codeMirror?.getCursor();
|
const cursor = this.codeMirror.getCursor();
|
||||||
this.codeMirror?.setSelection({ line: cursor.line, ch: cursor.ch - 4 }, { line: cursor.line, ch: cursor.ch - 1 });
|
this.codeMirror.setSelection({ line: cursor.line, ch: cursor.ch - 4 }, { line: cursor.line, ch: cursor.ch - 1 });
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
makeList : function(listType) {
|
makeList : function(listType) {
|
||||||
const selectionStart = this.codeMirror?.getCursor('from'), selectionEnd = this.codeMirror?.getCursor('to');
|
const selectionStart = this.codeMirror.getCursor('from'), selectionEnd = this.codeMirror.getCursor('to');
|
||||||
this.codeMirror?.setSelection(
|
this.codeMirror.setSelection(
|
||||||
{ line: selectionStart.line, ch: 0 },
|
{ line: selectionStart.line, ch: 0 },
|
||||||
{ line: selectionEnd.line, ch: this.codeMirror?.getLine(selectionEnd.line).length }
|
{ line: selectionEnd.line, ch: this.codeMirror.getLine(selectionEnd.line).length }
|
||||||
);
|
);
|
||||||
const newSelection = this.codeMirror?.getSelection();
|
const newSelection = this.codeMirror.getSelection();
|
||||||
|
|
||||||
const regex = /^\d+\.\s|^-\s/gm;
|
const regex = /^\d+\.\s|^-\s/gm;
|
||||||
if(newSelection.match(regex) != null){ // if selection IS A LIST
|
if(newSelection.match(regex) != null){ // if selection IS A LIST
|
||||||
this.codeMirror?.replaceSelection(newSelection.replace(regex, ''), 'around');
|
this.codeMirror.replaceSelection(newSelection.replace(regex, ''), 'around');
|
||||||
} else { // if selection IS NOT A LIST
|
} else { // if selection IS NOT A LIST
|
||||||
listType == 'UL' ? this.codeMirror?.replaceSelection(newSelection.replace(/^/gm, `- `), 'around') :
|
listType == 'UL' ? this.codeMirror.replaceSelection(newSelection.replace(/^/gm, `- `), 'around') :
|
||||||
this.codeMirror?.replaceSelection(newSelection.replace(/^/gm, (()=>{
|
this.codeMirror.replaceSelection(newSelection.replace(/^/gm, (()=>{
|
||||||
let n = 1;
|
let n = 1;
|
||||||
return ()=>{
|
return ()=>{
|
||||||
return `${n++}. `;
|
return `${n++}. `;
|
||||||
@@ -373,39 +380,39 @@ const CodeEditor = createReactClass({
|
|||||||
},
|
},
|
||||||
|
|
||||||
foldAllCode : function() {
|
foldAllCode : function() {
|
||||||
this.codeMirror?.execCommand('foldAll');
|
this.codeMirror.execCommand('foldAll');
|
||||||
},
|
},
|
||||||
|
|
||||||
unfoldAllCode : function() {
|
unfoldAllCode : function() {
|
||||||
this.codeMirror?.execCommand('unfoldAll');
|
this.codeMirror.execCommand('unfoldAll');
|
||||||
},
|
},
|
||||||
|
|
||||||
//=-- Externally used -==//
|
//=-- Externally used -==//
|
||||||
setCursorPosition : function(line, char){
|
setCursorPosition : function(line, char){
|
||||||
setTimeout(()=>{
|
setTimeout(()=>{
|
||||||
this.codeMirror?.focus();
|
this.codeMirror.focus();
|
||||||
this.codeMirror?.doc.setCursor(line, char);
|
this.codeMirror.doc.setCursor(line, char);
|
||||||
}, 10);
|
}, 10);
|
||||||
},
|
},
|
||||||
getCursorPosition : function(){
|
getCursorPosition : function(){
|
||||||
return this.codeMirror?.getCursor();
|
return this.codeMirror.getCursor();
|
||||||
},
|
},
|
||||||
getTopVisibleLine : function(){
|
getTopVisibleLine : function(){
|
||||||
const rect = this.codeMirror?.getWrapperElement().getBoundingClientRect();
|
const rect = this.codeMirror.getWrapperElement().getBoundingClientRect();
|
||||||
const topVisibleLine = this.codeMirror?.lineAtHeight(rect.top, 'window');
|
const topVisibleLine = this.codeMirror.lineAtHeight(rect.top, 'window');
|
||||||
return topVisibleLine;
|
return topVisibleLine;
|
||||||
},
|
},
|
||||||
updateSize : function(){
|
updateSize : function(){
|
||||||
this.codeMirror?.refresh();
|
this.codeMirror.refresh();
|
||||||
},
|
},
|
||||||
redo : function(){
|
redo : function(){
|
||||||
return this.codeMirror?.redo();
|
return this.codeMirror.redo();
|
||||||
},
|
},
|
||||||
undo : function(){
|
undo : function(){
|
||||||
return this.codeMirror?.undo();
|
return this.codeMirror.undo();
|
||||||
},
|
},
|
||||||
historySize : function(){
|
historySize : function(){
|
||||||
return this.codeMirror?.doc.historySize();
|
return this.codeMirror.doc.historySize();
|
||||||
},
|
},
|
||||||
|
|
||||||
foldOptions : function(cm){
|
foldOptions : function(cm){
|
||||||
@@ -419,7 +426,7 @@ const CodeEditor = createReactClass({
|
|||||||
|
|
||||||
let foldPreviewText = '';
|
let foldPreviewText = '';
|
||||||
while (currentLine <= to.line && text.length <= maxLength) {
|
while (currentLine <= to.line && text.length <= maxLength) {
|
||||||
const currentText = this.codeMirror?.getLine(currentLine);
|
const currentText = this.codeMirror.getLine(currentLine);
|
||||||
currentLine++;
|
currentLine++;
|
||||||
if(currentText[0] == '#'){
|
if(currentText[0] == '#'){
|
||||||
foldPreviewText = currentText;
|
foldPreviewText = currentText;
|
||||||
@@ -454,5 +461,5 @@ const CodeEditor = createReactClass({
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
export default CodeEditor;
|
module.exports = CodeEditor;
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
export default {
|
module.exports = {
|
||||||
registerHomebreweryHelper : function(CodeMirror) {
|
registerHomebreweryHelper : function(CodeMirror) {
|
||||||
CodeMirror.registerHelper('fold', 'homebrewerycss', function(cm, start) {
|
CodeMirror.registerHelper('fold', 'homebrewerycss', function(cm, start) {
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
export default {
|
module.exports = {
|
||||||
registerHomebreweryHelper : function(CodeMirror) {
|
registerHomebreweryHelper : function(CodeMirror) {
|
||||||
CodeMirror.registerHelper('fold', 'homebrewery', function(cm, start) {
|
CodeMirror.registerHelper('fold', 'homebrewery', function(cm, start) {
|
||||||
const matcher = /^\\page.*/;
|
const matcher = /^\\page.*/;
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
import React from 'react';
|
const React = require('react');
|
||||||
import createReactClass from 'create-react-class';
|
const createClass = require('create-react-class');
|
||||||
import _ from 'lodash';
|
const _ = require('lodash');
|
||||||
import './combobox.less';
|
require('./combobox.less');
|
||||||
|
|
||||||
const Combobox = createReactClass({
|
const Combobox = createClass({
|
||||||
displayName : 'Combobox',
|
displayName : 'Combobox',
|
||||||
getDefaultProps : function() {
|
getDefaultProps : function() {
|
||||||
return {
|
return {
|
||||||
@@ -126,4 +126,4 @@ const Combobox = createReactClass({
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
export default Combobox;
|
module.exports = Combobox;
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
import './renderWarnings.less';
|
require('./renderWarnings.less');
|
||||||
import React from 'react';
|
const React = require('react');
|
||||||
import createReactClass from 'create-react-class';
|
const createClass = require('create-react-class');
|
||||||
import _ from 'lodash';
|
const _ = require('lodash');
|
||||||
|
|
||||||
import Dialog from '../dialog.jsx';
|
import Dialog from '../dialog.jsx';
|
||||||
|
|
||||||
const RenderWarnings = createReactClass({
|
const RenderWarnings = createClass({
|
||||||
displayName : 'RenderWarnings',
|
displayName : 'RenderWarnings',
|
||||||
getInitialState : function() {
|
getInitialState : function() {
|
||||||
return {
|
return {
|
||||||
@@ -57,4 +57,4 @@ const RenderWarnings = createReactClass({
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
export default RenderWarnings;
|
module.exports = RenderWarnings;
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
@import './shared/naturalcrit/styles/colors.less';
|
|
||||||
|
|
||||||
.renderWarnings {
|
.renderWarnings {
|
||||||
position : relative;
|
position : relative;
|
||||||
float : right;
|
float : right;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
|
require('./splitPane.less');
|
||||||
import './splitPane.less';
|
const React = require('react');
|
||||||
import React, { useEffect, useState } from 'react';
|
const { useState, useEffect } = React;
|
||||||
|
|
||||||
const PANE_WIDTH_KEY = 'HB_editor_splitWidth';
|
const PANE_WIDTH_KEY = 'HB_editor_splitWidth';
|
||||||
const LIVE_SCROLL_KEY = 'HB_editor_liveScroll';
|
const LIVE_SCROLL_KEY = 'HB_editor_liveScroll';
|
||||||
@@ -108,4 +108,4 @@ const Pane = ({ width, children, isDragging, moveBrew, moveSource, liveScroll, s
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default SplitPane;
|
module.exports = SplitPane;
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
@import './shared/naturalcrit/styles/core.less';
|
|
||||||
|
|
||||||
.splitPane {
|
.splitPane {
|
||||||
position : relative;
|
position : relative;
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import React from 'react';
|
const React = require('react');
|
||||||
|
const createClass = require('create-react-class');
|
||||||
|
|
||||||
export default function(props){
|
module.exports = function(props){
|
||||||
return <svg version='1.1' x='0px' y='0px' viewBox='0 0 90 112.5' enableBackground='new 0 0 90 90' >
|
return <svg version='1.1' x='0px' y='0px' viewBox='0 0 90 112.5' enableBackground='new 0 0 90 90' >
|
||||||
<path d='M25.363,25.54c0,1.906,8.793,3.454,19.636,3.454c10.848,0,19.638-1.547,19.638-3.454c0-1.12-3.056-2.117-7.774-2.75 c-1.418,1.891-3.659,3.133-6.208,3.133c-2.85,0-5.315-1.547-6.67-3.833C33.617,22.185,25.363,23.692,25.363,25.54z'/><path d='M84.075,54.142c0-8.68-2.868-17.005-8.144-23.829c1.106-1.399,1.41-2.771,1.41-3.854c0-6.574-10.245-9.358-19.264-10.533 c0.209,0.706,0.359,1.439,0.359,2.215c0,0.09-0.022,0.17-0.028,0.26l0,0c-0.028,0.853-0.195,1.667-0.479,2.429 c9.106,1.282,14.508,3.754,14.508,5.63c0,2.644-10.688,6.486-27.439,6.486c-16.748,0-27.438-3.842-27.438-6.486 c0-2.542,9.904-6.183,25.559-6.459c-0.098-0.396-0.159-0.807-0.2-1.223c0.006,0,0.013,0,0.017,0 c-0.017-0.213-0.063-0.417-0.063-0.636c0-1.084,0.226-2.119,0.628-3.058c-6.788,0.129-30.846,1.299-30.846,11.376 c0,1.083,0.305,2.455,1.411,3.854c-5.276,6.823-8.145,15.149-8.145,23.829c0,11.548,5.187,20.107,14.693,25.115 c-0.902,3.146-1.391,7.056,1.111,8.181c2.626,1.178,5.364-2.139,7.111-5.005c4.73,1.261,10.13,1.923,16.161,1.923 c6.034,0,11.428-0.661,16.158-1.922c1.75,2.865,4.493,6.18,7.112,5.004c2.504-1.123,2.014-5.035,1.113-8.179 C78.889,74.249,84.075,65.689,84.075,54.142z M70.39,31.392c5.43,6.046,8.78,14,8.78,22.75c0,20.919-18.582,25.309-34.171,25.309 c-15.587,0-34.17-4.39-34.17-25.309c0-8.75,3.35-16.7,8.781-22.753c5.561,2.643,15.502,4.009,25.389,4.009 C54.886,35.397,64.829,34.031,70.39,31.392z'/><path d='M50.654,23.374c2.892,0,5.234-2.341,5.234-5.233c0-2.887-2.343-5.23-5.234-5.23c-2.887,0-5.231,2.343-5.231,5.23 C45.423,21.032,47.768,23.374,50.654,23.374z'/>
|
<path d='M25.363,25.54c0,1.906,8.793,3.454,19.636,3.454c10.848,0,19.638-1.547,19.638-3.454c0-1.12-3.056-2.117-7.774-2.75 c-1.418,1.891-3.659,3.133-6.208,3.133c-2.85,0-5.315-1.547-6.67-3.833C33.617,22.185,25.363,23.692,25.363,25.54z'/><path d='M84.075,54.142c0-8.68-2.868-17.005-8.144-23.829c1.106-1.399,1.41-2.771,1.41-3.854c0-6.574-10.245-9.358-19.264-10.533 c0.209,0.706,0.359,1.439,0.359,2.215c0,0.09-0.022,0.17-0.028,0.26l0,0c-0.028,0.853-0.195,1.667-0.479,2.429 c9.106,1.282,14.508,3.754,14.508,5.63c0,2.644-10.688,6.486-27.439,6.486c-16.748,0-27.438-3.842-27.438-6.486 c0-2.542,9.904-6.183,25.559-6.459c-0.098-0.396-0.159-0.807-0.2-1.223c0.006,0,0.013,0,0.017,0 c-0.017-0.213-0.063-0.417-0.063-0.636c0-1.084,0.226-2.119,0.628-3.058c-6.788,0.129-30.846,1.299-30.846,11.376 c0,1.083,0.305,2.455,1.411,3.854c-5.276,6.823-8.145,15.149-8.145,23.829c0,11.548,5.187,20.107,14.693,25.115 c-0.902,3.146-1.391,7.056,1.111,8.181c2.626,1.178,5.364-2.139,7.111-5.005c4.73,1.261,10.13,1.923,16.161,1.923 c6.034,0,11.428-0.661,16.158-1.922c1.75,2.865,4.493,6.18,7.112,5.004c2.504-1.123,2.014-5.035,1.113-8.179 C78.889,74.249,84.075,65.689,84.075,54.142z M70.39,31.392c5.43,6.046,8.78,14,8.78,22.75c0,20.919-18.582,25.309-34.171,25.309 c-15.587,0-34.17-4.39-34.17-25.309c0-8.75,3.35-16.7,8.781-22.753c5.561,2.643,15.502,4.009,25.389,4.009 C54.886,35.397,64.829,34.031,70.39,31.392z'/><path d='M50.654,23.374c2.892,0,5.234-2.341,5.234-5.233c0-2.887-2.343-5.23-5.234-5.23c-2.887,0-5.231,2.343-5.231,5.23 C45.423,21.032,47.768,23.374,50.654,23.374z'/>
|
||||||
<circle cx='62.905' cy='10.089' r='3.595'/>
|
<circle cx='62.905' cy='10.089' r='3.595'/>
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import React from 'react';
|
const React = require('react');
|
||||||
|
const createClass = require('create-react-class');
|
||||||
|
|
||||||
export default function(props){
|
module.exports = function(props){
|
||||||
return <svg version='1.1' x='0px' y='0px' viewBox='0 0 100 100' enableBackground='new 0 0 100 100'><path d='M80.644,87.982l16.592-41.483c0.054-0.128,0.088-0.26,0.108-0.394c0.006-0.039,0.007-0.077,0.011-0.116 c0.007-0.087,0.008-0.174,0.002-0.26c-0.003-0.046-0.007-0.091-0.014-0.137c-0.014-0.089-0.036-0.176-0.063-0.262 c-0.012-0.034-0.019-0.069-0.031-0.103c-0.047-0.118-0.106-0.229-0.178-0.335c-0.004-0.006-0.006-0.012-0.01-0.018L67.999,3.358 c-0.01-0.013-0.003-0.026-0.013-0.04L68,3.315V4c0,0-0.033,0-0.037,0c-0.403-1-1.094-1.124-1.752-0.976 c0,0.004-0.004-0.012-0.007-0.012C66.201,3.016,66.194,3,66.194,3H66.19h-0.003h-0.003h-0.004h-0.003c0,0-0.004,0-0.007,0 s-0.003-0.151-0.007-0.151L20.495,15.227c-0.025,0.007-0.046-0.019-0.071-0.011c-0.087,0.028-0.172,0.041-0.253,0.083 c-0.054,0.027-0.102,0.053-0.152,0.085c-0.051,0.033-0.101,0.061-0.147,0.099c-0.044,0.036-0.084,0.073-0.124,0.113 c-0.048,0.048-0.093,0.098-0.136,0.152c-0.03,0.039-0.059,0.076-0.085,0.117c-0.046,0.07-0.084,0.145-0.12,0.223 c-0.011,0.023-0.027,0.042-0.036,0.066L2.911,57.664C2.891,57.715,3,57.768,3,57.82v0.002c0,0.186,0,0.375,0,0.562 c0,0.004,0,0.004,0,0.008c0,0,0,0,0,0.002c0,0,0,0,0,0.004v0.004v0.002c0,0.074-0.002,0.15,0.012,0.223 C3.015,58.631,3,58.631,3,58.633c0,0.004,0,0.004,0,0.008c0,0,0,0,0,0.002c0,0,0,0,0,0.004v0.004c0,0,0,0,0,0.002v0.004 c0,0.191-0.046,0.377,0.06,0.545c0-0.002-0.03,0.004-0.03,0.004c0,0.004-0.03,0.004-0.03,0.004c0,0.002,0,0.002,0,0.002 l-0.045,0.004c0.03,0.047,0.036,0.09,0.068,0.133l29.049,37.359c0.002,0.004,0,0.006,0.002,0.01c0.002,0.002,0,0.004,0.002,0.008 c0.006,0.008,0.014,0.014,0.021,0.021c0.024,0.029,0.052,0.051,0.078,0.078c0.027,0.029,0.053,0.057,0.082,0.082 c0.03,0.027,0.055,0.062,0.086,0.088c0.026,0.02,0.057,0.033,0.084,0.053c0.04,0.027,0.081,0.053,0.123,0.076 c0.005,0.004,0.01,0.008,0.016,0.01c0.087,0.051,0.176,0.09,0.269,0.123c0.042,0.014,0.082,0.031,0.125,0.043 c0.021,0.006,0.041,0.018,0.062,0.021c0.123,0.027,0.249,0.043,0.375,0.043c0.099,0,0.202-0.012,0.304-0.027l45.669-8.303 c0.057-0.01,0.108-0.021,0.163-0.037C79.547,88.992,79.562,89,79.575,89c0.004,0,0.004,0,0.004,0c0.021,0,0.039-0.027,0.06-0.035 c0.041-0.014,0.08-0.034,0.12-0.052c0.021-0.01,0.044-0.019,0.064-0.03c0.017-0.01,0.026-0.015,0.033-0.017 c0.014-0.008,0.023-0.021,0.037-0.028c0.14-0.078,0.269-0.174,0.38-0.285c0.014-0.016,0.024-0.034,0.038-0.048 c0.109-0.119,0.201-0.252,0.271-0.398c0.006-0.01,0.016-0.018,0.021-0.029c0.004-0.008,0.008-0.017,0.011-0.026 c0.002-0.004,0.003-0.006,0.005-0.01C80.627,88.021,80.635,88.002,80.644,87.982z M77.611,84.461L48.805,66.453l32.407-25.202 L77.611,84.461z M46.817,63.709L35.863,23.542l43.818,14.608L46.817,63.709z M84.668,40.542l8.926,5.952l-11.902,29.75 L84.668,40.542z M89.128,39.446L84.53,36.38l-6.129-12.257L89.128,39.446z M79.876,34.645L37.807,20.622L65.854,6.599L79.876,34.645 z M33.268,19.107l-6.485-2.162l23.781-6.487L33.268,19.107z M21.92,18.895l8.67,2.891L10.357,47.798L21.92,18.895z M32.652,24.649 l10.845,39.757L7.351,57.178L32.652,24.649z M43.472,67.857L32.969,92.363L8.462,60.855L43.472,67.857z M46.631,69.09l27.826,17.393 l-38.263,6.959L46.631,69.09z'></path></svg>;
|
return <svg version='1.1' x='0px' y='0px' viewBox='0 0 100 100' enableBackground='new 0 0 100 100'><path d='M80.644,87.982l16.592-41.483c0.054-0.128,0.088-0.26,0.108-0.394c0.006-0.039,0.007-0.077,0.011-0.116 c0.007-0.087,0.008-0.174,0.002-0.26c-0.003-0.046-0.007-0.091-0.014-0.137c-0.014-0.089-0.036-0.176-0.063-0.262 c-0.012-0.034-0.019-0.069-0.031-0.103c-0.047-0.118-0.106-0.229-0.178-0.335c-0.004-0.006-0.006-0.012-0.01-0.018L67.999,3.358 c-0.01-0.013-0.003-0.026-0.013-0.04L68,3.315V4c0,0-0.033,0-0.037,0c-0.403-1-1.094-1.124-1.752-0.976 c0,0.004-0.004-0.012-0.007-0.012C66.201,3.016,66.194,3,66.194,3H66.19h-0.003h-0.003h-0.004h-0.003c0,0-0.004,0-0.007,0 s-0.003-0.151-0.007-0.151L20.495,15.227c-0.025,0.007-0.046-0.019-0.071-0.011c-0.087,0.028-0.172,0.041-0.253,0.083 c-0.054,0.027-0.102,0.053-0.152,0.085c-0.051,0.033-0.101,0.061-0.147,0.099c-0.044,0.036-0.084,0.073-0.124,0.113 c-0.048,0.048-0.093,0.098-0.136,0.152c-0.03,0.039-0.059,0.076-0.085,0.117c-0.046,0.07-0.084,0.145-0.12,0.223 c-0.011,0.023-0.027,0.042-0.036,0.066L2.911,57.664C2.891,57.715,3,57.768,3,57.82v0.002c0,0.186,0,0.375,0,0.562 c0,0.004,0,0.004,0,0.008c0,0,0,0,0,0.002c0,0,0,0,0,0.004v0.004v0.002c0,0.074-0.002,0.15,0.012,0.223 C3.015,58.631,3,58.631,3,58.633c0,0.004,0,0.004,0,0.008c0,0,0,0,0,0.002c0,0,0,0,0,0.004v0.004c0,0,0,0,0,0.002v0.004 c0,0.191-0.046,0.377,0.06,0.545c0-0.002-0.03,0.004-0.03,0.004c0,0.004-0.03,0.004-0.03,0.004c0,0.002,0,0.002,0,0.002 l-0.045,0.004c0.03,0.047,0.036,0.09,0.068,0.133l29.049,37.359c0.002,0.004,0,0.006,0.002,0.01c0.002,0.002,0,0.004,0.002,0.008 c0.006,0.008,0.014,0.014,0.021,0.021c0.024,0.029,0.052,0.051,0.078,0.078c0.027,0.029,0.053,0.057,0.082,0.082 c0.03,0.027,0.055,0.062,0.086,0.088c0.026,0.02,0.057,0.033,0.084,0.053c0.04,0.027,0.081,0.053,0.123,0.076 c0.005,0.004,0.01,0.008,0.016,0.01c0.087,0.051,0.176,0.09,0.269,0.123c0.042,0.014,0.082,0.031,0.125,0.043 c0.021,0.006,0.041,0.018,0.062,0.021c0.123,0.027,0.249,0.043,0.375,0.043c0.099,0,0.202-0.012,0.304-0.027l45.669-8.303 c0.057-0.01,0.108-0.021,0.163-0.037C79.547,88.992,79.562,89,79.575,89c0.004,0,0.004,0,0.004,0c0.021,0,0.039-0.027,0.06-0.035 c0.041-0.014,0.08-0.034,0.12-0.052c0.021-0.01,0.044-0.019,0.064-0.03c0.017-0.01,0.026-0.015,0.033-0.017 c0.014-0.008,0.023-0.021,0.037-0.028c0.14-0.078,0.269-0.174,0.38-0.285c0.014-0.016,0.024-0.034,0.038-0.048 c0.109-0.119,0.201-0.252,0.271-0.398c0.006-0.01,0.016-0.018,0.021-0.029c0.004-0.008,0.008-0.017,0.011-0.026 c0.002-0.004,0.003-0.006,0.005-0.01C80.627,88.021,80.635,88.002,80.644,87.982z M77.611,84.461L48.805,66.453l32.407-25.202 L77.611,84.461z M46.817,63.709L35.863,23.542l43.818,14.608L46.817,63.709z M84.668,40.542l8.926,5.952l-11.902,29.75 L84.668,40.542z M89.128,39.446L84.53,36.38l-6.129-12.257L89.128,39.446z M79.876,34.645L37.807,20.622L65.854,6.599L79.876,34.645 z M33.268,19.107l-6.485-2.162l23.781-6.487L33.268,19.107z M21.92,18.895l8.67,2.891L10.357,47.798L21.92,18.895z M32.652,24.649 l10.845,39.757L7.351,57.178L32.652,24.649z M43.472,67.857L32.969,92.363L8.462,60.855L43.472,67.857z M46.631,69.09l27.826,17.393 l-38.263,6.959L46.631,69.09z'></path></svg>;
|
||||||
};
|
};
|
||||||
@@ -1,22 +1,23 @@
|
|||||||
/*eslint max-lines: ["warn", {"max": 300, "skipBlankLines": true, "skipComments": true}]*/
|
/*eslint max-lines: ["warn", {"max": 300, "skipBlankLines": true, "skipComments": true}]*/
|
||||||
import './brewRenderer.less';
|
require('./brewRenderer.less');
|
||||||
import React, { useState, useRef, useMemo, useEffect } from 'react';
|
const React = require('react');
|
||||||
import _ from 'lodash';
|
const { useState, useRef, useMemo, useEffect } = React;
|
||||||
|
const _ = require('lodash');
|
||||||
|
|
||||||
import MarkdownLegacy from '../../../shared/markdownLegacy.js';
|
const MarkdownLegacy = require('markdownLegacy.js');
|
||||||
import Markdown from '../../../shared/markdown.js';
|
import Markdown from 'markdown.js';
|
||||||
import ErrorBar from './errorBar/errorBar.jsx';
|
const ErrorBar = require('./errorBar/errorBar.jsx');
|
||||||
import ToolBar from './toolBar/toolBar.jsx';
|
const ToolBar = require('./toolBar/toolBar.jsx');
|
||||||
|
|
||||||
//TODO: move to the brew renderer
|
//TODO: move to the brew renderer
|
||||||
import RenderWarnings from '../../components/renderWarnings/renderWarnings.jsx';
|
const RenderWarnings = require('client/components/renderWarnings/renderWarnings.jsx');
|
||||||
import NotificationPopup from './notificationPopup/notificationPopup.jsx';
|
const NotificationPopup = require('./notificationPopup/notificationPopup.jsx');
|
||||||
import Frame from 'react-frame-component';
|
const Frame = require('react-frame-component').default;
|
||||||
import dedent from 'dedent';
|
const dedent = require('dedent-tabs').default;
|
||||||
import { printCurrentBrew } from '../../../shared/helpers.js';
|
const { printCurrentBrew } = require('../../../shared/helpers.js');
|
||||||
|
|
||||||
import HeaderNav from './headerNav/headerNav.jsx';
|
import HeaderNav from './headerNav/headerNav.jsx';
|
||||||
import safeHTML from './safeHTML.js';
|
import { safeHTML } from './safeHTML.js';
|
||||||
|
|
||||||
const PAGEBREAK_REGEX_V3 = /^(?=\\page(?:break)?(?: *{[^\n{}]*})?$)/m;
|
const PAGEBREAK_REGEX_V3 = /^(?=\\page(?:break)?(?: *{[^\n{}]*})?$)/m;
|
||||||
const PAGEBREAK_REGEX_LEGACY = /\\page(?:break)?/m;
|
const PAGEBREAK_REGEX_LEGACY = /\\page(?:break)?/m;
|
||||||
@@ -344,4 +345,4 @@ const BrewRenderer = (props)=>{
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default BrewRenderer;
|
module.exports = BrewRenderer;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import './errorBar.less';
|
require('./errorBar.less');
|
||||||
import React from 'react';
|
const React = require('react');
|
||||||
|
|
||||||
import Dialog from '../../../components/dialog.jsx';
|
import Dialog from '../../../components/dialog.jsx';
|
||||||
|
|
||||||
@@ -50,4 +50,4 @@ const ErrorBar = (props)=>{
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default ErrorBar;
|
module.exports = ErrorBar;
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
@import './shared/naturalcrit/styles/colors.less';
|
|
||||||
|
|
||||||
.errorBar {
|
.errorBar {
|
||||||
position : absolute;
|
position : absolute;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import './headerNav.less';
|
require('./headerNav.less');
|
||||||
|
|
||||||
import React from 'react';
|
import * as React from 'react';
|
||||||
import _ from 'lodash';
|
import * as _ from 'lodash';
|
||||||
|
|
||||||
const MAX_TEXT_LENGTH = 40;
|
const MAX_TEXT_LENGTH = 40;
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import './notificationPopup.less';
|
require('./notificationPopup.less');
|
||||||
import React, { useEffect, useState } from 'react';
|
import React, { useEffect, useState } from 'react';
|
||||||
import request from '../../utils/request-middleware.js';
|
import request from '../../utils/request-middleware.js';
|
||||||
import Markdown from '../../../../shared/markdown.js';
|
import Markdown from 'markdown.js';
|
||||||
|
|
||||||
import Dialog from '../../../components/dialog.jsx';
|
import Dialog from '../../../components/dialog.jsx';
|
||||||
|
|
||||||
@@ -62,4 +62,4 @@ const NotificationPopup = ()=>{
|
|||||||
</Dialog>;
|
</Dialog>;
|
||||||
};
|
};
|
||||||
|
|
||||||
export default NotificationPopup;
|
module.exports = NotificationPopup;
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
@import './client/homebrew/navbar/navbar.less';
|
|
||||||
|
|
||||||
.popups {
|
.popups {
|
||||||
position : fixed;
|
position : fixed;
|
||||||
top : calc(@navbarHeight + @viewerToolsHeight);
|
top : calc(@navbarHeight + @viewerToolsHeight);
|
||||||
|
|||||||
@@ -43,4 +43,4 @@ function safeHTML(htmlString) {
|
|||||||
return div.innerHTML;
|
return div.innerHTML;
|
||||||
};
|
};
|
||||||
|
|
||||||
export default safeHTML;
|
module.exports.safeHTML = safeHTML;
|
||||||
@@ -1,7 +1,8 @@
|
|||||||
/* eslint-disable max-lines */
|
/* eslint-disable max-lines */
|
||||||
import './toolBar.less';
|
require('./toolBar.less');
|
||||||
import React, { useState, useEffect } from 'react';
|
const React = require('react');
|
||||||
import _ from 'lodash';
|
const { useState, useEffect } = React;
|
||||||
|
const _ = require('lodash');
|
||||||
|
|
||||||
import { Anchored, AnchoredBox, AnchoredTrigger } from '../../../components/Anchored.jsx';
|
import { Anchored, AnchoredBox, AnchoredTrigger } from '../../../components/Anchored.jsx';
|
||||||
|
|
||||||
@@ -258,4 +259,4 @@ const ToolBar = ({ displayOptions, onDisplayOptionsChange, visiblePages, totalPa
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default ToolBar;
|
module.exports = ToolBar;
|
||||||
|
|||||||
@@ -1,14 +1,14 @@
|
|||||||
/*eslint max-lines: ["warn", {"max": 500, "skipBlankLines": true, "skipComments": true}]*/
|
/*eslint max-lines: ["warn", {"max": 500, "skipBlankLines": true, "skipComments": true}]*/
|
||||||
import './editor.less';
|
require('./editor.less');
|
||||||
import React from 'react';
|
const React = require('react');
|
||||||
import createReactClass from 'create-react-class';
|
const createClass = require('create-react-class');
|
||||||
import _ from 'lodash';
|
const _ = require('lodash');
|
||||||
import dedent from 'dedent';
|
const dedent = require('dedent-tabs').default;
|
||||||
import Markdown from '../../../shared/markdown.js';
|
import Markdown from '../../../shared/markdown.js';
|
||||||
|
|
||||||
import CodeEditor from '../../components/codeEditor/codeEditor.jsx';
|
const CodeEditor = require('client/components/codeEditor/codeEditor.jsx');
|
||||||
import SnippetBar from './snippetbar/snippetbar.jsx';
|
const SnippetBar = require('./snippetbar/snippetbar.jsx');
|
||||||
import MetadataEditor from './metadataEditor/metadataEditor.jsx';
|
const MetadataEditor = require('./metadataEditor/metadataEditor.jsx');
|
||||||
|
|
||||||
const EDITOR_THEME_KEY = 'HB_editor_theme';
|
const EDITOR_THEME_KEY = 'HB_editor_theme';
|
||||||
|
|
||||||
@@ -31,7 +31,7 @@ const DEFAULT_SNIPPET_TEXT = dedent`
|
|||||||
`;
|
`;
|
||||||
let isJumping = false;
|
let isJumping = false;
|
||||||
|
|
||||||
const Editor = createReactClass({
|
const Editor = createClass({
|
||||||
displayName : 'Editor',
|
displayName : 'Editor',
|
||||||
getDefaultProps : function() {
|
getDefaultProps : function() {
|
||||||
return {
|
return {
|
||||||
@@ -76,8 +76,8 @@ const Editor = createReactClass({
|
|||||||
document.getElementById('BrewRenderer').addEventListener('keydown', this.handleControlKeys);
|
document.getElementById('BrewRenderer').addEventListener('keydown', this.handleControlKeys);
|
||||||
document.addEventListener('keydown', this.handleControlKeys);
|
document.addEventListener('keydown', this.handleControlKeys);
|
||||||
|
|
||||||
this.codeEditor.current.codeMirror?.on('cursorActivity', (cm)=>{this.updateCurrentCursorPage(cm.getCursor());});
|
this.codeEditor.current.codeMirror.on('cursorActivity', (cm)=>{this.updateCurrentCursorPage(cm.getCursor());});
|
||||||
this.codeEditor.current.codeMirror?.on('scroll', _.throttle(()=>{this.updateCurrentViewPage(this.codeEditor.current.getTopVisibleLine());}, 200));
|
this.codeEditor.current.codeMirror.on('scroll', _.throttle(()=>{this.updateCurrentViewPage(this.codeEditor.current.getTopVisibleLine());}, 200));
|
||||||
|
|
||||||
const editorTheme = window.localStorage.getItem(EDITOR_THEME_KEY);
|
const editorTheme = window.localStorage.getItem(EDITOR_THEME_KEY);
|
||||||
if(editorTheme) {
|
if(editorTheme) {
|
||||||
@@ -156,21 +156,21 @@ const Editor = createReactClass({
|
|||||||
this.setState({
|
this.setState({
|
||||||
view : newView
|
view : newView
|
||||||
}, ()=>{
|
}, ()=>{
|
||||||
this.codeEditor.current?.codeMirror?.focus();
|
this.codeEditor.current?.codeMirror.focus();
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
highlightCustomMarkdown : function(){
|
highlightCustomMarkdown : function(){
|
||||||
if(!this.codeEditor.current?.codeMirror) return;
|
if(!this.codeEditor.current) return;
|
||||||
if((this.state.view === 'text') ||(this.state.view === 'snippet')) {
|
if((this.state.view === 'text') ||(this.state.view === 'snippet')) {
|
||||||
const codeMirror = this.codeEditor.current.codeMirror;
|
const codeMirror = this.codeEditor.current.codeMirror;
|
||||||
|
|
||||||
codeMirror?.operation(()=>{ // Batch CodeMirror styling
|
codeMirror.operation(()=>{ // Batch CodeMirror styling
|
||||||
|
|
||||||
const foldLines = [];
|
const foldLines = [];
|
||||||
|
|
||||||
//reset custom text styles
|
//reset custom text styles
|
||||||
const customHighlights = codeMirror?.getAllMarks().filter((mark)=>{
|
const customHighlights = codeMirror.getAllMarks().filter((mark)=>{
|
||||||
// Record details of folded sections
|
// Record details of folded sections
|
||||||
if(mark.__isFold) {
|
if(mark.__isFold) {
|
||||||
const fold = mark.find();
|
const fold = mark.find();
|
||||||
@@ -191,10 +191,10 @@ const Editor = createReactClass({
|
|||||||
const textOrSnip = this.state.view === 'text';
|
const textOrSnip = this.state.view === 'text';
|
||||||
|
|
||||||
//reset custom line styles
|
//reset custom line styles
|
||||||
codeMirror?.removeLineClass(lineNumber, 'background', 'pageLine');
|
codeMirror.removeLineClass(lineNumber, 'background', 'pageLine');
|
||||||
codeMirror?.removeLineClass(lineNumber, 'background', 'snippetLine');
|
codeMirror.removeLineClass(lineNumber, 'background', 'snippetLine');
|
||||||
codeMirror?.removeLineClass(lineNumber, 'text');
|
codeMirror.removeLineClass(lineNumber, 'text');
|
||||||
codeMirror?.removeLineClass(lineNumber, 'wrap', 'sourceMoveFlash');
|
codeMirror.removeLineClass(lineNumber, 'wrap', 'sourceMoveFlash');
|
||||||
|
|
||||||
// Don't process lines inside folded text
|
// Don't process lines inside folded text
|
||||||
// If the current lineNumber is inside any folded marks, skip line styling
|
// If the current lineNumber is inside any folded marks, skip line styling
|
||||||
@@ -210,19 +210,19 @@ const Editor = createReactClass({
|
|||||||
else if(this.state.view !== 'text') userSnippetCount += 1;
|
else if(this.state.view !== 'text') userSnippetCount += 1;
|
||||||
|
|
||||||
// add back the original class 'background' but also add the new class '.pageline'
|
// add back the original class 'background' but also add the new class '.pageline'
|
||||||
codeMirror?.addLineClass(lineNumber, 'background', tabHighlight);
|
codeMirror.addLineClass(lineNumber, 'background', tabHighlight);
|
||||||
const pageCountElement = Object.assign(document.createElement('span'), {
|
const pageCountElement = Object.assign(document.createElement('span'), {
|
||||||
className : 'editor-page-count',
|
className : 'editor-page-count',
|
||||||
textContent : textOrSnip ? editorPageCount : userSnippetCount
|
textContent : textOrSnip ? editorPageCount : userSnippetCount
|
||||||
});
|
});
|
||||||
codeMirror?.setBookmark({ line: lineNumber, ch: line.length }, pageCountElement);
|
codeMirror.setBookmark({ line: lineNumber, ch: line.length }, pageCountElement);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// New CodeMirror styling for V3 renderer
|
// New Codemirror styling for V3 renderer
|
||||||
if(this.props.renderer === 'V3') {
|
if(this.props.renderer === 'V3') {
|
||||||
if(line.match(/^\\column(?:break)?$/)){
|
if(line.match(/^\\column(?:break)?$/)){
|
||||||
codeMirror?.addLineClass(lineNumber, 'text', 'columnSplit');
|
codeMirror.addLineClass(lineNumber, 'text', 'columnSplit');
|
||||||
}
|
}
|
||||||
|
|
||||||
// definition lists
|
// definition lists
|
||||||
@@ -231,14 +231,14 @@ const Editor = createReactClass({
|
|||||||
const regex = /^([^\n]*?:?\s?)(::[^\n]*)(?:\n|$)/ymd; // the `d` flag, for match indices, throws an ESLint error.
|
const regex = /^([^\n]*?:?\s?)(::[^\n]*)(?:\n|$)/ymd; // the `d` flag, for match indices, throws an ESLint error.
|
||||||
let match;
|
let match;
|
||||||
while ((match = regex.exec(line)) != null){
|
while ((match = regex.exec(line)) != null){
|
||||||
codeMirror?.markText({ line: lineNumber, ch: match.indices[0][0] }, { line: lineNumber, ch: match.indices[0][1] }, { className: 'dl-highlight' });
|
codeMirror.markText({ line: lineNumber, ch: match.indices[0][0] }, { line: lineNumber, ch: match.indices[0][1] }, { className: 'dl-highlight' });
|
||||||
codeMirror?.markText({ line: lineNumber, ch: match.indices[1][0] }, { line: lineNumber, ch: match.indices[1][1] }, { className: 'dt-highlight' });
|
codeMirror.markText({ line: lineNumber, ch: match.indices[1][0] }, { line: lineNumber, ch: match.indices[1][1] }, { className: 'dt-highlight' });
|
||||||
codeMirror?.markText({ line: lineNumber, ch: match.indices[2][0] }, { line: lineNumber, ch: match.indices[2][1] }, { className: 'dd-highlight' });
|
codeMirror.markText({ line: lineNumber, ch: match.indices[2][0] }, { line: lineNumber, ch: match.indices[2][1] }, { className: 'dd-highlight' });
|
||||||
const ddIndex = match.indices[2][0];
|
const ddIndex = match.indices[2][0];
|
||||||
const colons = /::/g;
|
const colons = /::/g;
|
||||||
const colonMatches = colons.exec(match[2]);
|
const colonMatches = colons.exec(match[2]);
|
||||||
if(colonMatches !== null){
|
if(colonMatches !== null){
|
||||||
codeMirror?.markText({ line: lineNumber, ch: colonMatches.index + ddIndex }, { line: lineNumber, ch: colonMatches.index + colonMatches[0].length + ddIndex }, { className: 'dl-colon-highlight' });
|
codeMirror.markText({ line: lineNumber, ch: colonMatches.index + ddIndex }, { line: lineNumber, ch: colonMatches.index + colonMatches[0].length + ddIndex }, { className: 'dl-colon-highlight' });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -255,7 +255,7 @@ const Editor = createReactClass({
|
|||||||
const match = subRegex.exec(line) || superRegex.exec(line);
|
const match = subRegex.exec(line) || superRegex.exec(line);
|
||||||
if(match) {
|
if(match) {
|
||||||
isSuper = !subRegex.lastIndex;
|
isSuper = !subRegex.lastIndex;
|
||||||
codeMirror?.markText({ line: lineNumber, ch: match.index }, { line: lineNumber, ch: match.index + match[0].length }, { className: isSuper ? 'superscript' : 'subscript' });
|
codeMirror.markText({ line: lineNumber, ch: match.index }, { line: lineNumber, ch: match.index + match[0].length }, { className: isSuper ? 'superscript' : 'subscript' });
|
||||||
}
|
}
|
||||||
startIndex = line.indexOf('^', Math.max(startIndex + 1, subRegex.lastIndex, superRegex.lastIndex));
|
startIndex = line.indexOf('^', Math.max(startIndex + 1, subRegex.lastIndex, superRegex.lastIndex));
|
||||||
}
|
}
|
||||||
@@ -266,7 +266,7 @@ const Editor = createReactClass({
|
|||||||
const regex = /(?:^|[^{\n])({(?=((?:[:=](?:"[\w,\-()#%. ]*"|[\w\-()#%.]*)|[^"':={}\s]*)*))\2})/gm;
|
const regex = /(?:^|[^{\n])({(?=((?:[:=](?:"[\w,\-()#%. ]*"|[\w\-()#%.]*)|[^"':={}\s]*)*))\2})/gm;
|
||||||
let match;
|
let match;
|
||||||
while ((match = regex.exec(line)) != null) {
|
while ((match = regex.exec(line)) != null) {
|
||||||
codeMirror?.markText({ line: lineNumber, ch: line.indexOf(match[1]) }, { line: lineNumber, ch: line.indexOf(match[1]) + match[1].length }, { className: 'injection' });
|
codeMirror.markText({ line: lineNumber, ch: line.indexOf(match[1]) }, { line: lineNumber, ch: line.indexOf(match[1]) + match[1].length }, { className: 'injection' });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Highlight inline spans {{content}}
|
// Highlight inline spans {{content}}
|
||||||
@@ -284,7 +284,7 @@ const Editor = createReactClass({
|
|||||||
blockCount = 0;
|
blockCount = 0;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
codeMirror?.markText({ line: lineNumber, ch: match.index }, { line: lineNumber, ch: match.index + match[0].length }, { className: 'inline-block' });
|
codeMirror.markText({ line: lineNumber, ch: match.index }, { line: lineNumber, ch: match.index + match[0].length }, { className: 'inline-block' });
|
||||||
}
|
}
|
||||||
} else if(line.trimLeft().startsWith('{{') || line.trimLeft().startsWith('}}')){
|
} else if(line.trimLeft().startsWith('{{') || line.trimLeft().startsWith('}}')){
|
||||||
// Highlight block divs {{\n Content \n}}
|
// Highlight block divs {{\n Content \n}}
|
||||||
@@ -293,7 +293,7 @@ const Editor = createReactClass({
|
|||||||
const match = line.match(/^ *{{(?=((?:[:=](?:"[\w,\-()#%. ]*"|[\w\-()#%.]*)|[^"':={}\s]*)*))\1 *$|^ *}}$/);
|
const match = line.match(/^ *{{(?=((?:[:=](?:"[\w,\-()#%. ]*"|[\w\-()#%.]*)|[^"':={}\s]*)*))\1 *$|^ *}}$/);
|
||||||
if(match)
|
if(match)
|
||||||
endCh = match.index+match[0].length;
|
endCh = match.index+match[0].length;
|
||||||
codeMirror?.markText({ line: lineNumber, ch: 0 }, { line: lineNumber, ch: endCh }, { className: 'block' });
|
codeMirror.markText({ line: lineNumber, ch: 0 }, { line: lineNumber, ch: endCh }, { className: 'block' });
|
||||||
}
|
}
|
||||||
|
|
||||||
// Emojis
|
// Emojis
|
||||||
@@ -314,11 +314,11 @@ const Editor = createReactClass({
|
|||||||
const endPos = { line: lineNumber, ch: match.index + match[0].length };
|
const endPos = { line: lineNumber, ch: match.index + match[0].length };
|
||||||
|
|
||||||
// Iterate over conflicting marks and clear them
|
// Iterate over conflicting marks and clear them
|
||||||
const marks = codeMirror?.findMarks(startPos, endPos);
|
const marks = codeMirror.findMarks(startPos, endPos);
|
||||||
marks.forEach(function(marker) {
|
marks.forEach(function(marker) {
|
||||||
if(!marker.__isFold) marker.clear();
|
if(!marker.__isFold) marker.clear();
|
||||||
});
|
});
|
||||||
codeMirror?.markText(startPos, endPos, { className: 'emoji' });
|
codeMirror.markText(startPos, endPos, { className: 'emoji' });
|
||||||
}
|
}
|
||||||
startIndex = line.indexOf(':', Math.max(startIndex + 1, emojiRegex.lastIndex));
|
startIndex = line.indexOf(':', Math.max(startIndex + 1, emojiRegex.lastIndex));
|
||||||
}
|
}
|
||||||
@@ -378,46 +378,44 @@ const Editor = createReactClass({
|
|||||||
const textString = this.props.brew.text.split(textSplit).slice(0, targetPage-1).join(textSplit);
|
const textString = this.props.brew.text.split(textSplit).slice(0, targetPage-1).join(textSplit);
|
||||||
const targetLine = textString.match('\n') ? textString.split('\n').length - 1 : -1;
|
const targetLine = textString.match('\n') ? textString.split('\n').length - 1 : -1;
|
||||||
|
|
||||||
let currentY = this.codeEditor.current.codeMirror?.getScrollInfo().top;
|
let currentY = this.codeEditor.current.codeMirror.getScrollInfo().top;
|
||||||
let targetY = this.codeEditor.current.codeMirror?.heightAtLine(targetLine, 'local', true);
|
let targetY = this.codeEditor.current.codeMirror.heightAtLine(targetLine, 'local', true);
|
||||||
|
|
||||||
let scrollingTimeout;
|
let scrollingTimeout;
|
||||||
const checkIfScrollComplete = ()=>{ // Prevent interrupting a scroll in progress if user clicks multiple times
|
const checkIfScrollComplete = ()=>{ // Prevent interrupting a scroll in progress if user clicks multiple times
|
||||||
clearTimeout(scrollingTimeout); // Reset the timer every time a scroll event occurs
|
clearTimeout(scrollingTimeout); // Reset the timer every time a scroll event occurs
|
||||||
scrollingTimeout = setTimeout(()=>{
|
scrollingTimeout = setTimeout(()=>{
|
||||||
isJumping = false;
|
isJumping = false;
|
||||||
this.codeEditor.current.codeMirror?.off('scroll', checkIfScrollComplete);
|
this.codeEditor.current.codeMirror.off('scroll', checkIfScrollComplete);
|
||||||
}, 150); // If 150 ms pass without a scroll event, assume scrolling is done
|
}, 150); // If 150 ms pass without a scroll event, assume scrolling is done
|
||||||
};
|
};
|
||||||
|
|
||||||
isJumping = true;
|
isJumping = true;
|
||||||
checkIfScrollComplete();
|
checkIfScrollComplete();
|
||||||
if (this.codeEditor.current?.codeMirror) {
|
this.codeEditor.current.codeMirror.on('scroll', checkIfScrollComplete);
|
||||||
this.codeEditor.current.codeMirror?.on('scroll', checkIfScrollComplete);
|
|
||||||
}
|
|
||||||
|
|
||||||
if(smooth) {
|
if(smooth) {
|
||||||
//Scroll 1/10 of the way every 10ms until 1px off.
|
//Scroll 1/10 of the way every 10ms until 1px off.
|
||||||
const incrementalScroll = setInterval(()=>{
|
const incrementalScroll = setInterval(()=>{
|
||||||
currentY += (targetY - currentY) / 10;
|
currentY += (targetY - currentY) / 10;
|
||||||
this.codeEditor.current.codeMirror?.scrollTo(null, currentY);
|
this.codeEditor.current.codeMirror.scrollTo(null, currentY);
|
||||||
|
|
||||||
// Update target: target height is not accurate until within +-10 lines of the visible window
|
// Update target: target height is not accurate until within +-10 lines of the visible window
|
||||||
if(Math.abs(targetY - currentY > 100))
|
if(Math.abs(targetY - currentY > 100))
|
||||||
targetY = this.codeEditor.current.codeMirror?.heightAtLine(targetLine, 'local', true);
|
targetY = this.codeEditor.current.codeMirror.heightAtLine(targetLine, 'local', true);
|
||||||
|
|
||||||
// End when close enough
|
// End when close enough
|
||||||
if(Math.abs(targetY - currentY) < 1) {
|
if(Math.abs(targetY - currentY) < 1) {
|
||||||
this.codeEditor.current.codeMirror?.scrollTo(null, targetY); // Scroll any remaining difference
|
this.codeEditor.current.codeMirror.scrollTo(null, targetY); // Scroll any remaining difference
|
||||||
this.codeEditor.current.setCursorPosition({ line: targetLine + 1, ch: 0 });
|
this.codeEditor.current.setCursorPosition({ line: targetLine + 1, ch: 0 });
|
||||||
this.codeEditor.current.codeMirror?.addLineClass(targetLine + 1, 'wrap', 'sourceMoveFlash');
|
this.codeEditor.current.codeMirror.addLineClass(targetLine + 1, 'wrap', 'sourceMoveFlash');
|
||||||
clearInterval(incrementalScroll);
|
clearInterval(incrementalScroll);
|
||||||
}
|
}
|
||||||
}, 10);
|
}, 10);
|
||||||
} else {
|
} else {
|
||||||
this.codeEditor.current.codeMirror?.scrollTo(null, targetY); // Scroll any remaining difference
|
this.codeEditor.current.codeMirror.scrollTo(null, targetY); // Scroll any remaining difference
|
||||||
this.codeEditor.current.setCursorPosition({ line: targetLine + 1, ch: 0 });
|
this.codeEditor.current.setCursorPosition({ line: targetLine + 1, ch: 0 });
|
||||||
this.codeEditor.current.codeMirror?.addLineClass(targetLine + 1, 'wrap', 'sourceMoveFlash');
|
this.codeEditor.current.codeMirror.addLineClass(targetLine + 1, 'wrap', 'sourceMoveFlash');
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -544,4 +542,4 @@ const Editor = createReactClass({
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
export default Editor;
|
module.exports = Editor;
|
||||||
|
|||||||
@@ -1,6 +1,4 @@
|
|||||||
@import './shared/naturalcrit/styles/core.less';
|
@import 'themes/codeMirror/customEditorStyles.less';
|
||||||
@import './themes/codeMirror/customEditorStyles.less';
|
|
||||||
|
|
||||||
.editor {
|
.editor {
|
||||||
position : relative;
|
position : relative;
|
||||||
width : 100%;
|
width : 100%;
|
||||||
|
|||||||
@@ -1,19 +1,19 @@
|
|||||||
/* eslint-disable max-lines */
|
/* eslint-disable max-lines */
|
||||||
import './metadataEditor.less';
|
require('./metadataEditor.less');
|
||||||
import React from 'react';
|
const React = require('react');
|
||||||
import createReactClass from 'create-react-class';
|
const createClass = require('create-react-class');
|
||||||
import _ from 'lodash';
|
const _ = require('lodash');
|
||||||
import request from '../../utils/request-middleware.js';
|
import request from '../../utils/request-middleware.js';
|
||||||
import Combobox from '../../../components/combobox.jsx';
|
const Combobox = require('client/components/combobox.jsx');
|
||||||
import TagInput from '../tagInput/tagInput.jsx';
|
const TagInput = require('../tagInput/tagInput.jsx');
|
||||||
|
|
||||||
|
|
||||||
import Themes from '../../../../themes/themes.json';
|
const Themes = require('themes/themes.json');
|
||||||
import validations from './validations.js';
|
const validations = require('./validations.js');
|
||||||
|
|
||||||
const SYSTEMS = ['5e', '4e', '3.5e', 'Pathfinder'];
|
const SYSTEMS = ['5e', '4e', '3.5e', 'Pathfinder'];
|
||||||
|
|
||||||
import homebreweryThumbnail from '../../thumbnail.png';
|
const homebreweryThumbnail = require('../../thumbnail.png');
|
||||||
|
|
||||||
const callIfExists = (val, fn, ...args)=>{
|
const callIfExists = (val, fn, ...args)=>{
|
||||||
if(val[fn]) {
|
if(val[fn]) {
|
||||||
@@ -21,7 +21,7 @@ const callIfExists = (val, fn, ...args)=>{
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const MetadataEditor = createReactClass({
|
const MetadataEditor = createClass({
|
||||||
displayName : 'MetadataEditor',
|
displayName : 'MetadataEditor',
|
||||||
getDefaultProps : function() {
|
getDefaultProps : function() {
|
||||||
return {
|
return {
|
||||||
@@ -411,4 +411,4 @@ const MetadataEditor = createReactClass({
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
export default MetadataEditor;
|
module.exports = MetadataEditor;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
@import './shared/naturalcrit/styles/core.less';
|
@import 'naturalcrit/styles/colors.less';
|
||||||
|
|
||||||
.userThemeName {
|
.userThemeName {
|
||||||
padding-right : 10px;
|
padding-right : 10px;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
export default {
|
module.exports = {
|
||||||
title : [
|
title : [
|
||||||
(value)=>{
|
(value)=>{
|
||||||
return value?.length > 100 ? 'Max title length of 100 characters' : null;
|
return value?.length > 100 ? 'Max title length of 100 characters' : null;
|
||||||
|
|||||||
@@ -1,36 +1,29 @@
|
|||||||
/*eslint max-lines: ["warn", {"max": 350, "skipBlankLines": true, "skipComments": true}]*/
|
/*eslint max-lines: ["warn", {"max": 350, "skipBlankLines": true, "skipComments": true}]*/
|
||||||
import './snippetbar.less';
|
require('./snippetbar.less');
|
||||||
import React from 'react';
|
const React = require('react');
|
||||||
import createReactClass from 'create-react-class';
|
const createClass = require('create-react-class');
|
||||||
|
const _ = require('lodash');
|
||||||
import _ from 'lodash';
|
const cx = require('classnames');
|
||||||
import cx from 'classnames';
|
|
||||||
|
|
||||||
import { loadHistory } from '../../utils/versionHistory.js';
|
import { loadHistory } from '../../utils/versionHistory.js';
|
||||||
import { brewSnippetsToJSON } from '../../../../shared/helpers.js';
|
import { brewSnippetsToJSON } from '../../../../shared/helpers.js';
|
||||||
|
|
||||||
import Legacy5ePHB from '../../../../themes/Legacy/5ePHB/snippets.js';
|
//Import all themes
|
||||||
import V3_5ePHB from '../../../../themes/V3/5ePHB/snippets.js';
|
const ThemeSnippets = {};
|
||||||
import V3_5eDMG from '../../../../themes/V3/5eDMG/snippets.js';
|
ThemeSnippets['Legacy_5ePHB'] = require('themes/Legacy/5ePHB/snippets.js');
|
||||||
import V3_Journal from '../../../../themes/V3/Journal/snippets.js';
|
ThemeSnippets['V3_5ePHB'] = require('themes/V3/5ePHB/snippets.js');
|
||||||
import V3_Blank from '../../../../themes/V3/Blank/snippets.js';
|
ThemeSnippets['V3_5eDMG'] = require('themes/V3/5eDMG/snippets.js');
|
||||||
|
ThemeSnippets['V3_Journal'] = require('themes/V3/Journal/snippets.js');
|
||||||
|
ThemeSnippets['V3_Blank'] = require('themes/V3/Blank/snippets.js');
|
||||||
|
|
||||||
const ThemeSnippets = {
|
const EditorThemes = require('build/homebrew/codeMirror/editorThemes.json');
|
||||||
Legacy_5ePHB : Legacy5ePHB,
|
|
||||||
V3_5ePHB : V3_5ePHB,
|
|
||||||
V3_5eDMG : V3_5eDMG,
|
|
||||||
V3_Journal : V3_Journal,
|
|
||||||
V3_Blank : V3_Blank,
|
|
||||||
};
|
|
||||||
|
|
||||||
import EditorThemes from '../../../../build/homebrew/codeMirror/editorThemes.json';
|
|
||||||
|
|
||||||
const execute = function(val, props){
|
const execute = function(val, props){
|
||||||
if(_.isFunction(val)) return val(props);
|
if(_.isFunction(val)) return val(props);
|
||||||
return val;
|
return val;
|
||||||
};
|
};
|
||||||
|
|
||||||
const Snippetbar = createReactClass({
|
const Snippetbar = createClass({
|
||||||
displayName : 'SnippetBar',
|
displayName : 'SnippetBar',
|
||||||
getDefaultProps : function() {
|
getDefaultProps : function() {
|
||||||
return {
|
return {
|
||||||
@@ -288,9 +281,9 @@ const Snippetbar = createReactClass({
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
export default Snippetbar;
|
module.exports = Snippetbar;
|
||||||
|
|
||||||
const SnippetGroup = createReactClass({
|
const SnippetGroup = createClass({
|
||||||
displayName : 'SnippetGroup',
|
displayName : 'SnippetGroup',
|
||||||
getDefaultProps : function() {
|
getDefaultProps : function() {
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
@import './shared/naturalcrit/styles/core.less';
|
|
||||||
@import (less) './client/icons/customIcons.less';
|
@import (less) './client/icons/customIcons.less';
|
||||||
@import (less) '././././themes/fonts/5e/fonts.less';
|
@import (less) '././././themes/fonts/5e/fonts.less';
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import './tagInput.less';
|
require('./tagInput.less');
|
||||||
import React, { useState, useEffect } from 'react';
|
const React = require('react');
|
||||||
import _ from 'lodash';
|
const { useState, useEffect } = React;
|
||||||
|
const _ = require('lodash');
|
||||||
|
|
||||||
const TagInput = ({ unique = true, values = [], ...props })=>{
|
const TagInput = ({ unique = true, values = [], ...props })=>{
|
||||||
const [tempInputText, setTempInputText] = useState('');
|
const [tempInputText, setTempInputText] = useState('');
|
||||||
@@ -101,4 +102,4 @@ const TagInput = ({ unique = true, values = [], ...props })=>{
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default TagInput;
|
module.exports = TagInput;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
|
/* eslint-disable camelcase */
|
||||||
import 'core-js/es/string/to-well-formed.js'; //Polyfill for older browsers
|
import 'core-js/es/string/to-well-formed.js'; //Polyfill for older browsers
|
||||||
import './homebrew.less';
|
import './homebrew.less';
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
@@ -46,8 +46,8 @@ const Homebrew = (props)=>{
|
|||||||
global.config = config;
|
global.config = config;
|
||||||
|
|
||||||
const backgroundObject = ()=>{
|
const backgroundObject = ()=>{
|
||||||
if(global.config?.deployment || (config?.local && config?.development)){
|
if(global.config.deployment || (config.local && config.development)){
|
||||||
const bgText = global.config?.deployment || 'Local';
|
const bgText = global.config.deployment || 'Local';
|
||||||
return {
|
return {
|
||||||
backgroundImage : `url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' version='1.1' height='100px' width='200px'><text x='0' y='15' fill='%23fff7' font-size='20'>${bgText}</text></svg>")`
|
backgroundImage : `url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' version='1.1' height='100px' width='200px'><text x='0' y='15' fill='%23fff7' font-size='20'>${bgText}</text></svg>")`
|
||||||
};
|
};
|
||||||
@@ -58,7 +58,7 @@ const Homebrew = (props)=>{
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Router location={url}>
|
<Router location={url}>
|
||||||
<div className={`homebrew${(config?.deployment || config?.local) ? ' deployment' : ''}`} style={backgroundObject()}>
|
<div className={`homebrew${(config.deployment || config.local) ? ' deployment' : ''}`} style={backgroundObject()}>
|
||||||
<Routes>
|
<Routes>
|
||||||
<Route path='/edit/:id' element={<WithRoute el={EditPage} brew={brew} userThemes={userThemes}/>} />
|
<Route path='/edit/:id' element={<WithRoute el={EditPage} brew={brew} userThemes={userThemes}/>} />
|
||||||
<Route path='/share/:id' element={<WithRoute el={SharePage} brew={brew} />} />
|
<Route path='/share/:id' element={<WithRoute el={SharePage} brew={brew} />} />
|
||||||
@@ -80,4 +80,4 @@ const Homebrew = (props)=>{
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default Homebrew;
|
module.exports = Homebrew;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
@import './shared/naturalcrit/styles/core.less';
|
@import 'naturalcrit/styles/core.less';
|
||||||
.homebrew {
|
.homebrew {
|
||||||
height : 100%;
|
height : 100%;
|
||||||
background-color:@steel;
|
background-color:@steel;
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
import React from 'react';
|
const React = require('react');
|
||||||
import createReactClass from 'create-react-class';
|
const createClass = require('create-react-class');
|
||||||
import request from 'superagent';
|
const Nav = require('client/homebrew/navbar/nav.jsx');
|
||||||
import Nav from './nav.jsx';
|
const request = require('superagent');
|
||||||
|
|
||||||
const Account = createReactClass({
|
const Account = createClass({
|
||||||
displayName : 'AccountNavItem',
|
displayName : 'AccountNavItem',
|
||||||
getInitialState : function() {
|
getInitialState : function() {
|
||||||
return {
|
return {
|
||||||
@@ -97,7 +97,7 @@ const Account = createReactClass({
|
|||||||
|
|
||||||
// Logged out
|
// Logged out
|
||||||
// LOCAL ONLY
|
// LOCAL ONLY
|
||||||
if(global.config?.local) {
|
if(global.config.local) {
|
||||||
return <Nav.item color='teal' icon='fas fa-sign-in-alt' onClick={this.localLogin}>
|
return <Nav.item color='teal' icon='fas fa-sign-in-alt' onClick={this.localLogin}>
|
||||||
login
|
login
|
||||||
</Nav.item>;
|
</Nav.item>;
|
||||||
@@ -111,4 +111,4 @@ const Account = createReactClass({
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
export default Account;
|
module.exports = Account;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import './error-navitem.less';
|
require('./error-navitem.less');
|
||||||
import React from 'react';
|
const React = require('react');
|
||||||
import Nav from './nav.jsx';
|
const Nav = require('client/homebrew/navbar/nav.jsx');
|
||||||
|
|
||||||
const ErrorNavItem = ({ error = '', clearError })=>{
|
const ErrorNavItem = ({ error = '', clearError })=>{
|
||||||
const response = error.response;
|
const response = error.response;
|
||||||
@@ -144,4 +144,4 @@ const ErrorNavItem = ({ error = '', clearError })=>{
|
|||||||
</Nav.item>;
|
</Nav.item>;
|
||||||
};
|
};
|
||||||
|
|
||||||
export default ErrorNavItem;
|
module.exports = ErrorNavItem;
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
@import './shared/naturalcrit/styles/core.less';
|
|
||||||
|
|
||||||
.navItem.error {
|
.navItem.error {
|
||||||
position : relative;
|
position : relative;
|
||||||
background-color : @red;
|
background-color : @red;
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
import React from 'react';
|
const React = require('react');
|
||||||
import dedent from 'dedent';
|
const dedent = require('dedent-tabs').default;
|
||||||
|
|
||||||
import Nav from './nav.jsx';
|
const Nav = require('client/homebrew/navbar/nav.jsx');
|
||||||
|
|
||||||
export default function(props){
|
module.exports = function(props){
|
||||||
return <Nav.dropdown>
|
return <Nav.dropdown>
|
||||||
<Nav.item color='grey' icon='fas fa-question-circle'>
|
<Nav.item color='grey' icon='fas fa-question-circle'>
|
||||||
need help?
|
need help?
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
import React from 'react';
|
const React = require('react');
|
||||||
import createReactClass from 'create-react-class';
|
const createClass = require('create-react-class');
|
||||||
import Moment from 'moment';
|
const Moment = require('moment');
|
||||||
|
|
||||||
import Nav from './nav.jsx';
|
const Nav = require('client/homebrew/navbar/nav.jsx');
|
||||||
|
|
||||||
|
|
||||||
const MetadataNav = createReactClass({
|
const MetadataNav = createClass({
|
||||||
displayName : 'MetadataNav',
|
displayName : 'MetadataNav',
|
||||||
getDefaultProps : function() {
|
getDefaultProps : function() {
|
||||||
return {
|
return {
|
||||||
@@ -86,4 +86,4 @@ const MetadataNav = createReactClass({
|
|||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
export default MetadataNav;
|
module.exports = MetadataNav;
|
||||||
|
|||||||
@@ -1,13 +1,14 @@
|
|||||||
import './navbar.less';
|
require('client/homebrew/navbar/navbar.less');
|
||||||
import React, { useState, useRef, useEffect } from 'react';
|
const React = require('react');
|
||||||
import createReactClass from 'create-react-class';
|
const { useState, useRef, useEffect } = React;
|
||||||
import _ from 'lodash';
|
const createClass = require('create-react-class');
|
||||||
import cx from 'classnames';
|
const _ = require('lodash');
|
||||||
|
const cx = require('classnames');
|
||||||
|
|
||||||
import NaturalCritIcon from '../../components/svg/naturalcrit-d20.svg.jsx';
|
const NaturalCritIcon = require('client/components/svg/naturalcrit-d20.svg.jsx');
|
||||||
|
|
||||||
const Nav = {
|
const Nav = {
|
||||||
base : createReactClass({
|
base : createClass({
|
||||||
displayName : 'Nav.base',
|
displayName : 'Nav.base',
|
||||||
render : function(){
|
render : function(){
|
||||||
return <nav>
|
return <nav>
|
||||||
@@ -24,7 +25,7 @@ const Nav = {
|
|||||||
</a>;
|
</a>;
|
||||||
},
|
},
|
||||||
|
|
||||||
section : createReactClass({
|
section : createClass({
|
||||||
displayName : 'Nav.section',
|
displayName : 'Nav.section',
|
||||||
render : function(){
|
render : function(){
|
||||||
return <div className={`navSection ${this.props.className ?? ''}`}>
|
return <div className={`navSection ${this.props.className ?? ''}`}>
|
||||||
@@ -33,7 +34,7 @@ const Nav = {
|
|||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
|
|
||||||
item : createReactClass({
|
item : createClass({
|
||||||
displayName : 'Nav.item',
|
displayName : 'Nav.item',
|
||||||
getDefaultProps : function() {
|
getDefaultProps : function() {
|
||||||
return {
|
return {
|
||||||
@@ -116,4 +117,4 @@ const Nav = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
export default Nav;
|
module.exports = Nav;
|
||||||
|
|||||||
@@ -1,16 +1,22 @@
|
|||||||
import './navbar.less';
|
require('./navbar.less');
|
||||||
import React from 'react';
|
const React = require('react');
|
||||||
import createReactClass from 'create-react-class';
|
const createClass = require('create-react-class');
|
||||||
|
|
||||||
import Nav from './nav.jsx';
|
const Nav = require('client/homebrew/navbar/nav.jsx');
|
||||||
import PatreonNavItem from './patreon.navitem.jsx';
|
const PatreonNavItem = require('./patreon.navitem.jsx');
|
||||||
|
|
||||||
const Navbar = createReactClass({
|
const Navbar = createClass({
|
||||||
displayName : 'Navbar',
|
displayName : 'Navbar',
|
||||||
getInitialState: function() {
|
getInitialState : function() {
|
||||||
return {
|
return {
|
||||||
// showNonChromeWarning: false, // uncomment if needed
|
//showNonChromeWarning : false,
|
||||||
ver: global.version || '0.0.0'
|
ver : '0.0.0'
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
|
getInitialState : function() {
|
||||||
|
return {
|
||||||
|
ver : global.version
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -43,4 +49,4 @@ const Navbar = createReactClass({
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
export default Navbar;
|
module.exports = Navbar;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
@import './shared/naturalcrit/styles/core.less';
|
@import 'naturalcrit/styles/colors.less';
|
||||||
|
|
||||||
@navbarHeight : 28px;
|
@navbarHeight : 28px;
|
||||||
@viewerToolsHeight : 32px;
|
@viewerToolsHeight : 32px;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import React from 'react';
|
const React = require('react');
|
||||||
import _ from 'lodash';
|
const _ = require('lodash');
|
||||||
import Nav from './nav.jsx';
|
const Nav = require('client/homebrew/navbar/nav.jsx');
|
||||||
import { splitTextStyleAndMetadata } from '../../../shared/helpers.js';
|
const { splitTextStyleAndMetadata } = require('../../../shared/helpers.js'); // Importing the function from helpers.js
|
||||||
|
|
||||||
const BREWKEY = 'HB_newPage_content';
|
const BREWKEY = 'HB_newPage_content';
|
||||||
const STYLEKEY = 'HB_newPage_style';
|
const STYLEKEY = 'HB_newPage_style';
|
||||||
@@ -100,4 +100,4 @@ const NewBrew = ()=>{
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default NewBrew;
|
module.exports = NewBrew;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import React from 'react';
|
const React = require('react');
|
||||||
import Nav from './nav.jsx';
|
const Nav = require('client/homebrew/navbar/nav.jsx');
|
||||||
|
|
||||||
export default function(props){
|
module.exports = function(props){
|
||||||
return <Nav.item
|
return <Nav.item
|
||||||
className='patreon'
|
className='patreon'
|
||||||
newTab={true}
|
newTab={true}
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
import React from 'react';
|
const React = require('react');
|
||||||
import Nav from './nav.jsx';
|
const Nav = require('client/homebrew/navbar/nav.jsx');
|
||||||
import { printCurrentBrew } from '../../../shared/helpers.js';
|
const { printCurrentBrew } = require('../../../shared/helpers.js');
|
||||||
|
|
||||||
export default function(){
|
module.exports = function(){
|
||||||
return <Nav.item onClick={printCurrentBrew} color='purple' icon='far fa-file-pdf'>
|
return <Nav.item onClick={printCurrentBrew} color='purple' icon='far fa-file-pdf'>
|
||||||
get PDF
|
get PDF
|
||||||
</Nav.item>;
|
</Nav.item>;
|
||||||
|
|||||||
@@ -1,15 +1,15 @@
|
|||||||
import React from 'react';
|
const React = require('react');
|
||||||
import createReactClass from 'create-react-class';
|
const createClass = require('create-react-class');
|
||||||
import _ from 'lodash';
|
const _ = require('lodash');
|
||||||
import Moment from 'moment';
|
const Moment = require('moment');
|
||||||
|
|
||||||
import Nav from './nav.jsx';
|
const Nav = require('client/homebrew/navbar/nav.jsx');
|
||||||
|
|
||||||
const EDIT_KEY = 'HB_nav_recentlyEdited';
|
const EDIT_KEY = 'HB_nav_recentlyEdited';
|
||||||
const VIEW_KEY = 'HB_nav_recentlyViewed';
|
const VIEW_KEY = 'HB_nav_recentlyViewed';
|
||||||
|
|
||||||
|
|
||||||
const RecentItems = createReactClass({
|
const RecentItems = createClass({
|
||||||
DisplayName : 'RecentItems',
|
DisplayName : 'RecentItems',
|
||||||
getDefaultProps : function() {
|
getDefaultProps : function() {
|
||||||
return {
|
return {
|
||||||
@@ -175,7 +175,7 @@ const RecentItems = createReactClass({
|
|||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
export default {
|
module.exports = {
|
||||||
|
|
||||||
edited : (props)=>{
|
edited : (props)=>{
|
||||||
return <RecentItems
|
return <RecentItems
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import dedent from 'dedent';
|
import dedent from 'dedent-tabs';
|
||||||
import Nav from './nav.jsx';
|
import Nav from 'client/homebrew/navbar/nav.jsx';
|
||||||
|
|
||||||
const getShareId = (brew)=>(
|
const getShareId = (brew)=>(
|
||||||
brew.googleId && !brew.stubbed
|
brew.googleId && !brew.stubbed
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
import React from 'react';
|
const React = require('react');
|
||||||
|
|
||||||
import Nav from './nav.jsx';
|
const Nav = require('client/homebrew/navbar/nav.jsx');
|
||||||
|
|
||||||
export default function (props) {
|
module.exports = function (props) {
|
||||||
return (
|
return (
|
||||||
<Nav.item
|
<Nav.item
|
||||||
color='purple'
|
color='purple'
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import React from 'react';
|
const React = require('react');
|
||||||
import moment from 'moment';
|
const moment = require('moment');
|
||||||
import UIPage from '../basePages/uiPage/uiPage.jsx';
|
const UIPage = require('../basePages/uiPage/uiPage.jsx');
|
||||||
import NaturalCritIcon from '../../../components/svg/naturalcrit-d20.svg.jsx';
|
const NaturalCritIcon = require('client/components/svg/naturalcrit-d20.svg.jsx');
|
||||||
|
|
||||||
let SAVEKEY = '';
|
let SAVEKEY = '';
|
||||||
|
|
||||||
@@ -79,4 +79,4 @@ const AccountPage = (props)=>{
|
|||||||
</UIPage>);
|
</UIPage>);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default AccountPage;
|
module.exports = AccountPage;
|
||||||
|
|||||||
@@ -1,11 +1,12 @@
|
|||||||
import './brewItem.less';
|
require('./brewItem.less');
|
||||||
import React, { useCallback } from 'react';
|
const React = require('react');
|
||||||
import moment from 'moment';
|
const { useCallback } = React;
|
||||||
|
const moment = require('moment');
|
||||||
import request from '../../../../utils/request-middleware.js';
|
import request from '../../../../utils/request-middleware.js';
|
||||||
|
|
||||||
import googleDriveIcon from '../../../../googleDrive.svg';
|
const googleDriveIcon = require('../../../../googleDrive.svg');
|
||||||
import homebreweryIcon from '../../../../thumbnail.svg';
|
const homebreweryIcon = require('../../../../thumbnail.svg');
|
||||||
import dedent from 'dedent';
|
const dedent = require('dedent-tabs').default;
|
||||||
|
|
||||||
const BrewItem = ({
|
const BrewItem = ({
|
||||||
brew = {
|
brew = {
|
||||||
@@ -175,4 +176,4 @@ const BrewItem = ({
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default BrewItem;
|
module.exports = BrewItem;
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
@import './shared/naturalcrit/styles/core.less';
|
|
||||||
|
|
||||||
.brewItem {
|
.brewItem {
|
||||||
position : relative;
|
position : relative;
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
/*eslint max-lines: ["warn", {"max": 300, "skipBlankLines": true, "skipComments": true}]*/
|
/*eslint max-lines: ["warn", {"max": 300, "skipBlankLines": true, "skipComments": true}]*/
|
||||||
import './listPage.less';
|
require('./listPage.less');
|
||||||
import React from 'react';
|
const React = require('react');
|
||||||
import createReactClass from 'create-react-class';
|
const createClass = require('create-react-class');
|
||||||
import _ from 'lodash';
|
const _ = require('lodash');
|
||||||
import moment from 'moment';
|
const moment = require('moment');
|
||||||
|
|
||||||
import BrewItem from './brewItem/brewItem.jsx';
|
const BrewItem = require('./brewItem/brewItem.jsx');
|
||||||
|
|
||||||
const USERPAGE_SORT_DIR = 'HB_listPage_sortDir';
|
const USERPAGE_SORT_DIR = 'HB_listPage_sortDir';
|
||||||
const USERPAGE_SORT_TYPE = 'HB_listPage_sortType';
|
const USERPAGE_SORT_TYPE = 'HB_listPage_sortType';
|
||||||
@@ -14,7 +14,7 @@ const USERPAGE_GROUP_VISIBILITY_PREFIX = 'HB_listPage_visibility_group';
|
|||||||
const DEFAULT_SORT_TYPE = 'alpha';
|
const DEFAULT_SORT_TYPE = 'alpha';
|
||||||
const DEFAULT_SORT_DIR = 'asc';
|
const DEFAULT_SORT_DIR = 'asc';
|
||||||
|
|
||||||
const ListPage = createReactClass({
|
const ListPage = createClass({
|
||||||
displayName : 'ListPage',
|
displayName : 'ListPage',
|
||||||
getDefaultProps : function() {
|
getDefaultProps : function() {
|
||||||
return {
|
return {
|
||||||
@@ -279,4 +279,4 @@ const ListPage = createReactClass({
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
export default ListPage;
|
module.exports = ListPage;
|
||||||
|
|||||||
@@ -1,17 +1,16 @@
|
|||||||
import './uiPage.less';
|
require('./uiPage.less');
|
||||||
import React from 'react';
|
const React = require('react');
|
||||||
import createReactClass from 'create-react-class';
|
const createClass = require('create-react-class');
|
||||||
|
|
||||||
import Nav from '../../../navbar/nav.jsx';
|
const Nav = require('client/homebrew/navbar/nav.jsx');
|
||||||
import Navbar from '../../../navbar/navbar.jsx';
|
const Navbar = require('client/homebrew/navbar/navbar.jsx');
|
||||||
import NewBrewItem from '../../../navbar/newbrew.navitem.jsx';
|
const NewBrewItem = require('client/homebrew/navbar/newbrew.navitem.jsx');
|
||||||
import HelpNavItem from '../../../navbar/help.navitem.jsx';
|
const HelpNavItem = require('client/homebrew/navbar/help.navitem.jsx');
|
||||||
import RecentNavItems from '../../../navbar/recent.navitem.jsx';
|
const RecentNavItem = require('client/homebrew/navbar/recent.navitem.jsx').both;
|
||||||
const { both: RecentNavItem } = RecentNavItems;
|
const Account = require('client/homebrew/navbar/account.navitem.jsx');
|
||||||
import Account from '../../../navbar/account.navitem.jsx';
|
|
||||||
|
|
||||||
|
|
||||||
const UIPage = createReactClass({
|
const UIPage = createClass({
|
||||||
displayName : 'UIPage',
|
displayName : 'UIPage',
|
||||||
|
|
||||||
render : function(){
|
render : function(){
|
||||||
@@ -36,4 +35,4 @@ const UIPage = createReactClass({
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
export default UIPage;
|
module.exports = UIPage;
|
||||||
|
|||||||
@@ -4,34 +4,33 @@ import './editPage.less';
|
|||||||
// Common imports
|
// Common imports
|
||||||
import React, { useState, useEffect, useRef } from 'react';
|
import React, { useState, useEffect, useRef } from 'react';
|
||||||
import request from '../../utils/request-middleware.js';
|
import request from '../../utils/request-middleware.js';
|
||||||
import Markdown from '../../../../shared/markdown.js';
|
import Markdown from 'markdown.js';
|
||||||
import _ from 'lodash';
|
import _ from 'lodash';
|
||||||
|
|
||||||
import { DEFAULT_BREW_LOAD } from '../../../../server/brewDefaults.js';
|
import { DEFAULT_BREW_LOAD } from '../../../../server/brewDefaults.js';
|
||||||
import { printCurrentBrew, fetchThemeBundle, splitTextStyleAndMetadata } from '../../../../shared/helpers.js';
|
import { printCurrentBrew, fetchThemeBundle, splitTextStyleAndMetadata } from '../../../../shared/helpers.js';
|
||||||
|
|
||||||
import SplitPane from '../../../components/splitPane/splitPane.jsx';
|
import SplitPane from 'client/components/splitPane/splitPane.jsx';
|
||||||
import Editor from '../../editor/editor.jsx';
|
import Editor from '../../editor/editor.jsx';
|
||||||
import BrewRenderer from '../../brewRenderer/brewRenderer.jsx';
|
import BrewRenderer from '../../brewRenderer/brewRenderer.jsx';
|
||||||
|
|
||||||
import Nav from '../../navbar/nav.jsx';
|
import Nav from 'client/homebrew/navbar/nav.jsx';
|
||||||
import Navbar from '../../navbar/navbar.jsx';
|
import Navbar from 'client/homebrew/navbar/navbar.jsx';
|
||||||
import NewBrewItem from '../../navbar/newbrew.navitem.jsx';
|
import NewBrewItem from 'client/homebrew/navbar/newbrew.navitem.jsx';
|
||||||
import AccountNavItem from '../../navbar/account.navitem.jsx';
|
import AccountNavItem from 'client/homebrew/navbar/account.navitem.jsx';
|
||||||
import ErrorNavItem from '../../navbar/error-navitem.jsx';
|
import ErrorNavItem from 'client/homebrew/navbar/error-navitem.jsx';
|
||||||
import HelpNavItem from '../../navbar/help.navitem.jsx';
|
import HelpNavItem from 'client/homebrew/navbar/help.navitem.jsx';
|
||||||
import VaultNavItem from '../../navbar/vault.navitem.jsx';
|
import VaultNavItem from 'client/homebrew/navbar/vault.navitem.jsx';
|
||||||
import PrintNavItem from '../../navbar/print.navitem.jsx';
|
import PrintNavItem from 'client/homebrew/navbar/print.navitem.jsx';
|
||||||
import RecentNavItems from '../../navbar/recent.navitem.jsx';
|
import { both as RecentNavItem } from 'client/homebrew/navbar/recent.navitem.jsx';
|
||||||
const { both: RecentNavItem } = RecentNavItems;
|
|
||||||
|
|
||||||
// Page specific imports
|
// Page specific imports
|
||||||
import Meta from '../../../../vitreum/headtags.js';
|
import { Meta } from 'vitreum/headtags';
|
||||||
import { md5 } from 'hash-wasm';
|
import { md5 } from 'hash-wasm';
|
||||||
import { gzipSync, strToU8 } from 'fflate';
|
import { gzipSync, strToU8 } from 'fflate';
|
||||||
import { makePatches, stringifyPatches } from '@sanity/diff-match-patch';
|
import { makePatches, stringifyPatches } from '@sanity/diff-match-patch';
|
||||||
|
|
||||||
import ShareNavItem from '../../navbar/share.navitem.jsx';
|
import ShareNavItem from 'client/homebrew/navbar/share.navitem.jsx';
|
||||||
import LockNotification from './lockNotification/lockNotification.jsx';
|
import LockNotification from './lockNotification/lockNotification.jsx';
|
||||||
import { updateHistory, versionHistoryGarbageCollection } from '../../utils/versionHistory.js';
|
import { updateHistory, versionHistoryGarbageCollection } from '../../utils/versionHistory.js';
|
||||||
import googleDriveIcon from '../../googleDrive.svg';
|
import googleDriveIcon from '../../googleDrive.svg';
|
||||||
@@ -217,7 +216,7 @@ const EditPage = (props)=>{
|
|||||||
text : brew.text.normalize('NFC'),
|
text : brew.text.normalize('NFC'),
|
||||||
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,
|
||||||
patches : stringifyPatches(makePatches(encodeURI(lastSavedBrew.current.text.normalize('NFC')), encodeURI(brew.text.normalize('NFC')))),
|
patches : stringifyPatches(makePatches(encodeURI(lastSavedBrew.current.text.normalize('NFC')), encodeURI(brew.text.normalize('NFC')))),
|
||||||
hash : await md5(lastSavedBrew.current.text.normalize('NFC')),
|
hash : await md5(lastSavedBrew.current.text),
|
||||||
textBin : undefined,
|
textBin : undefined,
|
||||||
version : lastSavedBrew.current.version
|
version : lastSavedBrew.current.version
|
||||||
};
|
};
|
||||||
@@ -416,4 +415,4 @@ const EditPage = (props)=>{
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default EditPage;
|
module.exports = EditPage;
|
||||||
|
|||||||
@@ -40,4 +40,4 @@ function LockNotification(props) {
|
|||||||
</Dialog>;
|
</Dialog>;
|
||||||
};
|
};
|
||||||
|
|
||||||
export default LockNotification;
|
module.exports = LockNotification;
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
import './errorPage.less';
|
require('./errorPage.less');
|
||||||
import React from 'react';
|
const React = require('react');
|
||||||
import UIPage from '../basePages/uiPage/uiPage.jsx';
|
const UIPage = require('../basePages/uiPage/uiPage.jsx');
|
||||||
import Markdown from '../../../../shared/markdown.js';
|
import Markdown from '../../../../shared/markdown.js';
|
||||||
import ErrorIndex from './errors/errorIndex.js';
|
const ErrorIndex = require('./errors/errorIndex.js');
|
||||||
|
|
||||||
const ErrorPage = ({ brew })=>{
|
const ErrorPage = ({ brew })=>{
|
||||||
// Retrieving the error text based on the brew's error code from ErrorIndex
|
// Retrieving the error text based on the brew's error code from ErrorIndex
|
||||||
@@ -22,4 +22,4 @@ const ErrorPage = ({ brew })=>{
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default ErrorPage;
|
module.exports = ErrorPage;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import dedent from 'dedent';
|
const dedent = require('dedent-tabs').default;
|
||||||
|
|
||||||
const loginUrl = 'https://www.naturalcrit.com/login';
|
const loginUrl = 'https://www.naturalcrit.com/login';
|
||||||
|
|
||||||
@@ -268,4 +268,4 @@ const errorIndex = (props)=>{
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export default errorIndex;
|
module.exports = errorIndex;
|
||||||
|
|||||||
@@ -4,30 +4,28 @@ import './homePage.less';
|
|||||||
// Common imports
|
// Common imports
|
||||||
import React, { useState, useEffect, useRef } from 'react';
|
import React, { useState, useEffect, useRef } from 'react';
|
||||||
import request from '../../utils/request-middleware.js';
|
import request from '../../utils/request-middleware.js';
|
||||||
import Markdown from '../../../../shared/markdown.js';
|
import Markdown from 'markdown.js';
|
||||||
import _ from 'lodash';
|
import _ from 'lodash';
|
||||||
|
|
||||||
import { DEFAULT_BREW } from '../../../../server/brewDefaults.js';
|
import { DEFAULT_BREW } from '../../../../server/brewDefaults.js';
|
||||||
import { printCurrentBrew, fetchThemeBundle, splitTextStyleAndMetadata } from '../../../../shared/helpers.js';
|
import { printCurrentBrew, fetchThemeBundle, splitTextStyleAndMetadata } from '../../../../shared/helpers.js';
|
||||||
|
|
||||||
import SplitPane from '../../../components/splitPane/splitPane.jsx';
|
import SplitPane from 'client/components/splitPane/splitPane.jsx';
|
||||||
import Editor from '../../editor/editor.jsx';
|
import Editor from '../../editor/editor.jsx';
|
||||||
import BrewRenderer from '../../brewRenderer/brewRenderer.jsx';
|
import BrewRenderer from '../../brewRenderer/brewRenderer.jsx';
|
||||||
|
|
||||||
import Nav from '../../navbar/nav.jsx';
|
import Nav from 'client/homebrew/navbar/nav.jsx';
|
||||||
import Navbar from '../../navbar/navbar.jsx';
|
import Navbar from 'client/homebrew/navbar/navbar.jsx';
|
||||||
import NewBrewItem from '../../navbar/newbrew.navitem.jsx';
|
import NewBrewItem from 'client/homebrew/navbar/newbrew.navitem.jsx';
|
||||||
import AccountNavItem from '../../navbar/account.navitem.jsx';
|
import AccountNavItem from 'client/homebrew/navbar/account.navitem.jsx';
|
||||||
import ErrorNavItem from '../../navbar/error-navitem.jsx';
|
import ErrorNavItem from 'client/homebrew/navbar/error-navitem.jsx';
|
||||||
import HelpNavItem from '../../navbar/help.navitem.jsx';
|
import HelpNavItem from 'client/homebrew/navbar/help.navitem.jsx';
|
||||||
import VaultNavItem from '../../navbar/vault.navitem.jsx';
|
import VaultNavItem from 'client/homebrew/navbar/vault.navitem.jsx';
|
||||||
import PrintNavItem from '../../navbar/print.navitem.jsx';
|
import PrintNavItem from 'client/homebrew/navbar/print.navitem.jsx';
|
||||||
import RecentNavItems from '../../navbar/recent.navitem.jsx';
|
import { both as RecentNavItem } from 'client/homebrew/navbar/recent.navitem.jsx';
|
||||||
const { both: RecentNavItem } = RecentNavItems;
|
|
||||||
|
|
||||||
|
|
||||||
// Page specific imports
|
// Page specific imports
|
||||||
import Meta from '../../../../vitreum/headtags.js';
|
import { Meta } from 'vitreum/headtags';
|
||||||
|
|
||||||
const BREWKEY = 'homebrewery-new';
|
const BREWKEY = 'homebrewery-new';
|
||||||
const STYLEKEY = 'homebrewery-new-style';
|
const STYLEKEY = 'homebrewery-new-style';
|
||||||
@@ -232,4 +230,4 @@ const HomePage =(props)=>{
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default HomePage;
|
module.exports = HomePage;
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
@import './shared/naturalcrit/styles/core.less';
|
|
||||||
|
|
||||||
.homePage {
|
.homePage {
|
||||||
position : relative;
|
position : relative;
|
||||||
a.floatingNewButton {
|
a.floatingNewButton {
|
||||||
|
|||||||
@@ -4,29 +4,28 @@ import './newPage.less';
|
|||||||
// Common imports
|
// Common imports
|
||||||
import React, { useState, useEffect, useRef } from 'react';
|
import React, { useState, useEffect, useRef } from 'react';
|
||||||
import request from '../../utils/request-middleware.js';
|
import request from '../../utils/request-middleware.js';
|
||||||
import Markdown from '../../../../shared/markdown.js';
|
import Markdown from 'markdown.js';
|
||||||
import _ from 'lodash';
|
import _ from 'lodash';
|
||||||
|
|
||||||
import { DEFAULT_BREW } from '../../../../server/brewDefaults.js';
|
import { DEFAULT_BREW } from '../../../../server/brewDefaults.js';
|
||||||
import { printCurrentBrew, fetchThemeBundle, splitTextStyleAndMetadata } from '../../../../shared/helpers.js';
|
import { printCurrentBrew, fetchThemeBundle, splitTextStyleAndMetadata } from '../../../../shared/helpers.js';
|
||||||
|
|
||||||
import SplitPane from '../../../components/splitPane/splitPane.jsx';
|
import SplitPane from 'client/components/splitPane/splitPane.jsx';
|
||||||
import Editor from '../../editor/editor.jsx';
|
import Editor from '../../editor/editor.jsx';
|
||||||
import BrewRenderer from '../../brewRenderer/brewRenderer.jsx';
|
import BrewRenderer from '../../brewRenderer/brewRenderer.jsx';
|
||||||
|
|
||||||
import Nav from '../../navbar/nav.jsx';
|
import Nav from 'client/homebrew/navbar/nav.jsx';
|
||||||
import Navbar from '../../navbar/navbar.jsx';
|
import Navbar from 'client/homebrew/navbar/navbar.jsx';
|
||||||
import NewBrewItem from '../../navbar/newbrew.navitem.jsx';
|
import NewBrewItem from 'client/homebrew/navbar/newbrew.navitem.jsx';
|
||||||
import AccountNavItem from '../../navbar/account.navitem.jsx';
|
import AccountNavItem from 'client/homebrew/navbar/account.navitem.jsx';
|
||||||
import ErrorNavItem from '../../navbar/error-navitem.jsx';
|
import ErrorNavItem from 'client/homebrew/navbar/error-navitem.jsx';
|
||||||
import HelpNavItem from '../../navbar/help.navitem.jsx';
|
import HelpNavItem from 'client/homebrew/navbar/help.navitem.jsx';
|
||||||
import VaultNavItem from '../../navbar/vault.navitem.jsx';
|
import VaultNavItem from 'client/homebrew/navbar/vault.navitem.jsx';
|
||||||
import PrintNavItem from '../../navbar/print.navitem.jsx';
|
import PrintNavItem from 'client/homebrew/navbar/print.navitem.jsx';
|
||||||
import RecentNavItems from '../../navbar/recent.navitem.jsx';
|
import { both as RecentNavItem } from 'client/homebrew/navbar/recent.navitem.jsx';
|
||||||
const { both: RecentNavItem } = RecentNavItems;
|
|
||||||
|
|
||||||
// Page specific imports
|
// Page specific imports
|
||||||
import { Meta } from '../../../../vitreum/headtags.js';
|
import { Meta } from 'vitreum/headtags';
|
||||||
|
|
||||||
const BREWKEY = 'HB_newPage_content';
|
const BREWKEY = 'HB_newPage_content';
|
||||||
const STYLEKEY = 'HB_newPage_style';
|
const STYLEKEY = 'HB_newPage_style';
|
||||||
@@ -277,4 +276,4 @@ const NewPage = (props)=>{
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default NewPage;
|
module.exports = NewPage;
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
@import './shared/naturalcrit/styles/colors.less';
|
|
||||||
|
|
||||||
.newPage {
|
.newPage {
|
||||||
.navItem.save {
|
.navItem.save {
|
||||||
background-color : @orange;
|
background-color : @orange;
|
||||||
|
|||||||
@@ -1,18 +1,18 @@
|
|||||||
import './sharePage.less';
|
require('./sharePage.less');
|
||||||
import React, { useState, useEffect, useCallback } from 'react';
|
const React = require('react');
|
||||||
import Meta from '../../../../vitreum/headtags.js';
|
const { useState, useEffect, useCallback } = React;
|
||||||
|
const { Meta } = require('vitreum/headtags');
|
||||||
|
|
||||||
import Nav from '../../navbar/nav.jsx';
|
const Nav = require('client/homebrew/navbar/nav.jsx');
|
||||||
import Navbar from '../../navbar/navbar.jsx';
|
const Navbar = require('client/homebrew/navbar/navbar.jsx');
|
||||||
import MetadataNav from '../../navbar/metadata.navitem.jsx';
|
const MetadataNav = require('client/homebrew/navbar/metadata.navitem.jsx');
|
||||||
import PrintNavItem from '../../navbar/print.navitem.jsx';
|
const PrintNavItem = require('client/homebrew/navbar/print.navitem.jsx');
|
||||||
import RecentNavItems from '../../navbar/recent.navitem.jsx';
|
const RecentNavItem = require('client/homebrew/navbar/recent.navitem.jsx').both;
|
||||||
const { both: RecentNavItem } = RecentNavItems;
|
const Account = require('client/homebrew/navbar/account.navitem.jsx');
|
||||||
import Account from '../../navbar/account.navitem.jsx';
|
const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
|
||||||
import BrewRenderer from '../../brewRenderer/brewRenderer.jsx';
|
|
||||||
|
|
||||||
import { DEFAULT_BREW_LOAD } from '../../../../server/brewDefaults.js';
|
const { DEFAULT_BREW_LOAD } = require('../../../../server/brewDefaults.js');
|
||||||
import { printCurrentBrew, fetchThemeBundle } from '../../../../shared/helpers.js';
|
const { printCurrentBrew, fetchThemeBundle } = require('../../../../shared/helpers.js');
|
||||||
|
|
||||||
const SharePage = (props)=>{
|
const SharePage = (props)=>{
|
||||||
const { brew = DEFAULT_BREW_LOAD, disableMeta = false } = props;
|
const { brew = DEFAULT_BREW_LOAD, disableMeta = false } = props;
|
||||||
@@ -116,4 +116,4 @@ const SharePage = (props)=>{
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default SharePage;
|
module.exports = SharePage;
|
||||||
|
|||||||
@@ -1,17 +1,17 @@
|
|||||||
import React, { useState } from 'react';
|
const React = require('react');
|
||||||
import _ from 'lodash';
|
const { useState } = React;
|
||||||
|
const _ = require('lodash');
|
||||||
|
|
||||||
import ListPage from '../basePages/listPage/listPage.jsx';
|
const ListPage = require('../basePages/listPage/listPage.jsx');
|
||||||
|
|
||||||
import Nav from '../../navbar/nav.jsx';
|
const Nav = require('client/homebrew/navbar/nav.jsx');
|
||||||
import Navbar from '../../navbar/navbar.jsx';
|
const Navbar = require('client/homebrew/navbar/navbar.jsx');
|
||||||
import RecentNavItems from '../../navbar/recent.navitem.jsx';
|
const RecentNavItem = require('client/homebrew/navbar/recent.navitem.jsx').both;
|
||||||
const { both: RecentNavItem } = RecentNavItems;
|
const Account = require('client/homebrew/navbar/account.navitem.jsx');
|
||||||
import Account from '../../navbar/account.navitem.jsx';
|
const NewBrew = require('client/homebrew/navbar/newbrew.navitem.jsx');
|
||||||
import NewBrew from '../../navbar/newbrew.navitem.jsx';
|
const HelpNavItem = require('client/homebrew/navbar/help.navitem.jsx');
|
||||||
import HelpNavItem from '../../navbar/help.navitem.jsx';
|
const ErrorNavItem = require('client/homebrew/navbar/error-navitem.jsx');
|
||||||
import ErrorNavItem from '../../navbar/error-navitem.jsx';
|
const VaultNavitem = require('client/homebrew/navbar/vault.navitem.jsx');
|
||||||
import VaultNavitem from '../../navbar/vault.navitem.jsx';
|
|
||||||
|
|
||||||
const UserPage = (props)=>{
|
const UserPage = (props)=>{
|
||||||
props = {
|
props = {
|
||||||
@@ -61,4 +61,4 @@ const UserPage = (props)=>{
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default UserPage;
|
module.exports = UserPage;
|
||||||
|
|||||||
@@ -1,18 +1,19 @@
|
|||||||
/*eslint max-lines: ["warn", {"max": 400, "skipBlankLines": true, "skipComments": true}]*/
|
/*eslint max-lines: ["warn", {"max": 400, "skipBlankLines": true, "skipComments": true}]*/
|
||||||
/*eslint max-params:["warn", { max: 10 }], */
|
/*eslint max-params:["warn", { max: 10 }], */
|
||||||
import './vaultPage.less';
|
require('./vaultPage.less');
|
||||||
import React, { useState, useEffect, useRef } from 'react';
|
|
||||||
|
|
||||||
import Nav from '../../navbar/nav.jsx';
|
const React = require('react');
|
||||||
import Navbar from '../../navbar/navbar.jsx';
|
const { useState, useEffect, useRef } = React;
|
||||||
import RecentNavItems from '../../navbar/recent.navitem.jsx';
|
|
||||||
const { both: RecentNavItem } = RecentNavItems;
|
const Nav = require('client/homebrew/navbar/nav.jsx');
|
||||||
import Account from '../../navbar/account.navitem.jsx';
|
const Navbar = require('client/homebrew/navbar/navbar.jsx');
|
||||||
import NewBrew from '../../navbar/newbrew.navitem.jsx';
|
const RecentNavItem = require('client/homebrew/navbar/recent.navitem.jsx').both;
|
||||||
import HelpNavItem from '../../navbar/help.navitem.jsx';
|
const Account = require('client/homebrew/navbar/account.navitem.jsx');
|
||||||
import BrewItem from '../basePages/listPage/brewItem/brewItem.jsx';
|
const NewBrew = require('client/homebrew/navbar/newbrew.navitem.jsx');
|
||||||
import SplitPane from '../../../components/splitPane/splitPane.jsx';
|
const HelpNavItem = require('client/homebrew/navbar/help.navitem.jsx');
|
||||||
import ErrorIndex from '../errorPage/errors/errorIndex.js';
|
const BrewItem = require('../basePages/listPage/brewItem/brewItem.jsx');
|
||||||
|
const SplitPane = require('client/components/splitPane/splitPane.jsx');
|
||||||
|
const ErrorIndex = require('../errorPage/errors/errorIndex.js');
|
||||||
|
|
||||||
import request from '../../utils/request-middleware.js';
|
import request from '../../utils/request-middleware.js';
|
||||||
|
|
||||||
@@ -100,7 +101,7 @@ const VaultPage = (props)=>{
|
|||||||
|
|
||||||
const title = titleRef.current.value || '';
|
const title = titleRef.current.value || '';
|
||||||
const author = authorRef.current.value || '';
|
const author = authorRef.current.value || '';
|
||||||
const count = countRef.current.value || 20;
|
const count = countRef.current.value || 10;
|
||||||
const v3 = v3Ref.current.checked != false;
|
const v3 = v3Ref.current.checked != false;
|
||||||
const legacy = legacyRef.current.checked != false;
|
const legacy = legacyRef.current.checked != false;
|
||||||
const sortOption = sort || 'title';
|
const sortOption = sort || 'title';
|
||||||
@@ -287,8 +288,7 @@ const VaultPage = (props)=>{
|
|||||||
const renderPaginationControls = ()=>{
|
const renderPaginationControls = ()=>{
|
||||||
if(!totalBrews || totalBrews < 10) return null;
|
if(!totalBrews || totalBrews < 10) return null;
|
||||||
|
|
||||||
|
const countInt = parseInt(brewCollection.length || 20);
|
||||||
const countInt = parseInt(countRef.current.value || 20);
|
|
||||||
const totalPages = Math.ceil(totalBrews / countInt);
|
const totalPages = Math.ceil(totalBrews / countInt);
|
||||||
|
|
||||||
let startPage, endPage;
|
let startPage, endPage;
|
||||||
@@ -429,4 +429,4 @@ const VaultPage = (props)=>{
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default VaultPage;
|
module.exports = VaultPage;
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
@import './shared/naturalcrit/styles/core.less';
|
|
||||||
|
|
||||||
.vaultPage {
|
.vaultPage {
|
||||||
height : 100%;
|
height : 100%;
|
||||||
overflow-y : hidden;
|
overflow-y : hidden;
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ export default [{
|
|||||||
"max-depth" : ["warn", { max: 4 }],
|
"max-depth" : ["warn", { max: 4 }],
|
||||||
"max-params" : ["warn", { max: 5 }],
|
"max-params" : ["warn", { max: 5 }],
|
||||||
"no-restricted-syntax" : ["warn", "ClassDeclaration", "SwitchStatement"],
|
"no-restricted-syntax" : ["warn", "ClassDeclaration", "SwitchStatement"],
|
||||||
"no-unused-vars" : ["warn", { vars: "all", args: "none", varsIgnorePattern: "config|_|cx|createReactClass" }],
|
"no-unused-vars" : ["warn", { vars: "all", args: "none", varsIgnorePattern: "config|_|cx|createClass" }],
|
||||||
"react/jsx-uses-vars" : "warn",
|
"react/jsx-uses-vars" : "warn",
|
||||||
|
|
||||||
/** Fixable **/
|
/** Fixable **/
|
||||||
|
|||||||
7432
package-lock.json
generated
7432
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
22
package.json
22
package.json
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "homebrewery",
|
"name": "homebrewery",
|
||||||
"description": "Create authentic looking D&D homebrews using only markdown",
|
"description": "Create authentic looking D&D homebrews using only markdown",
|
||||||
"version": "3.20.1",
|
"version": "3.20.0",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"engines": {
|
"engines": {
|
||||||
"npm": "^10.8.x",
|
"npm": "^10.8.x",
|
||||||
@@ -12,10 +12,6 @@
|
|||||||
"url": "git://github.com/naturalcrit/homebrewery.git"
|
"url": "git://github.com/naturalcrit/homebrewery.git"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"viteDev": "node scripts/dev.js",
|
|
||||||
"viteDevAdmin": "vite --config vite.config.js --ssr client/admin/admin.jsx",
|
|
||||||
"viteBuild": "vite build",
|
|
||||||
"viteStart": "vite preview --outDir build",
|
|
||||||
"dev": "node --experimental-require-module scripts/dev.js",
|
"dev": "node --experimental-require-module scripts/dev.js",
|
||||||
"quick": "node --experimental-require-module scripts/quick.js",
|
"quick": "node --experimental-require-module scripts/quick.js",
|
||||||
"build": "node --experimental-require-module scripts/buildHomebrew.js && node --experimental-require-module scripts/buildAdmin.js",
|
"build": "node --experimental-require-module scripts/buildHomebrew.js && node --experimental-require-module scripts/buildAdmin.js",
|
||||||
@@ -65,11 +61,8 @@
|
|||||||
"server"
|
"server"
|
||||||
],
|
],
|
||||||
"transformIgnorePatterns": [
|
"transformIgnorePatterns": [
|
||||||
"node_modules/(?!(nanoid|@exodus/bytes|parse5)/)"
|
"node_modules/(?!nanoid/).*"
|
||||||
],
|
],
|
||||||
"transform": {
|
|
||||||
"^.+\\.js$": "babel-jest"
|
|
||||||
},
|
|
||||||
"coveragePathIgnorePatterns": [
|
"coveragePathIgnorePatterns": [
|
||||||
"build/*"
|
"build/*"
|
||||||
],
|
],
|
||||||
@@ -100,7 +93,6 @@
|
|||||||
"@dmsnell/diff-match-patch": "^1.1.0",
|
"@dmsnell/diff-match-patch": "^1.1.0",
|
||||||
"@googleapis/drive": "^19.2.0",
|
"@googleapis/drive": "^19.2.0",
|
||||||
"@sanity/diff-match-patch": "^3.2.0",
|
"@sanity/diff-match-patch": "^3.2.0",
|
||||||
"@vitejs/plugin-react": "^5.1.2",
|
|
||||||
"body-parser": "^2.2.0",
|
"body-parser": "^2.2.0",
|
||||||
"classnames": "^2.5.1",
|
"classnames": "^2.5.1",
|
||||||
"codemirror": "^5.65.6",
|
"codemirror": "^5.65.6",
|
||||||
@@ -108,7 +100,7 @@
|
|||||||
"core-js": "^3.47.0",
|
"core-js": "^3.47.0",
|
||||||
"cors": "^2.8.5",
|
"cors": "^2.8.5",
|
||||||
"create-react-class": "^15.7.0",
|
"create-react-class": "^15.7.0",
|
||||||
"dedent": "^1.7.1",
|
"dedent-tabs": "^0.10.3",
|
||||||
"expr-eval": "^2.0.2",
|
"expr-eval": "^2.0.2",
|
||||||
"express": "^5.1.0",
|
"express": "^5.1.0",
|
||||||
"express-async-handler": "^1.2.0",
|
"express-async-handler": "^1.2.0",
|
||||||
@@ -119,7 +111,7 @@
|
|||||||
"idb-keyval": "^6.2.2",
|
"idb-keyval": "^6.2.2",
|
||||||
"js-yaml": "^4.1.1",
|
"js-yaml": "^4.1.1",
|
||||||
"jwt-simple": "^0.5.6",
|
"jwt-simple": "^0.5.6",
|
||||||
"less": "^4.5.1",
|
"less": "^3.13.1",
|
||||||
"lodash": "^4.17.21",
|
"lodash": "^4.17.21",
|
||||||
"marked": "15.0.12",
|
"marked": "15.0.12",
|
||||||
"marked-alignment-paragraphs": "^1.0.0",
|
"marked-alignment-paragraphs": "^1.0.0",
|
||||||
@@ -133,7 +125,7 @@
|
|||||||
"marked-variables": "^1.0.4",
|
"marked-variables": "^1.0.4",
|
||||||
"markedLegacy": "npm:marked@^0.3.19",
|
"markedLegacy": "npm:marked@^0.3.19",
|
||||||
"moment": "^2.30.1",
|
"moment": "^2.30.1",
|
||||||
"mongoose": "^8.20.0",
|
"mongoose": "^9.0.0",
|
||||||
"nanoid": "5.1.6",
|
"nanoid": "5.1.6",
|
||||||
"nconf": "^0.13.0",
|
"nconf": "^0.13.0",
|
||||||
"react": "^18.3.1",
|
"react": "^18.3.1",
|
||||||
@@ -143,12 +135,11 @@
|
|||||||
"romans": "^3.1.0",
|
"romans": "^3.1.0",
|
||||||
"sanitize-filename": "1.6.3",
|
"sanitize-filename": "1.6.3",
|
||||||
"superagent": "^10.2.1",
|
"superagent": "^10.2.1",
|
||||||
"vite": "^7.3.1",
|
"vitreum": "git+https://git@github.com/calculuschild/vitreum.git",
|
||||||
"written-number": "^0.11.1"
|
"written-number": "^0.11.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@stylistic/stylelint-plugin": "^4.0.0",
|
"@stylistic/stylelint-plugin": "^4.0.0",
|
||||||
"babel-jest": "^30.2.0",
|
|
||||||
"babel-plugin-transform-import-meta": "^2.3.3",
|
"babel-plugin-transform-import-meta": "^2.3.3",
|
||||||
"eslint": "^9.39.1",
|
"eslint": "^9.39.1",
|
||||||
"eslint-plugin-jest": "^29.1.0",
|
"eslint-plugin-jest": "^29.1.0",
|
||||||
@@ -156,7 +147,6 @@
|
|||||||
"globals": "^16.4.0",
|
"globals": "^16.4.0",
|
||||||
"jest": "^30.2.0",
|
"jest": "^30.2.0",
|
||||||
"jest-expect-message": "^1.1.3",
|
"jest-expect-message": "^1.1.3",
|
||||||
"jsdom": "^27.4.0",
|
|
||||||
"jsdom-global": "^3.0.2",
|
"jsdom-global": "^3.0.2",
|
||||||
"postcss-less": "^6.0.0",
|
"postcss-less": "^6.0.0",
|
||||||
"stylelint": "^16.25.0",
|
"stylelint": "^16.25.0",
|
||||||
|
|||||||
@@ -1,44 +1,22 @@
|
|||||||
import express from "express";
|
const label = 'dev';
|
||||||
import { createServer as createViteServer } from "vite";
|
console.time(label);
|
||||||
import path from "path";
|
|
||||||
import url from "url";
|
|
||||||
import template from "../client/template.js";
|
|
||||||
|
|
||||||
const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
|
const jsx = require('vitreum/steps/jsx.watch.js');
|
||||||
const app = express();
|
const less = require('vitreum/steps/less.watch.js');
|
||||||
|
const assets = require('vitreum/steps/assets.watch.js');
|
||||||
|
const server = require('vitreum/steps/server.watch.js');
|
||||||
|
const livereload = require('vitreum/steps/livereload.js');
|
||||||
|
|
||||||
async function start() {
|
const Proj = require('./project.json');
|
||||||
const vite = await createViteServer({
|
|
||||||
server: { middlewareMode: true },
|
|
||||||
root: __dirname,
|
|
||||||
appType: "custom",
|
|
||||||
});
|
|
||||||
|
|
||||||
app.use(vite.middlewares);
|
Promise.resolve()
|
||||||
app.use("/assets", express.static(path.resolve(__dirname, "/client/assets")));
|
.then(()=>jsx('homebrew', './client/homebrew/homebrew.jsx', { libs: Proj.libs, shared: ['./shared'] }))
|
||||||
|
.then((deps)=>less('homebrew', { shared: ['./shared'] }, deps))
|
||||||
|
.then(()=>jsx('admin', './client/admin/admin.jsx', { libs: Proj.libs, shared: ['./shared'] }))
|
||||||
|
.then((deps)=>less('admin', { shared: ['./shared'] }, deps))
|
||||||
|
|
||||||
app.use(/(.*)/, async (req, res, next) => {
|
.then(()=>assets(Proj.assets, ['./shared', './client']))
|
||||||
try {
|
.then(()=>livereload())
|
||||||
const parsed = url.parse(req.url);
|
.then(()=>server('./server.js', ['server']))
|
||||||
const pathname = parsed.pathname || "/";
|
.then(console.timeEnd.bind(console, label))
|
||||||
|
.catch(console.error);
|
||||||
// Ignore vite HMR or ping requests
|
|
||||||
if (pathname.startsWith("/__vite")) return next();
|
|
||||||
|
|
||||||
const entry = pathname.startsWith("/admin") ? "admin" : "homebrew";
|
|
||||||
|
|
||||||
const ssrModule = await vite.ssrLoadModule(`client/${entry}/${entry}.jsx`);
|
|
||||||
|
|
||||||
const html = await template(entry, "", { path: pathname, ssrModule });
|
|
||||||
res.status(200).set({ "Content-Type": "text/html" }).end(html);
|
|
||||||
} catch (e) {
|
|
||||||
vite.ssrFixStacktrace(e);
|
|
||||||
console.error(e);
|
|
||||||
res.status(500).end(e.message);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
app.listen(8000, () => console.log("Dev server running on http://localhost:8000"));
|
|
||||||
}
|
|
||||||
|
|
||||||
start();
|
|
||||||
@@ -110,9 +110,9 @@ app.use(homebrewApi);
|
|||||||
app.use(adminApi);
|
app.use(adminApi);
|
||||||
app.use(vaultApi);
|
app.use(vaultApi);
|
||||||
|
|
||||||
const welcomeText = fs.readFileSync('./client/homebrew/pages/homePage/welcome_msg.md', 'utf8');
|
const welcomeText = fs.readFileSync('client/homebrew/pages/homePage/welcome_msg.md', 'utf8');
|
||||||
const welcomeTextLegacy = fs.readFileSync('./client/homebrew/pages/homePage/welcome_msg_legacy.md', 'utf8');
|
const welcomeTextLegacy = fs.readFileSync('client/homebrew/pages/homePage/welcome_msg_legacy.md', 'utf8');
|
||||||
const migrateText = fs.readFileSync('./client/homebrew/pages/homePage/migrate.md', 'utf8');
|
const migrateText = fs.readFileSync('client/homebrew/pages/homePage/migrate.md', 'utf8');
|
||||||
const changelogText = fs.readFileSync('changelog.md', 'utf8');
|
const changelogText = fs.readFileSync('changelog.md', 'utf8');
|
||||||
const faqText = fs.readFileSync('faq.md', 'utf8');
|
const faqText = fs.readFileSync('faq.md', 'utf8');
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import config from './config.js';
|
|||||||
|
|
||||||
|
|
||||||
let serviceAuth;
|
let serviceAuth;
|
||||||
let clientEmail;
|
|
||||||
if(!config.get('service_account')){
|
if(!config.get('service_account')){
|
||||||
const reset = '\x1b[0m'; // Reset to default style
|
const reset = '\x1b[0m'; // Reset to default style
|
||||||
const yellow = '\x1b[33m'; // yellow color
|
const yellow = '\x1b[33m'; // yellow color
|
||||||
@@ -16,10 +15,6 @@ if(!config.get('service_account')){
|
|||||||
JSON.parse(config.get('service_account')) :
|
JSON.parse(config.get('service_account')) :
|
||||||
config.get('service_account');
|
config.get('service_account');
|
||||||
|
|
||||||
if(keys?.client_email) {
|
|
||||||
clientEmail = keys.client_email;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
serviceAuth = googleDrive.auth.fromJSON(keys);
|
serviceAuth = googleDrive.auth.fromJSON(keys);
|
||||||
serviceAuth.scopes = ['https://www.googleapis.com/auth/drive'];
|
serviceAuth.scopes = ['https://www.googleapis.com/auth/drive'];
|
||||||
@@ -232,22 +227,6 @@ const GoogleActions = {
|
|||||||
|
|
||||||
if(!obj) return;
|
if(!obj) return;
|
||||||
|
|
||||||
if(clientEmail) {
|
|
||||||
await drive.permissions.create({
|
|
||||||
resource : {
|
|
||||||
type : 'user',
|
|
||||||
emailAddress : clientEmail,
|
|
||||||
role : 'writer'
|
|
||||||
},
|
|
||||||
fileId : obj.data.id,
|
|
||||||
fields : 'id',
|
|
||||||
})
|
|
||||||
.catch((err)=>{
|
|
||||||
console.log('Error adding Service Account permissions on Google Drive file');
|
|
||||||
console.error(err);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
await drive.permissions.create({
|
await drive.permissions.create({
|
||||||
resource : { type : 'anyone',
|
resource : { type : 'anyone',
|
||||||
role : 'writer' },
|
role : 'writer' },
|
||||||
@@ -255,7 +234,7 @@ const GoogleActions = {
|
|||||||
fields : 'id',
|
fields : 'id',
|
||||||
})
|
})
|
||||||
.catch((err)=>{
|
.catch((err)=>{
|
||||||
console.log('Error adding "Anyone" permissions on Google Drive file');
|
console.log('Error updating permissions');
|
||||||
console.error(err);
|
console.error(err);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import _ from 'lodash';
|
const _ = require('lodash');
|
||||||
import Markdown from 'markedLegacy';
|
const Markdown = require('markedLegacy');
|
||||||
const renderer = new Markdown.Renderer();
|
const renderer = new Markdown.Renderer();
|
||||||
|
|
||||||
//Processes the markdown within an HTML block if it's just a class-wrapper
|
//Processes the markdown within an HTML block if it's just a class-wrapper
|
||||||
@@ -103,7 +103,7 @@ const voidTags = new Set([
|
|||||||
]);
|
]);
|
||||||
|
|
||||||
|
|
||||||
export default {
|
module.exports = {
|
||||||
marked : Markdown,
|
marked : Markdown,
|
||||||
render : (rawBrewText)=>{
|
render : (rawBrewText)=>{
|
||||||
return Markdown(
|
return Markdown(
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
|
|
||||||
@import './reset.less';
|
@import 'naturalcrit/styles/reset.less';
|
||||||
//@import './elements.less';
|
//@import 'naturalcrit/styles/elements.less';
|
||||||
@import './animations.less';
|
@import 'naturalcrit/styles/animations.less';
|
||||||
@import './colors.less';
|
@import 'naturalcrit/styles/colors.less';
|
||||||
@import './tooltip.less';
|
@import 'naturalcrit/styles/tooltip.less';
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family : 'CodeLight';
|
font-family : 'CodeLight';
|
||||||
src : data-uri('naturalcrit/styles/CODE Light.otf') format('opentype');
|
src : data-uri('naturalcrit/styles/CODE Light.otf') format('opentype');
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
import globalJsdom from 'jsdom-global';
|
|
||||||
globalJsdom();
|
|
||||||
|
require('jsdom-global')();
|
||||||
|
|
||||||
import { safeHTML } from '../../client/homebrew/brewRenderer/safeHTML';
|
import { safeHTML } from '../../client/homebrew/brewRenderer/safeHTML';
|
||||||
|
|
||||||
test('Exit if no document', function() {
|
test('Exit if no document', function() {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
|
|
||||||
import Markdown from './shared/markdown.js';
|
import Markdown from 'markdown.js';
|
||||||
|
|
||||||
test('Processes the markdown within an HTML block if its just a class wrapper', function() {
|
test('Processes the markdown within an HTML block if its just a class wrapper', function() {
|
||||||
const source = '<div>*Bold text*</div>';
|
const source = '<div>*Bold text*</div>';
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
|
|
||||||
import Markdown from './shared/markdown.js';
|
import Markdown from 'markdown.js';
|
||||||
|
|
||||||
describe('Inline Definition Lists', ()=>{
|
describe('Inline Definition Lists', ()=>{
|
||||||
test('No Term 1 Definition', function() {
|
test('No Term 1 Definition', function() {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import Markdown from './shared/markdown.js';
|
import Markdown from 'markdown.js';
|
||||||
import dedent from 'dedent';
|
const dedent = require('dedent-tabs').default;
|
||||||
|
|
||||||
// Marked.js adds line returns after closing tags on some default tokens.
|
// Marked.js adds line returns after closing tags on some default tokens.
|
||||||
// This removes those line returns for comparison sake.
|
// This removes those line returns for comparison sake.
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
|
|
||||||
import Markdown from './shared/markdown.js';
|
import Markdown from 'markdown.js';
|
||||||
|
|
||||||
describe('Hard Breaks', ()=>{
|
describe('Hard Breaks', ()=>{
|
||||||
test('Single Break', function() {
|
test('Single Break', function() {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/* eslint-disable max-lines */
|
/* eslint-disable max-lines */
|
||||||
|
|
||||||
import dedent from 'dedent';
|
const dedent = require('dedent-tabs').default;
|
||||||
import Markdown from './shared/markdown.js';
|
import Markdown from 'markdown.js';
|
||||||
|
|
||||||
// Marked.js adds line returns after closing tags on some default tokens.
|
// Marked.js adds line returns after closing tags on some default tokens.
|
||||||
// This removes those line returns for comparison sake.
|
// This removes those line returns for comparison sake.
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
|
|
||||||
import Markdown from './shared/markdown.js';
|
import Markdown from 'markdown.js';
|
||||||
|
|
||||||
describe('Non-Breaking Spaces Interactions', ()=>{
|
describe('Non-Breaking Spaces Interactions', ()=>{
|
||||||
test('I am actually a single-line definition list!', function() {
|
test('I am actually a single-line definition list!', function() {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
|
|
||||||
import Markdown from './shared/markdown.js';
|
import Markdown from 'markdown.js';
|
||||||
|
|
||||||
describe('Justification', ()=>{
|
describe('Justification', ()=>{
|
||||||
test('Left Justify', function() {
|
test('Left Justify', function() {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/* eslint-disable max-lines */
|
/* eslint-disable max-lines */
|
||||||
|
|
||||||
import dedent from 'dedent';
|
const dedent = require('dedent-tabs').default;
|
||||||
import Markdown from './shared/markdown.js';
|
import Markdown from 'markdown.js';
|
||||||
|
|
||||||
// Marked.js adds line returns after closing tags on some default tokens.
|
// Marked.js adds line returns after closing tags on some default tokens.
|
||||||
// This removes those line returns for comparison sake.
|
// This removes those line returns for comparison sake.
|
||||||
|
|||||||
@@ -1,14 +1,14 @@
|
|||||||
/* eslint-disable max-lines */
|
/* eslint-disable max-lines */
|
||||||
|
|
||||||
import MagicGen from './snippets/magic.gen.js';
|
const MagicGen = require('./snippets/magic.gen.js');
|
||||||
import ClassTableGen from './snippets/classtable.gen.js';
|
const ClassTableGen = require('./snippets/classtable.gen.js');
|
||||||
import MonsterBlockGen from './snippets/monsterblock.gen.js';
|
const MonsterBlockGen = require('./snippets/monsterblock.gen.js');
|
||||||
import ClassFeatureGen from './snippets/classfeature.gen.js';
|
const ClassFeatureGen = require('./snippets/classfeature.gen.js');
|
||||||
import CoverPageGen from './snippets/coverpage.gen.js';
|
const CoverPageGen = require('./snippets/coverpage.gen.js');
|
||||||
import TableOfContentsGen from './snippets/tableOfContents.gen.js';
|
const TableOfContentsGen = require('./snippets/tableOfContents.gen.js');
|
||||||
import dedent from 'dedent';
|
const dedent = require('dedent-tabs').default;
|
||||||
|
|
||||||
export default [
|
module.exports = [
|
||||||
|
|
||||||
{
|
{
|
||||||
groupName : 'Text Editor',
|
groupName : 'Text Editor',
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import _ from 'lodash';
|
const _ = require('lodash');
|
||||||
|
|
||||||
function classFeatureGen(classname) {
|
module.exports = function(classname){
|
||||||
|
|
||||||
classname = _.sample(['archivist', 'fancyman', 'linguist', 'fletcher',
|
classname = _.sample(['archivist', 'fancyman', 'linguist', 'fletcher',
|
||||||
'notary', 'berserker-typist', 'fishmongerer', 'manicurist', 'haberdasher', 'concierge']);
|
'notary', 'berserker-typist', 'fishmongerer', 'manicurist', 'haberdasher', 'concierge']);
|
||||||
@@ -49,6 +49,4 @@ function classFeatureGen(classname) {
|
|||||||
`- ${_.sample(['10 lint fluffs', '1 button', 'a cherished lost sock'])}`,
|
`- ${_.sample(['10 lint fluffs', '1 button', 'a cherished lost sock'])}`,
|
||||||
'\n\n\n'
|
'\n\n\n'
|
||||||
].join('\n');
|
].join('\n');
|
||||||
}
|
};
|
||||||
|
|
||||||
export default classFeatureGen;
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import _ from 'lodash';
|
const _ = require('lodash');
|
||||||
|
|
||||||
const features = [
|
const features = [
|
||||||
'Astrological Botany',
|
'Astrological Botany',
|
||||||
@@ -50,7 +50,7 @@ const getFeature = (level)=>{
|
|||||||
return res.join(', ');
|
return res.join(', ');
|
||||||
};
|
};
|
||||||
|
|
||||||
export default {
|
module.exports = {
|
||||||
full : function(){
|
full : function(){
|
||||||
const classname = _.sample(classnames);
|
const classname = _.sample(classnames);
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import _ from 'lodash';
|
const _ = require('lodash');
|
||||||
|
|
||||||
const titles = [
|
const titles = [
|
||||||
'The Burning Gallows',
|
'The Burning Gallows',
|
||||||
@@ -98,8 +98,8 @@ const subtitles = [
|
|||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
function coverPageGen() {
|
module.exports = ()=>{
|
||||||
return `<style>
|
return `<style>
|
||||||
.phb#p1{ text-align:center; }
|
.phb#p1{ text-align:center; }
|
||||||
.phb#p1:after{ display:none; }
|
.phb#p1:after{ display:none; }
|
||||||
</style>
|
</style>
|
||||||
@@ -114,6 +114,4 @@ return `<style>
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
\\page`;
|
\\page`;
|
||||||
}
|
};
|
||||||
|
|
||||||
export default coverPageGen;
|
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
import _ from 'lodash';
|
const _ = require('lodash');
|
||||||
|
|
||||||
import ClassFeatureGen from './classfeature.gen.js';
|
const ClassFeatureGen = require('./classfeature.gen.js');
|
||||||
|
|
||||||
import ClassTableGen from './classtable.gen.js';
|
const ClassTableGen = require('./classtable.gen.js');
|
||||||
|
|
||||||
function fullClassGen(){
|
module.exports = function(){
|
||||||
|
|
||||||
const classname = _.sample(['Archivist', 'Fancyman', 'Linguist', 'Fletcher',
|
const classname = _.sample(['Archivist', 'Fancyman', 'Linguist', 'Fletcher',
|
||||||
'Notary', 'Berserker-Typist', 'Fishmongerer', 'Manicurist', 'Haberdasher', 'Concierge']);
|
'Notary', 'Berserker-Typist', 'Fishmongerer', 'Manicurist', 'Haberdasher', 'Concierge']);
|
||||||
@@ -40,6 +40,4 @@ function fullClassGen(){
|
|||||||
|
|
||||||
|
|
||||||
].join('\n')}\n\n\n`;
|
].join('\n')}\n\n\n`;
|
||||||
}
|
};
|
||||||
|
|
||||||
export default fullClassGen;
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import _ from 'lodash';
|
const _ = require('lodash');
|
||||||
|
|
||||||
const spellNames = [
|
const spellNames = [
|
||||||
'Astral Rite of Acne',
|
'Astral Rite of Acne',
|
||||||
@@ -48,7 +48,7 @@ const spellNames = [
|
|||||||
'Ultimate Ritual of Mouthwash',
|
'Ultimate Ritual of Mouthwash',
|
||||||
];
|
];
|
||||||
|
|
||||||
export default {
|
module.exports = {
|
||||||
|
|
||||||
spellList : function(){
|
spellList : function(){
|
||||||
const levels = ['Cantrips (0 Level)', '1st Level', '2nd Level', '3rd Level', '4th Level', '5th Level', '6th Level', '7th Level', '8th Level', '9th Level'];
|
const levels = ['Cantrips (0 Level)', '1st Level', '2nd Level', '3rd Level', '4th Level', '5th Level', '6th Level', '7th Level', '8th Level', '9th Level'];
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import _ from 'lodash';
|
const _ = require('lodash');
|
||||||
|
|
||||||
const genList = function(list, max){
|
const genList = function(list, max){
|
||||||
return _.sampleSize(list, _.random(0, max)).join(', ') || 'None';
|
return _.sampleSize(list, _.random(0, max)).join(', ') || 'None';
|
||||||
@@ -137,7 +137,7 @@ const genAction = function(){
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
export default {
|
module.exports = {
|
||||||
|
|
||||||
full : function(){
|
full : function(){
|
||||||
return `${[
|
return `${[
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user