diff --git a/client/components/renderWarnings/renderWarnings.less b/client/components/renderWarnings/renderWarnings.less index 70799092a..100de0bc7 100644 --- a/client/components/renderWarnings/renderWarnings.less +++ b/client/components/renderWarnings/renderWarnings.less @@ -1,3 +1,5 @@ +@import './shared/naturalcrit/styles/colors.less'; + .renderWarnings { position : relative; float : right; diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx index 26b637897..131d34695 100644 --- a/client/homebrew/brewRenderer/brewRenderer.jsx +++ b/client/homebrew/brewRenderer/brewRenderer.jsx @@ -3,13 +3,13 @@ import './brewRenderer.less'; import React, { useState, useRef, useMemo, useEffect } from 'react'; import _ from 'lodash'; -import MarkdownLegacy from 'markdownLegacy.js'; -import Markdown from 'markdown.js'; +import MarkdownLegacy from './shared/markdownLegacy.js'; +import Markdown from './shared/markdown.js'; import ErrorBar from './errorBar/errorBar.jsx'; import ToolBar from './toolBar/toolBar.jsx'; //TODO: move to the brew renderer -import RenderWarnings from 'client/components/renderWarnings/renderWarnings.jsx'; +import RenderWarnings from '../../components/renderWarnings/renderWarnings.jsx'; import NotificationPopup from './notificationPopup/notificationPopup.jsx'; import Frame from 'react-frame-component'; import dedent from 'dedent'; diff --git a/client/homebrew/brewRenderer/errorBar/errorBar.less b/client/homebrew/brewRenderer/errorBar/errorBar.less index 163648533..83efd2391 100644 --- a/client/homebrew/brewRenderer/errorBar/errorBar.less +++ b/client/homebrew/brewRenderer/errorBar/errorBar.less @@ -1,3 +1,4 @@ +@import './shared/naturalcrit/styles/colors.less'; .errorBar { position : absolute; diff --git a/client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx b/client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx index dd05391f0..c28233fbf 100644 --- a/client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx +++ b/client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx @@ -1,7 +1,7 @@ import './notificationPopup.less'; import React, { useEffect, useState } from 'react'; import request from '../../utils/request-middleware.js'; -import Markdown from 'markdown.js'; +import Markdown from './shared/markdown.js'; import Dialog from '../../../components/dialog.jsx'; diff --git a/client/homebrew/brewRenderer/notificationPopup/notificationPopup.less b/client/homebrew/brewRenderer/notificationPopup/notificationPopup.less index 85d4c8365..4f34bad8d 100644 --- a/client/homebrew/brewRenderer/notificationPopup/notificationPopup.less +++ b/client/homebrew/brewRenderer/notificationPopup/notificationPopup.less @@ -1,3 +1,5 @@ +@import './client/homebrew/navbar/navbar.less'; + .popups { position : fixed; top : calc(@navbarHeight + @viewerToolsHeight); diff --git a/client/homebrew/brewRenderer/safeHTML.js b/client/homebrew/brewRenderer/safeHTML.js index 2574f4cfe..d9438b663 100644 --- a/client/homebrew/brewRenderer/safeHTML.js +++ b/client/homebrew/brewRenderer/safeHTML.js @@ -43,4 +43,4 @@ function safeHTML(htmlString) { return div.innerHTML; }; -module.exports.safeHTML = safeHTML; \ No newline at end of file +export default safeHTML; \ No newline at end of file diff --git a/client/homebrew/editor/metadataEditor/metadataEditor.jsx b/client/homebrew/editor/metadataEditor/metadataEditor.jsx index 5ef409b9f..54dc1a6e8 100644 --- a/client/homebrew/editor/metadataEditor/metadataEditor.jsx +++ b/client/homebrew/editor/metadataEditor/metadataEditor.jsx @@ -4,7 +4,7 @@ import React from 'react'; import createReactClass from 'create-react-class'; import _ from 'lodash'; import request from '../../utils/request-middleware.js'; -import Combobox from 'client/components/combobox.jsx'; +import Combobox from '../../../components/combobox.jsx'; import TagInput from '../tagInput/tagInput.jsx'; diff --git a/client/homebrew/editor/metadataEditor/metadataEditor.less b/client/homebrew/editor/metadataEditor/metadataEditor.less index fd04f07d9..edf559ce9 100644 --- a/client/homebrew/editor/metadataEditor/metadataEditor.less +++ b/client/homebrew/editor/metadataEditor/metadataEditor.less @@ -1,4 +1,4 @@ -@import 'naturalcrit/styles/colors.less'; +@import './shared/naturalcrit/styles/core.less'; .userThemeName { padding-right : 10px; diff --git a/client/homebrew/navbar/account.navitem.jsx b/client/homebrew/navbar/account.navitem.jsx index 0bec1d27d..731f27666 100644 --- a/client/homebrew/navbar/account.navitem.jsx +++ b/client/homebrew/navbar/account.navitem.jsx @@ -1,7 +1,7 @@ import React from 'react'; import createReactClass from 'create-react-class'; import request from 'superagent'; -import Nav from 'client/homebrew/navbar/nav.jsx'; +import Nav from './client/homebrew/navbar/nav.jsx'; const Account = createReactClass({ displayName : 'AccountNavItem', diff --git a/client/homebrew/navbar/error-navitem.jsx b/client/homebrew/navbar/error-navitem.jsx index 01e1ca516..a11860c0a 100644 --- a/client/homebrew/navbar/error-navitem.jsx +++ b/client/homebrew/navbar/error-navitem.jsx @@ -1,6 +1,6 @@ import './error-navitem.less'; import React from 'react'; -import Nav from 'client/homebrew/navbar/nav.jsx'; +import Nav from './client/homebrew/navbar/nav.jsx'; const ErrorNavItem = ({ error = '', clearError })=>{ const response = error.response; diff --git a/client/homebrew/navbar/error-navitem.less b/client/homebrew/navbar/error-navitem.less index 637ddac95..15c741bbc 100644 --- a/client/homebrew/navbar/error-navitem.less +++ b/client/homebrew/navbar/error-navitem.less @@ -1,3 +1,5 @@ +@import './shared/naturalcrit/styles/core.less'; + .navItem.error { position : relative; background-color : @red; diff --git a/client/homebrew/navbar/help.navitem.jsx b/client/homebrew/navbar/help.navitem.jsx index d1f24fbc8..a7013cc59 100644 --- a/client/homebrew/navbar/help.navitem.jsx +++ b/client/homebrew/navbar/help.navitem.jsx @@ -1,7 +1,7 @@ import React from 'react'; import dedent from 'dedent'; -import Nav from 'client/homebrew/navbar/nav.jsx'; +import Nav from './client/homebrew/navbar/nav.jsx'; export default function(props){ return diff --git a/client/homebrew/navbar/metadata.navitem.jsx b/client/homebrew/navbar/metadata.navitem.jsx index 09800391d..eb1efe54f 100644 --- a/client/homebrew/navbar/metadata.navitem.jsx +++ b/client/homebrew/navbar/metadata.navitem.jsx @@ -2,7 +2,7 @@ import React from 'react'; import createReactClass from 'create-react-class'; import Moment from 'moment'; -import Nav from 'client/homebrew/navbar/nav.jsx'; +import Nav from './client/homebrew/navbar/nav.jsx'; const MetadataNav = createReactClass({ diff --git a/client/homebrew/navbar/nav.jsx b/client/homebrew/navbar/nav.jsx index cf1e2adbf..b4ae4f9d2 100644 --- a/client/homebrew/navbar/nav.jsx +++ b/client/homebrew/navbar/nav.jsx @@ -1,10 +1,10 @@ -import 'client/homebrew/navbar/navbar.less'; +import './client/homebrew/navbar/navbar.less'; import React, { useState, useRef, useEffect } from 'react'; import createReactClass from 'create-react-class'; import _ from 'lodash'; import cx from 'classnames'; -import NaturalCritIcon from 'client/components/svg/naturalcrit-d20.svg.jsx'; +import NaturalCritIcon from './client/components/svg/naturalcrit-d20.svg.jsx'; const Nav = { base : createReactClass({ diff --git a/client/homebrew/navbar/navbar.jsx b/client/homebrew/navbar/navbar.jsx index 234580fb4..bea433850 100644 --- a/client/homebrew/navbar/navbar.jsx +++ b/client/homebrew/navbar/navbar.jsx @@ -2,7 +2,7 @@ import './navbar.less'; import React from 'react'; import createReactClass from 'create-react-class'; -import Nav from 'client/homebrew/navbar/nav.jsx'; +import Nav from './client/homebrew/navbar/nav.jsx'; import PatreonNavItem from './patreon.navitem.jsx'; const Navbar = createReactClass({ diff --git a/client/homebrew/navbar/navbar.less b/client/homebrew/navbar/navbar.less index 7b0217bf8..c8154a7d8 100644 --- a/client/homebrew/navbar/navbar.less +++ b/client/homebrew/navbar/navbar.less @@ -1,4 +1,4 @@ -@import 'naturalcrit/styles/colors.less'; +@import './shared/naturalcrit/styles/core.less'; @navbarHeight : 28px; @viewerToolsHeight : 32px; diff --git a/client/homebrew/navbar/newbrew.navitem.jsx b/client/homebrew/navbar/newbrew.navitem.jsx index 3af2b6acf..249788308 100644 --- a/client/homebrew/navbar/newbrew.navitem.jsx +++ b/client/homebrew/navbar/newbrew.navitem.jsx @@ -1,6 +1,6 @@ import React from 'react'; import _ from 'lodash'; -import Nav from 'client/homebrew/navbar/nav.jsx'; +import Nav from './client/homebrew/navbar/nav.jsx'; import { splitTextStyleAndMetadata } from '../../../shared/helpers.js'; const BREWKEY = 'HB_newPage_content'; diff --git a/client/homebrew/navbar/patreon.navitem.jsx b/client/homebrew/navbar/patreon.navitem.jsx index 7eb7daee8..ab4aaa48e 100644 --- a/client/homebrew/navbar/patreon.navitem.jsx +++ b/client/homebrew/navbar/patreon.navitem.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import Nav from 'client/homebrew/navbar/nav.jsx'; +import Nav from './client/homebrew/navbar/nav.jsx'; export default function(props){ return ( brew.googleId && !brew.stubbed diff --git a/client/homebrew/navbar/vault.navitem.jsx b/client/homebrew/navbar/vault.navitem.jsx index 9e4305811..dca32c295 100644 --- a/client/homebrew/navbar/vault.navitem.jsx +++ b/client/homebrew/navbar/vault.navitem.jsx @@ -1,6 +1,6 @@ import React from 'react'; -import Nav from 'client/homebrew/navbar/nav.jsx'; +import Nav from './client/homebrew/navbar/nav.jsx'; export default function (props) { return ( diff --git a/client/homebrew/pages/accountPage/accountPage.jsx b/client/homebrew/pages/accountPage/accountPage.jsx index 015106628..0715f5d13 100644 --- a/client/homebrew/pages/accountPage/accountPage.jsx +++ b/client/homebrew/pages/accountPage/accountPage.jsx @@ -1,7 +1,7 @@ import React from 'react'; import moment from 'moment'; import UIPage from '../basePages/uiPage/uiPage.jsx'; -import NaturalCritIcon from 'client/components/svg/naturalcrit-d20.svg.jsx'; +import NaturalCritIcon from './client/components/svg/naturalcrit-d20.svg.jsx'; let SAVEKEY = ''; diff --git a/client/homebrew/pages/basePages/uiPage/uiPage.jsx b/client/homebrew/pages/basePages/uiPage/uiPage.jsx index 91b4396cc..745966b73 100644 --- a/client/homebrew/pages/basePages/uiPage/uiPage.jsx +++ b/client/homebrew/pages/basePages/uiPage/uiPage.jsx @@ -2,13 +2,13 @@ import './uiPage.less'; import React from 'react'; import createReactClass from 'create-react-class'; -import Nav from 'client/homebrew/navbar/nav.jsx'; -import Navbar from 'client/homebrew/navbar/navbar.jsx'; -import NewBrewItem from 'client/homebrew/navbar/newbrew.navitem.jsx'; -import HelpNavItem from 'client/homebrew/navbar/help.navitem.jsx'; -import RecentNavItems from 'client/homebrew/navbar/recent.navitem.jsx'; +import Nav from './client/homebrew/navbar/nav.jsx'; +import Navbar from './client/homebrew/navbar/navbar.jsx'; +import NewBrewItem from './client/homebrew/navbar/newbrew.navitem.jsx'; +import HelpNavItem from './client/homebrew/navbar/help.navitem.jsx'; +import RecentNavItems from './client/homebrew/navbar/recent.navitem.jsx'; const { both: RecentNavItem } = RecentNavItems; -import Account from 'client/homebrew/navbar/account.navitem.jsx'; +import Account from './client/homebrew/navbar/account.navitem.jsx'; const UIPage = createReactClass({ diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx index 1b228d8b3..e1f7dca5f 100644 --- a/client/homebrew/pages/editPage/editPage.jsx +++ b/client/homebrew/pages/editPage/editPage.jsx @@ -4,25 +4,25 @@ import './editPage.less'; // Common imports import React, { useState, useEffect, useRef } from 'react'; import request from '../../utils/request-middleware.js'; -import Markdown from 'markdown.js'; +import Markdown from './shared/markdown.js'; import _ from 'lodash'; import { DEFAULT_BREW_LOAD } from '../../../../server/brewDefaults.js'; import { printCurrentBrew, fetchThemeBundle, splitTextStyleAndMetadata } from '../../../../shared/helpers.js'; -import SplitPane from 'client/components/splitPane/splitPane.jsx'; +import SplitPane from './client/components/splitPane/splitPane.jsx'; import Editor from '../../editor/editor.jsx'; import BrewRenderer from '../../brewRenderer/brewRenderer.jsx'; -import Nav from 'client/homebrew/navbar/nav.jsx'; -import Navbar from 'client/homebrew/navbar/navbar.jsx'; -import NewBrewItem from 'client/homebrew/navbar/newbrew.navitem.jsx'; -import AccountNavItem from 'client/homebrew/navbar/account.navitem.jsx'; -import ErrorNavItem from 'client/homebrew/navbar/error-navitem.jsx'; -import HelpNavItem from 'client/homebrew/navbar/help.navitem.jsx'; -import VaultNavItem from 'client/homebrew/navbar/vault.navitem.jsx'; -import PrintNavItem from 'client/homebrew/navbar/print.navitem.jsx'; -import RecentNavItems from 'client/homebrew/navbar/recent.navitem.jsx'; +import Nav from './client/homebrew/navbar/nav.jsx'; +import Navbar from './client/homebrew/navbar/navbar.jsx'; +import NewBrewItem from './client/homebrew/navbar/newbrew.navitem.jsx'; +import AccountNavItem from './client/homebrew/navbar/account.navitem.jsx'; +import ErrorNavItem from './client/homebrew/navbar/error-navitem.jsx'; +import HelpNavItem from './client/homebrew/navbar/help.navitem.jsx'; +import VaultNavItem from './client/homebrew/navbar/vault.navitem.jsx'; +import PrintNavItem from './client/homebrew/navbar/print.navitem.jsx'; +import RecentNavItems from './client/homebrew/navbar/recent.navitem.jsx'; const { both: RecentNavItem } = RecentNavItems; // Page specific imports @@ -31,7 +31,7 @@ import { md5 } from 'hash-wasm'; import { gzipSync, strToU8 } from 'fflate'; import { makePatches, stringifyPatches } from '@sanity/diff-match-patch'; -import ShareNavItem from 'client/homebrew/navbar/share.navitem.jsx'; +import ShareNavItem from './client/homebrew/navbar/share.navitem.jsx'; import LockNotification from './lockNotification/lockNotification.jsx'; import { updateHistory, versionHistoryGarbageCollection } from '../../utils/versionHistory.js'; import googleDriveIcon from '../../googleDrive.svg'; diff --git a/client/homebrew/pages/homePage/homePage.jsx b/client/homebrew/pages/homePage/homePage.jsx index f5fae80d9..fd5a7261a 100644 --- a/client/homebrew/pages/homePage/homePage.jsx +++ b/client/homebrew/pages/homePage/homePage.jsx @@ -14,15 +14,15 @@ import SplitPane from '../../../components/splitPane/splitPane.jsx'; import Editor from '../../editor/editor.jsx'; import BrewRenderer from '../../brewRenderer/brewRenderer.jsx'; -import Nav from 'client/homebrew/navbar/nav.jsx'; -import Navbar from 'client/homebrew/navbar/navbar.jsx'; -import NewBrewItem from 'client/homebrew/navbar/newbrew.navitem.jsx'; -import AccountNavItem from 'client/homebrew/navbar/account.navitem.jsx'; -import ErrorNavItem from 'client/homebrew/navbar/error-navitem.jsx'; -import HelpNavItem from 'client/homebrew/navbar/help.navitem.jsx'; -import VaultNavItem from 'client/homebrew/navbar/vault.navitem.jsx'; -import PrintNavItem from 'client/homebrew/navbar/print.navitem.jsx'; -import RecentNavItems from 'client/homebrew/navbar/recent.navitem.jsx'; +import Nav from './client/homebrew/navbar/nav.jsx'; +import Navbar from './client/homebrew/navbar/navbar.jsx'; +import NewBrewItem from './client/homebrew/navbar/newbrew.navitem.jsx'; +import AccountNavItem from './client/homebrew/navbar/account.navitem.jsx'; +import ErrorNavItem from './client/homebrew/navbar/error-navitem.jsx'; +import HelpNavItem from './client/homebrew/navbar/help.navitem.jsx'; +import VaultNavItem from './client/homebrew/navbar/vault.navitem.jsx'; +import PrintNavItem from './client/homebrew/navbar/print.navitem.jsx'; +import RecentNavItems from './client/homebrew/navbar/recent.navitem.jsx'; const { both: RecentNavItem } = RecentNavItems; diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx index 5099a98a1..860fa310c 100644 --- a/client/homebrew/pages/newPage/newPage.jsx +++ b/client/homebrew/pages/newPage/newPage.jsx @@ -4,25 +4,25 @@ import './newPage.less'; // Common imports import React, { useState, useEffect, useRef } from 'react'; import request from '../../utils/request-middleware.js'; -import Markdown from 'markdown.js'; +import Markdown from './shared/markdown.js'; import _ from 'lodash'; import { DEFAULT_BREW } from '../../../../server/brewDefaults.js'; import { printCurrentBrew, fetchThemeBundle, splitTextStyleAndMetadata } from '../../../../shared/helpers.js'; -import SplitPane from 'client/components/splitPane/splitPane.jsx'; +import SplitPane from './client/components/splitPane/splitPane.jsx'; import Editor from '../../editor/editor.jsx'; import BrewRenderer from '../../brewRenderer/brewRenderer.jsx'; -import Nav from 'client/homebrew/navbar/nav.jsx'; -import Navbar from 'client/homebrew/navbar/navbar.jsx'; -import NewBrewItem from 'client/homebrew/navbar/newbrew.navitem.jsx'; -import AccountNavItem from 'client/homebrew/navbar/account.navitem.jsx'; -import ErrorNavItem from 'client/homebrew/navbar/error-navitem.jsx'; -import HelpNavItem from 'client/homebrew/navbar/help.navitem.jsx'; -import VaultNavItem from 'client/homebrew/navbar/vault.navitem.jsx'; -import PrintNavItem from 'client/homebrew/navbar/print.navitem.jsx'; -import RecentNavItems from 'client/homebrew/navbar/recent.navitem.jsx'; +import Nav from './client/homebrew/navbar/nav.jsx'; +import Navbar from './client/homebrew/navbar/navbar.jsx'; +import NewBrewItem from './client/homebrew/navbar/newbrew.navitem.jsx'; +import AccountNavItem from './client/homebrew/navbar/account.navitem.jsx'; +import ErrorNavItem from './client/homebrew/navbar/error-navitem.jsx'; +import HelpNavItem from './client/homebrew/navbar/help.navitem.jsx'; +import VaultNavItem from './client/homebrew/navbar/vault.navitem.jsx'; +import PrintNavItem from './client/homebrew/navbar/print.navitem.jsx'; +import RecentNavItems from './client/homebrew/navbar/recent.navitem.jsx'; const { both: RecentNavItem } = RecentNavItems; // Page specific imports diff --git a/client/homebrew/pages/sharePage/sharePage.jsx b/client/homebrew/pages/sharePage/sharePage.jsx index 90d6cb3df..8de9642f5 100644 --- a/client/homebrew/pages/sharePage/sharePage.jsx +++ b/client/homebrew/pages/sharePage/sharePage.jsx @@ -2,13 +2,13 @@ import './sharePage.less'; import React, { useState, useEffect, useCallback } from 'react'; import { Meta } from 'vitreum/headtags'; -import Nav from 'client/homebrew/navbar/nav.jsx'; -import Navbar from 'client/homebrew/navbar/navbar.jsx'; -import MetadataNav from 'client/homebrew/navbar/metadata.navitem.jsx'; -import PrintNavItem from 'client/homebrew/navbar/print.navitem.jsx'; -import RecentNavItems from 'client/homebrew/navbar/recent.navitem.jsx'; +import Nav from './client/homebrew/navbar/nav.jsx'; +import Navbar from './client/homebrew/navbar/navbar.jsx'; +import MetadataNav from './client/homebrew/navbar/metadata.navitem.jsx'; +import PrintNavItem from './client/homebrew/navbar/print.navitem.jsx'; +import RecentNavItems from './client/homebrew/navbar/recent.navitem.jsx'; const { both: RecentNavItem } = RecentNavItems; -import Account from 'client/homebrew/navbar/account.navitem.jsx'; +import Account from './client/homebrew/navbar/account.navitem.jsx'; import BrewRenderer from '../../brewRenderer/brewRenderer.jsx'; import { DEFAULT_BREW_LOAD } from '../../../../server/brewDefaults.js'; diff --git a/client/homebrew/pages/userPage/userPage.jsx b/client/homebrew/pages/userPage/userPage.jsx index ff7345ef4..e0db5378a 100644 --- a/client/homebrew/pages/userPage/userPage.jsx +++ b/client/homebrew/pages/userPage/userPage.jsx @@ -3,15 +3,15 @@ import _ from 'lodash'; import ListPage from '../basePages/listPage/listPage.jsx'; -import Nav from 'client/homebrew/navbar/nav.jsx'; -import Navbar from 'client/homebrew/navbar/navbar.jsx'; -import RecentNavItems from 'client/homebrew/navbar/recent.navitem.jsx'; +import Nav from './client/homebrew/navbar/nav.jsx'; +import Navbar from './client/homebrew/navbar/navbar.jsx'; +import RecentNavItems from './client/homebrew/navbar/recent.navitem.jsx'; const { both: RecentNavItem } = RecentNavItems; -import Account from 'client/homebrew/navbar/account.navitem.jsx'; -import NewBrew from 'client/homebrew/navbar/newbrew.navitem.jsx'; -import HelpNavItem from 'client/homebrew/navbar/help.navitem.jsx'; -import ErrorNavItem from 'client/homebrew/navbar/error-navitem.jsx'; -import VaultNavitem from 'client/homebrew/navbar/vault.navitem.jsx'; +import Account from './client/homebrew/navbar/account.navitem.jsx'; +import NewBrew from './client/homebrew/navbar/newbrew.navitem.jsx'; +import HelpNavItem from './client/homebrew/navbar/help.navitem.jsx'; +import ErrorNavItem from './client/homebrew/navbar/error-navitem.jsx'; +import VaultNavitem from './client/homebrew/navbar/vault.navitem.jsx'; const UserPage = (props)=>{ props = { diff --git a/client/homebrew/pages/vaultPage/vaultPage.jsx b/client/homebrew/pages/vaultPage/vaultPage.jsx index 61ae89014..3138940ec 100644 --- a/client/homebrew/pages/vaultPage/vaultPage.jsx +++ b/client/homebrew/pages/vaultPage/vaultPage.jsx @@ -3,15 +3,15 @@ import './vaultPage.less'; import React, { useState, useEffect, useRef } from 'react'; -import Nav from 'client/homebrew/navbar/nav.jsx'; -import Navbar from 'client/homebrew/navbar/navbar.jsx'; -import RecentNavItems from 'client/homebrew/navbar/recent.navitem.jsx'; +import Nav from './client/homebrew/navbar/nav.jsx'; +import Navbar from './client/homebrew/navbar/navbar.jsx'; +import RecentNavItems from './client/homebrew/navbar/recent.navitem.jsx'; const { both: RecentNavItem } = RecentNavItems; -import Account from 'client/homebrew/navbar/account.navitem.jsx'; -import NewBrew from 'client/homebrew/navbar/newbrew.navitem.jsx'; -import HelpNavItem from 'client/homebrew/navbar/help.navitem.jsx'; +import Account from './client/homebrew/navbar/account.navitem.jsx'; +import NewBrew from './client/homebrew/navbar/newbrew.navitem.jsx'; +import HelpNavItem from './client/homebrew/navbar/help.navitem.jsx'; import BrewItem from '../basePages/listPage/brewItem/brewItem.jsx'; -import SplitPane from 'client/components/splitPane/splitPane.jsx'; +import SplitPane from './client/components/splitPane/splitPane.jsx'; import ErrorIndex from '../errorPage/errors/errorIndex.js'; import request from '../../utils/request-middleware.js'; diff --git a/server/app.js b/server/app.js index 1bdb5aac3..2965128c4 100644 --- a/server/app.js +++ b/server/app.js @@ -110,9 +110,9 @@ app.use(homebrewApi); app.use(adminApi); app.use(vaultApi); -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 migrateText = fs.readFileSync('client/homebrew/pages/homePage/migrate.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 migrateText = fs.readFileSync('./client/homebrew/pages/homePage/migrate.md', 'utf8'); const changelogText = fs.readFileSync('changelog.md', 'utf8'); const faqText = fs.readFileSync('faq.md', 'utf8'); diff --git a/shared/naturalcrit/styles/core.less b/shared/naturalcrit/styles/core.less index 6b02d1e4e..9c7b99aa5 100644 --- a/shared/naturalcrit/styles/core.less +++ b/shared/naturalcrit/styles/core.less @@ -1,6 +1,6 @@ @import './reset.less'; -//@import 'naturalcrit/styles/elements.less'; +//@import './elements.less'; @import './animations.less'; @import './colors.less'; @import './tooltip.less'; diff --git a/tests/markdown/basic.test.js b/tests/markdown/basic.test.js index ddceb9197..b74e93d85 100644 --- a/tests/markdown/basic.test.js +++ b/tests/markdown/basic.test.js @@ -1,6 +1,6 @@ -import Markdown from 'markdown.js'; +import Markdown from './shared/markdown.js'; test('Processes the markdown within an HTML block if its just a class wrapper', function() { const source = '
*Bold text*
'; diff --git a/tests/markdown/definition-lists.test.js b/tests/markdown/definition-lists.test.js index 12499d559..ee7d6da87 100644 --- a/tests/markdown/definition-lists.test.js +++ b/tests/markdown/definition-lists.test.js @@ -1,6 +1,6 @@ -import Markdown from 'markdown.js'; +import Markdown from './shared/markdown.js'; describe('Inline Definition Lists', ()=>{ test('No Term 1 Definition', function() { diff --git a/tests/markdown/emojis.test.js b/tests/markdown/emojis.test.js index 5f0e102c9..41cd844a4 100644 --- a/tests/markdown/emojis.test.js +++ b/tests/markdown/emojis.test.js @@ -1,4 +1,4 @@ -import Markdown from 'markdown.js'; +import Markdown from './shared/markdown.js'; import dedent from 'dedent'; // Marked.js adds line returns after closing tags on some default tokens. diff --git a/tests/markdown/hard-breaks.test.js b/tests/markdown/hard-breaks.test.js index 068b2053a..0f48ca9ad 100644 --- a/tests/markdown/hard-breaks.test.js +++ b/tests/markdown/hard-breaks.test.js @@ -1,6 +1,6 @@ -import Markdown from 'markdown.js'; +import Markdown from './shared/markdown.js'; describe('Hard Breaks', ()=>{ test('Single Break', function() { diff --git a/tests/markdown/mustache-syntax.test.js b/tests/markdown/mustache-syntax.test.js index 8562ae412..7c82db3f2 100644 --- a/tests/markdown/mustache-syntax.test.js +++ b/tests/markdown/mustache-syntax.test.js @@ -1,7 +1,7 @@ /* eslint-disable max-lines */ import dedent from 'dedent'; -import Markdown from 'markdown.js'; +import Markdown from './shared/markdown.js'; // Marked.js adds line returns after closing tags on some default tokens. // This removes those line returns for comparison sake. diff --git a/tests/markdown/non-breaking-spaces.test.js b/tests/markdown/non-breaking-spaces.test.js index 9da59b047..d541e24b2 100644 --- a/tests/markdown/non-breaking-spaces.test.js +++ b/tests/markdown/non-breaking-spaces.test.js @@ -1,6 +1,6 @@ -import Markdown from 'markdown.js'; +import Markdown from './shared/markdown.js'; describe('Non-Breaking Spaces Interactions', ()=>{ test('I am actually a single-line definition list!', function() { diff --git a/tests/markdown/paragraph-justification.test.js b/tests/markdown/paragraph-justification.test.js index f5a5b12ab..eca3838a9 100644 --- a/tests/markdown/paragraph-justification.test.js +++ b/tests/markdown/paragraph-justification.test.js @@ -1,6 +1,6 @@ -import Markdown from 'markdown.js'; +import Markdown from './shared/markdown.js'; describe('Justification', ()=>{ test('Left Justify', function() { diff --git a/tests/markdown/variables.test.js b/tests/markdown/variables.test.js index 49cd333c8..cb2b40495 100644 --- a/tests/markdown/variables.test.js +++ b/tests/markdown/variables.test.js @@ -1,7 +1,7 @@ /* eslint-disable max-lines */ import dedent from 'dedent'; -import Markdown from 'markdown.js'; +import Markdown from './shared/markdown.js'; // Marked.js adds line returns after closing tags on some default tokens. // This removes those line returns for comparison sake.