1
0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 09:46:22 +00:00

Merge pull request #1052 from PaulRosset/trash-counter-notes

Add counter on deleted notes
This commit is contained in:
Kazz Yokomizo
2017-11-09 15:33:36 +09:00
committed by GitHub
3 changed files with 11 additions and 1 deletions

View File

@@ -15,7 +15,8 @@ import styles from './SideNavFilter.styl'
*/ */
const SideNavFilter = ({ const SideNavFilter = ({
isFolded, isHomeActive, handleAllNotesButtonClick, isFolded, isHomeActive, handleAllNotesButtonClick,
isStarredActive, handleStarredButtonClick, isTrashedActive, handleTrashedButtonClick isStarredActive, handleStarredButtonClick, isTrashedActive, handleTrashedButtonClick, counterDelNote,
counterTotalNote, counterStarredNote
}) => ( }) => (
<div styleName={isFolded ? 'menu--folded' : 'menu'}> <div styleName={isFolded ? 'menu--folded' : 'menu'}>
<button styleName={isHomeActive ? 'menu-button--active' : 'menu-button'} <button styleName={isHomeActive ? 'menu-button--active' : 'menu-button'}
@@ -23,18 +24,21 @@ const SideNavFilter = ({
> >
<i className='fa fa-archive fa-fw' /> <i className='fa fa-archive fa-fw' />
<span styleName='menu-button-label'>All Notes</span> <span styleName='menu-button-label'>All Notes</span>
<span styleName='counters'>{counterTotalNote}</span>
</button> </button>
<button styleName={isStarredActive ? 'menu-button-star--active' : 'menu-button'} <button styleName={isStarredActive ? 'menu-button-star--active' : 'menu-button'}
onClick={handleStarredButtonClick} onClick={handleStarredButtonClick}
> >
<i className='fa fa-star fa-fw' /> <i className='fa fa-star fa-fw' />
<span styleName='menu-button-label'>Starred</span> <span styleName='menu-button-label'>Starred</span>
<span styleName='counters'>{counterStarredNote}</span>
</button> </button>
<button styleName={isTrashedActive ? 'menu-button--active' : 'menu-button'} <button styleName={isTrashedActive ? 'menu-button--active' : 'menu-button'}
onClick={handleTrashedButtonClick} onClick={handleTrashedButtonClick}
> >
<i className='fa fa-trash fa-fw' /> <i className='fa fa-trash fa-fw' />
<span styleName='menu-button-label'>Trash</span> <span styleName='menu-button-label'>Trash</span>
<span styleName='counters'>{counterDelNote}</span>
</button> </button>
</div> </div>
) )

View File

@@ -10,6 +10,9 @@
text-align left text-align left
overflow ellipsis overflow ellipsis
.counters
float right
.menu-button--active .menu-button--active
@extend .menu-button @extend .menu-button
color #e74c3c color #e74c3c

View File

@@ -72,6 +72,9 @@ class SideNav extends React.Component {
isTrashedActive={isTrashedActive} isTrashedActive={isTrashedActive}
handleStarredButtonClick={(e) => this.handleStarredButtonClick(e)} handleStarredButtonClick={(e) => this.handleStarredButtonClick(e)}
handleTrashedButtonClick={(e) => this.handleTrashedButtonClick(e)} handleTrashedButtonClick={(e) => this.handleTrashedButtonClick(e)}
counterTotalNote={data.noteMap._map.size}
counterStarredNote={data.starredSet._set.size}
counterDelNote={data.trashedSet._set.size}
/> />
<StorageList storageList={storageList} /> <StorageList storageList={storageList} />