From efef243d2b8bc54d54b7c31ec479834fb82c31fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Sat, 10 Oct 2026 00:40:47 +0200 Subject: [PATCH] set pagename --- client/homebrew/navbar/metadata.navitem.jsx | 2 ++ client/homebrew/navbar/navbar.jsx | 25 ++++++++++--------- .../pages/accountPage/accountPage.jsx | 2 +- .../pages/basePages/listPage/listPage.jsx | 4 +-- .../pages/basePages/uiPage/uiPage.jsx | 2 +- client/homebrew/pages/errorPage/errorPage.jsx | 2 +- client/homebrew/pages/sharePage/sharePage.jsx | 2 +- client/homebrew/pages/userPage/userPage.jsx | 2 +- client/homebrew/pages/vaultPage/vaultPage.jsx | 2 +- .../utils/commonEditPageFunctions.jsx | 2 +- 10 files changed, 24 insertions(+), 21 deletions(-) diff --git a/client/homebrew/navbar/metadata.navitem.jsx b/client/homebrew/navbar/metadata.navitem.jsx index 8ee6b72c0..dbe7a7719 100644 --- a/client/homebrew/navbar/metadata.navitem.jsx +++ b/client/homebrew/navbar/metadata.navitem.jsx @@ -68,6 +68,8 @@ const MetadataNav = createReactClass({ }, render : function(){ + if(!this.props.brew.shareId) return <> + return this.toggleMetaWindow()}> {this.props.children} diff --git a/client/homebrew/navbar/navbar.jsx b/client/homebrew/navbar/navbar.jsx index fee06f1c9..e6b61392e 100644 --- a/client/homebrew/navbar/navbar.jsx +++ b/client/homebrew/navbar/navbar.jsx @@ -2,16 +2,17 @@ import './navbar.less'; import React from 'react'; import { Dropdown } from '@components/dropdown/dropdown.jsx'; -import NewBrew from './newbrew.navitem'; -import PrintNavitem from './print.navitem.jsx'; -import ShareNavitem from './share.navitem.jsx'; -import HelpNavitem from './help.navitem.jsx'; +import NewBrewNavItem from './newbrew.navitem'; +import PrintNavItem from './print.navitem.jsx'; +import ShareNavItem from './share.navitem.jsx'; +import HelpNavItem from './help.navitem.jsx'; import RecentNavItems from './recent.navitem.jsx'; -import Account from './account.navitem.jsx'; +import MetadataNavItem from './metadata.navitem.jsx' +import AccountNavItem from './account.navitem.jsx'; const { both: RecentNavItem } = RecentNavItems; import Nav from './nav.jsx'; -const Navbar = ({ children, brew, editor, title = '', props }) => { +const Navbar = ({ children, brew, pageName, editor, title = '', props }) => { const version = global.version || '0.0.0'; const isMac = navigator.platform.toUpperCase().includes('MAC'); const mod = isMac ? '⌘' : 'Ctrl'; @@ -63,12 +64,12 @@ const Navbar = ({ children, brew, editor, title = '', props }) => { const renderFile = () => { return ( File} icon={null} key={'file'}> - + Save document
- + {renderDownloadLink()}
@@ -129,7 +130,7 @@ const Navbar = ({ children, brew, editor, title = '', props }) => { return ( Go} icon={null} key={'go'}> {renderEditLink()} - +
Patreon @@ -158,13 +159,13 @@ const Navbar = ({ children, brew, editor, title = '', props }) => { {renderEdit()} {renderGo()} Help} icon={null} key={'help'}> - + - {renderTitle()} +
    {account.username}} icon={null} key={account.username}> - +
diff --git a/client/homebrew/pages/accountPage/accountPage.jsx b/client/homebrew/pages/accountPage/accountPage.jsx index 8a443545c..d9378593c 100644 --- a/client/homebrew/pages/accountPage/accountPage.jsx +++ b/client/homebrew/pages/accountPage/accountPage.jsx @@ -74,7 +74,7 @@ const AccountPage = (props)=>{ // return the account page inside the base layout wrapper (with navbar etc). return ( - + {renderAccountPage()} ); }; diff --git a/client/homebrew/pages/basePages/listPage/listPage.jsx b/client/homebrew/pages/basePages/listPage/listPage.jsx index 79a8ee713..bf5effbb4 100644 --- a/client/homebrew/pages/basePages/listPage/listPage.jsx +++ b/client/homebrew/pages/basePages/listPage/listPage.jsx @@ -16,7 +16,7 @@ const DEFAULT_SORT_TYPE = 'alpha'; const DEFAULT_SORT_DIR = 'asc'; const DEFAULT_LAYOUT_MODE = 'grid'; -const ListPage = ({ brewCollection = [{ title: '', class: '', brews: [] }], navItems = <>, reportError = null, query })=>{ +const ListPage = ({ brewCollection = [{ title: '', class: '', brews: [] }], pageName, navItems = <>, reportError = null, query })=>{ const [filterString, setFilterString] = useState(query?.filter || ''); const [filterTags, setFilterTags] = useState([]); const [sortType, setSortType] = useState(query?.sort || null); @@ -329,7 +329,7 @@ const ListPage = ({ brewCollection = [{ title: '', class: '', brews: [] }], navI return (
- {navItems} + {navItems} {renderNav()} diff --git a/client/homebrew/pages/basePages/uiPage/uiPage.jsx b/client/homebrew/pages/basePages/uiPage/uiPage.jsx index 6bf6ff74b..0796816f7 100644 --- a/client/homebrew/pages/basePages/uiPage/uiPage.jsx +++ b/client/homebrew/pages/basePages/uiPage/uiPage.jsx @@ -8,7 +8,7 @@ const UIPage = createReactClass({ render : function(){ return
- +
{this.props.children}
diff --git a/client/homebrew/pages/errorPage/errorPage.jsx b/client/homebrew/pages/errorPage/errorPage.jsx index fb36394e8..3a527a201 100644 --- a/client/homebrew/pages/errorPage/errorPage.jsx +++ b/client/homebrew/pages/errorPage/errorPage.jsx @@ -9,7 +9,7 @@ const ErrorPage = ({ brew })=>{ const errorText = ErrorIndex({ brew })[brew.HBErrorCode.toString()] || ''; return ( - +

{`Error ${brew?.status || '000'}`}

diff --git a/client/homebrew/pages/sharePage/sharePage.jsx b/client/homebrew/pages/sharePage/sharePage.jsx index a7ed505b5..90d2e3c5e 100644 --- a/client/homebrew/pages/sharePage/sharePage.jsx +++ b/client/homebrew/pages/sharePage/sharePage.jsx @@ -68,7 +68,7 @@ const SharePage = (props)=>{ return (
- +
{ }; return ( - setError(err)} /> + setError(err)} /> ); }; diff --git a/client/homebrew/pages/vaultPage/vaultPage.jsx b/client/homebrew/pages/vaultPage/vaultPage.jsx index f7852fd63..d83ecd54d 100644 --- a/client/homebrew/pages/vaultPage/vaultPage.jsx +++ b/client/homebrew/pages/vaultPage/vaultPage.jsx @@ -393,7 +393,7 @@ const VaultPage = (props)=>{
- +
{renderForm()}
diff --git a/client/homebrew/utils/commonEditPageFunctions.jsx b/client/homebrew/utils/commonEditPageFunctions.jsx index 3dbf2d049..09e336ae0 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}>