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
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
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
5e9fad9b09
Merge branch 'master' into actualPageNumber
2024-09-06 16:56:49 -04:00
Trevor Buckner
22678b15af
Fix snippet filter
2024-09-06 16:35:18 -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
Trevor Buckner
a1e585ccaa
Remove redundant validation check
...
`performSearch()` and `loadTotal()` shouldn't need a separate check for valid items if `loadPage` already does it through `validateForm`
2024-09-04 00:43:12 -04:00
Trevor Buckner
373a627c14
With unneeded state gone, can rename back to title, author, etc.
...
No longer naming conflict with state and function parameters. We can go back to the shorter names
2024-09-04 00:35:27 -04:00
Trevor Buckner
a7cb73b02e
Remove unused update in loadPage
...
Now `update` is unused; can remove that parameter.
2024-09-04 00:20:18 -04:00
Trevor Buckner
cd3e517b03
Remove setPageState in loadPage. Already occurs in performSearch()
...
`performSearch` will set PageState whether `update` is true or not, so this line here is not doing anything.
2024-09-04 00:18:35 -04:00
Trevor Buckner
ef201409d9
rename setPage to setPageState (match pageState name)
2024-09-03 23:55:54 -04:00
Trevor Buckner
e3ef93f03a
Alignment
2024-09-03 23:54:52 -04:00
Trevor Buckner
1990064be4
Tidy findTotal
2024-09-03 23:44:43 -04:00
Trevor Buckner
44099c813c
Fix err is not defined. Remove extra console.error (central error handler already prints the error)
2024-09-03 23:44:24 -04:00
Trevor Buckner
56185e2a1c
Tidy findBrews
2024-09-03 23:11:10 -04:00
Trevor Buckner
590318ff1d
Simplify rendererConditions
2024-09-03 22:58:50 -04:00
Trevor Buckner
9bc5701006
Indent
2024-09-03 14:18:17 -04:00
Trevor Buckner
a3a5f749ab
Merge pull request #3700 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-react-7.35.1
...
Bump eslint-plugin-react from 7.35.0 to 7.35.1
2024-09-03 14:10:20 -04:00
Trevor Buckner
dbd4a5c490
Merge pull request #3686 from G-Ambatte/v3.14.3
...
Up version to v3.14.3
2024-09-03 14:08:29 -04:00
Trevor Buckner
0d95c48988
Merge branch 'master' into v3.14.3
2024-09-03 14:08:06 -04:00
Trevor Buckner
0d40f4eb16
Small Rewording
2024-09-03 14:06:54 -04:00
Trevor Buckner
6234943ffd
Merge pull request #3698 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-jest-28.8.2
...
Bump eslint-plugin-jest from 28.8.0 to 28.8.2
2024-09-03 13:52:41 -04:00
Trevor Buckner
859117cdf8
Merge pull request #3691 from naturalcrit/dependabot/npm_and_yarn/googleapis/drive-8.14.0
...
Bump @googleapis/drive from 8.13.1 to 8.14.0
2024-09-03 13:34:22 -04:00
Trevor Buckner
c41116e6c8
Merge pull request #3687 from G-Ambatte/fixImageWrapIcons
...
Fix Image Wrap icons
2024-08-29 01:30:17 -04:00
Trevor Buckner
e776e5e054
Merge pull request #3684 from naturalcrit/FixTableInterruptors
2024-08-29 00:47:00 -04:00
Trevor Buckner
04bbb3d615
Merge branch 'master' into FixTableInterruptors
2024-08-29 00:44:46 -04:00
Trevor Buckner
5d1f589b07
Merge pull request #3685 from naturalcrit/dependabot/npm_and_yarn/marked-extended-tables-1.0.10
2024-08-29 00:44:38 -04:00
Trevor Buckner
371e464eb2
Merge branch 'master' into FixTableInterruptors
2024-08-29 00:30:07 -04:00
Trevor Buckner
804d714473
Add regex to detect when to interrupt a table
2024-08-29 00:20:47 -04:00
Trevor Buckner
8d00389aa2
Merge pull request #3683 from naturalcrit/dependabot/npm_and_yarn/marked-extended-tables-1.0.9
2024-08-29 00:19:42 -04:00
Trevor Buckner
49a1a74263
Merge pull request #3681 from naturalcrit/dependabot/npm_and_yarn/mongoose-8.6.0
2024-08-29 00:04:39 -04:00
Trevor Buckner
c49c620ce1
Merge pull request #3680 from naturalcrit/dependabot/npm_and_yarn/stylelint-16.9.0
2024-08-29 00:00:07 -04:00
Trevor Buckner
5e19bdaee7
Merge pull request #3678 from dbolack-ab/accursedKeys
2024-08-28 22:24:50 -04:00
Trevor Buckner
2dbb92a37e
Merge pull request #3677 from 5e-Cleric/account-page-handling-of-invalid-user
...
Account page handling of invalid user
2024-08-28 17:07:52 -04:00
Trevor Buckner
a124bd8657
I'm dumb.
2024-08-28 16:59:22 -04:00
Trevor Buckner
5323e6ca7a
Merge branch 'master' into account-page-handling-of-invalid-user
2024-08-28 15:25:12 -04:00
Trevor Buckner
8423c48fd1
Slight rewording and add a period
2024-08-28 15:24:50 -04:00
Trevor Buckner
e8aceac133
Move check for account up a little
2024-08-28 15:21:43 -04:00
Trevor Buckner
5a692a74c5
Merge pull request #3660 from naturalcrit/imageWrappin
...
Image wrapping
2024-08-28 15:18:50 -04:00
Trevor Buckner
3b3127248b
Merge branch 'master' into imageWrappin
2024-08-28 14:37:26 -04:00
Trevor Buckner
1d2355e802
Merge pull request #3674 from naturalcrit/dependabot/npm_and_yarn/googleapis/drive-8.13.1
...
Bump @googleapis/drive from 8.13.0 to 8.13.1
2024-08-28 09:47:22 -04:00
Trevor Buckner
a016bfd133
Merge pull request #3673 from Gazook89/Fix-Toolbar-Positioning
...
Revert toolbar positioning change
2024-08-27 13:03:12 -04:00
Trevor Buckner
63fa747fd7
Merge branch 'master' into Fix-Toolbar-Positioning
2024-08-27 13:03:06 -04:00
Trevor Buckner
81e6cae99d
Merge pull request #3670 from 5e-Cleric/v3.14.2
...
up to v3.14.2
2024-08-27 12:00:38 -04:00
Trevor Buckner
be0db1770d
Reword to describe the fix, rather than the PR title
2024-08-27 11:55:41 -04:00
Trevor Buckner
f905a62b6c
Merge branch 'master' into v3.14.2
2024-08-27 11:47:47 -04:00
Trevor Buckner
35ca31cf43
Merge pull request #3671 from Gazook89/Fix-Toolbar-Positioning
...
Small Patch for Toolbar Positioning
2024-08-27 11:47:24 -04:00
Trevor Buckner
0ce3ac9be2
Merge branch 'master' into Fix-Toolbar-Positioning
2024-08-27 11:27:36 -04:00
Trevor Buckner
7cdf1c93cf
Merge pull request #3665 from Gazook89/Fill-Pane-Buttons
...
VIEWER TOOLS PART 2 - Zoom to Fit, Fit to Width
2024-08-27 11:26:56 -04:00
Trevor Buckner
183687d676
Merge pull request #3075 from G-Ambatte/addCSSRoute-#1097
...
Add route to get brew styling
2024-08-26 20:04:46 -04:00
Trevor Buckner
786acc7a1c
Merge branch 'master' into addCSSRoute-#1097
2024-08-26 20:01:45 -04:00
Trevor Buckner
3d3ad3f284
Small tweaks
2024-08-26 19:58:28 -04:00