more changes

This commit is contained in:
Víctor Losada Hernández
2026-10-07 22:32:27 +02:00
parent b3a71fead4
commit 4da4aa7b6c
11 changed files with 52 additions and 155 deletions
+2 -2
View File
@@ -61,7 +61,7 @@ const Account = createReactClass({
render : function(){
// Logged in
if(global.account){
return <Nav.dropdown>
return <div className='nav-section'>
<Nav.item
className='account username'
color='orange'
@@ -92,7 +92,7 @@ const Account = createReactClass({
>
logout
</Nav.item>
</Nav.dropdown>;
</div>;
}
// Logged out
+34 -8
View File
@@ -7,14 +7,36 @@ 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';
const { both: RecentNavItem } = RecentNavItems;
import Nav from './nav.jsx';
import useCommonEditPageFunctions from '../../homebrew/utils/commonEditPageFunctions.jsx';
const Navbar = ({ children }) => {
const Navbar = ({ account, brew, title, props }) => {
const version = global.version || '0.0.0';
const renderTitle = () => {
//if vault
const cleanTitle = title.replace(/^\/+|\/+$/g, '');
if (!brew.shareId) return <Nav.item className='brewTitle'>{cleanTitle || 'Home'}</Nav.item>;
return (
<Nav.item className='brewTitle' style={disableMeta ? { cursor: 'default' } : {}}>
{brew.title}
</Nav.item>
);
};
const renderEdit = () => {
if (!brew.editId) return null;
const editLink = brew.googleId && !brew.stubbed ? brew.googleId + brew.editId : brew.editId;
return (
<Nav.item color='orange' icon='fas fa-pencil-alt' href={`/edit/${editLink}`}>
edit
</Nav.item>
);
};
return (
<nav>
<ul>
@@ -58,9 +80,6 @@ const Navbar = ({ children }) => {
Changelog
</Nav.item>
</div>
<HelpNavitem />
<div className='nav-section'>
<Nav.item href={`/user/${encodeURIComponent(global.account.username)}`} color='yellow' icon='fas fa-beer'>
brews
@@ -73,8 +92,15 @@ const Navbar = ({ children }) => {
<RecentNavItem />
</Dropdown>
</Dropdown>
<li>Help</li>
<li>User</li>
<Dropdown groupName={'Help'} customTrigger={<>Help</>} icon={null} key={'help'}>
<HelpNavitem />
</Dropdown>
</ul>
{renderTitle()}
<ul>
<Dropdown groupName={account.username} customTrigger={<>{account.username}</>} icon={null} key={account.username}>
<Account />
</Dropdown>
</ul>
</nav>
);
+7
View File
@@ -319,10 +319,17 @@
> .menu-wrapper {
height: 100%;
text-wrap:nowrap;
&:not(:only-child) {
&:first-child {
padding-left: 10px;
}
&:last-child {
padding-right: 10px;
}
}
}
}