mirror of
https://github.com/naturalcrit/homebrewery.git
synced 2026-11-20 09:18:11 +00:00
lint navbar
This commit is contained in:
@@ -68,7 +68,7 @@ const MetadataNav = createReactClass({
|
|||||||
},
|
},
|
||||||
|
|
||||||
render : function(){
|
render : function(){
|
||||||
if(!this.props.brew?.shareId || this.props.pageName !== 'sharePage') 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()}>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import './navbar.less';
|
import './navbar.less';
|
||||||
import React, { useState, useRef, useEffect } from 'react';
|
import React from 'react';
|
||||||
import cx from 'classnames';
|
import cx from 'classnames';
|
||||||
|
|
||||||
import NaturalCritIcon from '@components/svg/naturalcrit-d20.svg.jsx';
|
import NaturalCritIcon from '@components/svg/naturalcrit-d20.svg.jsx';
|
||||||
@@ -28,7 +28,7 @@ const Nav = {
|
|||||||
item : ({ icon, kbd, href, newTab, onClick, color, children, className, disabled, noDismiss, ...props })=>{
|
item : ({ icon, kbd, href, newTab, onClick, color, children, className, disabled, noDismiss, ...props })=>{
|
||||||
const classes = cx('navItem', color, className);
|
const classes = cx('navItem', color, className);
|
||||||
if(disabled) {
|
if(disabled) {
|
||||||
return <button className={classes} disabled>{children}{icon && <i className={icon}></i>}</button>
|
return <button className={classes} disabled>{children}{icon && <i className={icon}></i>}</button>;
|
||||||
}
|
}
|
||||||
if(href){
|
if(href){
|
||||||
return <a className={classes} href={href} target={newTab ? '_blank' : '_self'} {...props}>
|
return <a className={classes} href={href} target={newTab ? '_blank' : '_self'} {...props}>
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ const { both: RecentNavItem } = RecentNavItems;
|
|||||||
import Nav from './nav.jsx';
|
import Nav from './nav.jsx';
|
||||||
|
|
||||||
const Navbar = ({ children, brew, pageName, editor, title, currentPage, props })=>{
|
const Navbar = ({ children, brew, pageName, editor, title, currentPage, props })=>{
|
||||||
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');
|
||||||
@@ -88,13 +87,13 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props })
|
|||||||
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'>
|
||||||
<Nav.item onClick={() => editor?.undo()} kbd={mod + ' + z'} disabled={!editor}>
|
<Nav.item onClick={()=>editor?.undo()} kbd={`${mod} + z`} disabled={!editor}>
|
||||||
Undo
|
Undo
|
||||||
</Nav.item>
|
</Nav.item>
|
||||||
<Nav.item onClick={() => editor?.redo()} kbd={mod + ' + Shift + z'} disabled={!editor}>
|
<Nav.item onClick={()=>editor?.redo()} kbd={`${mod} + Shift + z`} disabled={!editor}>
|
||||||
Redo
|
Redo
|
||||||
</Nav.item>
|
</Nav.item>
|
||||||
<Nav.item onClick={() => editor?.find()} kbd={mod + ' + f'} disabled={!editor}>
|
<Nav.item onClick={()=>editor?.find()} kbd={`${mod} + f`} disabled={!editor}>
|
||||||
Find / Replace
|
Find / Replace
|
||||||
</Nav.item>
|
</Nav.item>
|
||||||
<Nav.item onClick={()=>editor?.foldCode()} disabled={!editor}>
|
<Nav.item onClick={()=>editor?.foldCode()} disabled={!editor}>
|
||||||
@@ -126,7 +125,7 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props })
|
|||||||
return (
|
return (
|
||||||
<Dropdown groupName={'Go'} customTrigger={<>Go</>} icon={null} key={'go'}>
|
<Dropdown groupName={'Go'} customTrigger={<>Go</>} icon={null} key={'go'}>
|
||||||
{renderEditLink()}
|
{renderEditLink()}
|
||||||
<ShareNavItem brew={brew} disabled={!brew?.shareId} currentPage={'' /*how the hell do i get it here?*/} />
|
<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' color='green' icon='fas fa-heart'>
|
<Nav.item className='patreon' newTab={true} href='https://www.patreon.com/NaturalCrit' color='green' icon='fas fa-heart'>
|
||||||
Patreon
|
Patreon
|
||||||
|
|||||||
@@ -143,15 +143,15 @@ const RecentItems = createReactClass({
|
|||||||
// if(!this.state.showDropdown) return null;
|
// if(!this.state.showDropdown) return null;
|
||||||
|
|
||||||
const makeItems = (brews)=>{
|
const makeItems = (brews)=>{
|
||||||
return <div className="nav-section">
|
return <div className='nav-section'>
|
||||||
{_.map(brews, (brew, i)=>{
|
{_.map(brews, (brew, i)=>{
|
||||||
return <a className='navItem' href={brew.url} key={`${brew.id}-${i}`} target='_blank' rel='noopener noreferrer' title={brew.title || '[ no title ]'}>
|
return <a className='navItem' href={brew.url} key={`${brew.id}-${i}`} target='_blank' rel='noopener noreferrer' title={brew.title || '[ no title ]'}>
|
||||||
<span className='title'>{brew.title || '[ no title ]'}</span>
|
<span className='title'>{brew.title || '[ no title ]'}</span>
|
||||||
<span className='time'>{Moment(brew.ts).fromNow()}</span>
|
<span className='time'>{Moment(brew.ts).fromNow()}</span>
|
||||||
<button className='clear' title='Remove from Recents' onClick={(e)=>{this.removeItem(`${brew.url}`, e);}}><i className='fas fa-times'></i></button>
|
<button className='clear' title='Remove from Recents' onClick={(e)=>{this.removeItem(`${brew.url}`, e);}}><i className='fas fa-times'></i></button>
|
||||||
</a>
|
</a>;
|
||||||
})}
|
})}
|
||||||
</div>
|
</div>;
|
||||||
};
|
};
|
||||||
|
|
||||||
return <>
|
return <>
|
||||||
@@ -167,7 +167,7 @@ const RecentItems = createReactClass({
|
|||||||
},
|
},
|
||||||
|
|
||||||
render : function(){
|
render : function(){
|
||||||
return this.renderDropdown()
|
return this.renderDropdown();
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ const getShareId = (brew)=>{
|
|||||||
if(!brew) return null;
|
if(!brew) return null;
|
||||||
return brew.googleId && !brew.stubbed
|
return brew.googleId && !brew.stubbed
|
||||||
? brew.googleId + brew.shareId
|
? brew.googleId + brew.shareId
|
||||||
: brew.shareId
|
: brew.shareId;
|
||||||
};
|
};
|
||||||
|
|
||||||
const getRedditLink = (brew)=>{
|
const getRedditLink = (brew)=>{
|
||||||
@@ -37,5 +37,5 @@ export default ({ brew, disabled, currentPage })=> {
|
|||||||
post to reddit
|
post to reddit
|
||||||
</Nav.item>
|
</Nav.item>
|
||||||
</div>
|
</div>
|
||||||
)
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user