From 9ecd53267f79b1725a9d1eb9af5804305b76d4ec Mon Sep 17 00:00:00 2001 From: David Bolack Date: Tue, 29 Apr 2025 19:43:11 -0500 Subject: [PATCH 01/20] Tweak icon height --- client/homebrew/pages/basePages/listPage/brewItem/brewItem.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less index 0d45e8537..6f5e072e5 100644 --- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less +++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less @@ -123,7 +123,7 @@ position : relative; top : 5px; left : -5px; - height : 24px; + height : 1.25em; mix-blend-mode : darken; } } From 6f52b8473f1414967d40b2e799e6a5783de5959b Mon Sep 17 00:00:00 2001 From: David Bolack Date: Wed, 30 Apr 2025 10:38:15 -0500 Subject: [PATCH 02/20] Swap in an svg --- .../basePages/listPage/brewItem/brewItem.jsx | 2 +- client/homebrew/thumbnail.svg | 64 +++++++++++++++++++ themes/assets/naturalCritLogoBlack.svg | 41 ++++++++++++ 3 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 client/homebrew/thumbnail.svg create mode 100644 themes/assets/naturalCritLogoBlack.svg diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx index ef309a613..b4c455b88 100644 --- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx +++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx @@ -5,7 +5,7 @@ const moment = require('moment'); import request from '../../../../utils/request-middleware.js'; const googleDriveIcon = require('../../../../googleDrive.svg'); -const homebreweryIcon = require('../../../../thumbnail.png'); +const homebreweryIcon = require('../../../../thumbnail.svg'); const dedent = require('dedent-tabs').default; const BrewItem = ({ diff --git a/client/homebrew/thumbnail.svg b/client/homebrew/thumbnail.svg new file mode 100644 index 000000000..d9422909d --- /dev/null +++ b/client/homebrew/thumbnail.svg @@ -0,0 +1,64 @@ + + + + + + + NaturalCritLogo + + + + + + + + + NaturalCritLogo + + + + diff --git a/themes/assets/naturalCritLogoBlack.svg b/themes/assets/naturalCritLogoBlack.svg new file mode 100644 index 000000000..0e3135066 --- /dev/null +++ b/themes/assets/naturalCritLogoBlack.svg @@ -0,0 +1,41 @@ + + + + + + NaturalCritLogo + + + + + + + + + NaturalCritLogo + + + + From a9d71078d3bae122ced19671b30d90838407fdc4 Mon Sep 17 00:00:00 2001 From: David Bolack Date: Sat, 10 May 2025 18:52:32 -0500 Subject: [PATCH 03/20] A better look, I think? --- .../pages/basePages/listPage/brewItem/brewItem.less | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less index 6f5e072e5..05a0aaf61 100644 --- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less +++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less @@ -115,15 +115,18 @@ } } .googleDriveIcon { - height : 18px; padding : 0px; margin : -5px; + height : 18px; + width : 20.1406px; } .homebreweryIcon { position : relative; + padding : 0px; top : 5px; - left : -5px; - height : 1.25em; + left : -7.5px; + height : 18px; + width : 20.1406px; mix-blend-mode : darken; } } From ab62f0fcf9b47c298a97f807ace057090d3b9f9f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 May 2025 03:13:55 +0000 Subject: [PATCH 04/20] Bump mongoose from 8.14.2 to 8.14.3 Bumps [mongoose](https://github.com/Automattic/mongoose) from 8.14.2 to 8.14.3. - [Release notes](https://github.com/Automattic/mongoose/releases) - [Changelog](https://github.com/Automattic/mongoose/blob/master/CHANGELOG.md) - [Commits](https://github.com/Automattic/mongoose/compare/8.14.2...8.14.3) --- updated-dependencies: - dependency-name: mongoose dependency-version: 8.14.3 dependency-type: direct:production 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 f0571b473..3c456e997 100644 --- a/package-lock.json +++ b/package-lock.json @@ -45,7 +45,7 @@ "marked-subsuper-text": "^1.0.3", "markedLegacy": "npm:marked@^0.3.19", "moment": "^2.30.1", - "mongoose": "^8.14.2", + "mongoose": "^8.14.3", "nanoid": "5.1.5", "nconf": "^0.13.0", "react": "^18.3.1", @@ -10563,9 +10563,9 @@ } }, "node_modules/mongoose": { - "version": "8.14.2", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.14.2.tgz", - "integrity": "sha512-LPLZiN6M8ap4GlXmaaG7yrHIkK45dSO3NZ0qgERJl2CfcL5eP7MA9umn4zGhKiWkMLbnHM4jhebIYbUhvuwWvQ==", + "version": "8.14.3", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.14.3.tgz", + "integrity": "sha512-BiIQK4mZiStUgnNep1YJMMYTiC4K893+Dj/Sr3lvxXutqy4+yZMVhlHq60xRH3r/l6eXkQXO3tXJnVOE5g592Q==", "license": "MIT", "dependencies": { "bson": "^6.10.3", diff --git a/package.json b/package.json index cee44b933..eca416616 100644 --- a/package.json +++ b/package.json @@ -118,7 +118,7 @@ "marked-subsuper-text": "^1.0.3", "markedLegacy": "npm:marked@^0.3.19", "moment": "^2.30.1", - "mongoose": "^8.14.2", + "mongoose": "^8.14.3", "nanoid": "5.1.5", "nconf": "^0.13.0", "react": "^18.3.1", From eb48d981d6b08d6e807e2e94945ffa6b5d399c70 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 May 2025 14:13:10 +0000 Subject: [PATCH 05/20] Bump supertest from 7.1.0 to 7.1.1 Bumps [supertest](https://github.com/ladjs/supertest) from 7.1.0 to 7.1.1. - [Release notes](https://github.com/ladjs/supertest/releases) - [Commits](https://github.com/ladjs/supertest/compare/v7.1.0...v7.1.1) --- updated-dependencies: - dependency-name: supertest dependency-version: 7.1.1 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 42 +++++------------------------------------- package.json | 2 +- 2 files changed, 6 insertions(+), 38 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3c456e997..f07a2f3c7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -72,7 +72,7 @@ "stylelint": "^16.19.1", "stylelint-config-recess-order": "^6.0.0", "stylelint-config-recommended": "^16.0.0", - "supertest": "^7.1.0" + "supertest": "^7.1.1" }, "engines": { "node": "^20.18.x", @@ -13719,46 +13719,14 @@ } }, "node_modules/supertest": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supertest/-/supertest-7.1.0.tgz", - "integrity": "sha512-5QeSO8hSrKghtcWEoPiO036fxH0Ii2wVQfFZSP0oqQhmjk8bOLhDFXr4JrvaFmPuEWUoq4znY3uSi8UzLKxGqw==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/supertest/-/supertest-7.1.1.tgz", + "integrity": "sha512-aI59HBTlG9e2wTjxGJV+DygfNLgnWbGdZxiA/sgrnNNikIW8lbDvCtF6RnhZoJ82nU7qv7ZLjrvWqCEm52fAmw==", "dev": true, "license": "MIT", "dependencies": { "methods": "^1.1.2", - "superagent": "^9.0.1" - }, - "engines": { - "node": ">=14.18.0" - } - }, - "node_modules/supertest/node_modules/mime": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", - "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", - "dev": true, - "bin": { - "mime": "cli.js" - }, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/supertest/node_modules/superagent": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/superagent/-/superagent-9.0.2.tgz", - "integrity": "sha512-xuW7dzkUpcJq7QnhOsnNUgtYp3xRwpt2F7abdRYIpCsAt0hhUqia0EdxyXZQQpNmGtsCzYHryaKSV3q3GJnq7w==", - "dev": true, - "dependencies": { - "component-emitter": "^1.3.0", - "cookiejar": "^2.1.4", - "debug": "^4.3.4", - "fast-safe-stringify": "^2.1.1", - "form-data": "^4.0.0", - "formidable": "^3.5.1", - "methods": "^1.1.2", - "mime": "2.6.0", - "qs": "^6.11.0" + "superagent": "^10.2.1" }, "engines": { "node": ">=14.18.0" diff --git a/package.json b/package.json index eca416616..a623c3389 100644 --- a/package.json +++ b/package.json @@ -145,6 +145,6 @@ "stylelint": "^16.19.1", "stylelint-config-recess-order": "^6.0.0", "stylelint-config-recommended": "^16.0.0", - "supertest": "^7.1.0" + "supertest": "^7.1.1" } } From c4d6cc4579897af1f0bbff438e0169bb4fa7de94 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 May 2025 03:25:36 +0000 Subject: [PATCH 06/20] Bump marked from 15.0.11 to 15.0.12 Bumps [marked](https://github.com/markedjs/marked) from 15.0.11 to 15.0.12. - [Release notes](https://github.com/markedjs/marked/releases) - [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json) - [Commits](https://github.com/markedjs/marked/compare/v15.0.11...v15.0.12) --- updated-dependencies: - dependency-name: marked dependency-version: 15.0.12 dependency-type: direct:production 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 f07a2f3c7..921fa7341 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,7 +34,7 @@ "jwt-simple": "^0.5.6", "less": "^3.13.1", "lodash": "^4.17.21", - "marked": "15.0.11", + "marked": "15.0.12", "marked-alignment-paragraphs": "^1.0.0", "marked-definition-lists": "^1.0.1", "marked-emoji": "^2.0.0", @@ -10116,9 +10116,9 @@ } }, "node_modules/marked": { - "version": "15.0.11", - "resolved": "https://registry.npmjs.org/marked/-/marked-15.0.11.tgz", - "integrity": "sha512-1BEXAU2euRCG3xwgLVT1y0xbJEld1XOrmRJpUwRCcy7rxhSCwMrmEu9LXoPhHSCJG41V7YcQ2mjKRr5BA3ITIA==", + "version": "15.0.12", + "resolved": "https://registry.npmjs.org/marked/-/marked-15.0.12.tgz", + "integrity": "sha512-8dD6FusOQSrpv9Z1rdNMdlSgQOIP880DHqnohobOmYLElGEqAL/JvxvuxZO16r4HtjTlfPRDC1hbvxC9dPN2nA==", "license": "MIT", "bin": { "marked": "bin/marked.js" diff --git a/package.json b/package.json index a623c3389..8b1604ee2 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,7 @@ "jwt-simple": "^0.5.6", "less": "^3.13.1", "lodash": "^4.17.21", - "marked": "15.0.11", + "marked": "15.0.12", "marked-alignment-paragraphs": "^1.0.0", "marked-definition-lists": "^1.0.1", "marked-emoji": "^2.0.0", From 07adf0342dee525926fd7c182c9c257e32e38b17 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 May 2025 19:56:20 +0000 Subject: [PATCH 07/20] Bump @googleapis/drive from 12.0.0 to 12.1.0 Bumps [@googleapis/drive](https://github.com/googleapis/google-api-nodejs-client) from 12.0.0 to 12.1.0. - [Release notes](https://github.com/googleapis/google-api-nodejs-client/releases) - [Changelog](https://github.com/googleapis/google-api-nodejs-client/blob/main/release-please-config.json) - [Commits](https://github.com/googleapis/google-api-nodejs-client/compare/12.0.0...iam-v12.1.0) --- updated-dependencies: - dependency-name: "@googleapis/drive" dependency-version: 12.1.0 dependency-type: direct:production update-type: version-update:semver-minor ... 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 921fa7341..97e9b3028 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "@babel/preset-env": "^7.27.2", "@babel/preset-react": "^7.27.1", "@babel/runtime": "^7.27.1", - "@googleapis/drive": "^12.0.0", + "@googleapis/drive": "^12.1.0", "body-parser": "^2.2.0", "classnames": "^2.5.1", "codemirror": "^5.65.6", @@ -2030,9 +2030,9 @@ } }, "node_modules/@googleapis/drive": { - "version": "12.0.0", - "resolved": "https://registry.npmjs.org/@googleapis/drive/-/drive-12.0.0.tgz", - "integrity": "sha512-bAZ82QKSuvzT4UNuuistEJCGjYCGcDYo2WsZ8S7KmN/gaHs2oz5U07/y/ITbzganqMtvXw7B6YG1f76k7F8+0Q==", + "version": "12.1.0", + "resolved": "https://registry.npmjs.org/@googleapis/drive/-/drive-12.1.0.tgz", + "integrity": "sha512-Y5JyrpjHxdo4uJTr/7MLE5NXpBjdU6JBOVWgMcLH7HdqwiZx9QTv+YloQ5SwExMlfDWcOEHmzMcyYWv4HoVtSA==", "license": "Apache-2.0", "dependencies": { "googleapis-common": "^7.0.0" diff --git a/package.json b/package.json index 8b1604ee2..89043e10d 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "@babel/preset-env": "^7.27.2", "@babel/preset-react": "^7.27.1", "@babel/runtime": "^7.27.1", - "@googleapis/drive": "^12.0.0", + "@googleapis/drive": "^12.1.0", "body-parser": "^2.2.0", "classnames": "^2.5.1", "codemirror": "^5.65.6", From dbb67113b93729b3d912c3e8ed4b04fa8a828957 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 May 2025 00:18:55 +0000 Subject: [PATCH 08/20] Bump eslint from 9.26.0 to 9.27.0 Bumps [eslint](https://github.com/eslint/eslint) from 9.26.0 to 9.27.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v9.26.0...v9.27.0) --- updated-dependencies: - dependency-name: eslint dependency-version: 9.27.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 132 ++++++++-------------------------------------- package.json | 2 +- 2 files changed, 22 insertions(+), 112 deletions(-) diff --git a/package-lock.json b/package-lock.json index 97e9b3028..cd35aa72c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -61,7 +61,7 @@ "devDependencies": { "@stylistic/stylelint-plugin": "^3.1.2", "babel-plugin-transform-import-meta": "^2.3.2", - "eslint": "^9.26.0", + "eslint": "^9.27.0", "eslint-plugin-jest": "^28.11.0", "eslint-plugin-react": "^7.37.5", "globals": "^16.1.0", @@ -1946,9 +1946,9 @@ } }, "node_modules/@eslint/core": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.13.0.tgz", - "integrity": "sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw==", + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.14.0.tgz", + "integrity": "sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -1996,13 +1996,16 @@ } }, "node_modules/@eslint/js": { - "version": "9.26.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.26.0.tgz", - "integrity": "sha512-I9XlJawFdSMvWjDt6wksMCrgns5ggLNfFwFvnShsleWruvXM514Qxk8V246efTw+eo9JABvVz+u3q2RiAowKxQ==", + "version": "9.27.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.27.0.tgz", + "integrity": "sha512-G5JD9Tu5HJEu4z2Uo4aHY2sLV64B7CDMXxFzqzjl3NKd6RVzSXNoE80jk7Y0lJkTTkjiIhBAqmlYwjuBY3tvpA==", "dev": true, "license": "MIT", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://eslint.org/donate" } }, "node_modules/@eslint/object-schema": { @@ -2016,13 +2019,13 @@ } }, "node_modules/@eslint/plugin-kit": { - "version": "0.2.8", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.8.tgz", - "integrity": "sha512-ZAoA40rNMPwSm+AeHpCq8STiNAwzWLJuP8Xv4CHIc9wv/PSuExjMrmjfYNj682vW0OOiZ1HKxzvjQr9XZIisQA==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.1.tgz", + "integrity": "sha512-0J+zgWxHN+xXONWIyPWKFMgVuJoZuGiIFu8yxk7RJjxkzpGmyja5wRFqZIVtjDVOQpV+Rw0iOAjYPE2eQyjr0w==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@eslint/core": "^0.13.0", + "@eslint/core": "^0.14.0", "levn": "^0.4.1" }, "engines": { @@ -2796,28 +2799,6 @@ "ieee754": "^1.2.1" } }, - "node_modules/@modelcontextprotocol/sdk": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.11.0.tgz", - "integrity": "sha512-k/1pb70eD638anoi0e8wUGAlbMJXyvdV4p62Ko+EZ7eBe1xMx8Uhak1R5DgfoofsK5IBBnRwsYGTaLZl+6/+RQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "content-type": "^1.0.5", - "cors": "^2.8.5", - "cross-spawn": "^7.0.3", - "eventsource": "^3.0.2", - "express": "^5.0.1", - "express-rate-limit": "^7.5.0", - "pkce-challenge": "^5.0.0", - "raw-body": "^3.0.0", - "zod": "^3.23.8", - "zod-to-json-schema": "^3.24.1" - }, - "engines": { - "node": ">=18" - } - }, "node_modules/@mongodb-js/saslprep": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.2.2.tgz", @@ -5798,9 +5779,9 @@ "license": "MIT" }, "node_modules/eslint": { - "version": "9.26.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.26.0.tgz", - "integrity": "sha512-Hx0MOjPh6uK9oq9nVsATZKE/Wlbai7KFjfCuw9UHaguDW3x+HF0O5nIi3ud39TWgrTjTO5nHxmL3R1eANinWHQ==", + "version": "9.27.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.27.0.tgz", + "integrity": "sha512-ixRawFQuMB9DZ7fjU3iGGganFDp3+45bPOdaRurcFHSXO1e/sYwUX/FtQZpLZJR6SjMoJH8hR2pPEAfDyCoU2Q==", "dev": true, "license": "MIT", "dependencies": { @@ -5808,14 +5789,13 @@ "@eslint-community/regexpp": "^4.12.1", "@eslint/config-array": "^0.20.0", "@eslint/config-helpers": "^0.2.1", - "@eslint/core": "^0.13.0", + "@eslint/core": "^0.14.0", "@eslint/eslintrc": "^3.3.1", - "@eslint/js": "9.26.0", - "@eslint/plugin-kit": "^0.2.8", + "@eslint/js": "9.27.0", + "@eslint/plugin-kit": "^0.3.1", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.4.2", - "@modelcontextprotocol/sdk": "^1.8.0", "@types/estree": "^1.0.6", "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", @@ -5839,8 +5819,7 @@ "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", - "optionator": "^0.9.3", - "zod": "^3.24.2" + "optionator": "^0.9.3" }, "bin": { "eslint": "bin/eslint.js" @@ -6153,29 +6132,6 @@ "node": ">=0.4.x" } }, - "node_modules/eventsource": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-3.0.6.tgz", - "integrity": "sha512-l19WpE2m9hSuyP06+FbuUUf1G+R0SFLrtQfbRb9PRr+oimOfxQhgGCbVaXg5IvZyyTThJsxh6L/srkMiCeBPDA==", - "dev": true, - "license": "MIT", - "dependencies": { - "eventsource-parser": "^3.0.1" - }, - "engines": { - "node": ">=18.0.0" - } - }, - "node_modules/eventsource-parser": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/eventsource-parser/-/eventsource-parser-3.0.1.tgz", - "integrity": "sha512-VARTJ9CYeuQYb0pZEPbzi740OWFgpHe7AYJ2WFZVnUDUQp5Dk2yJUgF36YsZ81cOyxT0QxmXD2EQpapAouzWVA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18.0.0" - } - }, "node_modules/evp_bytestokey": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", @@ -6323,22 +6279,6 @@ "integrity": "sha512-rCSVtPXRmQSW8rmik/AIb2P0op6l7r1fMW538yyvTMltCO4xQEWMmobfrIxN2V1/mVrgxB8Az3reYF6yUZw37w==", "license": "MIT" }, - "node_modules/express-rate-limit": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.5.0.tgz", - "integrity": "sha512-eB5zbQh5h+VenMPM3fh+nw1YExi5nMr6HUCR62ELSP11huvxm/Uir1H1QEyTkk5QX6A58pX6NmaTMceKZ0Eodg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 16" - }, - "funding": { - "url": "https://github.com/sponsors/express-rate-limit" - }, - "peerDependencies": { - "express": "^4.11 || 5 || ^5.0.0-beta.1" - } - }, "node_modules/express-static-gzip": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/express-static-gzip/-/express-static-gzip-2.2.0.tgz", @@ -11509,16 +11449,6 @@ "node": ">= 6" } }, - "node_modules/pkce-challenge": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/pkce-challenge/-/pkce-challenge-5.0.0.tgz", - "integrity": "sha512-ueGLflrrnvwB3xuo/uGob5pd5FN7l0MsLf0Z87o/UQmRtwjvfylfc9MurIxRAWywCYTgrvpXBcqjV4OfCYGCIQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=16.20.0" - } - }, "node_modules/pkg-dir": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", @@ -15315,26 +15245,6 @@ "funding": { "url": "https://github.com/sponsors/sindresorhus" } - }, - "node_modules/zod": { - "version": "3.24.4", - "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.4.tgz", - "integrity": "sha512-OdqJE9UDRPwWsrHjLN2F8bPxvwJBK22EHLWtanu0LSYr5YqzsaaW3RMgmjwr8Rypg5k+meEJdSPXJZXE/yqOMg==", - "dev": true, - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/colinhacks" - } - }, - "node_modules/zod-to-json-schema": { - "version": "3.24.5", - "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.24.5.tgz", - "integrity": "sha512-/AuWwMP+YqiPbsJx5D6TfgRTc4kTLjsh5SOcd4bLsfUg2RcEXrFMJl1DGgdHy2aCfsIA/cr/1JM0xcB2GZji8g==", - "dev": true, - "license": "ISC", - "peerDependencies": { - "zod": "^3.24.1" - } } } } diff --git a/package.json b/package.json index 89043e10d..cb05470cf 100644 --- a/package.json +++ b/package.json @@ -134,7 +134,7 @@ "devDependencies": { "@stylistic/stylelint-plugin": "^3.1.2", "babel-plugin-transform-import-meta": "^2.3.2", - "eslint": "^9.26.0", + "eslint": "^9.27.0", "eslint-plugin-jest": "^28.11.0", "eslint-plugin-react": "^7.37.5", "globals": "^16.1.0", From 1efe570daeac533cdb44a3373c963df422ce8b77 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Thu, 22 May 2025 14:30:15 -0400 Subject: [PATCH 09/20] Up version to 3.19.0 --- changelog.md | 62 +++++++++++++++++++++++++++++++++++++++++------ package-lock.json | 4 +-- package.json | 2 +- 3 files changed, 57 insertions(+), 11 deletions(-) diff --git a/changelog.md b/changelog.md index f560ce1e5..5c3a3cb34 100644 --- a/changelog.md +++ b/changelog.md @@ -88,24 +88,70 @@ pre { ## changelog For a full record of development, visit our [Github Page](https://github.com/naturalcrit/homebrewery). -### Tuesday 03/18/2025 - v3.18.1 +### Thursday 05/22/2025 - v3.19.0 {{taskList +##### abquintic +* [x] Fix crash due to colons after `\page` + +Fixes issue [#4105](https://github.com/naturalcrit/homebrewery/issues/4105) + +* [x] Fix images with spaces in alt text not rendering + +Fixes issue [#3659](https://github.com/naturalcrit/homebrewery/issues/3659) + +* [x] Custom snippets! Open the new {{openSans **:fas_table_list: SNIPPETS**}} tab (next to the {{openSans **:fas_paintbrush: STYLE**}} tab). Custom snippets will appear in a new snippet dropdown, and will be included when imported as a custom theme. + +* [x] Move several generic styles/snippets from PHB to the Blank theme; generic snippets like image masks no longer require the PHB theme. + +* [x] Extract several Markdown+ syntax extensions into their own NPM packages, for use by the wider community. + +* [x] Allow `\pagebreak` and `\columnbreak` as alternatives to `\page` and `\column` + +Partially fixes issue [#4035](https://github.com/naturalcrit/homebrewery/issues/4035) + +* [x] Fix misbehaving column breaks on old Chrome + +Fixes issue [#4192](https://github.com/naturalcrit/homebrewery/issues/4192) + +* [x] Self-host font-awesome icons; fix missing icons on local installs + +Fixes issue [#1965](https://github.com/naturalcrit/homebrewery/issues/1965) +Fixes issue [#1548](https://github.com/naturalcrit/homebrewery/issues/1548) + ##### G-Ambatte -* [x] Revert colon rendering from br elements to blank divs +* [x] Fix CORS issue on local installs + +* [x] Fix print size issues when using the Facing and Flow view options. + +Fixes issue [#4146](https://github.com/naturalcrit/homebrewery/issues/4146) + +* [x] New built-in `$[HB_pageNumber]` variable. Works with math operations or can be reassigned like any other variable for more customization over the old `{{pageNumber,auto}}` snippet.\ +New snippet found at {{openSans **:fas_pencil: TEXT EDITOR :fas_arrow_right: :fas_bookmark: PAGE NUMBERING :fas_arrow_right: :fas_arrow_down_1_9: VARIABLE AUTO PAGE NUMBER**}} ##### 5e-Cleric -* [x] Allow for local connections within a same network when running a local version -Fixes issue [#4094](https://github.com/naturalcrit/homebrewery/issues/4094) +* [x] Fix search bar covering up snippet bar + +Fixes issue [#4098](https://github.com/naturalcrit/homebrewery/issues/4098) + +* [x] Save view toolbar settings across sessions + +Fixes issue [#3835](https://github.com/naturalcrit/homebrewery/issues/3835) + +* [x] Fix styling issues on the view toolbar + +* [x] Update the Darkbrewery editor theme + +Fixes issue [#3312](https://github.com/naturalcrit/homebrewery/issues/3312) -* [x] Add US Letter size page snippet -Fixes issue [#3893](https://github.com/naturalcrit/homebrewery/issues/3893) }} +\page + ### Monday 03/10/2025 - v3.18.0 {{taskList -##### dbolack +##### abquintic * [x] Add ability to paste in any Share ID/URL into a brew's {{openSans :fas_circle_info: **Properties** :fas_arrow_right: **THEMES**}} selection, as long as that brew has been tagged as `meta:theme`. You can now share your custom brew themes without needing to make a personal copy. * [x] Begin migration of custom Markdown extensions into their own NPM packages, for easier adoption by other users or projects * [x] Fix external HTML appearing in open codeblocks @@ -167,7 +213,7 @@ Fixes issue [#4073](https://github.com/naturalcrit/homebrewery/issues/4073) * [x] Fix Reddit link crash when title has non-latin chars -##### dbolack +##### abquintic * [x] Fix page shadows toolbar option diff --git a/package-lock.json b/package-lock.json index 97e9b3028..99fe56c2d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "homebrewery", - "version": "3.18.1", + "version": "3.19.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "homebrewery", - "version": "3.18.1", + "version": "3.19.0", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 89043e10d..003481fb4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "homebrewery", "description": "Create authentic looking D&D homebrews using only markdown", - "version": "3.18.1", + "version": "3.19.0", "type": "module", "engines": { "npm": "^10.8.x", From b07f75ac3622de015a45a3a5182623532bfb11c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 May 2025 18:33:03 +0000 Subject: [PATCH 10/20] Bump mongoose from 8.14.3 to 8.15.0 Bumps [mongoose](https://github.com/Automattic/mongoose) from 8.14.3 to 8.15.0. - [Release notes](https://github.com/Automattic/mongoose/releases) - [Changelog](https://github.com/Automattic/mongoose/blob/master/CHANGELOG.md) - [Commits](https://github.com/Automattic/mongoose/compare/8.14.3...8.15.0) --- updated-dependencies: - dependency-name: mongoose dependency-version: 8.15.0 dependency-type: direct:production update-type: version-update:semver-minor ... 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 a49568453..5ffc3b216 100644 --- a/package-lock.json +++ b/package-lock.json @@ -45,7 +45,7 @@ "marked-subsuper-text": "^1.0.3", "markedLegacy": "npm:marked@^0.3.19", "moment": "^2.30.1", - "mongoose": "^8.14.3", + "mongoose": "^8.15.0", "nanoid": "5.1.5", "nconf": "^0.13.0", "react": "^18.3.1", @@ -10503,9 +10503,9 @@ } }, "node_modules/mongoose": { - "version": "8.14.3", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.14.3.tgz", - "integrity": "sha512-BiIQK4mZiStUgnNep1YJMMYTiC4K893+Dj/Sr3lvxXutqy4+yZMVhlHq60xRH3r/l6eXkQXO3tXJnVOE5g592Q==", + "version": "8.15.0", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.15.0.tgz", + "integrity": "sha512-WFKsY1q12ScGabnZWUB9c/QzZmz/ESorrV27OembB7Gz6rrh9m3GA4Srsv1uvW1s9AHO5DeZ6DdUTyF9zyNERQ==", "license": "MIT", "dependencies": { "bson": "^6.10.3", diff --git a/package.json b/package.json index 0a24b9916..4995421ef 100644 --- a/package.json +++ b/package.json @@ -118,7 +118,7 @@ "marked-subsuper-text": "^1.0.3", "markedLegacy": "npm:marked@^0.3.19", "moment": "^2.30.1", - "mongoose": "^8.14.3", + "mongoose": "^8.15.0", "nanoid": "5.1.5", "nconf": "^0.13.0", "react": "^18.3.1", From eabff4f6b2cbe1a68f7b8343813cac349ad627cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 May 2025 18:40:45 +0000 Subject: [PATCH 11/20] Bump express-static-gzip from 2.2.0 to 3.0.0 Bumps [express-static-gzip](https://github.com/tkoenig89/express-static-gzip) from 2.2.0 to 3.0.0. - [Release notes](https://github.com/tkoenig89/express-static-gzip/releases) - [Commits](https://github.com/tkoenig89/express-static-gzip/compare/v2.2.0...v3.0.0) --- updated-dependencies: - dependency-name: express-static-gzip dependency-version: 3.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package-lock.json | 183 +++++++++++++++++++--------------------------- package.json | 2 +- 2 files changed, 76 insertions(+), 109 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5ffc3b216..581bd5b30 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,7 +27,7 @@ "expr-eval": "^2.0.2", "express": "^5.1.0", "express-async-handler": "^1.2.0", - "express-static-gzip": "2.2.0", + "express-static-gzip": "3.0.0", "fs-extra": "11.3.0", "idb-keyval": "^6.2.2", "js-yaml": "^4.1.0", @@ -5365,16 +5365,6 @@ "minimalistic-assert": "^1.0.0" } }, - "node_modules/destroy": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", - "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", - "license": "MIT", - "engines": { - "node": ">= 0.8", - "npm": "1.2.8000 || >= 1.4.16" - } - }, "node_modules/detect-newline": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", @@ -6280,13 +6270,35 @@ "license": "MIT" }, "node_modules/express-static-gzip": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/express-static-gzip/-/express-static-gzip-2.2.0.tgz", - "integrity": "sha512-4ZQ0pHX0CAauxmzry2/8XFLM6aZA4NBvg9QezSlsEO1zLnl7vMFa48/WIcjzdfOiEUS4S1npPPKP2NHHYAp6qg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/express-static-gzip/-/express-static-gzip-3.0.0.tgz", + "integrity": "sha512-36O10S0asHl3QojOBQQ0ZjXNtElmhgPS6erSUCCZymXkB/CK1mnGqOj4BTJN+FYRDIzVFnzo3wLFCZJvAk6rQQ==", "license": "MIT", "dependencies": { + "mime-types": "^3.0.1", "parseurl": "^1.3.3", - "serve-static": "^1.16.2" + "serve-static": "^2.2.0" + } + }, + "node_modules/express-static-gzip/node_modules/mime-db": { + "version": "1.54.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz", + "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/express-static-gzip/node_modules/mime-types": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz", + "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==", + "license": "MIT", + "dependencies": { + "mime-db": "^1.54.0" + }, + "engines": { + "node": ">= 0.6" } }, "node_modules/express/node_modules/cookie-signature": { @@ -6298,15 +6310,6 @@ "node": ">=6.6.0" } }, - "node_modules/express/node_modules/fresh": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz", - "integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==", - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, "node_modules/express/node_modules/mime-db": { "version": "1.54.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz", @@ -6328,43 +6331,6 @@ "node": ">= 0.6" } }, - "node_modules/express/node_modules/send": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/send/-/send-1.2.0.tgz", - "integrity": "sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw==", - "license": "MIT", - "dependencies": { - "debug": "^4.3.5", - "encodeurl": "^2.0.0", - "escape-html": "^1.0.3", - "etag": "^1.8.1", - "fresh": "^2.0.0", - "http-errors": "^2.0.0", - "mime-types": "^3.0.1", - "ms": "^2.1.3", - "on-finished": "^2.4.1", - "range-parser": "^1.2.1", - "statuses": "^2.0.1" - }, - "engines": { - "node": ">= 18" - } - }, - "node_modules/express/node_modules/serve-static": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.0.tgz", - "integrity": "sha512-61g9pCh0Vnh7IutZjtLGGpTA355+OPn2TyDv/6ivP2h/AdAVX9azsoxmg2/M6nZeQZNYBEwIcsne1mJd9oQItQ==", - "license": "MIT", - "dependencies": { - "encodeurl": "^2.0.0", - "escape-html": "^1.0.3", - "parseurl": "^1.3.3", - "send": "^1.2.0" - }, - "engines": { - "node": ">= 18" - } - }, "node_modules/extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", @@ -6680,12 +6646,12 @@ } }, "node_modules/fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz", + "integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==", "license": "MIT", "engines": { - "node": ">= 0.6" + "node": ">= 0.8" } }, "node_modules/fs-extra": { @@ -10296,6 +10262,7 @@ "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", "license": "MIT", + "optional": true, "bin": { "mime": "cli.js" }, @@ -12494,61 +12461,61 @@ } }, "node_modules/send": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", - "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/send/-/send-1.2.0.tgz", + "integrity": "sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw==", + "license": "MIT", "dependencies": { - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "mime": "1.6.0", - "ms": "2.1.3", - "on-finished": "2.4.1", - "range-parser": "~1.2.1", - "statuses": "2.0.1" + "debug": "^4.3.5", + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "etag": "^1.8.1", + "fresh": "^2.0.0", + "http-errors": "^2.0.0", + "mime-types": "^3.0.1", + "ms": "^2.1.3", + "on-finished": "^2.4.1", + "range-parser": "^1.2.1", + "statuses": "^2.0.1" }, "engines": { - "node": ">= 0.8.0" + "node": ">= 18" } }, - "node_modules/send/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/send/node_modules/debug/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" - }, - "node_modules/send/node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "node_modules/send/node_modules/mime-db": { + "version": "1.54.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz", + "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==", + "license": "MIT", "engines": { - "node": ">= 0.8" + "node": ">= 0.6" + } + }, + "node_modules/send/node_modules/mime-types": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz", + "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==", + "license": "MIT", + "dependencies": { + "mime-db": "^1.54.0" + }, + "engines": { + "node": ">= 0.6" } }, "node_modules/serve-static": { - "version": "1.16.2", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", - "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.0.tgz", + "integrity": "sha512-61g9pCh0Vnh7IutZjtLGGpTA355+OPn2TyDv/6ivP2h/AdAVX9azsoxmg2/M6nZeQZNYBEwIcsne1mJd9oQItQ==", + "license": "MIT", "dependencies": { - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "parseurl": "~1.3.3", - "send": "0.19.0" + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "parseurl": "^1.3.3", + "send": "^1.2.0" }, "engines": { - "node": ">= 0.8.0" + "node": ">= 18" } }, "node_modules/set-cookie-parser": { diff --git a/package.json b/package.json index 4995421ef..10db28857 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,7 @@ "expr-eval": "^2.0.2", "express": "^5.1.0", "express-async-handler": "^1.2.0", - "express-static-gzip": "2.2.0", + "express-static-gzip": "3.0.0", "fs-extra": "11.3.0", "idb-keyval": "^6.2.2", "js-yaml": "^4.1.0", From 5eecb5ea2008feaa10cb4ef0ce9e7a9ae5697976 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Thu, 22 May 2025 15:01:38 -0400 Subject: [PATCH 12/20] Remove unnecessary properties --- .../pages/basePages/listPage/brewItem/brewItem.less | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less index 3d2c9ab74..d335f3ca9 100644 --- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less +++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less @@ -118,15 +118,12 @@ padding : 0px; margin : -5px; height : 18px; - width : 20.1406px; } .homebreweryIcon { - position : relative; - padding : 0px; - top : 5px; - left : -7.5px; - height : 18px; - width : 20.1406px; - mix-blend-mode : darken; + position : relative; + padding : 0px; + top : 5px; + left : -7.5px; + height : 18px; } } From 03527a1f95dd2bf29c46eadd3786267f5071a60f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Thu, 22 May 2025 22:35:26 +0200 Subject: [PATCH 13/20] fix it damn it --- client/homebrew/editor/editor.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/homebrew/editor/editor.less b/client/homebrew/editor/editor.less index 372d8b302..d37c076ca 100644 --- a/client/homebrew/editor/editor.less +++ b/client/homebrew/editor/editor.less @@ -5,7 +5,7 @@ height : 100%; container : editor / inline-size; .codeEditor { - height : 100%; + height : calc(100% - 25px); .CodeMirror { height : 100%; } .pageLine, .snippetLine { background : #33333328; @@ -111,6 +111,6 @@ } @container editor (width < 683px) { - .editor .codeEditor .CodeMirror { height : calc(100% - 51px);} - .homePage .editor .codeEditor .CodeMirror { height : calc(100% - 25px);} + .editor .codeEditor { height : calc(100% - 51px);} + .homePage .editor .codeEditor { height : calc(100% - 25px);} } \ No newline at end of file From 9adf6dee619f761fad16a6d868a28ada38dd568d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Thu, 22 May 2025 23:29:08 +0200 Subject: [PATCH 14/20] use js for it --- client/homebrew/editor/editor.jsx | 19 +++++++++++++------ client/homebrew/editor/editor.less | 5 ----- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/client/homebrew/editor/editor.jsx b/client/homebrew/editor/editor.jsx index cf9a17303..8d331e46e 100644 --- a/client/homebrew/editor/editor.jsx +++ b/client/homebrew/editor/editor.jsx @@ -14,7 +14,6 @@ const EDITOR_THEME_KEY = 'HOMEBREWERY-EDITOR-THEME'; const PAGEBREAK_REGEX_V3 = /^(?=\\page(?:break)?(?: *{[^\n{}]*})?$)/m; const SNIPPETBREAK_REGEX_V3 = /^\\snippet\ .*$/; -const SNIPPETBAR_HEIGHT = 25; const DEFAULT_STYLE_TEXT = dedent` /*=======--- Example CSS styling ---=======*/ /* Any CSS here will apply to your document! */ @@ -60,8 +59,9 @@ const Editor = createClass({ }, getInitialState : function() { return { - editorTheme : this.props.editorTheme, - view : 'text' //'text', 'style', 'meta', 'snippet' + editorTheme : this.props.editorTheme, + view : 'text', //'text', 'style', 'meta', 'snippet' + snippetbarHeight : 25 }; }, @@ -88,6 +88,7 @@ const Editor = createClass({ editorTheme : editorTheme }); } + this.setState({ snippetbarHeight: document.querySelector('.editor > .snippetBar').offsetHeight }); }, componentDidUpdate : function(prevProps, prevState, snapshot) { @@ -412,6 +413,9 @@ const Editor = createClass({ //Called when there are changes to the editor's dimensions update : function(){ this.codeEditor.current?.updateSize(); + const snipHeight = document.querySelector('.editor > .snippetBar').offsetHeight; + if(snipHeight !== this.state.snippetbarHeight) + this.setState({ snippetbarHeight: snipHeight }); }, updateEditorTheme : function(newTheme){ @@ -436,7 +440,8 @@ const Editor = createClass({ value={this.props.brew.text} onChange={this.props.onTextChange} editorTheme={this.state.editorTheme} - rerenderParent={this.rerenderParent} /> + rerenderParent={this.rerenderParent} + style={{ height: `calc(100% - ${this.state.snippetbarHeight}px)` }} /> ; } if(this.isStyle()){ @@ -449,7 +454,8 @@ const Editor = createClass({ onChange={this.props.onStyleChange} enableFolding={true} editorTheme={this.state.editorTheme} - rerenderParent={this.rerenderParent} /> + rerenderParent={this.rerenderParent} + style={{ height: `calc(100% - ${this.state.snippetbarHeight}px)` }} /> ; } if(this.isMeta()){ @@ -478,7 +484,8 @@ const Editor = createClass({ onChange={this.props.onSnipChange} enableFolding={true} editorTheme={this.state.editorTheme} - rerenderParent={this.rerenderParent} /> + rerenderParent={this.rerenderParent} + style={{ height: `calc(100% - ${this.state.snippetbarHeight}px)` }} /> ; } }, diff --git a/client/homebrew/editor/editor.less b/client/homebrew/editor/editor.less index d37c076ca..fb5891fbe 100644 --- a/client/homebrew/editor/editor.less +++ b/client/homebrew/editor/editor.less @@ -108,9 +108,4 @@ span { padding : 2px 5px; } } -} - -@container editor (width < 683px) { - .editor .codeEditor { height : calc(100% - 51px);} - .homePage .editor .codeEditor { height : calc(100% - 25px);} } \ No newline at end of file From 6748639ec5010a91e53e75faf1a4767913b05d9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Thu, 22 May 2025 23:35:00 +0200 Subject: [PATCH 15/20] remove dumb console log from another pr --- client/homebrew/brewRenderer/brewRenderer.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx index 16bd5adb0..c391d8c43 100644 --- a/client/homebrew/brewRenderer/brewRenderer.jsx +++ b/client/homebrew/brewRenderer/brewRenderer.jsx @@ -119,7 +119,6 @@ const BrewRenderer = (props)=>{ //useEffect to store or gather toolbar state from storage useEffect(()=>{ const toolbarState = JSON.parse(window.localStorage.getItem('hb_toolbarState')); - console.log('toolbar state:', toolbarState); toolbarState && setDisplayOptions(toolbarState); }, []); From 6960beb739c8a5be15775bf1919543e64ad40f7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Thu, 22 May 2025 23:35:26 +0200 Subject: [PATCH 16/20] updating changelog to reflect reality --- changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index 5c3a3cb34..3a5e37489 100644 --- a/changelog.md +++ b/changelog.md @@ -130,7 +130,7 @@ Fixes issue [#4146](https://github.com/naturalcrit/homebrewery/issues/4146) New snippet found at {{openSans **:fas_pencil: TEXT EDITOR :fas_arrow_right: :fas_bookmark: PAGE NUMBERING :fas_arrow_right: :fas_arrow_down_1_9: VARIABLE AUTO PAGE NUMBER**}} ##### 5e-Cleric -* [x] Fix search bar covering up snippet bar +* [x] Fix search bar covering up snippet bar (3 times) Fixes issue [#4098](https://github.com/naturalcrit/homebrewery/issues/4098) From 8de738a14658ebdda0654b2acaa9076d5f18fa54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Fri, 23 May 2025 00:20:32 +0200 Subject: [PATCH 17/20] initial commit --- client/admin/admin.less | 1 + 1 file changed, 1 insertion(+) diff --git a/client/admin/admin.less b/client/admin/admin.less index 1955f8a93..0fc353194 100644 --- a/client/admin/admin.less +++ b/client/admin/admin.less @@ -3,6 +3,7 @@ @import 'naturalcrit/styles/animations.less'; @import 'naturalcrit/styles/colors.less'; @import 'naturalcrit/styles/tooltip.less'; +@import './themes/fonts/iconFonts/fontAwesome.less'; @import 'font-awesome/css/font-awesome.css'; From bbb812cb0665eafd0370524d59315c07e36d5b51 Mon Sep 17 00:00:00 2001 From: David Bolack Date: Sun, 25 May 2025 08:07:50 -0500 Subject: [PATCH 18/20] Clone snippets --- server/app.js | 1 + 1 file changed, 1 insertion(+) diff --git a/server/app.js b/server/app.js index 90d2b8e94..7b12baacd 100644 --- a/server/app.js +++ b/server/app.js @@ -404,6 +404,7 @@ app.get('/new/:id', asyncHandler(getBrew('share')), asyncHandler(async(req, res, renderer : req.brew.renderer, theme : req.brew.theme, tags : req.brew.tags, + snippets : req.brew.snippets }; req.brew = _.defaults(brew, DEFAULT_BREW); From d5dbe0b4bac8185b68da79a39411548ecc0f2f0a Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Fri, 20 Jun 2025 17:53:08 -0400 Subject: [PATCH 19/20] Update error-navitem.jsx --- client/homebrew/navbar/error-navitem.jsx | 25 ++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/client/homebrew/navbar/error-navitem.jsx b/client/homebrew/navbar/error-navitem.jsx index 3de26ca56..ec72ace7d 100644 --- a/client/homebrew/navbar/error-navitem.jsx +++ b/client/homebrew/navbar/error-navitem.jsx @@ -23,14 +23,15 @@ const ErrorNavItem = createClass({ const error = this.props.error; const response = error.response; - const status = response.status; - const HBErrorCode = response.body?.HBErrorCode; - const message = response.body?.message; + const status = response?.status; + const errorCode = error.code + const HBErrorCode = response?.body?.HBErrorCode; + const message = response?.body?.message; let errMsg = ''; try { errMsg += `${error.toString()}\n\n`; errMsg += `\`\`\`\n${error.stack}\n`; - errMsg += `${JSON.stringify(response.error, null, ' ')}\n\`\`\``; + errMsg += `${JSON.stringify(response?.error, null, ' ')}\n\`\`\``; console.log(errMsg); } catch (e){} @@ -73,7 +74,7 @@ const ErrorNavItem = createClass({ ; } - if(response.body?.errors?.[0].reason == 'storageQuotaExceeded') { + if(response?.body?.errors?.[0].reason == 'storageQuotaExceeded') { return Oops!
@@ -82,7 +83,7 @@ const ErrorNavItem = createClass({ ; } - if(response.req.url.match(/^\/api.*Google.*$/m)){ + if(response?.req.url.match(/^\/api.*Google.*$/m)){ return Oops!
@@ -129,6 +130,18 @@ const ErrorNavItem = createClass({ ; } + if(errorCode === 'ECONNABORTED') { + return + Oops! +
+ The request to the server was interrupted or timed out. + This can happen due to a network issue, or if + trying to save a particularly large brew. + Please check your internet connection and try again. +
+ ; + } + return Oops!
From 862fa7de890161bc31b0f42ccbaa0e5cc016174a Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Tue, 24 Jun 2025 17:44:22 -0400 Subject: [PATCH 20/20] Don't send full text back to client on save We return the stub after saving. When saving to HB MongoDB, the stub also includes the full text. This does not need to be sent back to the client. --- server/homebrew.api.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/homebrew.api.js b/server/homebrew.api.js index 2ab29f31b..392e175ca 100644 --- a/server/homebrew.api.js +++ b/server/homebrew.api.js @@ -412,6 +412,8 @@ const api = { const after = await afterSave(); if(!after) return; + saved.textBin = undefined; // Remove textBin from the saved object to save bandwidth + res.status(200).send(saved); }, deleteGoogleBrew : async (account, id, editId, res)=>{