mirror of
https://github.com/naturalcrit/homebrewery.git
synced 2026-11-15 21:08:44 +00:00
set pagename
This commit is contained in:
@@ -68,6 +68,8 @@ const MetadataNav = createReactClass({
|
|||||||
},
|
},
|
||||||
|
|
||||||
render : function(){
|
render : function(){
|
||||||
|
if(!this.props.brew.shareId) 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()}>
|
||||||
{this.props.children}
|
{this.props.children}
|
||||||
|
|||||||
@@ -2,16 +2,17 @@ import './navbar.less';
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
|
|
||||||
import { Dropdown } from '@components/dropdown/dropdown.jsx';
|
import { Dropdown } from '@components/dropdown/dropdown.jsx';
|
||||||
import NewBrew from './newbrew.navitem';
|
import NewBrewNavItem from './newbrew.navitem';
|
||||||
import PrintNavitem from './print.navitem.jsx';
|
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 Account from './account.navitem.jsx';
|
import MetadataNavItem from './metadata.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';
|
||||||
|
|
||||||
const Navbar = ({ children, brew, editor, title = '', props }) => {
|
const Navbar = ({ children, brew, pageName, editor, title = '', 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';
|
||||||
@@ -63,12 +64,12 @@ const Navbar = ({ children, brew, editor, title = '', props }) => {
|
|||||||
const renderFile = () => {
|
const renderFile = () => {
|
||||||
return (
|
return (
|
||||||
<Dropdown groupName={'File'} customTrigger={<>File</>} icon={null} key={'file'}>
|
<Dropdown groupName={'File'} customTrigger={<>File</>} icon={null} key={'file'}>
|
||||||
<NewBrew />
|
<NewBrewNavItem />
|
||||||
<Nav.item className='beta' disabled={!isBrew}>
|
<Nav.item className='beta' disabled={!isBrew}>
|
||||||
Save document
|
Save document
|
||||||
</Nav.item>
|
</Nav.item>
|
||||||
<div className='nav-section'>
|
<div className='nav-section'>
|
||||||
<PrintNavitem disabled={!isBrew} />
|
<PrintNavItem disabled={!isBrew} />
|
||||||
{renderDownloadLink()}
|
{renderDownloadLink()}
|
||||||
</div>
|
</div>
|
||||||
<div className='nav-section'>
|
<div className='nav-section'>
|
||||||
@@ -129,7 +130,7 @@ const Navbar = ({ children, brew, editor, title = '', 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={!isBrew} 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'>
|
<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
|
||||||
@@ -158,13 +159,13 @@ const Navbar = ({ children, brew, editor, title = '', props }) => {
|
|||||||
{renderEdit()}
|
{renderEdit()}
|
||||||
{renderGo()}
|
{renderGo()}
|
||||||
<Dropdown groupName={'Help'} customTrigger={<>Help</>} icon={null} key={'help'}>
|
<Dropdown groupName={'Help'} customTrigger={<>Help</>} icon={null} key={'help'}>
|
||||||
<HelpNavitem />
|
<HelpNavItem />
|
||||||
</Dropdown>
|
</Dropdown>
|
||||||
</ul>
|
</ul>
|
||||||
{renderTitle()}
|
<MetadataNavItem brew={brew}></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}>
|
||||||
<Account />
|
<AccountNavItem />
|
||||||
</Dropdown>
|
</Dropdown>
|
||||||
</ul>
|
</ul>
|
||||||
</nav>
|
</nav>
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ const AccountPage = (props)=>{
|
|||||||
|
|
||||||
// return the account page inside the base layout wrapper (with navbar etc).
|
// return the account page inside the base layout wrapper (with navbar etc).
|
||||||
return (
|
return (
|
||||||
<UIPage brew={brew}>
|
<UIPage brew={brew} pageName={'accountPage'}>
|
||||||
{renderAccountPage()}
|
{renderAccountPage()}
|
||||||
</UIPage>);
|
</UIPage>);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ const DEFAULT_SORT_TYPE = 'alpha';
|
|||||||
const DEFAULT_SORT_DIR = 'asc';
|
const DEFAULT_SORT_DIR = 'asc';
|
||||||
const DEFAULT_LAYOUT_MODE = 'grid';
|
const DEFAULT_LAYOUT_MODE = 'grid';
|
||||||
|
|
||||||
const ListPage = ({ brewCollection = [{ title: '', class: '', brews: [] }], navItems = <></>, reportError = null, query })=>{
|
const ListPage = ({ brewCollection = [{ title: '', class: '', brews: [] }], pageName, navItems = <></>, reportError = null, query })=>{
|
||||||
const [filterString, setFilterString] = useState(query?.filter || '');
|
const [filterString, setFilterString] = useState(query?.filter || '');
|
||||||
const [filterTags, setFilterTags] = useState([]);
|
const [filterTags, setFilterTags] = useState([]);
|
||||||
const [sortType, setSortType] = useState(query?.sort || null);
|
const [sortType, setSortType] = useState(query?.sort || null);
|
||||||
@@ -329,7 +329,7 @@ const ListPage = ({ brewCollection = [{ title: '', class: '', brews: [] }], navI
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className='listPage sitePage'>
|
<div className='listPage sitePage'>
|
||||||
<Navbar>{navItems}</Navbar>
|
<Navbar pageName={pageName} >{navItems}</Navbar>
|
||||||
|
|
||||||
{renderNav()}
|
{renderNav()}
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ const UIPage = createReactClass({
|
|||||||
|
|
||||||
render : function(){
|
render : function(){
|
||||||
return <div className='uiPage sitePage'>
|
return <div className='uiPage sitePage'>
|
||||||
<Navbar/>
|
<Navbar pageName={this.props.pageName} />
|
||||||
<div className='content'>
|
<div className='content'>
|
||||||
{this.props.children}
|
{this.props.children}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ const ErrorPage = ({ brew })=>{
|
|||||||
const errorText = ErrorIndex({ brew })[brew.HBErrorCode.toString()] || '';
|
const errorText = ErrorIndex({ brew })[brew.HBErrorCode.toString()] || '';
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<UIPage brew={{ title: 'Crit Fail!' }}>
|
<UIPage brew={{ title: 'Crit Fail!' }} pageName='errorPage'>
|
||||||
<div className='dataGroup'>
|
<div className='dataGroup'>
|
||||||
<div className='errorTitle'>
|
<div className='errorTitle'>
|
||||||
<h1>{`Error ${brew?.status || '000'}`}</h1>
|
<h1>{`Error ${brew?.status || '000'}`}</h1>
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ const SharePage = (props)=>{
|
|||||||
return (
|
return (
|
||||||
<div className='sharePage sitePage'>
|
<div className='sharePage sitePage'>
|
||||||
<Meta name='robots' content='noindex, nofollow' />
|
<Meta name='robots' content='noindex, nofollow' />
|
||||||
<Navbar brew={currentBrew} />
|
<Navbar brew={currentBrew} pageName='sharePage' />
|
||||||
<div className='content'>
|
<div className='content'>
|
||||||
<BrewRenderer
|
<BrewRenderer
|
||||||
text={currentBrew.text}
|
text={currentBrew.text}
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ const UserPage = (props)=>{
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ListPage brewCollection={brewCollection} query={props.query} reportError={(err)=>setError(err)} />
|
<ListPage pageName={pageName} brewCollection={brewCollection} query={props.query} reportError={(err)=>setError(err)} />
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -393,7 +393,7 @@ const VaultPage = (props)=>{
|
|||||||
<div className='sitePage vaultPage'>
|
<div className='sitePage vaultPage'>
|
||||||
<link href='/themes/V3/Blank/style.css' rel='stylesheet' />
|
<link href='/themes/V3/Blank/style.css' rel='stylesheet' />
|
||||||
<link href='/themes/V3/5ePHB/style.css' rel='stylesheet' />
|
<link href='/themes/V3/5ePHB/style.css' rel='stylesheet' />
|
||||||
<Navbar/>
|
<Navbar pageName={'vaultPage'}/>
|
||||||
<div className='content'>
|
<div className='content'>
|
||||||
<SplitPane showDividerButtons={false}>
|
<SplitPane showDividerButtons={false}>
|
||||||
<div className='form dataGroup'>{renderForm()}</div>
|
<div className='form dataGroup'>{renderForm()}</div>
|
||||||
|
|||||||
@@ -379,7 +379,7 @@ export default function useCommonEditPageFunctions(dependencies) {
|
|||||||
<div className= {`${pageName} sitePage`}>
|
<div className= {`${pageName} sitePage`}>
|
||||||
<Meta name='google-site-verification' content='NwnAQSSJZzAT7N-p5MY6ydQ7Njm67dtbu73ZSyE5Fy4' />
|
<Meta name='google-site-verification' content='NwnAQSSJZzAT7N-p5MY6ydQ7Njm67dtbu73ZSyE5Fy4' />
|
||||||
{(pageName == 'editPage') && <Meta name='robots' content='noindex, nofollow' />}
|
{(pageName == 'editPage') && <Meta name='robots' content='noindex, nofollow' />}
|
||||||
<Navbar brew={currentBrew} editor={editorRef.current} account={global.account}>
|
<Navbar brew={currentBrew} editor={editorRef.current} pageName={pageName} account={global.account}>
|
||||||
<Navbar.File>
|
<Navbar.File>
|
||||||
{error
|
{error
|
||||||
? (<ErrorNavItem error={error} clearError={clearError} />) : (<Dropdown className='save-menu' customTrigger={<>Save</>}>
|
? (<ErrorNavItem error={error} clearError={clearError} />) : (<Dropdown className='save-menu' customTrigger={<>Save</>}>
|
||||||
|
|||||||
Reference in New Issue
Block a user