Trevor Buckner
9acecb63ed
Merge branch 'master' into addIndexedDM-#3763
2024-10-08 17:07:39 -04:00
Trevor Buckner
88d36bcf85
Merge pull request #3798 from naturalcrit/dependabot/npm_and_yarn/eslint-9.12.0
...
Bump eslint from 9.11.1 to 9.12.0
2024-10-07 13:24:31 -04:00
Trevor Buckner
337531a622
Merge pull request #3797 from naturalcrit/dependabot/npm_and_yarn/stylistic/stylelint-plugin-3.1.1
...
Bump @stylistic/stylelint-plugin from 3.1.0 to 3.1.1
2024-10-07 11:09:18 -04:00
Trevor Buckner
226e714f32
Merge pull request #3793 from 5e-Cleric/fix-wrong-brew-id-links-generated
2024-10-06 15:57:11 -04:00
Trevor Buckner
f3332fb95b
Merge branch 'master' into fix-wrong-brew-id-links-generated
2024-10-06 15:54:37 -04:00
Trevor Buckner
2ada6ce70d
Merge pull request #3789 from naturalcrit/dependabot/npm_and_yarn/babel/core-7.25.7
...
Bump @babel/core from 7.25.2 to 7.25.7
2024-10-04 13:53:11 -04:00
Trevor Buckner
0146ab7ce0
Merge pull request #3787 from naturalcrit/dependabot/npm_and_yarn/babel/plugin-transform-runtime-7.25.7
...
Bump @babel/plugin-transform-runtime from 7.25.4 to 7.25.7
2024-10-04 13:48:31 -04:00
Trevor Buckner
796f8ac8b7
Merge pull request #3788 from naturalcrit/dependabot/npm_and_yarn/babel/preset-env-7.25.7
...
Bump @babel/preset-env from 7.25.4 to 7.25.7
2024-10-04 13:45:42 -04:00
Trevor Buckner
f59a250bb1
Merge pull request #3790 from naturalcrit/dependabot/npm_and_yarn/babel/preset-react-7.25.7
...
Bump @babel/preset-react from 7.24.7 to 7.25.7
2024-10-04 10:49:52 -04:00
Trevor Buckner
e9286d4bb7
Merge pull request #3784 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-react-7.37.1
...
Bump eslint-plugin-react from 7.37.0 to 7.37.1
2024-10-01 23:39:13 -04:00
Trevor Buckner
53761bc567
Merge pull request #3785 from naturalcrit/dependabot/npm_and_yarn/globals-15.10.0
...
Bump globals from 15.9.0 to 15.10.0
2024-10-01 23:33:33 -04:00
Trevor Buckner
bc475b5ed9
Merge pull request #3762 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-react-7.37.0
...
Bump eslint-plugin-react from 7.36.1 to 7.37.0
2024-09-30 14:14:21 -04:00
Trevor Buckner
0415af624a
Merge branch 'master' into dependabot/npm_and_yarn/eslint-plugin-react-7.37.0
2024-09-30 13:52:13 -04:00
Trevor Buckner
8a63859546
Merge pull request #3778 from 5e-Cleric/fix-lang-on-share
...
fix lang on share page
2024-09-30 13:51:50 -04:00
Trevor Buckner
8d5bc9e37c
Merge pull request #3767 from G-Ambatte/fixToolbarZoomInPrint-#3744
...
Add zoom property to BrewRenderer print styling
2024-09-30 13:51:37 -04:00
Trevor Buckner
313f18c74c
Merge branch 'master' into fixToolbarZoomInPrint-#3744
2024-09-30 13:50:00 -04:00
Trevor Buckner
0c6bc5d7ac
Merge pull request #3757 from naturalcrit/v3.15.1
...
Fix Rate Limiting
2024-09-30 13:48:53 -04:00
Trevor Buckner
db6c689914
Merge branch 'master' into fix-lang-on-share
2024-09-30 13:48:20 -04:00
Trevor Buckner
a31f1da4dc
Merge branch 'master' into v3.15.1
2024-09-30 00:23:04 -04:00
Trevor Buckner
3ec3cf8df8
Merge pull request #3741 from naturalcrit/dependabot/npm_and_yarn/stylistic/stylelint-plugin-3.1.0
2024-09-30 00:22:49 -04:00
Trevor Buckner
96acd334a0
Merge pull request #3742 from naturalcrit/dependabot/npm_and_yarn/eslint-9.11.1
2024-09-29 21:53:36 -04:00
Trevor Buckner
8a06257a50
Merge pull request #3766 from naturalcrit/dependabot/npm_and_yarn/mongoose-8.7.0
2024-09-29 14:23:41 -04:00
Trevor Buckner
aaa0acdfea
Merge branch 'master' into v3.15.1
2024-09-28 23:40:25 -04:00
Trevor Buckner
f1f686d8c7
Merge pull request #3760 from naturalcrit/dependabot/npm_and_yarn/dompurify-3.1.7
2024-09-27 15:15:43 -04:00
Trevor Buckner
6e120c2d05
Merge pull request #3765 from G-Ambatte/fixLegacyBrewRenders-#3764
2024-09-27 15:15:26 -04:00
Trevor Buckner
9b58db9f1e
Let sharepage update page numbers
2024-09-27 15:03:29 -04:00
Trevor Buckner
ae123a8310
Change the other page number values as well
2024-09-27 11:35:01 -04:00
Trevor Buckner
58b0e12fcc
Update app.js
2024-09-27 00:34:35 -04:00
Trevor Buckner
51f4c83ec0
Update app.js
2024-09-27 00:34:12 -04:00
Trevor Buckner
9decaf73f7
Update app.js
2024-09-27 00:19:08 -04:00
Trevor Buckner
15fde76209
Merge branch 'master' into v3.15.1
2024-09-27 00:13:32 -04:00
Trevor Buckner
2ba160fe65
Re-remove extra error log for new google brews.
2024-09-27 00:08:23 -04:00
Trevor Buckner
05ad8e17a7
Merge pull request #3755 from naturalcrit/RaiseAutoSaveDelay
2024-09-26 19:17:51 -04:00
Trevor Buckner
bf87225415
Merge branch 'v3.15.1' into RaiseAutoSaveDelay
2024-09-26 19:17:35 -04:00
Trevor Buckner
8b61e69b77
Merge pull request #3754 from naturalcrit/RemoveDoubleGoogleDriveLogs
2024-09-26 19:15:46 -04:00
Trevor Buckner
e260eb0911
Raise timeout to 10 s.
...
No need to be stingy here... Can lower back down if this works.
2024-09-26 19:14:16 -04:00
Trevor Buckner
c8424e0b10
Remove test that no longer applies
2024-09-26 19:12:19 -04:00
Trevor Buckner
ff9a75f6b6
Remove duplicate error logs for google drive update / new
...
Errors are now logged once in the central error handler in app.js
2024-09-26 19:00:07 -04:00
Trevor Buckner
cd0bf9c947
Merge pull request #3740 from naturalcrit/dependabot/npm_and_yarn/stylelint-config-recess-order-5.1.1
...
Bump stylelint-config-recess-order from 5.1.0 to 5.1.1
2024-09-23 15:20:43 -04:00
Trevor Buckner
0e8387ec0d
Merge pull request #3734 from naturalcrit/dependabot/npm_and_yarn/mongoose-8.6.3
...
Bump mongoose from 8.6.2 to 8.6.3
2024-09-23 11:16:08 -04:00
Trevor Buckner
9419186e78
Merge pull request #3739 from naturalcrit/dependabot/npm_and_yarn/eslint-9.11.0
...
Bump eslint from 9.10.0 to 9.11.0
2024-09-23 09:53:30 -04:00
Trevor Buckner
6e2bc1cabe
Merge pull request #3723 from naturalcrit/sort-in-vault
...
Add sorting options to Vault Page
2024-09-20 16:03:17 -04:00
Trevor Buckner
971be6375e
lint
2024-09-20 16:02:09 -04:00
Trevor Buckner
4353c01032
Update server/vault.api.js
2024-09-20 16:01:29 -04:00
Trevor Buckner
87c6343f30
Merge pull request #3736 from Gazook89/metadataEditor-tweaks
2024-09-19 16:51:37 -04:00
Trevor Buckner
a8e5a96c98
Merge pull request #3733 from naturalcrit/fix-history-state-snippetbar-error
...
fix
2024-09-17 15:33:57 -04:00
Trevor Buckner
32c583ece8
Merge pull request #3634 from naturalcrit/nav-wrapping
2024-09-16 19:29:51 -04:00
Trevor Buckner
471de9df9f
Merge pull request #3692 from 5e-Cleric/more-style-snippets
...
Style snippets, more page sizes, A3, A5, Card
2024-09-16 16:55:58 -04:00
Trevor Buckner
398e6ef6f2
Slight rearranging
2024-09-16 16:53:55 -04:00
Trevor Buckner
1a8611c528
Merge branch 'master' into more-style-snippets
2024-09-16 16:07:47 -04:00
Trevor Buckner
f7aa9346e9
Merge pull request #3711 from G-Ambatte/experimentalLocalStorageHistory
...
Store limited Brew History in Local Storage
2024-09-16 16:05:28 -04:00
Trevor Buckner
e20e681888
Merge branch 'master' into experimentalLocalStorageHistory
2024-09-16 11:10:45 -04:00
Trevor Buckner
f8fef1187c
Merge pull request #3689 from dbolack-ab/GlobalToCToggles
...
Add Style Tab Snippets for Globally toggling additional header inclusion
2024-09-16 11:06:21 -04:00
Trevor Buckner
a866b45c55
Merge branch 'master' into GlobalToCToggles
2024-09-16 09:45:35 -04:00
Trevor Buckner
dfd3b99232
Merge branch 'master' into experimentalLocalStorageHistory
2024-09-16 01:50:54 -04:00
Trevor Buckner
a953bf0555
Merge pull request #3731 from naturalcrit/dependabot/npm_and_yarn/express-static-gzip-2.1.8
2024-09-16 01:44:48 -04:00
Trevor Buckner
88ff10d229
Merge pull request #3732 from naturalcrit/Linting
2024-09-16 01:44:34 -04:00
Trevor Buckner
8d479b8cd1
Lint whitespace changes
2024-09-16 01:42:44 -04:00
Trevor Buckner
63675a46e0
Lint more things
2024-09-16 01:42:21 -04:00
Trevor Buckner
5cc5eec619
Lint toolbar and snippetbar
2024-09-16 01:41:46 -04:00
Trevor Buckner
b5490e3a53
Lint editor.jsx
2024-09-16 01:40:21 -04:00
Trevor Buckner
1645a5acf4
Lint App.js
...
Just whitespace changes
2024-09-16 01:39:44 -04:00
Trevor Buckner
98c5b798a7
Merge branch 'master' into experimentalLocalStorageHistory
2024-09-16 01:03:29 -04:00
Trevor Buckner
295d878c3d
Merge branch 'master' into dependabot/npm_and_yarn/express-static-gzip-2.1.8
2024-09-16 01:02:24 -04:00
Trevor Buckner
a283438b28
Merge pull request #3484 from dbolack-ab/Issue_241_Part_II
2024-09-16 00:51:04 -04:00
Trevor Buckner
48bdc417fa
More logic simplification
2024-09-16 00:39:04 -04:00
Trevor Buckner
25a40e31c5
Remove console logs
2024-09-15 22:31:29 -04:00
Trevor Buckner
a353425d07
More cleanup
2024-09-15 22:13:41 -04:00
Trevor Buckner
c07c02f1d9
Remove unused variable
2024-09-15 21:44:02 -04:00
Trevor Buckner
81ab9417d3
Clean up unused code
2024-09-15 21:42:55 -04:00
Trevor Buckner
85401ba71b
Fix BrewRenderer scrolling to 0
2024-09-15 21:26:49 -04:00
Trevor Buckner
84c0242eee
Put page jump checks in componentDidUpdate
...
Jump when the current page for brew or editor changes
2024-09-15 00:13:49 -04:00
Trevor Buckner
181c6bf65a
Update editor.jsx
2024-09-14 19:15:39 -04:00
Trevor Buckner
d4fa5d55d0
Merge branch 'master' into pr/3484
2024-09-14 19:15:12 -04:00
Trevor Buckner
5a932b781b
Merge pull request #3729 from naturalcrit/LiftRendererPageStateUp
2024-09-14 19:06:02 -04:00
Trevor Buckner
eebf24e1ba
Merge branch 'LiftRendererPageStateUp' of https://github.com/naturalcrit/homebrewery into LiftRendererPageStateUp
2024-09-14 19:03:06 -04:00
Trevor Buckner
26a126859d
Lint
2024-09-14 19:02:55 -04:00
Trevor Buckner
41b9a570b5
Merge branch 'master' into LiftRendererPageStateUp
2024-09-14 19:01:10 -04:00
Trevor Buckner
76c9f2ee71
Lint
2024-09-14 18:58:23 -04:00
Trevor Buckner
5c2acf3183
Let Editor pass changes up and inherit values down
2024-09-14 18:52:13 -04:00
Trevor Buckner
fa2874b18f
Let brewRenderer pass changes up, and inherit values down
2024-09-14 18:50:38 -04:00
Trevor Buckner
7e776df4d4
Add Current Page states up into editor components, pass down to children
2024-09-14 18:50:09 -04:00
Trevor Buckner
4a9fe1dbdb
Merge pull request #3727 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-react-7.36.1
...
Bump eslint-plugin-react from 7.35.2 to 7.36.1
2024-09-13 11:50:16 -04:00
Trevor Buckner
6334d191f8
Merge pull request #3726 from naturalcrit/dependabot/npm_and_yarn/express-4.21.0
...
Bump express from 4.20.0 to 4.21.0
2024-09-13 11:43:57 -04:00
Trevor Buckner
f1633cf03c
Merge pull request #3725 from naturalcrit/dependabot/npm_and_yarn/mongoose-8.6.2
...
Bump mongoose from 8.6.1 to 8.6.2
2024-09-13 11:24:45 -04:00
Trevor Buckner
3ef91cb1ea
Add check for scroll event complete/ lift page state up
2024-09-12 12:55:11 -04:00
Trevor Buckner
1646ba7e25
Merge pull request #3481 from naturalcrit/metadata-api-endpoint
...
Add API endpoint to get metadata from brews
2024-09-10 13:36:17 -04:00
Trevor Buckner
29460edca9
Merge branch 'master' into metadata-api-endpoint
2024-09-10 13:26:40 -04:00
Trevor Buckner
2ecdd962bd
Merge pull request #3721 from naturalcrit/dependabot/npm_and_yarn/react-router-dom-6.26.2
...
Bump react-router-dom from 6.26.1 to 6.26.2
2024-09-10 13:13:11 -04:00
Trevor Buckner
a2b5903bde
Merge pull request #3720 from naturalcrit/dependabot/npm_and_yarn/express-4.20.0
...
Bump express from 4.19.2 to 4.20.0
2024-09-10 11:59:55 -04:00
Trevor Buckner
e5ab223571
Better line position (viewport has some margin)
2024-09-10 01:25:26 -04:00
Trevor Buckner
45a9501459
Jump based on scroll position, not cursor position
2024-09-10 01:11:28 -04:00
Trevor Buckner
ec74b994d7
Simplify scroll event for source editor using lodash Throttle
2024-09-10 00:43:44 -04:00
Trevor Buckner
b5155ed256
remove unused variable
2024-09-09 23:40:06 -04:00
Trevor Buckner
315296458a
Remove setting button styles in componentDidMount
...
Just set the state, and the renderer will know what to display.
2024-09-09 23:39:29 -04:00
Trevor Buckner
0fbb4879a9
Set button appearance based on state
...
Avoid manually editing the DOM elements. Let the Render function update the appearance based on state.
2024-09-09 23:35:18 -04:00
Trevor Buckner
51c8973a85
Move onClick from the lock icon to the whole button
2024-09-09 23:29:10 -04:00
Trevor Buckner
707b90e445
Merge branch 'master' into pr/3484
2024-09-09 23:22:00 -04:00
Trevor Buckner
7f656bc408
Merge pull request #3719 from naturalcrit/Refactor-tableOfContents.gen.js
2024-09-09 23:20:59 -04:00
Trevor Buckner
5c906ee722
Logic rewrite
...
Realized we don't need to build a whole descendency tree of all the headers. We can just track the current indendation level and what headers are at each indent. This removes about 1/4 of the code, and lets us put all of the exit conditions (no title, no showPage, ToCExclude) in one place to easily see what is being excluded and what not.
2024-09-09 23:16:56 -04:00