mirror of
https://github.com/naturalcrit/homebrewery.git
synced 2026-11-16 10:08:44 +00:00
reorder some stuff
This commit is contained in:
@@ -15,68 +15,41 @@ import Nav from './nav.jsx';
|
|||||||
const Navbar = ({ children, brew, pageName, editor, title, currentPage, props })=>{
|
const Navbar = ({ children, brew, pageName, editor, title, currentPage, props })=>{
|
||||||
const isMac = navigator.platform.toUpperCase().includes('MAC');
|
const isMac = navigator.platform.toUpperCase().includes('MAC');
|
||||||
const mod = isMac ? '⌘' : 'Ctrl';
|
const mod = isMac ? '⌘' : 'Ctrl';
|
||||||
const isBrew = !!brew && (brew.shareId || pageName === 'homePage' || pageName === 'newPage');
|
|
||||||
const account = global.account;
|
|
||||||
|
|
||||||
const navSlots = React.Children.toArray(children).reduce((slots, child)=>{
|
const navSlots = React.Children.toArray(children).reduce((slots, child)=>{
|
||||||
if(!React.isValidElement(child)) return slots;
|
if(!React.isValidElement(child)) return slots;
|
||||||
const content = child.props.children;
|
const content = child.props.children;
|
||||||
|
|
||||||
|
//To create new items inside the dropdowns call them with Navbar.[DropdownName]
|
||||||
if(child.type === Navbar.File) slots.file = content;
|
if(child.type === Navbar.File) slots.file = content;
|
||||||
else if(child.type === Navbar.Edit) slots.edit = content;
|
else if(child.type === Navbar.Edit) slots.edit = content;
|
||||||
else if(child.type === Navbar.Go) slots.go = content;
|
else if(child.type === Navbar.Go) slots.go = content;
|
||||||
else if(child.type === Navbar.Help) slots.help = content;
|
else if(child.type === Navbar.Help) slots.help = content;
|
||||||
|
//create a new dropdown with Navbar.Menu
|
||||||
else if(child.type === Navbar.Menu) slots.menu = content;
|
else if(child.type === Navbar.Menu) slots.menu = content;
|
||||||
|
|
||||||
return slots;
|
return slots;
|
||||||
}, {});
|
}, {});
|
||||||
|
|
||||||
const renderDownloadLink = ()=>{
|
const renderFile = ()=>{
|
||||||
if(!brew?.shareId) return <Nav.item disabled={!brew?.shareId}>Get txt</Nav.item>;
|
let shareLink = brew?.shareId;
|
||||||
let shareLink = brew.shareId;
|
if(brew?.googleId && !brew?.stubbed) {
|
||||||
if(brew.googleId && !brew.stubbed) {
|
shareLink = brew?.googleId + shareLink;
|
||||||
shareLink = brew.googleId + shareLink;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
|
||||||
<Nav.item icon='fas fa-download' href={`/download/${shareLink}`} disabled={!brew?.shareId}>
|
|
||||||
Get txt
|
|
||||||
</Nav.item>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
const renderEditLink = ()=>{
|
|
||||||
const editLink = brew?.googleId && !brew?.stubbed ? brew?.googleId + brew?.editId : brew?.editId;
|
|
||||||
return (
|
|
||||||
<Nav.item href={`/edit/${editLink}`} disabled={!brew?.editId}>
|
|
||||||
edit this brew
|
|
||||||
</Nav.item>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
const renderFile = ()=>{
|
|
||||||
return (
|
return (
|
||||||
<Dropdown groupName={'File'} customTrigger={<>File</>} icon={null} key={'file'}>
|
<Dropdown groupName={'File'} customTrigger={<>File</>} icon={null} key={'file'}>
|
||||||
<NewBrewNavItem />
|
<NewBrewNavItem />
|
||||||
<div className='nav-section'>
|
|
||||||
<PrintNavItem disabled={!isBrew} />
|
|
||||||
{renderDownloadLink()}
|
|
||||||
</div>
|
|
||||||
<div className='nav-section'>
|
<div className='nav-section'>
|
||||||
<Nav.item icon={'fas fa-clone'} href={`/new/${brew?.shareId}`} disabled={!brew?.shareId}>
|
<Nav.item icon={'fas fa-clone'} href={`/new/${brew?.shareId}`} disabled={!brew?.shareId}>
|
||||||
Clone File
|
Clone File
|
||||||
</Nav.item>
|
</Nav.item>
|
||||||
{/*
|
</div>
|
||||||
<Nav.item className='beta' disabled={!isBrew}>
|
<div className='nav-section'>
|
||||||
Delete File
|
<PrintNavItem disabled={pageName !== 'newPage' && pageName !== 'editPage' && pageName !== 'editPage'} />
|
||||||
|
<Nav.item icon='fas fa-download' href={`/download/${shareLink}`} disabled={!brew?.shareId}>
|
||||||
|
Get txt
|
||||||
</Nav.item>
|
</Nav.item>
|
||||||
<Nav.item className='beta' disabled={!isBrew}>
|
|
||||||
Publish File
|
|
||||||
</Nav.item>
|
|
||||||
<Nav.item className='beta' disabled={!isBrew}>
|
|
||||||
Transfer File
|
|
||||||
</Nav.item>
|
|
||||||
*/}
|
|
||||||
</div>
|
</div>
|
||||||
{navSlots.file}
|
{navSlots.file}
|
||||||
</Dropdown>
|
</Dropdown>
|
||||||
@@ -104,19 +77,6 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props })
|
|||||||
</Nav.item>
|
</Nav.item>
|
||||||
</div>
|
</div>
|
||||||
{navSlots.edit}
|
{navSlots.edit}
|
||||||
{/*
|
|
||||||
<div className="nav-section">
|
|
||||||
<Nav.item onClick={()=>editor?.cut()} kbd={mod + ' + x'} disabled={!editor}>
|
|
||||||
cut
|
|
||||||
</Nav.item>
|
|
||||||
<Nav.item onClick={()=>editor?.copy()} kbd={mod + ' + c'} disabled={!editor}>
|
|
||||||
copy
|
|
||||||
</Nav.item>
|
|
||||||
<Nav.item onClick={()=>editor?.paste()} kbd={mod + ' + v'} disabled={!editor}>
|
|
||||||
paste
|
|
||||||
</Nav.item>
|
|
||||||
</div>
|
|
||||||
*/}
|
|
||||||
</Dropdown>
|
</Dropdown>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
@@ -124,8 +84,6 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props })
|
|||||||
const renderGo = ()=>{
|
const renderGo = ()=>{
|
||||||
return (
|
return (
|
||||||
<Dropdown groupName={'Go'} customTrigger={<>Go</>} icon={null} key={'go'}>
|
<Dropdown groupName={'Go'} customTrigger={<>Go</>} icon={null} key={'go'}>
|
||||||
{renderEditLink()}
|
|
||||||
<ShareNavItem brew={brew} disabled={!brew?.shareId} currentPage={currentPage} />
|
|
||||||
<div className='nav-section'>
|
<div className='nav-section'>
|
||||||
<Nav.item className='patreon' newTab={true} href='https://www.patreon.com/NaturalCrit' icon='fas fa-heart'>
|
<Nav.item className='patreon' newTab={true} href='https://www.patreon.com/NaturalCrit' icon='fas fa-heart'>
|
||||||
Patreon
|
Patreon
|
||||||
@@ -137,6 +95,7 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props })
|
|||||||
Changelog
|
Changelog
|
||||||
</Nav.item>
|
</Nav.item>
|
||||||
</div>
|
</div>
|
||||||
|
<ShareNavItem brew={brew} disabled={!brew?.shareId} currentPage={currentPage} />
|
||||||
{navSlots.go}
|
{navSlots.go}
|
||||||
<Dropdown className='navItem recent' groupName={'Recent Brews'} customTrigger={<>Recent Brews</>} icon={null} key={'recent'}>
|
<Dropdown className='navItem recent' groupName={'Recent Brews'} customTrigger={<>Recent Brews</>} icon={null} key={'recent'}>
|
||||||
<RecentNavItem />
|
<RecentNavItem />
|
||||||
@@ -145,6 +104,13 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props })
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const renderHelp = ()=>{
|
||||||
|
<Dropdown groupName={'Help'} customTrigger={<>Help</>} icon={null} key={'help'}>
|
||||||
|
<HelpNavItem />
|
||||||
|
{navSlots.help}
|
||||||
|
</Dropdown>;
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<nav>
|
<nav>
|
||||||
<ul>
|
<ul>
|
||||||
@@ -154,10 +120,7 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props })
|
|||||||
{renderFile()}
|
{renderFile()}
|
||||||
{renderEdit()}
|
{renderEdit()}
|
||||||
{renderGo()}
|
{renderGo()}
|
||||||
<Dropdown groupName={'Help'} customTrigger={<>Help</>} icon={null} key={'help'}>
|
{renderHelp()}
|
||||||
<HelpNavItem />
|
|
||||||
{navSlots.help}
|
|
||||||
</Dropdown>
|
|
||||||
{navSlots.menu}
|
{navSlots.menu}
|
||||||
</ul>
|
</ul>
|
||||||
{pageName !== 'sharePage' && <Nav.header className='brewTitle'>{title}</Nav.header>}
|
{pageName !== 'sharePage' && <Nav.header className='brewTitle'>{title}</Nav.header>}
|
||||||
|
|||||||
@@ -8,6 +8,10 @@ const getShareId = (brew)=>{
|
|||||||
? brew.googleId + brew.shareId
|
? brew.googleId + brew.shareId
|
||||||
: brew.shareId;
|
: brew.shareId;
|
||||||
};
|
};
|
||||||
|
const getEditId = (brew)=>{
|
||||||
|
if(!brew) return null;
|
||||||
|
return brew.googleId && !brew.stubbed ? brew.googleId + brew.editId : brew.editId;
|
||||||
|
};
|
||||||
|
|
||||||
const getRedditLink = (brew)=>{
|
const getRedditLink = (brew)=>{
|
||||||
const text = dedent`
|
const text = dedent`
|
||||||
@@ -21,6 +25,9 @@ const getRedditLink = (brew)=>{
|
|||||||
export default ({ brew, disabled, currentPage })=>{
|
export default ({ brew, disabled, currentPage })=>{
|
||||||
return (
|
return (
|
||||||
<div className='nav-section'>
|
<div className='nav-section'>
|
||||||
|
<Nav.item href={`/edit/${getEditId(brew)}`} disabled={disabled || !brew?.editId}>
|
||||||
|
edit this brew
|
||||||
|
</Nav.item>
|
||||||
<Nav.item href={`/share/${getShareId(brew)}`} disabled={disabled}>
|
<Nav.item href={`/share/${getShareId(brew)}`} disabled={disabled}>
|
||||||
view share page
|
view share page
|
||||||
</Nav.item>
|
</Nav.item>
|
||||||
|
|||||||
Reference in New Issue
Block a user