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
@@ -5,6 +5,7 @@ import moment from 'moment';
import _ from 'lodash';
import BrewItem from './brewItem/brewItem.jsx';
import Navbar from '../../../navbar/navbar.jsx';
const USERPAGE_SORT_DIR = 'HB_listPage_sortDir';
const USERPAGE_SORT_TYPE = 'HB_listPage_sortType';
@@ -328,7 +329,7 @@ const ListPage = ({ brewCollection = [{ title: '', class: '', brews: [] }], navI
return (
<div className='listPage sitePage'>
{navItems}
<Navbar>{navItems}</Navbar>
{renderNav()}
@@ -1,13 +1,14 @@
import './uiPage.less';
import React from 'react';
import createReactClass from 'create-react-class';
import Navbar from '../../../navbar/navbar.jsx';
const UIPage = createReactClass({
displayName : 'UIPage',
render : function(){
return <div className='uiPage sitePage'>
<Navbar/>
<div className='content'>
{this.props.children}
</div>
+2 -23
View File
@@ -1,25 +1,4 @@
@keyframes glideDown {
0% {
opacity : 0;transform : translate(-50% + 3px, 0px);}
100% {
opacity : 1;transform : translate(-50% + 3px, 10px);}
}
.editPage {
.navItem.save {
position : relative;
width : 106px;
text-align : center;
&.saved {
color : #666666;
cursor : initial;
}
}
.googleDriveStorage { position : relative; }
.googleDriveStorage img {
height : 18px;
padding : 0px;
margin : -5px;
&.inactive { filter : grayscale(1); }
}
.editPage {
}
@@ -34,17 +34,4 @@
&:hover { background-color : darken(@blue, 20%); }
&.show { right : 350px; }
}
.navItem.save {
background-color : @orange;
transition : all 0.2s;
&:hover { background-color : @green; }
&.neverSaved {
cursor : auto;
background-color : #333333;
opacity : 0;
translate : -100%;
}
}
}
+1 -12
View File
@@ -1,17 +1,6 @@
@import '@sharedStyles/colors.less';
.newPage {
.navItem.save {
background-color : @orange;
transition : all 0.2s;
&:hover { background-color : @green; }
&.neverSaved {
cursor : auto;
background-color : #333333;
opacity : 0;
translate : -100%;
}
}
}
+16 -2
View File
@@ -4,7 +4,8 @@ import Headtags from '../../../../vitreum/headtags.js';
const Meta = Headtags.Meta;
import BrewRenderer from '../../brewRenderer/brewRenderer.jsx';
import Navbar from '../../navbar/navbar.jsx';
import Nav from '../../navbar/nav.jsx';
import request from '../../utils/request-middleware.js';
import { DEFAULT_BREW_LOAD } from '../../../../server/brewDefaults.js';
@@ -63,12 +64,25 @@ const SharePage = (props)=>{
document.removeEventListener('keydown', handleControlKeys);
};
}, []);
const renderEditLink = () => {
if (!currentBrew.editId) return null;
const editLink = currentBrew.googleId && !currentBrew.stubbed ? currentBrew.googleId + currentBrew.editId : currentBrew.editId;
return (
<Navbar.File>
<Nav.item color='orange' icon='fas fa-pencil-alt' href={`/edit/${editLink}`}>
edit
</Nav.item>
</Navbar.File>
);
};
return (
<div className='sharePage sitePage'>
<Meta name='robots' content='noindex, nofollow' />
<Navbar>{renderEditLink()}</Navbar>
<div className='content'>
<BrewRenderer
text={currentBrew.text}
@@ -8,6 +8,7 @@ import SplitPane from '@components/splitPane/splitPane.jsx';
import ErrorIndex from '../errorPage/errors/errorIndex.js';
import request from '../../utils/request-middleware.js';
import Navbar from '../../navbar/navbar.jsx';
const VaultPage = (props)=>{
const [pageState, setPageState] = useState(parseInt(props.query.page) || 1);
@@ -392,6 +393,7 @@ const VaultPage = (props)=>{
<div className='sitePage vaultPage'>
<link href='/themes/V3/Blank/style.css' rel='stylesheet' />
<link href='/themes/V3/5ePHB/style.css' rel='stylesheet' />
<Navbar/>
<div className='content'>
<SplitPane showDividerButtons={false}>
<div className='form dataGroup'>{renderForm()}</div>