mirror of
https://github.com/naturalcrit/homebrewery.git
synced 2026-11-17 18:38:44 +00:00
finally move savebutton
This commit is contained in:
@@ -68,7 +68,7 @@ const MetadataNav = createReactClass({
|
|||||||
},
|
},
|
||||||
|
|
||||||
render : function(){
|
render : function(){
|
||||||
if(!this.props.brew?.shareId) return <></>
|
if(!this.props.brew?.shareId || this.props.pageName !== 'sharePage') return <></>
|
||||||
|
|
||||||
return <Nav.item icon='fas fa-info-circle' color='grey' className='metadata'
|
return <Nav.item icon='fas fa-info-circle' color='grey' className='metadata'
|
||||||
onClick={()=>this.toggleMetaWindow()}>
|
onClick={()=>this.toggleMetaWindow()}>
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import PrintNavItem from './print.navitem.jsx';
|
|||||||
import ShareNavItem from './share.navitem.jsx';
|
import ShareNavItem from './share.navitem.jsx';
|
||||||
import HelpNavItem from './help.navitem.jsx';
|
import HelpNavItem from './help.navitem.jsx';
|
||||||
import RecentNavItems from './recent.navitem.jsx';
|
import RecentNavItems from './recent.navitem.jsx';
|
||||||
import MetadataNavItem from './metadata.navitem.jsx'
|
import MetadataNavItem from './metadata.navitem.jsx';
|
||||||
import AccountNavItem from './account.navitem.jsx';
|
import AccountNavItem from './account.navitem.jsx';
|
||||||
const { both: RecentNavItem } = RecentNavItems;
|
const { both: RecentNavItem } = RecentNavItems;
|
||||||
import Nav from './nav.jsx';
|
import Nav from './nav.jsx';
|
||||||
@@ -16,17 +16,21 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props })
|
|||||||
const version = global.version || '0.0.0';
|
const version = global.version || '0.0.0';
|
||||||
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 isBrew = !!brew && (brew.shareId || pageName === 'homePage' || pageName === 'newPage');
|
||||||
const account = global.account;
|
const account = global.account;
|
||||||
const generalPage = pageName === 'vaultPage' || pageName === 'changelog' || pageName === 'faq' || pageName === 'migrate';
|
const generalPage = pageName === 'vaultPage' || pageName === 'changelog' || pageName === 'faq' || pageName === 'migrate';
|
||||||
|
|
||||||
const slots = React.Children.toArray(children).reduce((acc, child) => {
|
const navSlots = React.Children.toArray(children).reduce((slots, child) => {
|
||||||
if (React.isValidElement(child)) {
|
if (!React.isValidElement(child)) return slots;
|
||||||
if (child.type === Navbar.File) acc.file = child;
|
const content = child.props.children;
|
||||||
if (child.type === Navbar.Edit) acc.edit = child;
|
|
||||||
if (child.type === Navbar.Go) acc.go = child;
|
if (child.type === Navbar.File) slots.file = content;
|
||||||
}
|
else if (child.type === Navbar.Edit) slots.edit = content;
|
||||||
return acc;
|
else if (child.type === Navbar.Go) slots.go = content;
|
||||||
|
else if (child.type === Navbar.Help) slots.help = content;
|
||||||
|
else if (child.type === Navbar.Menu) slots.menu = content;
|
||||||
|
|
||||||
|
return slots;
|
||||||
}, {});
|
}, {});
|
||||||
|
|
||||||
const renderDownloadLink = () => {
|
const renderDownloadLink = () => {
|
||||||
@@ -76,13 +80,12 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props })
|
|||||||
</Nav.item>
|
</Nav.item>
|
||||||
*/}
|
*/}
|
||||||
</div>
|
</div>
|
||||||
{slots.file?.props.children}
|
{navSlots.file}
|
||||||
</Dropdown>
|
</Dropdown>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
const renderEdit = () => {
|
const renderEdit = () => {
|
||||||
console.log(editor);
|
|
||||||
return (
|
return (
|
||||||
<Dropdown groupName={'Edit'} customTrigger={<>Edit</>} icon={null} key={'edit'}>
|
<Dropdown groupName={'Edit'} customTrigger={<>Edit</>} icon={null} key={'edit'}>
|
||||||
<div className='nav-section'>
|
<div className='nav-section'>
|
||||||
@@ -102,7 +105,7 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props })
|
|||||||
Unfold all lines
|
Unfold all lines
|
||||||
</Nav.item>
|
</Nav.item>
|
||||||
</div>
|
</div>
|
||||||
{slots.edit?.props.children}
|
{navSlots.edit}
|
||||||
{/*
|
{/*
|
||||||
<div className="nav-section">
|
<div className="nav-section">
|
||||||
<Nav.item onClick={()=>editor?.cut()} kbd={mod + ' + x'} disabled={!editor}>
|
<Nav.item onClick={()=>editor?.cut()} kbd={mod + ' + x'} disabled={!editor}>
|
||||||
@@ -136,6 +139,7 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props })
|
|||||||
Changelog
|
Changelog
|
||||||
</Nav.item>
|
</Nav.item>
|
||||||
</div>
|
</div>
|
||||||
|
{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 />
|
||||||
</Dropdown>
|
</Dropdown>
|
||||||
@@ -154,10 +158,12 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props })
|
|||||||
{renderGo()}
|
{renderGo()}
|
||||||
<Dropdown groupName={'Help'} customTrigger={<>Help</>} icon={null} key={'help'}>
|
<Dropdown groupName={'Help'} customTrigger={<>Help</>} icon={null} key={'help'}>
|
||||||
<HelpNavItem />
|
<HelpNavItem />
|
||||||
|
{navSlots.help}
|
||||||
</Dropdown>
|
</Dropdown>
|
||||||
|
{navSlots.menu}
|
||||||
</ul>
|
</ul>
|
||||||
{generalPage && <Nav.item className='brewTitle'>{title}</Nav.item>}
|
{generalPage && <Nav.item className='brewTitle'>{title}</Nav.item>}
|
||||||
<MetadataNavItem brew={brew}></MetadataNavItem>
|
<MetadataNavItem brew={brew} pageName={pageName}></MetadataNavItem>
|
||||||
<ul>
|
<ul>
|
||||||
<Dropdown groupName={account.username} customTrigger={<>{account.username}</>} icon={null} key={account.username}>
|
<Dropdown groupName={account.username} customTrigger={<>{account.username}</>} icon={null} key={account.username}>
|
||||||
<AccountNavItem />
|
<AccountNavItem />
|
||||||
@@ -167,4 +173,10 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props })
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Navbar.File = ({ children }) => children;
|
||||||
|
Navbar.Edit = ({ children }) => children;
|
||||||
|
Navbar.Go = ({ children }) => children;
|
||||||
|
Navbar.Help = ({ children }) => children;
|
||||||
|
Navbar.Menu = ({ children }) => children;
|
||||||
|
|
||||||
export default Navbar;
|
export default Navbar;
|
||||||
|
|||||||
@@ -279,23 +279,17 @@
|
|||||||
justify-content: center;
|
justify-content: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
&.beta {
|
|
||||||
color: @red;
|
|
||||||
}
|
|
||||||
|
|
||||||
&.neverSaved {
|
&.neverSaved {
|
||||||
background-color: @orange;
|
background-color: @orange;
|
||||||
color: white;
|
color: white;
|
||||||
transition: all 0.2s;
|
transition: all 0.2s;
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
background-color: @green;
|
background-color: @green;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&.save {
|
&.save {
|
||||||
position: relative;
|
width:90px;
|
||||||
width: 106px;
|
|
||||||
text-align: center;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
&.saved {
|
&.saved {
|
||||||
|
|||||||
@@ -15,16 +15,9 @@ const Meta = Headtags.Meta;
|
|||||||
//===---- Navbar
|
//===---- Navbar
|
||||||
import Nav from '@navbar/nav.jsx';
|
import Nav from '@navbar/nav.jsx';
|
||||||
import Navbar from '@navbar/navbar.jsx';
|
import Navbar from '@navbar/navbar.jsx';
|
||||||
import NewBrewItem from '@navbar/newbrew.navitem.jsx';
|
|
||||||
import AccountNavItem from '@navbar/account.navitem.jsx';
|
|
||||||
import ErrorNavItem from '@navbar/error-navitem.jsx';
|
import ErrorNavItem from '@navbar/error-navitem.jsx';
|
||||||
import HelpNavItem from '@navbar/help.navitem.jsx';
|
|
||||||
import PrintNavItem from '@navbar/print.navitem.jsx';
|
|
||||||
import ShareNavItem from '@navbar/share.navitem.jsx';
|
|
||||||
import RecentNavItems from '@navbar/recent.navitem.jsx';
|
|
||||||
const { both: RecentNavItem } = RecentNavItems;
|
|
||||||
import googleDriveIcon from '../../../googleDrive.svg';
|
import googleDriveIcon from '../../../googleDrive.svg';
|
||||||
import {Dropdown} from '../../components/dropdown/dropdown.jsx';
|
import {Dropdown} from '../../../../components/dropdown/dropdown.jsx';
|
||||||
|
|
||||||
const AUTOSAVE_KEY = 'HB_editor_autoSaveOn';
|
const AUTOSAVE_KEY = 'HB_editor_autoSaveOn';
|
||||||
const BREWKEY = 'HB_newPage_content';
|
const BREWKEY = 'HB_newPage_content';
|
||||||
@@ -263,13 +256,13 @@ const EditorPage = (props)=>{
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(unsavedChanges)
|
if(unsavedChanges)
|
||||||
return <Nav.item className='save' onClick={()=>trySave(true, true, saveGoogle)} color='blue' icon='fas fa-save'>save now</Nav.item>;
|
return <Nav.item className='save neverSaved' onClick={()=>trySave(true, true, saveGoogle)} color='blue' icon='fas fa-save'>save now</Nav.item>;
|
||||||
|
|
||||||
if(autoSaveEnabled)
|
if(autoSaveEnabled)
|
||||||
return <Nav.item className='save saved'>auto-saved</Nav.item>;
|
return <Nav.item className='save saved'>auto-saved</Nav.item>;
|
||||||
|
|
||||||
if(sandbox)
|
if(sandbox)
|
||||||
return <Nav.item className='save neverSaved' disabled={true}>save now</Nav.item>;
|
return <Nav.item className='save' disabled={true}>no changes</Nav.item>;
|
||||||
|
|
||||||
return <Nav.item className='save saved'>saved</Nav.item>;
|
return <Nav.item className='save saved'>saved</Nav.item>;
|
||||||
};
|
};
|
||||||
@@ -381,12 +374,17 @@ const EditorPage = (props)=>{
|
|||||||
{(pageName == 'editPage') && <Meta name='robots' content='noindex, nofollow' />}
|
{(pageName == 'editPage') && <Meta name='robots' content='noindex, nofollow' />}
|
||||||
<Navbar brew={currentBrew} editor={editorRef.current} pageName={pageName} account={global.account} currentPage={currentBrewRendererPageNum}>
|
<Navbar brew={currentBrew} editor={editorRef.current} pageName={pageName} account={global.account} currentPage={currentBrewRendererPageNum}>
|
||||||
<Navbar.File>
|
<Navbar.File>
|
||||||
{error
|
<Nav.item
|
||||||
? (<ErrorNavItem error={error} clearError={clearError} />) : (<Dropdown className='save-menu' customTrigger={<>Save</>}>
|
className='save'
|
||||||
{renderSaveButton()}
|
onClick={()=>trySave(true, true, saveGoogle)}
|
||||||
{(pageName == 'editPage') && renderAutoSaveButton()}
|
icon='fas fa-save'>
|
||||||
</Dropdown>)}
|
save now
|
||||||
|
</Nav.item>
|
||||||
|
{(pageName == 'editPage') && renderAutoSaveButton()}
|
||||||
</Navbar.File>
|
</Navbar.File>
|
||||||
|
<Navbar.Menu>
|
||||||
|
{error? <ErrorNavItem error={error} clearError={clearError} /> : renderSaveButton()}
|
||||||
|
</Navbar.Menu>
|
||||||
</Navbar>
|
</Navbar>
|
||||||
|
|
||||||
{currentBrew.lock && <LockNotification shareId={currentBrew.shareId} message={currentBrew.lock.editMessage} reviewRequested={currentBrew.lock.reviewRequested}/>}
|
{currentBrew.lock && <LockNotification shareId={currentBrew.shareId} message={currentBrew.lock.editMessage} reviewRequested={currentBrew.lock.reviewRequested}/>}
|
||||||
|
|||||||
Reference in New Issue
Block a user