From 27045fc42e490ecf6353044916dfc6ff857662d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Sat, 10 Oct 2026 22:05:52 +0200 Subject: [PATCH] lint navbar --- client/homebrew/navbar/metadata.navitem.jsx | 2 +- client/homebrew/navbar/nav.jsx | 8 ++-- client/homebrew/navbar/navbar.jsx | 53 ++++++++++----------- client/homebrew/navbar/print.navitem.jsx | 2 +- client/homebrew/navbar/recent.navitem.jsx | 8 ++-- client/homebrew/navbar/share.navitem.jsx | 26 +++++----- 6 files changed, 49 insertions(+), 50 deletions(-) diff --git a/client/homebrew/navbar/metadata.navitem.jsx b/client/homebrew/navbar/metadata.navitem.jsx index 310054ff5..5a593e784 100644 --- a/client/homebrew/navbar/metadata.navitem.jsx +++ b/client/homebrew/navbar/metadata.navitem.jsx @@ -68,7 +68,7 @@ const MetadataNav = createReactClass({ }, render : function(){ - if(!this.props.brew?.shareId || this.props.pageName !== 'sharePage') return <> + if(!this.props.brew?.shareId || this.props.pageName !== 'sharePage') return <>; return this.toggleMetaWindow()}> diff --git a/client/homebrew/navbar/nav.jsx b/client/homebrew/navbar/nav.jsx index d88321cc1..949e2aee4 100644 --- a/client/homebrew/navbar/nav.jsx +++ b/client/homebrew/navbar/nav.jsx @@ -1,5 +1,5 @@ import './navbar.less'; -import React, { useState, useRef, useEffect } from 'react'; +import React from 'react'; import cx from 'classnames'; import NaturalCritIcon from '@components/svg/naturalcrit-d20.svg.jsx'; @@ -25,10 +25,10 @@ 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); if(disabled) { - return + return ; } if(href){ return @@ -43,7 +43,7 @@ const Nav = { ; } }, - header: ({span, className, children, ...props})=>{ + header : ({ span, className, children, ...props })=>{ return {children} ; diff --git a/client/homebrew/navbar/navbar.jsx b/client/homebrew/navbar/navbar.jsx index 82484a0fc..f93e04367 100644 --- a/client/homebrew/navbar/navbar.jsx +++ b/client/homebrew/navbar/navbar.jsx @@ -12,30 +12,29 @@ import AccountNavItem from './account.navitem.jsx'; const { both: RecentNavItem } = RecentNavItems; import Nav from './nav.jsx'; -const Navbar = ({ children, brew, pageName, editor, title, currentPage, props }) => { - const version = global.version || '0.0.0'; +const Navbar = ({ children, brew, pageName, editor, title, currentPage, props })=>{ const isMac = navigator.platform.toUpperCase().includes('MAC'); 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) => { - if (!React.isValidElement(child)) return slots; + const navSlots = React.Children.toArray(children).reduce((slots, child)=>{ + if(!React.isValidElement(child)) return slots; const content = child.props.children; - if (child.type === Navbar.File) slots.file = content; - else if (child.type === Navbar.Edit) slots.edit = content; - 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; + if(child.type === Navbar.File) slots.file = content; + else if(child.type === Navbar.Edit) slots.edit = content; + 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 = () => { - if (!isBrew) return Get txt; + const renderDownloadLink = ()=>{ + if(!isBrew) return Get txt; let shareLink = brew.shareId; - if (brew.googleId && !brew.stubbed) { + if(brew.googleId && !brew.stubbed) { shareLink = brew.googleId + shareLink; } @@ -46,7 +45,7 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props }) ); }; - const renderEditLink = () => { + const renderEditLink = ()=>{ const editLink = brew?.googleId && !brew?.stubbed ? brew?.googleId + brew?.editId : brew?.editId; return ( @@ -55,7 +54,7 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props }) ); }; - const renderFile = () => { + const renderFile = ()=>{ return ( File} icon={null} key={'file'}> @@ -84,23 +83,23 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props }) ); }; - const renderEdit = () => { + const renderEdit = ()=>{ return ( Edit} icon={null} key={'edit'}>
- editor?.undo()} kbd={mod + ' + z'} disabled={!editor}> + editor?.undo()} kbd={`${mod} + z`} disabled={!editor}> Undo - editor?.redo()} kbd={mod + ' + Shift + z'} disabled={!editor}> + editor?.redo()} kbd={`${mod} + Shift + z`} disabled={!editor}> Redo - editor?.find()} kbd={mod + ' + f'} disabled={!editor}> + editor?.find()} kbd={`${mod} + f`} disabled={!editor}> Find / Replace - editor?.foldCode()} disabled={!editor}> + editor?.foldCode()} disabled={!editor}> Fold all lines - editor?.unfoldCode()} disabled={!editor}> + editor?.unfoldCode()} disabled={!editor}> Unfold all lines
@@ -122,11 +121,11 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props }) ); }; - const renderGo = () => { + const renderGo = ()=>{ return ( Go} icon={null} key={'go'}> {renderEditLink()} - +
Patreon @@ -172,10 +171,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; +Navbar.File = ({ children })=>children; +Navbar.Edit = ({ children })=>children; +Navbar.Go = ({ children })=>children; +Navbar.Help = ({ children })=>children; +Navbar.Menu = ({ children })=>children; export default Navbar; diff --git a/client/homebrew/navbar/print.navitem.jsx b/client/homebrew/navbar/print.navitem.jsx index 32dce6989..5daae407a 100644 --- a/client/homebrew/navbar/print.navitem.jsx +++ b/client/homebrew/navbar/print.navitem.jsx @@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react'; import Nav from './nav.jsx'; import { printCurrentBrew } from '@shared/helpers.js'; -export default function({disabled}){ +export default function({ disabled }){ const [printing, setPrinting] = useState(false); // listen for print cycle events to display "loading" message since it can take some time. diff --git a/client/homebrew/navbar/recent.navitem.jsx b/client/homebrew/navbar/recent.navitem.jsx index b8c30875d..e6b2219e3 100644 --- a/client/homebrew/navbar/recent.navitem.jsx +++ b/client/homebrew/navbar/recent.navitem.jsx @@ -143,15 +143,15 @@ const RecentItems = createReactClass({ // if(!this.state.showDropdown) return null; const makeItems = (brews)=>{ - return
+ return
{_.map(brews, (brew, i)=>{ return {brew.title || '[ no title ]'} {Moment(brew.ts).fromNow()} - + ; })} -
+
; }; return <> @@ -167,7 +167,7 @@ const RecentItems = createReactClass({ }, render : function(){ - return this.renderDropdown() + return this.renderDropdown(); } }); diff --git a/client/homebrew/navbar/share.navitem.jsx b/client/homebrew/navbar/share.navitem.jsx index d2aeaf378..0a0b48b07 100644 --- a/client/homebrew/navbar/share.navitem.jsx +++ b/client/homebrew/navbar/share.navitem.jsx @@ -3,10 +3,10 @@ import dedent from 'dedent'; import Nav from './nav.jsx'; const getShareId = (brew)=>{ - if (!brew) return null; + if(!brew) return null; return brew.googleId && !brew.stubbed ? brew.googleId + brew.shareId - : brew.shareId + : brew.shareId; }; const getRedditLink = (brew)=>{ @@ -18,24 +18,24 @@ const getRedditLink = (brew)=>{ return `https://www.reddit.com/r/UnearthedArcana/submit?title=${encodeURIComponent(brew.title.toWellFormed())}&text=${encodeURIComponent(text)}`; }; -export default ({ brew, disabled, currentPage })=> { +export default ({ brew, disabled, currentPage })=>{ return ( -
- +
+ view share page - - {navigator.clipboard.writeText(`${global.config.baseUrl}/share/${getShareId(brew)}`);}} disabled={disabled}> + + {navigator.clipboard.writeText(`${global.config.baseUrl}/share/${getShareId(brew)}`);}} disabled={disabled}> copy share url - - {currentPage > 1 && + + {currentPage > 1 && {navigator.clipboard.writeText(`${global.config.baseUrl}/share/${getShareId(brew)}#p${currentPage}`);}}> copy url (page {currentPage}) } - + post to reddit - -
-) +
+
+ ); };