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
Trevor Buckner
2cb3ca6880
Merge pull request #3714 from Gazook89/Meta-Tags-for-Vault
...
Meta Tags for the Vault Page
2024-09-09 11:13:42 -04:00
Trevor Buckner
90ee9afb54
Merge pull request #3679 from dbolack-ab/skipCountingSnippet
...
Add Page number alteration snippets
2024-09-09 11:12:16 -04:00
Trevor Buckner
2284f15876
Update tableOfContents.gen.js
2024-09-09 11:11:40 -04:00
Trevor Buckner
bfcb904ab7
Merge branch 'master' into skipCountingSnippet
2024-09-09 11:10:47 -04:00
Trevor Buckner
232d3c66a4
Merge pull request #3705 from Gazook89/Hide-Toolbar-2
...
Add button to toggle Preview tools
2024-09-09 11:03:53 -04:00
Trevor Buckner
2b458d1265
Merge branch 'master' into Hide-Toolbar-2
2024-09-09 11:01:39 -04:00
Trevor Buckner
58a2993fe1
use className for react classes
...
Avoid warning of conflict with JS "class" keyword.
2024-09-09 11:00:45 -04:00
Trevor Buckner
0f8fcb9889
Merge pull request #3716 from 5e-Cleric/fix-arrows-in-vault-this-time-for-real
...
fixing it once and for all
2024-09-09 10:52:52 -04:00
Trevor Buckner
cbe3c79b6b
Merge branch 'master' into fix-arrows-in-vault-this-time-for-real
2024-09-09 10:46:46 -04:00
Trevor Buckner
c707db4aa5
Merge pull request #3717 from naturalcrit/dependabot/npm_and_yarn/eslint-9.10.0
...
Bump eslint from 9.9.1 to 9.10.0
2024-09-09 10:46:33 -04:00
Trevor Buckner
87415d54d5
Merge branch 'master' into fix-arrows-in-vault-this-time-for-real
2024-09-09 10:46:24 -04:00
Trevor Buckner
7525509887
Merge branch 'master' into dependabot/npm_and_yarn/eslint-9.10.0
2024-09-09 10:40:11 -04:00
Trevor Buckner
e5a189939b
Merge pull request #3639 from dbolack-ab/actualPageNumber
...
Rework page counters for skipping and resets.
2024-09-09 10:39:25 -04:00
Trevor Buckner
7881d4b4a2
Small logic cleanup and renaming
2024-09-08 16:22:58 -04:00
Trevor Buckner
b124e55b3d
Merge branch 'master' into Issue_241_Part_II
2024-09-06 23:51:14 -04:00
Trevor Buckner
5e9fad9b09
Merge branch 'master' into actualPageNumber
2024-09-06 16:56:49 -04:00
Trevor Buckner
f0a8bf379a
Fix non-uniform spacing/indenting
2024-09-06 16:43:44 -04:00
Trevor Buckner
fb843ef3c1
Merge branch 'master' into GlobalToCToggles
2024-09-06 16:36:02 -04:00
Trevor Buckner
22678b15af
Fix snippet filter
2024-09-06 16:35:18 -04:00
Trevor Buckner
d2cefa8bf7
Merge branch 'master' into GlobalToCToggles
2024-09-06 16:22:52 -04:00
Trevor Buckner
e5d0051075
Create pull_request_template.md
2024-09-06 15:57:33 -04:00
Trevor Buckner
df8fd077ca
Merge pull request #3696 from dbolack-ab/snippets-no-gen
2024-09-06 14:16:50 -04:00
Trevor Buckner
84736980c9
Merge pull request #3713 from Gazook89/Fix-Vault-Styling-Issues
...
Fix Vault Page CSS specificity issues
2024-09-05 14:59:09 -04:00
Trevor Buckner
2e332d7699
Merge pull request #3710 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-jest-28.8.3
...
Bump eslint-plugin-jest from 28.8.2 to 28.8.3
2024-09-05 11:01:57 -04:00
Trevor Buckner
780c92cb9b
Merge pull request #3704 from G-Ambatte/experimentalGitAttribs
2024-09-04 19:38:41 -04:00
Trevor Buckner
20c54ef79e
Merge branch 'master' into experimentalGitAttribs
2024-09-04 19:38:32 -04:00
Trevor Buckner
5ce69041fc
Merge pull request #3708 from naturalcrit/fix-arrows
...
FIx missing arrows
2024-09-04 18:07:38 -04:00
Trevor Buckner
ed35eb2680
Merge pull request #3702 from naturalcrit/dependabot/npm_and_yarn/mongoose-8.6.1
2024-09-04 17:22:22 -04:00
Trevor Buckner
2a7b7cd50c
Merge branch 'master' into dependabot/npm_and_yarn/mongoose-8.6.1
2024-09-04 17:21:44 -04:00
Trevor Buckner
d37fa03ec7
Merge pull request #3701 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-react-7.35.2
2024-09-04 17:21:33 -04:00
Trevor Buckner
2c7d39147d
Merge branch 'master' into dependabot/npm_and_yarn/eslint-plugin-react-7.35.2
2024-09-04 17:20:58 -04:00
Trevor Buckner
6535e94ccd
Merge pull request #3707 from naturalcrit/v3.15.0
2024-09-04 17:20:49 -04:00
Trevor Buckner
2ede3d7cf3
Merge branch 'master' into v3.15.0
2024-09-04 17:20:41 -04:00
Trevor Buckner
e56b2a7ce5
Merge pull request #3706 from 5e-Cleric/experimental-development
2024-09-04 17:20:21 -04:00
Trevor Buckner
ad8e004fa9
Update Dismisskey for popup
...
Need a new key so this new message will appear again for users who cleared the popup before
2024-09-04 17:16:11 -04:00
Trevor Buckner
e05d2e805c
v3.15.0
2024-09-04 17:01:27 -04:00
Trevor Buckner
eb05ac00a6
Merge pull request #3263 from 5e-Cleric/experimental-development
2024-09-04 16:24:44 -04:00
Trevor Buckner
2bc39a468f
set default value for dontRenderStorage prop
2024-09-04 16:15:18 -04:00
Trevor Buckner
c735ab7c35
Fix crash on metaData tab
...
Hiding the `moveBrew` etc. properties when `this.state.showMoveArrows == false` means when the `metaData` tab turns off the arrows it crashes because now some functions are undefined.
Just using a whole separate property to avoid conflict.
2024-09-04 15:50:32 -04:00
Trevor Buckner
d7d690a9d1
Lint
2024-09-04 01:06:56 -04:00
Trevor Buckner
4f39222724
Change spaces to tabs
2024-09-04 00:52:08 -04:00