From aef66052254566c01658f41cd7a0a40785ea804b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Fri, 17 May 2024 22:28:01 +0200 Subject: [PATCH 1/5] Remove redundant snippetBar import from editor.jsx --- client/homebrew/editor/editor.jsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/client/homebrew/editor/editor.jsx b/client/homebrew/editor/editor.jsx index f5c1766a8..9b5f1d67d 100644 --- a/client/homebrew/editor/editor.jsx +++ b/client/homebrew/editor/editor.jsx @@ -3,12 +3,10 @@ require('./editor.less'); const React = require('react'); const createClass = require('create-react-class'); const _ = require('lodash'); -const cx = require('classnames'); const dedent = require('dedent-tabs').default; const Markdown = require('../../../shared/naturalcrit/markdown.js'); const CodeEditor = require('naturalcrit/codeEditor/codeEditor.jsx'); -const SnippetBar = require('./snippetbar/snippetbar.jsx'); const MetadataEditor = require('./metadataEditor/metadataEditor.jsx'); const EDITOR_THEME_KEY = 'HOMEBREWERY-EDITOR-THEME'; From 92e27cda6c42ad5882b48b68af2ae9ccb2b6cc11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Fri, 17 May 2024 22:31:55 +0200 Subject: [PATCH 2/5] "Removed unused imports of 'classnames' and 'create-react-class' from various JSX files. in the Client folder" --- client/admin/brewCleanup/brewCleanup.jsx | 1 - client/admin/brewCompress/brewCompress.jsx | 1 - client/components/combobox.jsx | 1 - client/homebrew/brewRenderer/errorBar/errorBar.jsx | 1 - .../brewRenderer/notificationPopup/notificationPopup.jsx | 1 - client/homebrew/editor/metadataEditor/metadataEditor.jsx | 1 - client/homebrew/navbar/help.navitem.jsx | 2 -- client/homebrew/navbar/metadata.navitem.jsx | 1 - client/homebrew/navbar/print.navitem.jsx | 1 - client/homebrew/navbar/reddit.navitem.jsx | 2 -- client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx | 2 -- client/homebrew/pages/newPage/newPage.jsx | 1 - client/homebrew/pages/printPage/printPage.jsx | 1 - client/homebrew/pages/userPage/userPage.jsx | 1 - 14 files changed, 17 deletions(-) diff --git a/client/admin/brewCleanup/brewCleanup.jsx b/client/admin/brewCleanup/brewCleanup.jsx index b55a70bef..a166ae112 100644 --- a/client/admin/brewCleanup/brewCleanup.jsx +++ b/client/admin/brewCleanup/brewCleanup.jsx @@ -1,7 +1,6 @@ require('./brewCleanup.less'); const React = require('react'); const createClass = require('create-react-class'); -const cx = require('classnames'); const request = require('superagent'); diff --git a/client/admin/brewCompress/brewCompress.jsx b/client/admin/brewCompress/brewCompress.jsx index c12f430a2..2c8e5b023 100644 --- a/client/admin/brewCompress/brewCompress.jsx +++ b/client/admin/brewCompress/brewCompress.jsx @@ -1,7 +1,6 @@ require('./brewCompress.less'); const React = require('react'); const createClass = require('create-react-class'); -const cx = require('classnames'); const request = require('superagent'); diff --git a/client/components/combobox.jsx b/client/components/combobox.jsx index a6e699dcf..5fcc154bc 100644 --- a/client/components/combobox.jsx +++ b/client/components/combobox.jsx @@ -1,7 +1,6 @@ const React = require('react'); const createClass = require('create-react-class'); const _ = require('lodash'); -const cx = require('classnames'); require('./combobox.less'); const Combobox = createClass({ diff --git a/client/homebrew/brewRenderer/errorBar/errorBar.jsx b/client/homebrew/brewRenderer/errorBar/errorBar.jsx index dd5ec5bc2..d2f847306 100644 --- a/client/homebrew/brewRenderer/errorBar/errorBar.jsx +++ b/client/homebrew/brewRenderer/errorBar/errorBar.jsx @@ -2,7 +2,6 @@ require('./errorBar.less'); const React = require('react'); const createClass = require('create-react-class'); const _ = require('lodash'); -const cx = require('classnames'); const ErrorBar = createClass({ displayName : 'ErrorBar', diff --git a/client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx b/client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx index 5a870c108..1a38ef8ad 100644 --- a/client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx +++ b/client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx @@ -2,7 +2,6 @@ require('./notificationPopup.less'); const React = require('react'); const createClass = require('create-react-class'); const _ = require('lodash'); -const cx = require('classnames'); //Unused variable const DISMISS_KEY = 'dismiss_notification12-04-23'; diff --git a/client/homebrew/editor/metadataEditor/metadataEditor.jsx b/client/homebrew/editor/metadataEditor/metadataEditor.jsx index 074879b05..a59a50f74 100644 --- a/client/homebrew/editor/metadataEditor/metadataEditor.jsx +++ b/client/homebrew/editor/metadataEditor/metadataEditor.jsx @@ -3,7 +3,6 @@ require('./metadataEditor.less'); const React = require('react'); const createClass = require('create-react-class'); const _ = require('lodash'); -const cx = require('classnames'); const request = require('../../utils/request-middleware.js'); const Nav = require('naturalcrit/nav/nav.jsx'); const Combobox = require('client/components/combobox.jsx'); diff --git a/client/homebrew/navbar/help.navitem.jsx b/client/homebrew/navbar/help.navitem.jsx index 952681fd8..bf0098c8d 100644 --- a/client/homebrew/navbar/help.navitem.jsx +++ b/client/homebrew/navbar/help.navitem.jsx @@ -1,6 +1,4 @@ const React = require('react'); -const createClass = require('create-react-class'); -const _ = require('lodash'); const dedent = require('dedent-tabs').default; const Nav = require('naturalcrit/nav/nav.jsx'); diff --git a/client/homebrew/navbar/metadata.navitem.jsx b/client/homebrew/navbar/metadata.navitem.jsx index f4a09e143..2a29aec40 100644 --- a/client/homebrew/navbar/metadata.navitem.jsx +++ b/client/homebrew/navbar/metadata.navitem.jsx @@ -1,6 +1,5 @@ const React = require('react'); const createClass = require('create-react-class'); -const _ = require('lodash'); const Moment = require('moment'); const Nav = require('naturalcrit/nav/nav.jsx'); diff --git a/client/homebrew/navbar/print.navitem.jsx b/client/homebrew/navbar/print.navitem.jsx index 4907cad73..54af0bb41 100644 --- a/client/homebrew/navbar/print.navitem.jsx +++ b/client/homebrew/navbar/print.navitem.jsx @@ -1,5 +1,4 @@ const React = require('react'); -const createClass = require('create-react-class'); const Nav = require('naturalcrit/nav/nav.jsx'); module.exports = function(props){ diff --git a/client/homebrew/navbar/reddit.navitem.jsx b/client/homebrew/navbar/reddit.navitem.jsx index 15bc1696e..1d9f95604 100644 --- a/client/homebrew/navbar/reddit.navitem.jsx +++ b/client/homebrew/navbar/reddit.navitem.jsx @@ -1,9 +1,7 @@ const React = require('react'); const createClass = require('create-react-class'); -const cx = require('classnames'); const Nav = require('naturalcrit/nav/nav.jsx'); -const MAX_URL_SIZE = 2083; const MAIN_URL = 'https://www.reddit.com/r/UnearthedArcana/submit?selftext=true'; diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx index 0369305d5..bf0624f1c 100644 --- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx +++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx @@ -1,8 +1,6 @@ require('./brewItem.less'); const React = require('react'); const createClass = require('create-react-class'); -const _ = require('lodash'); -const cx = require('classnames'); const moment = require('moment'); const request = require('../../../../utils/request-middleware.js'); 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..cde66ad7d 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'); 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'); From b7717171b378f21935c669708fb6857644561223 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Fri, 17 May 2024 22:34:40 +0200 Subject: [PATCH 3/5] Server and shared folders --- server/googleActions.js | 1 - shared/homebrewery/renderWarnings/renderWarnings.jsx | 1 - shared/naturalcrit/codeEditor/codeEditor.jsx | 1 - shared/naturalcrit/splitPane/splitPane.jsx | 1 - 4 files changed, 4 deletions(-) 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/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/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/splitPane/splitPane.jsx b/shared/naturalcrit/splitPane/splitPane.jsx index 2101480dc..b53d9de48 100644 --- a/shared/naturalcrit/splitPane/splitPane.jsx +++ b/shared/naturalcrit/splitPane/splitPane.jsx @@ -1,7 +1,6 @@ require('./splitPane.less'); const React = require('react'); const createClass = require('create-react-class'); -const _ = require('lodash'); const cx = require('classnames'); const SplitPane = createClass({ From b64c835706f7392b2c496a891e2d7160a1192869 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Fri, 17 May 2024 22:38:09 +0200 Subject: [PATCH 4/5] Aparently it wasn't redundant as VSCode said This reverts commit aef66052254566c01658f41cd7a0a40785ea804b. --- client/homebrew/editor/editor.jsx | 2 ++ themes/themes.json | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/client/homebrew/editor/editor.jsx b/client/homebrew/editor/editor.jsx index 9b5f1d67d..f5c1766a8 100644 --- a/client/homebrew/editor/editor.jsx +++ b/client/homebrew/editor/editor.jsx @@ -3,10 +3,12 @@ require('./editor.less'); const React = require('react'); const createClass = require('create-react-class'); const _ = require('lodash'); +const cx = require('classnames'); const dedent = require('dedent-tabs').default; const Markdown = require('../../../shared/naturalcrit/markdown.js'); const CodeEditor = require('naturalcrit/codeEditor/codeEditor.jsx'); +const SnippetBar = require('./snippetbar/snippetbar.jsx'); const MetadataEditor = require('./metadataEditor/metadataEditor.jsx'); const EDITOR_THEME_KEY = 'HOMEBREWERY-EDITOR-THEME'; diff --git a/themes/themes.json b/themes/themes.json index 0d28c7394..bc719185d 100644 --- a/themes/themes.json +++ b/themes/themes.json @@ -29,12 +29,12 @@ "baseSnippets": false, "path": "Blank" }, - "Journal": { + "journal": { "name": "Journal", "renderer": "V3", "baseTheme": false, "baseSnippets": "5ePHB", - "path": "Journal" + "path": "journal" } } } \ No newline at end of file From f12de7d95377050f8125db82c28e893001359f40 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Tue, 21 May 2024 17:28:17 -0400 Subject: [PATCH 5/5] Undo Journal path change --- themes/themes.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/themes.json b/themes/themes.json index bc719185d..0d28c7394 100644 --- a/themes/themes.json +++ b/themes/themes.json @@ -29,12 +29,12 @@ "baseSnippets": false, "path": "Blank" }, - "journal": { + "Journal": { "name": "Journal", "renderer": "V3", "baseTheme": false, "baseSnippets": "5ePHB", - "path": "journal" + "path": "Journal" } } } \ No newline at end of file