From 6f837980eb7be2758bbb8f7fe8a1c482e8e9bae5 Mon Sep 17 00:00:00 2001 From: David Bolack Date: Sat, 31 Aug 2024 13:54:52 -0500 Subject: [PATCH 1/6] All Snippet entries that have subsnippets but not generators. --- client/homebrew/editor/snippetbar/snippetbar.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/client/homebrew/editor/snippetbar/snippetbar.jsx b/client/homebrew/editor/snippetbar/snippetbar.jsx index af493c961..0cf5b0cce 100644 --- a/client/homebrew/editor/snippetbar/snippetbar.jsx +++ b/client/homebrew/editor/snippetbar/snippetbar.jsx @@ -70,7 +70,9 @@ const Snippetbar = createClass({ mergeCustomizer : function(oldValue, newValue, key) { if(key == 'snippets') { const result = _.reverse(_.unionBy(_.reverse(newValue), _.reverse(oldValue), 'name')); // Join snippets together, with preference for the child theme over the parent theme - return _.filter(result, 'gen'); //Only keep snippets with a 'gen' property. + return _.filter(result, function(snip) { + return(snip.hasOwnProperty('gen') || snip.hasOwnProperty('subsnippets')); + }); } }, From 53979f2266b1744ac6f54036a6e1f034ea0624f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Sep 2024 03:38:40 +0000 Subject: [PATCH 2/6] Bump eslint-plugin-jest from 28.8.2 to 28.8.3 Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 28.8.2 to 28.8.3. - [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases) - [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/main/CHANGELOG.md) - [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v28.8.2...v28.8.3) --- updated-dependencies: - dependency-name: eslint-plugin-jest dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index f138734cc..ed0cbf1f1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -52,7 +52,7 @@ "devDependencies": { "@stylistic/stylelint-plugin": "^3.0.1", "eslint": "^9.9.1", - "eslint-plugin-jest": "^28.8.2", + "eslint-plugin-jest": "^28.8.3", "eslint-plugin-react": "^7.35.2", "globals": "^15.9.0", "jest": "^29.7.0", @@ -5878,9 +5878,9 @@ } }, "node_modules/eslint-plugin-jest": { - "version": "28.8.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-28.8.2.tgz", - "integrity": "sha512-mC3OyklHmS5i7wYU1rGId9EnxRI8TVlnFG56AE+8U9iRy6zwaNygZR+DsdZuCL0gRG0wVeyzq+uWcPt6yJrrMA==", + "version": "28.8.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-28.8.3.tgz", + "integrity": "sha512-HIQ3t9hASLKm2IhIOqnu+ifw7uLZkIlR7RYNv7fMcEi/p0CIiJmfriStQS2LDkgtY4nyLbIZAD+JL347Yc2ETQ==", "dev": true, "dependencies": { "@typescript-eslint/utils": "^6.0.0 || ^7.0.0 || ^8.0.0" diff --git a/package.json b/package.json index c31e59094..8248f4304 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "devDependencies": { "@stylistic/stylelint-plugin": "^3.0.1", "eslint": "^9.9.1", - "eslint-plugin-jest": "^28.8.2", + "eslint-plugin-jest": "^28.8.3", "eslint-plugin-react": "^7.35.2", "globals": "^15.9.0", "jest": "^29.7.0", From e0be7a5db3ee2363adc928909ce9cd344b300a3d Mon Sep 17 00:00:00 2001 From: Gazook89 Date: Thu, 5 Sep 2024 11:13:08 -0500 Subject: [PATCH 3/6] Move rules out of `body` and into more specific elements --- .../homebrew/pages/vaultPage/vaultPage.less | 43 ++++++++----------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/client/homebrew/pages/vaultPage/vaultPage.less b/client/homebrew/pages/vaultPage/vaultPage.less index 49b988ee4..95e6b4c69 100644 --- a/client/homebrew/pages/vaultPage/vaultPage.less +++ b/client/homebrew/pages/vaultPage/vaultPage.less @@ -1,32 +1,13 @@ -body { - height : 100vh; - - .content { height : 100%; } - - small { - font-size : 10pt; - color : #555555; - - a { color : #333333; } - } - - code { - padding-inline : 5px; - background : lightgrey; - border-radius : 5px; - } - - *:not(input) { user-select : none; } -} - .vaultPage { height : 100%; overflow-y : hidden; background-color : #2C3E50; - + + *:not(input) { user-select : none; } .content { background : #2C3E50; + height: 100%; .dataGroup { width : 100%; @@ -37,11 +18,24 @@ body { position : relative; padding : 50px clamp(20px, 4vw, 50px); + small { + font-size : 10pt; + color : #555555; + + a { color : #333333; } + } + + code { + padding-inline : 5px; + background : lightgrey; + border-radius : 5px; + font-family : monospace; + } + h1, h2, h3, h4 { font-family : 'CodeBold'; letter-spacing : 2px; } - legend { h3 { @@ -144,8 +138,6 @@ body { } } - - #searchButton { position : absolute; right : 20px; @@ -166,7 +158,6 @@ body { overflow-y : auto; font-family : 'BookInsanityRemake'; font-size : 0.34cm; - h3 { font-family : 'Open Sans'; From 5c9c342b10f2965375301c2aaa6aaf8d6bd1a642 Mon Sep 17 00:00:00 2001 From: David Bolack Date: Fri, 6 Sep 2024 01:25:13 -0500 Subject: [PATCH 4/6] Update client/homebrew/editor/snippetbar/snippetbar.jsx Co-authored-by: Trevor Buckner --- client/homebrew/editor/snippetbar/snippetbar.jsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/client/homebrew/editor/snippetbar/snippetbar.jsx b/client/homebrew/editor/snippetbar/snippetbar.jsx index 0cf5b0cce..c91a0bc47 100644 --- a/client/homebrew/editor/snippetbar/snippetbar.jsx +++ b/client/homebrew/editor/snippetbar/snippetbar.jsx @@ -70,9 +70,7 @@ const Snippetbar = createClass({ mergeCustomizer : function(oldValue, newValue, key) { if(key == 'snippets') { const result = _.reverse(_.unionBy(_.reverse(newValue), _.reverse(oldValue), 'name')); // Join snippets together, with preference for the child theme over the parent theme - return _.filter(result, function(snip) { - return(snip.hasOwnProperty('gen') || snip.hasOwnProperty('subsnippets')); - }); + return result.filter(snip.gen || snip.subsnippets); } }, From e5d0051075ea180b423d8386bef395a46eb00c89 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Fri, 6 Sep 2024 15:57:33 -0400 Subject: [PATCH 5/6] Create pull_request_template.md --- .github/pull_request_template.md | 36 ++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .github/pull_request_template.md diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 000000000..b02835726 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,36 @@ + + +## Description + + +## Related Issues or Discussions + +- Closes # + +## QA Instructions, Screenshots, Recordings + +_Please replace this line with instructions on how to test or view your changes, as well as any before/after +images for UI changes._ + +### Reviewer Checklist + +_Please replace the list below with specific features you want reviewers to look at._ + +*Reviewers, refer to this list when testing features, or suggest new items * +- [ ] Verify new features are functional + - [ ] Feature A does X + - [ ] Feature B does Y +- [ ] Verify old features have not broken + - [ ] Feature Z can still be used +- [ ] Test for edge cases / try to break things + - [ ] Feature A handles negative numbers +- [ ] Identify opportunities for simplification and refactoring +- [ ] Check for code legibility and appropriate comments + +
Copy this list From 22678b15afa59b9190863e551cd81c88933e1993 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Fri, 6 Sep 2024 16:35:18 -0400 Subject: [PATCH 6/6] Fix snippet filter --- client/homebrew/editor/snippetbar/snippetbar.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/homebrew/editor/snippetbar/snippetbar.jsx b/client/homebrew/editor/snippetbar/snippetbar.jsx index c91a0bc47..f2680079e 100644 --- a/client/homebrew/editor/snippetbar/snippetbar.jsx +++ b/client/homebrew/editor/snippetbar/snippetbar.jsx @@ -70,7 +70,7 @@ const Snippetbar = createClass({ mergeCustomizer : function(oldValue, newValue, key) { if(key == 'snippets') { const result = _.reverse(_.unionBy(_.reverse(newValue), _.reverse(oldValue), 'name')); // Join snippets together, with preference for the child theme over the parent theme - return result.filter(snip.gen || snip.subsnippets); + return result.filter(snip => snip.gen || snip.subsnippets); } },