f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-07 18:32:40 +00:00
Code Wiki Activity

Merge branch 'master' into experimentalGoogleServiceAccountChange

Browse Source
This commit is contained in:
Víctor Losada Hernández
2025-11-10 23:57:25 +01:00
committed by GitHub
parent 14ea286aa2 6ccefc2399
commit ba2449f3d6
26 changed files with 77 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
shared/naturalcrit/codeEditor/autocompleteEmoji.js → client/components/codeEditor/autocompleteEmoji.js
View File

0
shared/naturalcrit/codeEditor/close-tag.js → client/components/codeEditor/close-tag.js
View File

0
shared/naturalcrit/codeEditor/codeEditor.jsx → client/components/codeEditor/codeEditor.jsx
View File

0
shared/naturalcrit/codeEditor/codeEditor.less → client/components/codeEditor/codeEditor.less
View File

0
shared/naturalcrit/codeEditor/fold-css.js → client/components/codeEditor/fold-css.js
View File

0
shared/naturalcrit/codeEditor/fold-pages.js → client/components/codeEditor/fold-pages.js
View File

2
client/homebrew/editor/editor.jsx
View File

@@ -6,7 +6,7 @@ const _ = require('lodash');
const dedent = require('dedent-tabs').default; const dedent = require('dedent-tabs').default;
import Markdown from '../../../shared/markdown.js'; import Markdown from '../../../shared/markdown.js';
const CodeEditor = require('naturalcrit/codeEditor/codeEditor.jsx'); const CodeEditor = require('client/components/codeEditor/codeEditor.jsx');
const SnippetBar = require('./snippetbar/snippetbar.jsx'); const SnippetBar = require('./snippetbar/snippetbar.jsx');
const MetadataEditor = require('./metadataEditor/metadataEditor.jsx'); const MetadataEditor = require('./metadataEditor/metadataEditor.jsx');

2
client/homebrew/navbar/account.navitem.jsx
View File

@@ -1,6 +1,6 @@
const React = require('react'); const React = require('react');
const createClass = require('create-react-class'); const createClass = require('create-react-class');
const Nav = require('naturalcrit/nav/nav.jsx'); const Nav = require('client/homebrew/navbar/nav.jsx');
const request = require('superagent'); const request = require('superagent');
const Account = createClass({ const Account = createClass({

2
client/homebrew/navbar/error-navitem.jsx
View File

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

2
client/homebrew/navbar/help.navitem.jsx
View File

@@ -1,7 +1,7 @@
const React = require('react'); const React = require('react');
const dedent = require('dedent-tabs').default; const dedent = require('dedent-tabs').default;
const Nav = require('naturalcrit/nav/nav.jsx'); const Nav = require('client/homebrew/navbar/nav.jsx');
module.exports = function(props){ module.exports = function(props){
return <Nav.dropdown> return <Nav.dropdown>

2
client/homebrew/navbar/metadata.navitem.jsx
View File

@@ -2,7 +2,7 @@ const React = require('react');
const createClass = require('create-react-class'); const createClass = require('create-react-class');
const Moment = require('moment'); const Moment = require('moment');
const Nav = require('naturalcrit/nav/nav.jsx'); const Nav = require('client/homebrew/navbar/nav.jsx');
const MetadataNav = createClass({ const MetadataNav = createClass({

0
shared/naturalcrit/nav/nav.jsx → client/homebrew/navbar/nav.jsx
View File

2
client/homebrew/navbar/navbar.jsx
View File

@@ -2,7 +2,7 @@ require('./navbar.less');
const React = require('react'); const React = require('react');
const createClass = require('create-react-class'); const createClass = require('create-react-class');
const Nav = require('naturalcrit/nav/nav.jsx'); const Nav = require('client/homebrew/navbar/nav.jsx');
const PatreonNavItem = require('./patreon.navitem.jsx'); const PatreonNavItem = require('./patreon.navitem.jsx');
const Navbar = createClass({ const Navbar = createClass({

2
client/homebrew/navbar/newbrew.navitem.jsx
View File

@@ -1,6 +1,6 @@
const React = require('react'); const React = require('react');
const _ = require('lodash'); const _ = require('lodash');
const Nav = require('naturalcrit/nav/nav.jsx'); const Nav = require('client/homebrew/navbar/nav.jsx');
const { splitTextStyleAndMetadata } = require('../../../shared/helpers.js'); // Importing the function from helpers.js const { splitTextStyleAndMetadata } = require('../../../shared/helpers.js'); // Importing the function from helpers.js
const BREWKEY = 'homebrewery-new'; const BREWKEY = 'homebrewery-new';

2
client/homebrew/navbar/patreon.navitem.jsx
View File

@@ -1,5 +1,5 @@
const React = require('react'); const React = require('react');
const Nav = require('naturalcrit/nav/nav.jsx'); const Nav = require('client/homebrew/navbar/nav.jsx');
module.exports = function(props){ module.exports = function(props){
return <Nav.item return <Nav.item

2
client/homebrew/navbar/print.navitem.jsx
View File

@@ -1,5 +1,5 @@
const React = require('react'); const React = require('react');
const Nav = require('naturalcrit/nav/nav.jsx'); const Nav = require('client/homebrew/navbar/nav.jsx');
const { printCurrentBrew } = require('../../../shared/helpers.js'); const { printCurrentBrew } = require('../../../shared/helpers.js');
module.exports = function(){ module.exports = function(){

2
client/homebrew/navbar/recent.navitem.jsx
View File

@@ -3,7 +3,7 @@ const createClass = require('create-react-class');
const _ = require('lodash'); const _ = require('lodash');
const Moment = require('moment'); const Moment = require('moment');
const Nav = require('naturalcrit/nav/nav.jsx'); const Nav = require('client/homebrew/navbar/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';

2
client/homebrew/navbar/share.navitem.jsx
View File

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

2
client/homebrew/navbar/vault.navitem.jsx
View File

@@ -1,6 +1,6 @@
const React = require('react'); const React = require('react');
const Nav = require('naturalcrit/nav/nav.jsx'); const Nav = require('client/homebrew/navbar/nav.jsx');
module.exports = function (props) { module.exports = function (props) {
return ( return (

12
client/homebrew/pages/basePages/uiPage/uiPage.jsx
View File

@@ -2,12 +2,12 @@ require('./uiPage.less');
const React = require('react'); const React = require('react');
const createClass = require('create-react-class'); const createClass = require('create-react-class');
const Nav = require('naturalcrit/nav/nav.jsx'); const Nav = require('client/homebrew/navbar/nav.jsx');
const Navbar = require('../../../navbar/navbar.jsx'); const Navbar = require('client/homebrew/navbar/navbar.jsx');
const NewBrewItem = require('../../../navbar/newbrew.navitem.jsx'); const NewBrewItem = require('client/homebrew/navbar/newbrew.navitem.jsx');
const HelpNavItem = require('../../../navbar/help.navitem.jsx'); const HelpNavItem = require('client/homebrew/navbar/help.navitem.jsx');
const RecentNavItem = require('../../../navbar/recent.navitem.jsx').both; const RecentNavItem = require('client/homebrew/navbar/recent.navitem.jsx').both;
const Account = require('../../../navbar/account.navitem.jsx'); const Account = require('client/homebrew/navbar/account.navitem.jsx');
const UIPage = createClass({ const UIPage = createClass({

20
client/homebrew/pages/editPage/editPage.jsx
View File

@@ -14,15 +14,15 @@ import SplitPane from 'client/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 'naturalcrit/nav/nav.jsx'; import Nav from 'client/homebrew/navbar/nav.jsx';
import Navbar from '../../navbar/navbar.jsx'; import Navbar from 'client/homebrew/navbar/navbar.jsx';
import NewBrewItem from '../../navbar/newbrew.navitem.jsx'; import NewBrewItem from 'client/homebrew/navbar/newbrew.navitem.jsx';
import AccountNavItem from '../../navbar/account.navitem.jsx'; import AccountNavItem from 'client/homebrew/navbar/account.navitem.jsx';
import ErrorNavItem from '../../navbar/error-navitem.jsx'; import ErrorNavItem from 'client/homebrew/navbar/error-navitem.jsx';
import HelpNavItem from '../../navbar/help.navitem.jsx'; import HelpNavItem from 'client/homebrew/navbar/help.navitem.jsx';
import VaultNavItem from '../../navbar/vault.navitem.jsx'; import VaultNavItem from 'client/homebrew/navbar/vault.navitem.jsx';
import PrintNavItem from '../../navbar/print.navitem.jsx'; import PrintNavItem from 'client/homebrew/navbar/print.navitem.jsx';
import { both as RecentNavItem } from '../../navbar/recent.navitem.jsx'; import { both as RecentNavItem } from 'client/homebrew/navbar/recent.navitem.jsx';
// Page specific imports // Page specific imports
import { Meta } from 'vitreum/headtags'; import { Meta } from 'vitreum/headtags';
@@ -30,7 +30,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 '../../navbar/share.navitem.jsx'; import ShareNavItem from 'client/homebrew/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';

18
client/homebrew/pages/homePage/homePage.jsx
View File

@@ -14,15 +14,15 @@ import SplitPane from 'client/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 'naturalcrit/nav/nav.jsx'; import Nav from 'client/homebrew/navbar/nav.jsx';
import Navbar from '../../navbar/navbar.jsx'; import Navbar from 'client/homebrew/navbar/navbar.jsx';
import NewBrewItem from '../../navbar/newbrew.navitem.jsx'; import NewBrewItem from 'client/homebrew/navbar/newbrew.navitem.jsx';
import AccountNavItem from '../../navbar/account.navitem.jsx'; import AccountNavItem from 'client/homebrew/navbar/account.navitem.jsx';
import ErrorNavItem from '../../navbar/error-navitem.jsx'; import ErrorNavItem from 'client/homebrew/navbar/error-navitem.jsx';
import HelpNavItem from '../../navbar/help.navitem.jsx'; import HelpNavItem from 'client/homebrew/navbar/help.navitem.jsx';
import VaultNavItem from '../../navbar/vault.navitem.jsx'; import VaultNavItem from 'client/homebrew/navbar/vault.navitem.jsx';
import PrintNavItem from '../../navbar/print.navitem.jsx'; import PrintNavItem from 'client/homebrew/navbar/print.navitem.jsx';
import { both as RecentNavItem } from '../../navbar/recent.navitem.jsx'; import { both as RecentNavItem } from 'client/homebrew/navbar/recent.navitem.jsx';
// Page specific imports // Page specific imports
import { Meta } from 'vitreum/headtags'; import { Meta } from 'vitreum/headtags';

31
client/homebrew/pages/newPage/newPage.jsx
View File

@@ -14,15 +14,15 @@ import SplitPane from 'client/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 'naturalcrit/nav/nav.jsx'; import Nav from 'client/homebrew/navbar/nav.jsx';
import Navbar from '../../navbar/navbar.jsx'; import Navbar from 'client/homebrew/navbar/navbar.jsx';
import NewBrewItem from '../../navbar/newbrew.navitem.jsx'; import NewBrewItem from 'client/homebrew/navbar/newbrew.navitem.jsx';
import AccountNavItem from '../../navbar/account.navitem.jsx'; import AccountNavItem from 'client/homebrew/navbar/account.navitem.jsx';
import ErrorNavItem from '../../navbar/error-navitem.jsx'; import ErrorNavItem from 'client/homebrew/navbar/error-navitem.jsx';
import HelpNavItem from '../../navbar/help.navitem.jsx'; import HelpNavItem from 'client/homebrew/navbar/help.navitem.jsx';
import VaultNavItem from '../../navbar/vault.navitem.jsx'; import VaultNavItem from 'client/homebrew/navbar/vault.navitem.jsx';
import PrintNavItem from '../../navbar/print.navitem.jsx'; import PrintNavItem from 'client/homebrew/navbar/print.navitem.jsx';
import { both as RecentNavItem } from '../../navbar/recent.navitem.jsx'; import { both as RecentNavItem } from 'client/homebrew/navbar/recent.navitem.jsx';
// Page specific imports // Page specific imports
import { Meta } from 'vitreum/headtags'; import { Meta } from 'vitreum/headtags';
@@ -56,6 +56,10 @@ const NewPage = (props)=>{
const editorRef = useRef(null); const editorRef = useRef(null);
const lastSavedBrew = useRef(_.cloneDeep(props.brew)); const lastSavedBrew = useRef(_.cloneDeep(props.brew));
// const saveTimeout = useRef(null);
// const warnUnsavedTimeout = useRef(null);
const trySaveRef = useRef(trySave); // CTRL+S listener lives outside React and needs ref to use trySave with latest copy of brew
const unsavedChangesRef = useRef(unsavedChanges); // Similarly, onBeforeUnload lives outside React and needs ref to unsavedChanges
useEffect(()=>{ useEffect(()=>{
loadBrew(); loadBrew();
@@ -114,6 +118,11 @@ const NewPage = (props)=>{
if(autoSaveEnabled) trySave(false, hasChange); if(autoSaveEnabled) trySave(false, hasChange);
}, [currentBrew]); }, [currentBrew]);
useEffect(()=>{
trySaveRef.current = trySave;
unsavedChangesRef.current = unsavedChanges;
});
const handleSplitMove = ()=>{ const handleSplitMove = ()=>{
editorRef.current.update(); editorRef.current.update();
}; };
@@ -141,7 +150,7 @@ const NewPage = (props)=>{
} }
}; };
const save = async ()=>{ const trySave = async ()=>{
setIsSaving(true); setIsSaving(true);
const updatedBrew = { ...currentBrew }; const updatedBrew = { ...currentBrew };
@@ -190,7 +199,7 @@ const NewPage = (props)=>{
// #3 - Unsaved changes exist, click to save, show SAVE NOW // #3 - Unsaved changes exist, click to save, show SAVE NOW
if(unsavedChanges) if(unsavedChanges)
return <Nav.item className='save' onClick={save} color='blue' icon='fas fa-save'>save now</Nav.item>; return <Nav.item className='save' onClick={trySave} color='blue' icon='fas fa-save'>save now</Nav.item>;
// #4 - No unsaved changes, autosave is ON, show AUTO-SAVED // #4 - No unsaved changes, autosave is ON, show AUTO-SAVED
if(autoSaveEnabled) if(autoSaveEnabled)

12
client/homebrew/pages/sharePage/sharePage.jsx
View File

@@ -3,12 +3,12 @@ const React = require('react');
const { useState, useEffect, useCallback } = React; const { useState, useEffect, useCallback } = React;
const { Meta } = require('vitreum/headtags'); const { Meta } = require('vitreum/headtags');
const Nav = require('naturalcrit/nav/nav.jsx'); const Nav = require('client/homebrew/navbar/nav.jsx');
const Navbar = require('../../navbar/navbar.jsx'); const Navbar = require('client/homebrew/navbar/navbar.jsx');
const MetadataNav = require('../../navbar/metadata.navitem.jsx'); const MetadataNav = require('client/homebrew/navbar/metadata.navitem.jsx');
const PrintNavItem = require('../../navbar/print.navitem.jsx'); const PrintNavItem = require('client/homebrew/navbar/print.navitem.jsx');
const RecentNavItem = require('../../navbar/recent.navitem.jsx').both; const RecentNavItem = require('client/homebrew/navbar/recent.navitem.jsx').both;
const Account = require('../../navbar/account.navitem.jsx'); const Account = require('client/homebrew/navbar/account.navitem.jsx');
const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx'); const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
const { DEFAULT_BREW_LOAD } = require('../../../../server/brewDefaults.js'); const { DEFAULT_BREW_LOAD } = require('../../../../server/brewDefaults.js');

16
client/homebrew/pages/userPage/userPage.jsx
View File

@@ -4,14 +4,14 @@ const _ = require('lodash');
const ListPage = require('../basePages/listPage/listPage.jsx'); const ListPage = require('../basePages/listPage/listPage.jsx');
const Nav = require('naturalcrit/nav/nav.jsx'); const Nav = require('client/homebrew/navbar/nav.jsx');
const Navbar = require('../../navbar/navbar.jsx'); const Navbar = require('client/homebrew/navbar/navbar.jsx');
const RecentNavItem = require('../../navbar/recent.navitem.jsx').both; const RecentNavItem = require('client/homebrew/navbar/recent.navitem.jsx').both;
const Account = require('../../navbar/account.navitem.jsx'); const Account = require('client/homebrew/navbar/account.navitem.jsx');
const NewBrew = require('../../navbar/newbrew.navitem.jsx'); const NewBrew = require('client/homebrew/navbar/newbrew.navitem.jsx');
const HelpNavItem = require('../../navbar/help.navitem.jsx'); const HelpNavItem = require('client/homebrew/navbar/help.navitem.jsx');
const ErrorNavItem = require('../../navbar/error-navitem.jsx'); const ErrorNavItem = require('client/homebrew/navbar/error-navitem.jsx');
const VaultNavitem = require('../../navbar/vault.navitem.jsx'); const VaultNavitem = require('client/homebrew/navbar/vault.navitem.jsx');
const UserPage = (props)=>{ const UserPage = (props)=>{
props = { props = {

12
client/homebrew/pages/vaultPage/vaultPage.jsx
View File

@@ -5,12 +5,12 @@ require('./vaultPage.less');
const React = require('react'); const React = require('react');
const { useState, useEffect, useRef } = React; const { useState, useEffect, useRef } = React;
const Nav = require('naturalcrit/nav/nav.jsx'); const Nav = require('client/homebrew/navbar/nav.jsx');
const Navbar = require('../../navbar/navbar.jsx'); const Navbar = require('client/homebrew/navbar/navbar.jsx');
const RecentNavItem = require('../../navbar/recent.navitem.jsx').both; const RecentNavItem = require('client/homebrew/navbar/recent.navitem.jsx').both;
const Account = require('../../navbar/account.navitem.jsx'); const Account = require('client/homebrew/navbar/account.navitem.jsx');
const NewBrew = require('../../navbar/newbrew.navitem.jsx'); const NewBrew = require('client/homebrew/navbar/newbrew.navitem.jsx');
const HelpNavItem = require('../../navbar/help.navitem.jsx'); const HelpNavItem = require('client/homebrew/navbar/help.navitem.jsx');
const BrewItem = require('../basePages/listPage/brewItem/brewItem.jsx'); const BrewItem = require('../basePages/listPage/brewItem/brewItem.jsx');
const SplitPane = require('client/components/splitPane/splitPane.jsx'); const SplitPane = require('client/components/splitPane/splitPane.jsx');
const ErrorIndex = require('../errorPage/errors/errorIndex.js'); const ErrorIndex = require('../errorPage/errors/errorIndex.js');