From 60bddd0f4159a1aa30ce74db462c6c0315e55674 Mon Sep 17 00:00:00 2001 From: Mo Date: Sun, 27 Feb 2022 17:46:55 -0600 Subject: [PATCH] feat: untagged notes smart view --- app/assets/javascripts/components/Icon.tsx | 4 +++- .../components/Tags/SmartViewsListItem.tsx | 4 ++++ package.json | 4 ++-- yarn.lock | 16 ++++++++-------- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/app/assets/javascripts/components/Icon.tsx b/app/assets/javascripts/components/Icon.tsx index 440f1f450..831dd5dca 100644 --- a/app/assets/javascripts/components/Icon.tsx +++ b/app/assets/javascripts/components/Icon.tsx @@ -26,6 +26,7 @@ import { EyeIcon, EyeOffIcon, HashtagIcon, + HashtagOffIcon, HelpIcon, HistoryIcon, InfoIcon, @@ -85,6 +86,7 @@ const ICONS = { 'chevron-right': ChevronRightIcon, 'cloud-off': CloudOffIcon, 'eye-off': EyeOffIcon, + 'hashtag-off': HashtagOffIcon, 'link-off': LinkOffIcon, 'list-bulleted': ListBulleted, 'lock-filled': LockFilledIcon, @@ -92,8 +94,8 @@ const ICONS = { 'menu-arrow-down': MenuArrowDownIcon, 'menu-arrow-right': MenuArrowRight, 'menu-close': MenuCloseIcon, - 'pencil-off': PencilOffIcon, 'pencil-filled': PencilFilledIcon, + 'pencil-off': PencilOffIcon, 'pin-filled': PinFilledIcon, 'plain-text': PlainTextIcon, 'premium-feature': PremiumFeatureIcon, diff --git a/app/assets/javascripts/components/Tags/SmartViewsListItem.tsx b/app/assets/javascripts/components/Tags/SmartViewsListItem.tsx index cb52f78cc..841c7c540 100644 --- a/app/assets/javascripts/components/Tags/SmartViewsListItem.tsx +++ b/app/assets/javascripts/components/Tags/SmartViewsListItem.tsx @@ -31,6 +31,10 @@ const smartViewIconType = (view: SmartView): IconType => { if (view.uuid === SystemViewId.TrashedNotes) { return 'trash'; } + if (view.uuid === SystemViewId.UntaggedNotes) { + return 'hashtag-off'; + } + return 'hashtag'; }; diff --git a/package.json b/package.json index e5cf44306..7d68cd75d 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "pretty-quick": "^3.1.3", "sass-loader": "^12.6.0", "serve-static": "^1.14.2", - "@standardnotes/stylekit": "5.9.0", + "@standardnotes/stylekit": "5.10.0", "svg-jest": "^1.0.1", "ts-jest": "^27.1.3", "ts-loader": "^9.2.6", @@ -78,7 +78,7 @@ "@reach/tooltip": "^0.16.2", "@standardnotes/components": "1.7.6", "@standardnotes/features": "1.33.1", - "@standardnotes/snjs": "2.65.3", + "@standardnotes/snjs": "2.66.0", "@standardnotes/settings": "^1.11.3", "@standardnotes/sncrypto-web": "1.7.1", "mobx": "^6.4.2", diff --git a/yarn.lock b/yarn.lock index 462ccdce8..60861a5bb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2445,10 +2445,10 @@ buffer "^6.0.3" libsodium-wrappers "^0.7.9" -"@standardnotes/snjs@2.65.3": - version "2.65.3" - resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.65.3.tgz#a5a769c3aabb80623cd62e3f861a865c1f376bf8" - integrity sha512-5kCJ53IKwhdZ9/hWpwmBnJlQ5kVSvAtrqfOf23Y/wHBhBmqSbaME3WtwUcvDS+MNZ1DH2ikv/iGkElAC+aClVw== +"@standardnotes/snjs@2.66.0": + version "2.66.0" + resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.66.0.tgz#ae4dd3def15e6e093bf9f39a677f67b98ca9685a" + integrity sha512-/sJ/9+a/ADhA77/k11liW1NlVkWhiT833euo/uhFDv/lfiZB512w/8Y3pfUrYGBQewBOPV1IqsXk4FH/eiz/GQ== dependencies: "@standardnotes/applications" "^1.1.1" "@standardnotes/auth" "^3.17.1" @@ -2461,10 +2461,10 @@ "@standardnotes/sncrypto-common" "^1.7.1" "@standardnotes/utils" "^1.2.1" -"@standardnotes/stylekit@5.9.0": - version "5.9.0" - resolved "https://registry.yarnpkg.com/@standardnotes/stylekit/-/stylekit-5.9.0.tgz#16d62623335091062238c850a930dedaa5ad6f1d" - integrity sha512-lIlEKwxKkQT+AttSmN40zvzWzfqpfI4VPTscZvRnWRqMQjYDEnSbcA1h0UDcT5tvnrna4RtsOiUL9o0KDx56sg== +"@standardnotes/stylekit@5.10.0": + version "5.10.0" + resolved "https://registry.yarnpkg.com/@standardnotes/stylekit/-/stylekit-5.10.0.tgz#94bc1c6686663b2b89b004eb777a6792a0305f47" + integrity sha512-W0vuqjfN1GD254ZTdlroMgKIQSebuhkJkc5Lh0tWQ5cpQyXrZ3HsHXd3H98PPbP+wtLS34XS5G/PHc7OjD146g== dependencies: "@reach/listbox" "^0.15.0" "@reach/menu-button" "^0.15.1"