From 58dedde54189cd6fccfcb8fc55ceac45b9b60301 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Sat, 10 Oct 2026 01:10:10 +0200 Subject: [PATCH] add pagename and title --- client/homebrew/homebrew.jsx | 2 +- client/homebrew/navbar/help.navitem.jsx | 3 -- client/homebrew/navbar/metadata.navitem.jsx | 2 +- client/homebrew/navbar/navbar.jsx | 46 ++++++++----------- client/homebrew/navbar/navbar.less | 4 +- client/homebrew/pages/sharePage/sharePage.jsx | 5 +- client/homebrew/pages/vaultPage/vaultPage.jsx | 2 +- .../utils/commonEditPageFunctions.jsx | 2 +- 8 files changed, 28 insertions(+), 38 deletions(-) diff --git a/client/homebrew/homebrew.jsx b/client/homebrew/homebrew.jsx index 2b2df6fe3..782263ad2 100644 --- a/client/homebrew/homebrew.jsx +++ b/client/homebrew/homebrew.jsx @@ -80,7 +80,7 @@ const Homebrew = (props)=>{ } /> } /> }/> - } /> + } /> } /> } /> } /> diff --git a/client/homebrew/navbar/help.navitem.jsx b/client/homebrew/navbar/help.navitem.jsx index d4849d070..dc168b218 100644 --- a/client/homebrew/navbar/help.navitem.jsx +++ b/client/homebrew/navbar/help.navitem.jsx @@ -5,9 +5,6 @@ import Nav from './nav.jsx'; export default function(props){ return
- - need help? - + if(!this.props.brew?.shareId) return <> return this.toggleMetaWindow()}> diff --git a/client/homebrew/navbar/navbar.jsx b/client/homebrew/navbar/navbar.jsx index e6b61392e..b1702f018 100644 --- a/client/homebrew/navbar/navbar.jsx +++ b/client/homebrew/navbar/navbar.jsx @@ -12,12 +12,13 @@ import AccountNavItem from './account.navitem.jsx'; const { both: RecentNavItem } = RecentNavItems; import Nav from './nav.jsx'; -const Navbar = ({ children, brew, pageName, editor, title = '', props }) => { +const Navbar = ({ children, brew, pageName, editor, title, currentPage, props }) => { const version = global.version || '0.0.0'; const isMac = navigator.platform.toUpperCase().includes('MAC'); const mod = isMac ? '⌘' : 'Ctrl'; - const isBrew = !!brew && brew.shareId; + const isBrew = !!brew &&(brew.shareId || pageName === 'homePage' || pageName === 'newPage'); const account = global.account; + const generalPage = pageName === 'vaultPage' || pageName === 'changelog' || pageName === 'faq' || pageName === 'migrate'; const slots = React.Children.toArray(children).reduce((acc, child) => { if (React.isValidElement(child)) { @@ -28,16 +29,6 @@ const Navbar = ({ children, brew, pageName, editor, title = '', props }) => { return acc; }, {}); - const renderTitle = () => { - const cleanTitle = title.replace(/^\/+|\/+$/g, ''); - if (!isBrew) return {cleanTitle || 'Home'}; - return ( - - {brew.title} - - ); - }; - const renderDownloadLink = () => { if (!isBrew) return Get txt; let shareLink = brew.shareId; @@ -65,14 +56,15 @@ const Navbar = ({ children, brew, pageName, editor, title = '', props }) => { return ( File} icon={null} key={'file'}> - - Save document -
{renderDownloadLink()}
+ + Clone File + + {/* Delete File @@ -82,6 +74,7 @@ const Navbar = ({ children, brew, pageName, editor, title = '', props }) => { Transfer File + */}
{slots.file?.props.children} @@ -92,32 +85,32 @@ const Navbar = ({ children, brew, pageName, editor, title = '', props }) => { return ( Edit} icon={null} key={'edit'}>
- editor?.undo()} kbd={mod + ' + z'} disabled={!isBrew}> + editor?.undo()} kbd={mod + ' + z'} disabled={!editor}> Undo - editor?.redo()} kbd={mod + ' + Shift + z'} disabled={!isBrew}> + editor?.redo()} kbd={mod + ' + Shift + z'} disabled={!editor}> Redo - editor?.find()} kbd={mod + ' + f'} disabled={!isBrew}> + editor?.find()} kbd={mod + ' + f'} disabled={!editor}> Find / Replace - editor?.foldCode()} disabled={!isBrew}> + editor?.foldCode()} disabled={!editor}> Fold all lines - editor?.unfoldCode()} disabled={!isBrew}> + editor?.unfoldCode()} disabled={!editor}> Unfold all lines
{slots.edit?.props.children} {/*
- editor?.cut()} kbd={mod + ' + x'} disabled={!isBrew}> + editor?.cut()} kbd={mod + ' + x'} disabled={!editor}> cut - editor?.copy()} kbd={mod + ' + c'} disabled={!isBrew}> + editor?.copy()} kbd={mod + ' + c'} disabled={!editor}> copy - editor?.paste()} kbd={mod + ' + v'} disabled={!isBrew}> + editor?.paste()} kbd={mod + ' + v'} disabled={!editor}> paste
@@ -130,15 +123,15 @@ const Navbar = ({ children, brew, pageName, editor, title = '', props }) => { return ( Go} icon={null} key={'go'}> {renderEditLink()} - +
Patreon - + Vault - + Changelog
@@ -162,6 +155,7 @@ const Navbar = ({ children, brew, pageName, editor, title = '', props }) => { + {generalPage && {title}}
    {account.username}} icon={null} key={account.username}> diff --git a/client/homebrew/navbar/navbar.less b/client/homebrew/navbar/navbar.less index d770ff2b9..a1b1f95b6 100644 --- a/client/homebrew/navbar/navbar.less +++ b/client/homebrew/navbar/navbar.less @@ -1,6 +1,6 @@ @import '@sharedStyles/core.less'; -@navbarHeight: 28px; +@navbarHeight: 29px; @viewerToolsHeight: 32px; @keyframes glideDropDown { @@ -203,7 +203,7 @@ .navItem, .menu-wrapper { --activeTriggerColor: #666; - &:has(ul):not(:has(ul button:not(:disabled))) { + &:has(ul):not(:has(ul :is(button, a):not(:disabled))) { color: grey; //faux disabled if all buttons are disabled } &:hover { diff --git a/client/homebrew/pages/sharePage/sharePage.jsx b/client/homebrew/pages/sharePage/sharePage.jsx index 90d2e3c5e..51d00d229 100644 --- a/client/homebrew/pages/sharePage/sharePage.jsx +++ b/client/homebrew/pages/sharePage/sharePage.jsx @@ -5,7 +5,6 @@ const Meta = Headtags.Meta; import BrewRenderer from '../../brewRenderer/brewRenderer.jsx'; import Navbar from '../../navbar/navbar.jsx'; -import Nav from '../../navbar/nav.jsx'; import request from '../../utils/request-middleware.js'; import { DEFAULT_BREW_LOAD } from '../../../../server/brewDefaults.js'; @@ -64,11 +63,11 @@ const SharePage = (props)=>{ document.removeEventListener('keydown', handleControlKeys); }; }, []); - + console.log('brew: ',currentBrew); return (
    - +
    {
    - +
    {renderForm()}
    diff --git a/client/homebrew/utils/commonEditPageFunctions.jsx b/client/homebrew/utils/commonEditPageFunctions.jsx index 09e336ae0..4a385cb65 100644 --- a/client/homebrew/utils/commonEditPageFunctions.jsx +++ b/client/homebrew/utils/commonEditPageFunctions.jsx @@ -379,7 +379,7 @@ export default function useCommonEditPageFunctions(dependencies) {
    {(pageName == 'editPage') && } - + {error ? () : (Save}>