refactor the nav into the pages

This commit is contained in:
Víctor Losada Hernández
2026-10-09 18:59:55 +02:00
parent 1d4cbfb487
commit 78b3a0be83
13 changed files with 144 additions and 94 deletions
@@ -1,5 +1,13 @@
@import '@sharedStyles/core.less';
@keyframes glideDown {
0% {
opacity : 0;transform : translate(-50% + 3px, 0px);}
100% {
opacity : 1;transform : translate(-50% + 3px, 10px);}
}
.navItem.error {
position : relative;
background-color : @red;
+59 -31
View File
@@ -11,14 +11,25 @@ import Account from './account.navitem.jsx';
const { both: RecentNavItem } = RecentNavItems;
import Nav from './nav.jsx';
const Navbar = ({ account, brew, title = '', props }) => {
const Navbar = ({ children, brew, title = '', 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 account = global.account;
const slots = React.Children.toArray(children).reduce((acc, child) => {
if (React.isValidElement(child)) {
if (child.type === Navbar.File) acc.file = child;
if (child.type === Navbar.Edit) acc.edit = child;
if (child.type === Navbar.Go) acc.go = child;
}
return acc;
}, {});
const renderTitle = () => {
const cleanTitle = title.replace(/^\/+|\/+$/g, '');
if (!brew.shareId) return <Nav.item className='brewTitle'>{cleanTitle || 'Home'}</Nav.item>;
if (!isBrew) return <Nav.item className='brewTitle'>{cleanTitle || 'Home'}</Nav.item>;
return (
<Nav.item className='brewTitle' style={title.includes('edit') ? { cursor: 'default' } : {}}>
{brew.title}
@@ -26,43 +37,44 @@ const Navbar = ({ account, brew, title = '', props }) => {
);
};
const renderEditLink = () => {
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>
);
};
const renderDownloadLink = () =>{
if(!brew.shareId) return <Nav.item disabled={!brew.shareId}>Get txt</Nav.item>
const renderDownloadLink = () => {
if (!isBrew) return <Nav.item disabled={!isBrew}>Get txt</Nav.item>;
let shareLink = brew.shareId;
if(brew.googleId && !brew.stubbed) {
if (brew.googleId && !brew.stubbed) {
shareLink = brew.googleId + shareLink;
}
return <Nav.item href={`/download/${shareLink}`} disabled={!brew.shareId}>Get txt</Nav.item>
}
return (
<Nav.item href={`/download/${shareLink}`} disabled={!isBrew}>
Get txt
</Nav.item>
);
};
const renderFile = () => {
return (
<Dropdown groupName={'File'} customTrigger={<>File</>} icon={null} key={'file'}>
<NewBrew />
<Nav.item className='beta' disabled={!brew.shareId}>Save document</Nav.item>
<Nav.item className='beta' disabled={!isBrew}>
Save document
</Nav.item>
<div className='nav-section'>
<PrintNavitem disabled={!brew.shareId}/>
<PrintNavitem disabled={!isBrew} />
{renderDownloadLink()}
</div>
<ShareNavitem brew={brew} disabled={!brew.shareId} currentPage={''/*how the hell do i get it here?*/}/>
<ShareNavitem brew={brew} disabled={!isBrew} currentPage={'' /*how the hell do i get it here?*/} />
<div className='nav-section'>
<Nav.item className='beta' disabled={!brew.shareId}>Delete File</Nav.item>
<Nav.item className='beta' disabled={!brew.shareId}>Publish File</Nav.item>
<Nav.item className='beta' disabled={!brew.shareId}>Transfer File</Nav.item>
<Nav.item className='beta' disabled={!isBrew}>
Delete File
</Nav.item>
<Nav.item className='beta' disabled={!isBrew}>
Publish File
</Nav.item>
<Nav.item className='beta' disabled={!isBrew}>
Transfer File
</Nav.item>
</div>
{slots.file?.props.children}
</Dropdown>
);
};
@@ -71,14 +83,25 @@ const Navbar = ({ account, brew, title = '', props }) => {
return (
<Dropdown groupName={'Edit'} customTrigger={<>Edit</>} icon={null} key={'edit'}>
<div className='nav-section'>
<Nav.item className='beta' kbd={mod + ' + z'} disabled={!brew.shareId}>
{slots.edit}
<Nav.item className='beta' kbd={mod + ' + z'} disabled={!isBrew}>
Undo
</Nav.item>
<Nav.item className='beta' kbd={mod + ' + Shift + z'} disabled={!brew.shareId}>Redo</Nav.item>
<Nav.item className='beta' kbd={mod + ' + x'} disabled={!brew.shareId}>cut</Nav.item>
<Nav.item className='beta' kbd={mod + ' + c'} disabled={!brew.shareId}>copy</Nav.item>
<Nav.item className='beta' kbd={mod + ' + v'} disabled={!brew.shareId}>paste</Nav.item>
<Nav.item className='beta' kbd={mod + ' + f'} disabled={!brew.shareId}>Find / Replace</Nav.item>
<Nav.item className='beta' kbd={mod + ' + Shift + z'} disabled={!isBrew}>
Redo
</Nav.item>
<Nav.item className='beta' kbd={mod + ' + x'} disabled={!isBrew}>
cut
</Nav.item>
<Nav.item className='beta' kbd={mod + ' + c'} disabled={!isBrew}>
copy
</Nav.item>
<Nav.item className='beta' kbd={mod + ' + v'} disabled={!isBrew}>
paste
</Nav.item>
<Nav.item className='beta' kbd={mod + ' + f'} disabled={!isBrew}>
Find / Replace
</Nav.item>
</div>
</Dropdown>
);
@@ -128,4 +151,9 @@ const Navbar = ({ account, brew, title = '', props }) => {
);
};
Navbar.File = () => null;
Navbar.Edit = () => null;
Navbar.Go = () => null;
export default Navbar;
+38 -6
View File
@@ -197,7 +197,9 @@
background: #333;
min-height: 29px;
font-size: 14px;
font-family: Alata, open sans;
font-family:
Alata,
open sans;
button,
a {
&:disabled {
@@ -217,7 +219,7 @@
.menu-wrapper {
--activeTriggerColor: #666;
&:has(ul):not(:has(ul button:not(:disabled))) {
color:grey; //faux disabled if all buttons are disabled
color: grey; //faux disabled if all buttons are disabled
}
&:hover {
background: #484848;
@@ -288,13 +290,43 @@
}
.navItem {
&.header {
justify-content: center;
}
&.beta {
color:@red;
color: @red;
}
&.neverSaved {
background-color: @orange;
color: white;
transition: all 0.2s;
&:hover {
background-color: @green;
}
}
&.save {
position: relative;
width: 106px;
text-align: center;
}
&.saved {
color: #666666;
cursor: initial;
}
&.googleDriveStorage {
position : relative;
img {
height: 18px;
padding: 0px;
margin: -5px;
&.inactive { filter : grayscale(1); }
}
}
}
@@ -322,12 +354,12 @@
padding-bottom: 5px;
.navItem {
min-height:2.2em;
min-height: 2.2em;
}
.nav-section:not(:last-child, :has(+ .header)) {
border-bottom: 1px solid;
padding-bottom:5px;
padding-bottom: 5px;
margin-bottom: 5px;
}
+4 -3
View File
@@ -2,11 +2,12 @@ import React from 'react';
import dedent from 'dedent';
import Nav from './nav.jsx';
const getShareId = (brew)=>(
brew.googleId && !brew.stubbed
const getShareId = (brew)=>{
if (!brew) return null;
return brew.googleId && !brew.stubbed
? brew.googleId + brew.shareId
: brew.shareId
);
};
const getRedditLink = (brew)=>{
const text = dedent`