From c8256bea3a9fcad295a4206cc7453030ed17f9af Mon Sep 17 00:00:00 2001 From: Paul Rosset Date: Wed, 1 Nov 2017 17:54:35 +0000 Subject: [PATCH 1/3] Add counter on deleted notes --- browser/components/SideNavFilter.js | 3 ++- browser/components/SideNavFilter.styl | 3 +++ browser/main/SideNav/index.js | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/browser/components/SideNavFilter.js b/browser/components/SideNavFilter.js index d6bc7642..e359d817 100644 --- a/browser/components/SideNavFilter.js +++ b/browser/components/SideNavFilter.js @@ -15,7 +15,7 @@ import styles from './SideNavFilter.styl' */ const SideNavFilter = ({ isFolded, isHomeActive, handleAllNotesButtonClick, - isStarredActive, handleStarredButtonClick, isTrashedActive, handleTrashedButtonClick + isStarredActive, handleStarredButtonClick, isTrashedActive, handleTrashedButtonClick, counterDelNote }) => (
) diff --git a/browser/components/SideNavFilter.styl b/browser/components/SideNavFilter.styl index b7fd7dc6..5bf95bf2 100644 --- a/browser/components/SideNavFilter.styl +++ b/browser/components/SideNavFilter.styl @@ -10,6 +10,9 @@ text-align left overflow ellipsis +.counter-notes-trash + float right + .menu-button--active @extend .menu-button color #e74c3c diff --git a/browser/main/SideNav/index.js b/browser/main/SideNav/index.js index d93eb87e..d9c2c12a 100644 --- a/browser/main/SideNav/index.js +++ b/browser/main/SideNav/index.js @@ -72,6 +72,7 @@ class SideNav extends React.Component { isTrashedActive={isTrashedActive} handleStarredButtonClick={(e) => this.handleStarredButtonClick(e)} handleTrashedButtonClick={(e) => this.handleTrashedButtonClick(e)} + counterDelNote={data.trashedSet._set.size === 0 ? null : data.trashedSet._set.size} /> From 875c4512212e4d04cc499c2305dfdf4f77d91388 Mon Sep 17 00:00:00 2001 From: Paul Rosset Date: Thu, 2 Nov 2017 17:03:59 +0000 Subject: [PATCH 2/3] Add Counters on All notes && Starred notes --- browser/components/SideNavFilter.js | 7 +++++-- browser/components/SideNavFilter.styl | 2 +- browser/main/SideNav/index.js | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/browser/components/SideNavFilter.js b/browser/components/SideNavFilter.js index e359d817..df019c7e 100644 --- a/browser/components/SideNavFilter.js +++ b/browser/components/SideNavFilter.js @@ -15,7 +15,8 @@ import styles from './SideNavFilter.styl' */ const SideNavFilter = ({ isFolded, isHomeActive, handleAllNotesButtonClick, - isStarredActive, handleStarredButtonClick, isTrashedActive, handleTrashedButtonClick, counterDelNote + isStarredActive, handleStarredButtonClick, isTrashedActive, handleTrashedButtonClick, counterDelNote, + counterTotalNote, counterStarredNote }) => (
) diff --git a/browser/components/SideNavFilter.styl b/browser/components/SideNavFilter.styl index 5bf95bf2..d2242db2 100644 --- a/browser/components/SideNavFilter.styl +++ b/browser/components/SideNavFilter.styl @@ -10,7 +10,7 @@ text-align left overflow ellipsis -.counter-notes-trash +.counters float right .menu-button--active diff --git a/browser/main/SideNav/index.js b/browser/main/SideNav/index.js index d9c2c12a..60fc28cd 100644 --- a/browser/main/SideNav/index.js +++ b/browser/main/SideNav/index.js @@ -72,6 +72,8 @@ class SideNav extends React.Component { isTrashedActive={isTrashedActive} handleStarredButtonClick={(e) => this.handleStarredButtonClick(e)} handleTrashedButtonClick={(e) => this.handleTrashedButtonClick(e)} + counterTotalNote={data.noteMap._map.size === 0 ? null : data.noteMap._map.size} + counterStarredNote={data.starredSet._set.size === 0 ? null : data.starredSet._set.size} counterDelNote={data.trashedSet._set.size === 0 ? null : data.trashedSet._set.size} /> From ef0b109ad42bd0f52ae56b2e4a1892774204b265 Mon Sep 17 00:00:00 2001 From: Paul Rosset Date: Mon, 6 Nov 2017 09:19:12 +0000 Subject: [PATCH 3/3] Add 0 by default --- browser/main/SideNav/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/browser/main/SideNav/index.js b/browser/main/SideNav/index.js index 60fc28cd..c4a6a56c 100644 --- a/browser/main/SideNav/index.js +++ b/browser/main/SideNav/index.js @@ -72,9 +72,9 @@ class SideNav extends React.Component { isTrashedActive={isTrashedActive} handleStarredButtonClick={(e) => this.handleStarredButtonClick(e)} handleTrashedButtonClick={(e) => this.handleTrashedButtonClick(e)} - counterTotalNote={data.noteMap._map.size === 0 ? null : data.noteMap._map.size} - counterStarredNote={data.starredSet._set.size === 0 ? null : data.starredSet._set.size} - counterDelNote={data.trashedSet._set.size === 0 ? null : data.trashedSet._set.size} + counterTotalNote={data.noteMap._map.size} + counterStarredNote={data.starredSet._set.size} + counterDelNote={data.trashedSet._set.size} />