{this.props.navItems}
{this.renderSortOptions()}
{this.renderTagsOptions()}
diff --git a/client/homebrew/pages/errorPage/errors/errorIndex.js b/client/homebrew/pages/errorPage/errors/errorIndex.js
index f9d52c109..7fa24dddc 100644
--- a/client/homebrew/pages/errorPage/errors/errorIndex.js
+++ b/client/homebrew/pages/errorPage/errors/errorIndex.js
@@ -95,7 +95,7 @@ const errorIndex = (props)=>{
**Current Authors:** ${props.brew.authors?.map((author)=>{return `[${author}](/user/${author})`;}).join(', ') || 'Unable to list authors'}
[Click here to be redirected to the brew's share page.](/share/${props.brew.shareId})`,
-
+
// Brew load error
'05' : dedent`
diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx
index 9877651c2..f137027cd 100644
--- a/client/homebrew/pages/newPage/newPage.jsx
+++ b/client/homebrew/pages/newPage/newPage.jsx
@@ -2,7 +2,6 @@
require('./newPage.less');
const React = require('react');
const createClass = require('create-react-class');
-const _ = require('lodash');
const request = require('../../utils/request-middleware.js');
const Markdown = require('naturalcrit/markdown.js');
diff --git a/client/homebrew/pages/printPage/printPage.jsx b/client/homebrew/pages/printPage/printPage.jsx
index 9a5a80dbf..5f512660c 100644
--- a/client/homebrew/pages/printPage/printPage.jsx
+++ b/client/homebrew/pages/printPage/printPage.jsx
@@ -2,7 +2,6 @@ require('./printPage.less');
const React = require('react');
const createClass = require('create-react-class');
const _ = require('lodash');
-const cx = require('classnames');
const { Meta } = require('vitreum/headtags');
const MarkdownLegacy = require('naturalcrit/markdownLegacy.js');
const Markdown = require('naturalcrit/markdown.js');
@@ -34,7 +33,7 @@ const PrintPage = createClass({
style : this.props.brew.style || undefined,
renderer : this.props.brew.renderer || 'legacy',
theme : this.props.brew.theme || '5ePHB',
- lang : this.props.brew.lang || 'en'
+ lang : this.props.brew.lang || 'en'
}
};
},
@@ -52,7 +51,7 @@ const PrintPage = createClass({
style : styleStorage,
renderer : metaStorage?.renderer || 'legacy',
theme : metaStorage?.theme || '5ePHB',
- lang : metaStorage?.lang || 'en'
+ lang : metaStorage?.lang || 'en'
}
};
});
@@ -96,11 +95,11 @@ const PrintPage = createClass({
return
-
+
{baseThemePath &&
-
+
}
-
+
{/* Apply CSS from Style tab */}
{this.renderStyle()}
diff --git a/client/homebrew/pages/sharePage/sharePage.jsx b/client/homebrew/pages/sharePage/sharePage.jsx
index deb476c2e..2eab5f34a 100644
--- a/client/homebrew/pages/sharePage/sharePage.jsx
+++ b/client/homebrew/pages/sharePage/sharePage.jsx
@@ -57,7 +57,7 @@ const SharePage = createClass({
return
edit
- ;
+ ;
},
render : function(){
diff --git a/client/homebrew/pages/userPage/userPage.jsx b/client/homebrew/pages/userPage/userPage.jsx
index 1e051987b..01778be44 100644
--- a/client/homebrew/pages/userPage/userPage.jsx
+++ b/client/homebrew/pages/userPage/userPage.jsx
@@ -1,7 +1,6 @@
const React = require('react');
const createClass = require('create-react-class');
const _ = require('lodash');
-const cx = require('classnames');
const ListPage = require('../basePages/listPage/listPage.jsx');
diff --git a/server.js b/server.js
index 39224bb88..6cbe07c4f 100644
--- a/server.js
+++ b/server.js
@@ -14,7 +14,7 @@ DB.connect(config).then(()=>{
console.log(`\n\tserver started at: ${new Date().toLocaleString()}`);
console.log(`\tserver on port: ${PORT}`);
- console.log(`\t${bright + cyan}Open in browser: ${reset}${underline + bright + cyan}http://localhost:${PORT}${reset}\n\n`)
+ console.log(`\t${bright + cyan}Open in browser: ${reset}${underline + bright + cyan}http://localhost:${PORT}${reset}\n\n`);
});
});
diff --git a/server/admin.api.js b/server/admin.api.js
index 5363ecc08..fe2def3ce 100644
--- a/server/admin.api.js
+++ b/server/admin.api.js
@@ -30,7 +30,7 @@ const junkBrewPipeline = [
{ $match : {
updatedAt : { $lt: Moment().subtract(30, 'days').toDate() },
lastViewed : { $lt: Moment().subtract(30, 'days').toDate() }
- }},
+ } },
{ $project: { textBinSize: { $binarySize: '$textBin' } } },
{ $match: { textBinSize: { $lt: 140 } } },
{ $limit: 100 }
diff --git a/server/app.js b/server/app.js
index e04df77a6..a08ab4404 100644
--- a/server/app.js
+++ b/server/app.js
@@ -25,7 +25,7 @@ const sanitizeBrew = (brew, accessType)=>{
brew.__v = undefined;
if(accessType !== 'edit' && accessType !== 'shareAuthor') {
brew.editId = undefined;
- }
+ }
return brew;
};
diff --git a/server/googleActions.js b/server/googleActions.js
index 16537d603..93367248e 100644
--- a/server/googleActions.js
+++ b/server/googleActions.js
@@ -1,5 +1,4 @@
/* eslint-disable max-lines */
-const _ = require('lodash');
const googleDrive = require('@googleapis/drive');
const { nanoid } = require('nanoid');
const token = require('./token.js');
diff --git a/server/homebrew.api.js b/server/homebrew.api.js
index e73a704a8..ae1abf787 100644
--- a/server/homebrew.api.js
+++ b/server/homebrew.api.js
@@ -83,9 +83,9 @@ const api = {
if(accessType === 'edit' && (authorsExist && !(isAuthor || isInvited))) {
const accessError = { name: 'Access Error', status: 401 };
if(req.account){
- throw { ...accessError, message: 'User is not an Author', HBErrorCode: '03', authors: stub.authors, brewTitle: stub.title, shareId: stub.shareId};
+ throw { ...accessError, message: 'User is not an Author', HBErrorCode: '03', authors: stub.authors, brewTitle: stub.title, shareId: stub.shareId };
}
- throw { ...accessError, message: 'User is not logged in', HBErrorCode: '04', authors: stub.authors, brewTitle: stub.title, shareId: stub.shareId};
+ throw { ...accessError, message: 'User is not logged in', HBErrorCode: '04', authors: stub.authors, brewTitle: stub.title, shareId: stub.shareId };
}
// If after all of that we still don't have a brew, throw an exception
diff --git a/shared/helpers.js b/shared/helpers.js
index 5abb93fea..42dd09e3f 100644
--- a/shared/helpers.js
+++ b/shared/helpers.js
@@ -1,22 +1,22 @@
const _ = require('lodash');
const yaml = require('js-yaml');
-const splitTextStyleAndMetadata = (brew) => {
- brew.text = brew.text.replaceAll('\r\n', '\n');
- if (brew.text.startsWith('```metadata')) {
- const index = brew.text.indexOf('```\n\n');
- const metadataSection = brew.text.slice(12, index - 1);
- const metadata = yaml.load(metadataSection);
- Object.assign(brew, _.pick(metadata, ['title', 'description', 'tags', 'systems', 'renderer', 'theme', 'lang']));
- brew.text = brew.text.slice(index + 5);
- }
- if (brew.text.startsWith('```css')) {
- const index = brew.text.indexOf('```\n\n');
- brew.style = brew.text.slice(7, index - 1);
- brew.text = brew.text.slice(index + 5);
- }
+const splitTextStyleAndMetadata = (brew)=>{
+ brew.text = brew.text.replaceAll('\r\n', '\n');
+ if(brew.text.startsWith('```metadata')) {
+ const index = brew.text.indexOf('```\n\n');
+ const metadataSection = brew.text.slice(12, index - 1);
+ const metadata = yaml.load(metadataSection);
+ Object.assign(brew, _.pick(metadata, ['title', 'description', 'tags', 'systems', 'renderer', 'theme', 'lang']));
+ brew.text = brew.text.slice(index + 5);
+ }
+ if(brew.text.startsWith('```css')) {
+ const index = brew.text.indexOf('```\n\n');
+ brew.style = brew.text.slice(7, index - 1);
+ brew.text = brew.text.slice(index + 5);
+ }
};
module.exports = {
- splitTextStyleAndMetadata
+ splitTextStyleAndMetadata
};
diff --git a/shared/homebrewery/renderWarnings/renderWarnings.jsx b/shared/homebrewery/renderWarnings/renderWarnings.jsx
index 981fc1969..6028f1708 100644
--- a/shared/homebrewery/renderWarnings/renderWarnings.jsx
+++ b/shared/homebrewery/renderWarnings/renderWarnings.jsx
@@ -2,7 +2,6 @@ require('./renderWarnings.less');
const React = require('react');
const createClass = require('create-react-class');
const _ = require('lodash');
-const cx = require('classnames');
const DISMISS_KEY = 'dismiss_render_warning';
diff --git a/shared/naturalcrit/codeEditor/autocompleteEmoji.js b/shared/naturalcrit/codeEditor/autocompleteEmoji.js
index 73e08de57..fae373115 100644
--- a/shared/naturalcrit/codeEditor/autocompleteEmoji.js
+++ b/shared/naturalcrit/codeEditor/autocompleteEmoji.js
@@ -1,11 +1,13 @@
const diceFont = require('../../../themes/fonts/iconFonts/diceFont.js');
const elderberryInn = require('../../../themes/fonts/iconFonts/elderberryInn.js');
const fontAwesome = require('../../../themes/fonts/iconFonts/fontAwesome.js');
+const gameIcons = require('../../../themes/fonts/iconFonts/gameIcons.js');
const emojis = {
...diceFont,
...elderberryInn,
- ...fontAwesome
+ ...fontAwesome,
+ ...gameIcons
};
const showAutocompleteEmoji = function(CodeMirror, editor) {
diff --git a/shared/naturalcrit/codeEditor/codeEditor.jsx b/shared/naturalcrit/codeEditor/codeEditor.jsx
index b034d1ca9..9f908d4bd 100644
--- a/shared/naturalcrit/codeEditor/codeEditor.jsx
+++ b/shared/naturalcrit/codeEditor/codeEditor.jsx
@@ -3,7 +3,6 @@ require('./codeEditor.less');
const React = require('react');
const createClass = require('create-react-class');
const _ = require('lodash');
-const cx = require('classnames');
const closeTag = require('./close-tag');
const autoCompleteEmoji = require('./autocompleteEmoji');
diff --git a/shared/naturalcrit/codeEditor/codeEditor.less b/shared/naturalcrit/codeEditor/codeEditor.less
index 349166248..0f29eff7b 100644
--- a/shared/naturalcrit/codeEditor/codeEditor.less
+++ b/shared/naturalcrit/codeEditor/codeEditor.less
@@ -7,6 +7,7 @@
//Icon fonts included so they can appear in emoji autosuggest dropdown
@import (less) './themes/fonts/iconFonts/diceFont.less';
@import (less) './themes/fonts/iconFonts/elderberryInn.less';
+@import (less) './themes/fonts/iconFonts/gameIcons.less';
@keyframes sourceMoveAnimation {
50% {background-color: red; color: white;}
diff --git a/shared/naturalcrit/markdown.js b/shared/naturalcrit/markdown.js
index 05518b695..95431487d 100644
--- a/shared/naturalcrit/markdown.js
+++ b/shared/naturalcrit/markdown.js
@@ -10,6 +10,7 @@ const { markedEmoji: MarkedEmojis } = require('marked-emoji');
const diceFont = require('../../themes/fonts/iconFonts/diceFont.js');
const elderberryInn = require('../../themes/fonts/iconFonts/elderberryInn.js');
const fontAwesome = require('../../themes/fonts/iconFonts/fontAwesome.js');
+const gameIcons = require('../../themes/fonts/iconFonts/gameIcons.js');
const MathParser = require('expr-eval').Parser;
const renderer = new Marked.Renderer();
@@ -688,7 +689,8 @@ const MarkedEmojiOptions = {
emojis : {
...diceFont,
...elderberryInn,
- ...fontAwesome
+ ...fontAwesome,
+ ...gameIcons,
},
renderer : (token)=>`