diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx index 131d34695..68e10e97d 100644 --- a/client/homebrew/brewRenderer/brewRenderer.jsx +++ b/client/homebrew/brewRenderer/brewRenderer.jsx @@ -3,8 +3,8 @@ import './brewRenderer.less'; import React, { useState, useRef, useMemo, useEffect } from 'react'; import _ from 'lodash'; -import MarkdownLegacy from './shared/markdownLegacy.js'; -import Markdown from './shared/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'; diff --git a/client/homebrew/navbar/account.navitem.jsx b/client/homebrew/navbar/account.navitem.jsx index 701235fda..0be06c471 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 './nav.jsx'; const Account = createReactClass({ displayName : 'AccountNavItem', diff --git a/client/homebrew/navbar/error-navitem.jsx b/client/homebrew/navbar/error-navitem.jsx index a11860c0a..e8802e184 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 './nav.jsx'; const ErrorNavItem = ({ error = '', clearError })=>{ const response = error.response; diff --git a/client/homebrew/navbar/help.navitem.jsx b/client/homebrew/navbar/help.navitem.jsx index a7013cc59..4e012d9a7 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 './nav.jsx'; export default function(props){ return diff --git a/client/homebrew/navbar/metadata.navitem.jsx b/client/homebrew/navbar/metadata.navitem.jsx index eb1efe54f..bfea2e81a 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 './nav.jsx'; const MetadataNav = createReactClass({ diff --git a/client/homebrew/navbar/nav.jsx b/client/homebrew/navbar/nav.jsx index b4ae4f9d2..9e065e0ee 100644 --- a/client/homebrew/navbar/nav.jsx +++ b/client/homebrew/navbar/nav.jsx @@ -1,10 +1,10 @@ -import './client/homebrew/navbar/navbar.less'; +import './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 '../../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 1924a7979..aa77dd2a0 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 './nav.jsx'; import PatreonNavItem from './patreon.navitem.jsx'; const Navbar = createReactClass({ diff --git a/client/homebrew/navbar/newbrew.navitem.jsx b/client/homebrew/navbar/newbrew.navitem.jsx index 249788308..4664d509b 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 './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 ab4aaa48e..8889892cc 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 './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 dca32c295..3114d0979 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 './nav.jsx'; export default function (props) { return ( diff --git a/client/homebrew/pages/basePages/uiPage/uiPage.jsx b/client/homebrew/pages/basePages/uiPage/uiPage.jsx index 745966b73..400dbb28e 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 '../../../navbar/nav.jsx'; +import Navbar from '../../../navbar/navbar.jsx'; +import NewBrewItem from '../../../navbar/newbrew.navitem.jsx'; +import HelpNavItem from '../../../navbar/help.navitem.jsx'; +import RecentNavItems from '../../../navbar/recent.navitem.jsx'; const { both: RecentNavItem } = RecentNavItems; -import Account from './client/homebrew/navbar/account.navitem.jsx'; +import Account from '../../../navbar/account.navitem.jsx'; const UIPage = createReactClass({ diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx index b4e8d3d32..3af8e97df 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 './shared/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 '../../../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 '../../navbar/nav.jsx'; +import Navbar from '../../navbar/navbar.jsx'; +import NewBrewItem from '../../navbar/newbrew.navitem.jsx'; +import AccountNavItem from '../../navbar/account.navitem.jsx'; +import ErrorNavItem from '../../navbar/error-navitem.jsx'; +import HelpNavItem from '../../navbar/help.navitem.jsx'; +import VaultNavItem from '../../navbar/vault.navitem.jsx'; +import PrintNavItem from '../../navbar/print.navitem.jsx'; +import RecentNavItems from '../../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 '../../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/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx index c1947c326..a643a734c 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 './shared/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 '../../../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 '../../navbar/nav.jsx'; +import Navbar from '../../navbar/navbar.jsx'; +import NewBrewItem from '../../navbar/newbrew.navitem.jsx'; +import AccountNavItem from '../../navbar/account.navitem.jsx'; +import ErrorNavItem from '../../navbar/error-navitem.jsx'; +import HelpNavItem from '../../navbar/help.navitem.jsx'; +import VaultNavItem from '../../navbar/vault.navitem.jsx'; +import PrintNavItem from '../../navbar/print.navitem.jsx'; +import RecentNavItems from '../../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 cffed8e1f..8239df656 100644 --- a/client/homebrew/pages/sharePage/sharePage.jsx +++ b/client/homebrew/pages/sharePage/sharePage.jsx @@ -3,12 +3,12 @@ import React, { useState, useEffect, useCallback } from 'react'; import { Meta } from '../../../../vitreum/headtags.js'; import Nav from '../../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 Navbar from '../../navbar/navbar.jsx'; +import MetadataNav from '../../navbar/metadata.navitem.jsx'; +import PrintNavItem from '../../navbar/print.navitem.jsx'; +import RecentNavItems from '../../navbar/recent.navitem.jsx'; const { both: RecentNavItem } = RecentNavItems; -import Account from './client/homebrew/navbar/account.navitem.jsx'; +import Account from '../../navbar/account.navitem.jsx'; import BrewRenderer from '../../brewRenderer/brewRenderer.jsx'; import { DEFAULT_BREW_LOAD } from '../../../../server/brewDefaults.js'; diff --git a/client/homebrew/pages/vaultPage/vaultPage.jsx b/client/homebrew/pages/vaultPage/vaultPage.jsx index 3138940ec..3a8c6bc25 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 '../../navbar/nav.jsx'; +import Navbar from '../../navbar/navbar.jsx'; +import RecentNavItems from '../../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 '../../navbar/account.navitem.jsx'; +import NewBrew from '../../navbar/newbrew.navitem.jsx'; +import HelpNavItem from '../../navbar/help.navitem.jsx'; import BrewItem from '../basePages/listPage/brewItem/brewItem.jsx'; -import SplitPane from './client/components/splitPane/splitPane.jsx'; +import SplitPane from '../../../components/splitPane/splitPane.jsx'; import ErrorIndex from '../errorPage/errors/errorIndex.js'; import request from '../../utils/request-middleware.js';