fix recent brews

This commit is contained in:
Víctor Losada Hernández
2026-10-13 22:23:40 +02:00
parent c606d87dc9
commit 3915d32794
3 changed files with 22 additions and 13 deletions
+1 -1
View File
@@ -41,7 +41,7 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props })
<Dropdown groupName={'File'} customTrigger={<>File</>} icon={null} key={'file'}> <Dropdown groupName={'File'} customTrigger={<>File</>} icon={null} key={'file'}>
<NewBrewNavItem /> <NewBrewNavItem />
<Dropdown className='navItem recent' groupName={'Recent Brews'} icon={'fas fa-history'} key={'recent'}> <Dropdown className='navItem recent' groupName={'Recent Brews'} icon={'fas fa-history'} key={'recent'}>
<RecentNavItem /> <RecentNavItem brew={brew} pageName={pageName} />
</Dropdown> </Dropdown>
<div className='nav-section'> <div className='nav-section'>
<Nav.item icon={'fas fa-clone'} href={`/new/${brew?.shareId}`} disabled={!brew?.shareId}> <Nav.item icon={'fas fa-clone'} href={`/new/${brew?.shareId}`} disabled={!brew?.shareId}>
+13 -4
View File
@@ -200,6 +200,10 @@
left:unset; left:unset;
right:5px; right:5px;
} }
&.fa-times {
position:relative;
left:unset;
}
} }
&.header { &.header {
@@ -228,7 +232,8 @@
} }
} }
.clear { .clear {
width: 55px; align-items: center;
width: 50px;
padding: 0; padding: 0;
cursor: pointer; cursor: pointer;
transition: background-color @defaultDuration; transition: background-color @defaultDuration;
@@ -296,9 +301,6 @@
min-height: 2.2em; min-height: 2.2em;
padding-left: 25px; padding-left: 25px;
&:last-child {
padding-bottom: 10px;
}
&.save { &.save {
width: 100%; width: 100%;
} }
@@ -309,6 +311,13 @@
} }
} }
>.navItem:last-child, .nav-section:last-child .navItem:last-child {
padding-bottom: 10px;
}
.nav-section:has(+ .header) {
padding-bottom:5px;
}
.nav-section:not(:last-child, :has(+ .header)) { .nav-section:not(:last-child, :has(+ .header)) {
border-bottom: 1px solid; border-bottom: 1px solid;
padding-bottom: 5px; padding-bottom: 5px;
+8 -8
View File
@@ -13,7 +13,7 @@ const RecentItems = createReactClass({
DisplayName : 'RecentItems', DisplayName : 'RecentItems',
getDefaultProps : function() { getDefaultProps : function() {
return { return {
storageKey : '', pageName : '',
showEdit : false, showEdit : false,
showView : false showView : false
}; };
@@ -33,8 +33,8 @@ const RecentItems = createReactClass({
let edited = JSON.parse(localStorage.getItem(EDIT_KEY) || '[]'); let edited = JSON.parse(localStorage.getItem(EDIT_KEY) || '[]');
let viewed = JSON.parse(localStorage.getItem(VIEW_KEY) || '[]'); let viewed = JSON.parse(localStorage.getItem(VIEW_KEY) || '[]');
//== Add current brew to appropriate recent items list (depending on storageKey) ==// //== Add current brew to appropriate recent items list (depending on pageName) ==//
if(this.props.storageKey == 'edit'){ if(this.props.pageName == 'editPage'){
let editId = this.props.brew.editId; let editId = this.props.brew.editId;
if(this.props.brew.googleId && !this.props.brew.stubbed){ if(this.props.brew.googleId && !this.props.brew.stubbed){
editId = `${this.props.brew.googleId}${this.props.brew.editId}`; editId = `${this.props.brew.googleId}${this.props.brew.editId}`;
@@ -49,7 +49,7 @@ const RecentItems = createReactClass({
ts : Date.now() ts : Date.now()
}); });
} }
if(this.props.storageKey == 'view'){ if(this.props.pageName == 'sharePage'){
let shareId = this.props.brew.shareId; let shareId = this.props.brew.shareId;
if(this.props.brew.googleId && !this.props.brew.stubbed){ if(this.props.brew.googleId && !this.props.brew.stubbed){
shareId = `${this.props.brew.googleId}${this.props.brew.shareId}`; shareId = `${this.props.brew.googleId}${this.props.brew.shareId}`;
@@ -81,7 +81,7 @@ const RecentItems = createReactClass({
componentDidUpdate : function(prevProps) { componentDidUpdate : function(prevProps) {
if(prevProps.brew && this.props.brew.editId !== prevProps.brew.editId) { if(prevProps.brew && this.props.brew.editId !== prevProps.brew.editId) {
let edited = JSON.parse(localStorage.getItem(EDIT_KEY) || '[]'); let edited = JSON.parse(localStorage.getItem(EDIT_KEY) || '[]');
if(this.props.storageKey == 'edit') { if(this.props.pageName == 'editPage') {
let prevEditId = prevProps.brew.editId; let prevEditId = prevProps.brew.editId;
if(prevProps.brew.googleId && !this.props.brew.stubbed){ if(prevProps.brew.googleId && !this.props.brew.stubbed){
prevEditId = `${prevProps.brew.googleId}${prevProps.brew.editId}`; prevEditId = `${prevProps.brew.googleId}${prevProps.brew.editId}`;
@@ -177,7 +177,7 @@ export default {
edited : (props)=>{ edited : (props)=>{
return <RecentItems return <RecentItems
brew={props.brew} brew={props.brew}
storageKey={props.storageKey} pageName={props.pageName}
text='recently edited' text='recently edited'
showEdit={true} showEdit={true}
/>; />;
@@ -186,7 +186,7 @@ export default {
viewed : (props)=>{ viewed : (props)=>{
return <RecentItems return <RecentItems
brew={props.brew} brew={props.brew}
storageKey={props.storageKey} pageName={props.pageName}
text='recently viewed' text='recently viewed'
showView={true} showView={true}
/>; />;
@@ -195,7 +195,7 @@ export default {
both : (props)=>{ both : (props)=>{
return <RecentItems return <RecentItems
brew={props.brew} brew={props.brew}
storageKey={props.storageKey} pageName={props.pageName}
text='recent brews' text='recent brews'
showEdit={true} showEdit={true}
showView={true} showView={true}