0
0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-27 07:23:09 +00:00

Merge branch 'master' of https://github.com/naturalcrit/homebrewery into vitreum-to-vite

This commit is contained in:
Víctor Losada Hernández
2026-01-24 00:39:57 +01:00
18 changed files with 56 additions and 56 deletions

View File

@@ -3,8 +3,8 @@ import './brewRenderer.less';
import React, { useState, useRef, useMemo, useEffect } from 'react'; import React, { useState, useRef, useMemo, useEffect } from 'react';
import _ from 'lodash'; import _ from 'lodash';
import MarkdownLegacy from './shared/markdownLegacy.js'; import MarkdownLegacy from '../../../shared/markdownLegacy.js';
import Markdown from './shared/markdown.js'; import Markdown from '../../../shared/markdown.js';
import ErrorBar from './errorBar/errorBar.jsx'; import ErrorBar from './errorBar/errorBar.jsx';
import ToolBar from './toolBar/toolBar.jsx'; import ToolBar from './toolBar/toolBar.jsx';

View File

@@ -1,7 +1,7 @@
import React from 'react'; import React from 'react';
import createReactClass from 'create-react-class'; import createReactClass from 'create-react-class';
import request from 'superagent'; import request from 'superagent';
import Nav from './client/homebrew/navbar/nav.jsx'; import Nav from './nav.jsx';
const Account = createReactClass({ const Account = createReactClass({
displayName : 'AccountNavItem', displayName : 'AccountNavItem',

View File

@@ -1,6 +1,6 @@
import './error-navitem.less'; import './error-navitem.less';
import React from 'react'; import React from 'react';
import Nav from './client/homebrew/navbar/nav.jsx'; import Nav from './nav.jsx';
const ErrorNavItem = ({ error = '', clearError })=>{ const ErrorNavItem = ({ error = '', clearError })=>{
const response = error.response; const response = error.response;

View File

@@ -1,7 +1,7 @@
import React from 'react'; import React from 'react';
import dedent from 'dedent'; import dedent from 'dedent';
import Nav from './client/homebrew/navbar/nav.jsx'; import Nav from './nav.jsx';
export default function(props){ export default function(props){
return <Nav.dropdown> return <Nav.dropdown>

View File

@@ -2,7 +2,7 @@ import React from 'react';
import createReactClass from 'create-react-class'; import createReactClass from 'create-react-class';
import Moment from 'moment'; import Moment from 'moment';
import Nav from './client/homebrew/navbar/nav.jsx'; import Nav from './nav.jsx';
const MetadataNav = createReactClass({ const MetadataNav = createReactClass({

View File

@@ -1,10 +1,10 @@
import './client/homebrew/navbar/navbar.less'; import './navbar.less';
import React, { useState, useRef, useEffect } from 'react'; import React, { useState, useRef, useEffect } from 'react';
import createReactClass from 'create-react-class'; import createReactClass from 'create-react-class';
import _ from 'lodash'; import _ from 'lodash';
import cx from 'classnames'; 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 = { const Nav = {
base : createReactClass({ base : createReactClass({

View File

@@ -2,7 +2,7 @@ import './navbar.less';
import React from 'react'; import React from 'react';
import createReactClass from 'create-react-class'; 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'; import PatreonNavItem from './patreon.navitem.jsx';
const Navbar = createReactClass({ const Navbar = createReactClass({

View File

@@ -1,6 +1,6 @@
import React from 'react'; import React from 'react';
import _ from 'lodash'; import _ from 'lodash';
import Nav from './client/homebrew/navbar/nav.jsx'; import Nav from './nav.jsx';
import { splitTextStyleAndMetadata } from '../../../shared/helpers.js'; import { splitTextStyleAndMetadata } from '../../../shared/helpers.js';
const BREWKEY = 'HB_newPage_content'; const BREWKEY = 'HB_newPage_content';

View File

@@ -1,5 +1,5 @@
import React from 'react'; import React from 'react';
import Nav from './client/homebrew/navbar/nav.jsx'; import Nav from './nav.jsx';
export default function(props){ export default function(props){
return <Nav.item return <Nav.item

View File

@@ -1,5 +1,5 @@
import React from 'react'; import React from 'react';
import Nav from './client/homebrew/navbar/nav.jsx'; import Nav from './nav.jsx';
import { printCurrentBrew } from '../../../shared/helpers.js'; import { printCurrentBrew } from '../../../shared/helpers.js';
export default function(){ export default function(){

View File

@@ -3,7 +3,7 @@ import createReactClass from 'create-react-class';
import _ from 'lodash'; import _ from 'lodash';
import Moment from 'moment'; import Moment from 'moment';
import Nav from './client/homebrew/navbar/nav.jsx'; import Nav from './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';

View File

@@ -1,6 +1,6 @@
import React from 'react'; import React from 'react';
import dedent from 'dedent'; import dedent from 'dedent';
import Nav from './client/homebrew/navbar/nav.jsx'; import Nav from './nav.jsx';
const getShareId = (brew)=>( const getShareId = (brew)=>(
brew.googleId && !brew.stubbed brew.googleId && !brew.stubbed

View File

@@ -1,6 +1,6 @@
import React from 'react'; import React from 'react';
import Nav from './client/homebrew/navbar/nav.jsx'; import Nav from './nav.jsx';
export default function (props) { export default function (props) {
return ( return (

View File

@@ -2,13 +2,13 @@ import './uiPage.less';
import React from 'react'; import React from 'react';
import createReactClass from 'create-react-class'; import createReactClass from 'create-react-class';
import Nav from './client/homebrew/navbar/nav.jsx'; import Nav from '../../../navbar/nav.jsx';
import Navbar from './client/homebrew/navbar/navbar.jsx'; import Navbar from '../../../navbar/navbar.jsx';
import NewBrewItem from './client/homebrew/navbar/newbrew.navitem.jsx'; import NewBrewItem from '../../../navbar/newbrew.navitem.jsx';
import HelpNavItem from './client/homebrew/navbar/help.navitem.jsx'; import HelpNavItem from '../../../navbar/help.navitem.jsx';
import RecentNavItems from './client/homebrew/navbar/recent.navitem.jsx'; import RecentNavItems from '../../../navbar/recent.navitem.jsx';
const { both: RecentNavItem } = RecentNavItems; const { both: RecentNavItem } = RecentNavItems;
import Account from './client/homebrew/navbar/account.navitem.jsx'; import Account from '../../../navbar/account.navitem.jsx';
const UIPage = createReactClass({ const UIPage = createReactClass({

View File

@@ -4,25 +4,25 @@ 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 '../../../../shared/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 './client/components/splitPane/splitPane.jsx'; import SplitPane from '../../../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 './client/homebrew/navbar/nav.jsx'; import Nav from '../../navbar/nav.jsx';
import Navbar from './client/homebrew/navbar/navbar.jsx'; import Navbar from '../../navbar/navbar.jsx';
import NewBrewItem from './client/homebrew/navbar/newbrew.navitem.jsx'; import NewBrewItem from '../../navbar/newbrew.navitem.jsx';
import AccountNavItem from './client/homebrew/navbar/account.navitem.jsx'; import AccountNavItem from '../../navbar/account.navitem.jsx';
import ErrorNavItem from './client/homebrew/navbar/error-navitem.jsx'; import ErrorNavItem from '../../navbar/error-navitem.jsx';
import HelpNavItem from './client/homebrew/navbar/help.navitem.jsx'; import HelpNavItem from '../../navbar/help.navitem.jsx';
import VaultNavItem from './client/homebrew/navbar/vault.navitem.jsx'; import VaultNavItem from '../../navbar/vault.navitem.jsx';
import PrintNavItem from './client/homebrew/navbar/print.navitem.jsx'; import PrintNavItem from '../../navbar/print.navitem.jsx';
import RecentNavItems from './client/homebrew/navbar/recent.navitem.jsx'; import RecentNavItems from '../../navbar/recent.navitem.jsx';
const { both: RecentNavItem } = RecentNavItems; const { both: RecentNavItem } = RecentNavItems;
// Page specific imports // Page specific imports
@@ -31,7 +31,7 @@ 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 './client/homebrew/navbar/share.navitem.jsx'; import ShareNavItem from '../../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';

View File

@@ -4,25 +4,25 @@ 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 '../../../../shared/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 './client/components/splitPane/splitPane.jsx'; import SplitPane from '../../../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 './client/homebrew/navbar/nav.jsx'; import Nav from '../../navbar/nav.jsx';
import Navbar from './client/homebrew/navbar/navbar.jsx'; import Navbar from '../../navbar/navbar.jsx';
import NewBrewItem from './client/homebrew/navbar/newbrew.navitem.jsx'; import NewBrewItem from '../../navbar/newbrew.navitem.jsx';
import AccountNavItem from './client/homebrew/navbar/account.navitem.jsx'; import AccountNavItem from '../../navbar/account.navitem.jsx';
import ErrorNavItem from './client/homebrew/navbar/error-navitem.jsx'; import ErrorNavItem from '../../navbar/error-navitem.jsx';
import HelpNavItem from './client/homebrew/navbar/help.navitem.jsx'; import HelpNavItem from '../../navbar/help.navitem.jsx';
import VaultNavItem from './client/homebrew/navbar/vault.navitem.jsx'; import VaultNavItem from '../../navbar/vault.navitem.jsx';
import PrintNavItem from './client/homebrew/navbar/print.navitem.jsx'; import PrintNavItem from '../../navbar/print.navitem.jsx';
import RecentNavItems from './client/homebrew/navbar/recent.navitem.jsx'; import RecentNavItems from '../../navbar/recent.navitem.jsx';
const { both: RecentNavItem } = RecentNavItems; const { both: RecentNavItem } = RecentNavItems;
// Page specific imports // Page specific imports

View File

@@ -3,12 +3,12 @@ import React, { useState, useEffect, useCallback } from 'react';
import { Meta } from '../../../../vitreum/headtags.js'; import { Meta } from '../../../../vitreum/headtags.js';
import Nav from '../../navbar/nav.jsx'; import Nav from '../../navbar/nav.jsx';
import Navbar from './client/homebrew/navbar/navbar.jsx'; import Navbar from '../../navbar/navbar.jsx';
import MetadataNav from './client/homebrew/navbar/metadata.navitem.jsx'; import MetadataNav from '../../navbar/metadata.navitem.jsx';
import PrintNavItem from './client/homebrew/navbar/print.navitem.jsx'; import PrintNavItem from '../../navbar/print.navitem.jsx';
import RecentNavItems from './client/homebrew/navbar/recent.navitem.jsx'; import RecentNavItems from '../../navbar/recent.navitem.jsx';
const { both: RecentNavItem } = RecentNavItems; 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 BrewRenderer from '../../brewRenderer/brewRenderer.jsx';
import { DEFAULT_BREW_LOAD } from '../../../../server/brewDefaults.js'; import { DEFAULT_BREW_LOAD } from '../../../../server/brewDefaults.js';

View File

@@ -3,15 +3,15 @@
import './vaultPage.less'; import './vaultPage.less';
import React, { useState, useEffect, useRef } from 'react'; import React, { useState, useEffect, useRef } from 'react';
import Nav from './client/homebrew/navbar/nav.jsx'; import Nav from '../../navbar/nav.jsx';
import Navbar from './client/homebrew/navbar/navbar.jsx'; import Navbar from '../../navbar/navbar.jsx';
import RecentNavItems from './client/homebrew/navbar/recent.navitem.jsx'; import RecentNavItems from '../../navbar/recent.navitem.jsx';
const { both: RecentNavItem } = RecentNavItems; const { both: RecentNavItem } = RecentNavItems;
import Account from './client/homebrew/navbar/account.navitem.jsx'; import Account from '../../navbar/account.navitem.jsx';
import NewBrew from './client/homebrew/navbar/newbrew.navitem.jsx'; import NewBrew from '../../navbar/newbrew.navitem.jsx';
import HelpNavItem from './client/homebrew/navbar/help.navitem.jsx'; import HelpNavItem from '../../navbar/help.navitem.jsx';
import BrewItem from '../basePages/listPage/brewItem/brewItem.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 ErrorIndex from '../errorPage/errors/errorIndex.js';
import request from '../../utils/request-middleware.js'; import request from '../../utils/request-middleware.js';