Trevor Buckner
cbc6dcdc35
Merge pull request #3625 from G-Ambatte/fixVarNameAsParam-#3622
...
Tweak variable math split regex
2024-08-11 23:01:38 -04:00
Trevor Buckner
5894dc5a7a
Merge branch 'master' into fixVarNameAsParam-#3622
2024-08-11 21:59:58 -04:00
Trevor Buckner
284bfe565b
Merge pull request #3624 from G-Ambatte/fixVarNameSubstringClash-#3613
...
Fix var name substring clash #3613
2024-08-11 21:49:31 -04:00
Trevor Buckner
e1ad6f8114
Merge pull request #3588 from G-Ambatte/fixInfoPanel-#3586
...
Add disableMeta prop to SharePage
2024-08-09 10:55:27 -04:00
Trevor Buckner
f8e68c1485
Merge pull request #3620 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-jest-28.8.0
...
Bump eslint-plugin-jest from 28.7.0 to 28.8.0
2024-08-08 18:14:24 -04:00
Trevor Buckner
60ccd08bce
Merge branch 'master' into dependabot/npm_and_yarn/eslint-plugin-jest-28.8.0
2024-08-08 17:53:01 -04:00
Trevor Buckner
f241024167
Merge pull request #3585 from dbolack-ab/CSSFolding
...
Add Code folding on CSS style tab
2024-08-08 17:51:43 -04:00
Trevor Buckner
f1fd75574d
Merge branch 'master' into CSSFolding
2024-08-08 17:51:05 -04:00
Trevor Buckner
31352e417f
Simplify folding logic
2024-08-08 17:48:32 -04:00
Trevor Buckner
643af98ca3
Add comment
2024-08-08 17:44:16 -04:00
Trevor Buckner
3b61cd355f
Fix edge case where string was emitting data: twice.
...
Also, a case where the input is right around 50 chars. It can be truncated twice, leading to a long `.....`
2024-08-08 17:43:57 -04:00
Trevor Buckner
8df19e3b8f
Merge branch 'master' into dependabot/npm_and_yarn/eslint-plugin-jest-28.8.0
2024-08-08 11:14:13 -04:00
Trevor Buckner
91d6548822
Merge pull request #3621 from naturalcrit/dependabot/npm_and_yarn/marked-emoji-1.4.2
...
Bump marked-emoji from 1.4.1 to 1.4.2
2024-08-08 11:13:55 -04:00
Trevor Buckner
5a9025f555
Merge pull request #3618 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-jest-28.7.0
...
Bump eslint-plugin-jest from 28.6.0 to 28.7.0
2024-08-07 13:15:48 -04:00
Trevor Buckner
0a494633bb
Merge branch 'master' into dependabot/npm_and_yarn/eslint-plugin-jest-28.7.0
2024-08-07 12:00:40 -04:00
Trevor Buckner
aeaea5b5e0
Merge pull request #3516 from dbolack-ab/Issue_2563
...
Update table of content list-item breakage rules for wide table of contents
2024-08-07 12:00:23 -04:00
Trevor Buckner
e03ec34104
Merge branch 'master' into Issue_2563
2024-08-07 11:59:32 -04:00
Trevor Buckner
4d59a14f74
Merge pull request #3617 from naturalcrit/lint-metadataEditor.less
...
Lint metadataEditor.less
2024-08-03 17:29:47 -04:00
Trevor Buckner
3c8aaa7465
Update metadataEditor.less
2024-08-03 17:28:47 -04:00
Trevor Buckner
ac70403203
Merge pull request #3611 from naturalcrit/dependabot/npm_and_yarn/react-router-dom-6.26.0
...
Bump react-router-dom from 6.25.1 to 6.26.0
2024-08-03 02:51:13 -04:00
Trevor Buckner
061925e89a
Merge pull request #3616 from naturalcrit/Replace-stylistic-stylelint-with-@stylistic-stylelint
...
Migrate from stylelint-stylistic to @stylelint-stylistic
2024-08-03 02:46:04 -04:00
Trevor Buckner
5fc8b508d1
Merge branch 'master' into Replace-stylistic-stylelint-with-@stylistic-stylelint
2024-08-03 02:43:33 -04:00
Trevor Buckner
cb444bef9d
stylelint-stylistic has a new owner; migrating to newer package
2024-08-03 02:42:22 -04:00
Trevor Buckner
481f2e7d39
Merge pull request #3587 from G-Ambatte/addSignedFunction-#3537
...
Add new var math functions
2024-08-03 02:12:23 -04:00
Trevor Buckner
7559652a32
Merge branch 'master' into addSignedFunction-#3537
2024-08-03 02:09:47 -04:00
Trevor Buckner
8e15466063
Merge pull request #3615 from G-Ambatte/fixSelectSelfInThemeSource-#3614
...
Prevent self-selection of User Theme
2024-08-03 02:07:33 -04:00
Trevor Buckner
bb06a3e4d4
Merge pull request #3526 from 5e-Cleric/fix-background-monster-in-safari
...
Fixing Monster Frame background in Safari for iphone and ipad
2024-08-01 17:23:37 -04:00
Trevor Buckner
6af9c9e432
Merge branch 'master' into Issue_2563
2024-08-01 17:16:18 -04:00
Trevor Buckner
84d0d15c5a
Merge branch 'master' into fix-background-monster-in-safari
2024-08-01 17:07:18 -04:00
Trevor Buckner
b185fe8e35
Move Monster block changes under main monster block stuff
2024-08-01 17:06:18 -04:00
Trevor Buckner
adbb9e54c1
Merge branch 'master' into addSignedFunction-#3537
2024-08-01 16:12:46 -04:00
Trevor Buckner
1d3c2d7cd6
Merge branch 'master' into fixInfoPanel-#3586
2024-08-01 15:57:43 -04:00
Trevor Buckner
2dc397e9f1
Merge pull request #3610 from naturalcrit/MoveMigrateToSharePage
...
Move Migrate page to use Share component
2024-08-01 15:56:37 -04:00
Trevor Buckner
6465564b6f
Add route to Homebrew.jsx
2024-08-01 15:37:00 -04:00
Trevor Buckner
423ed28fbd
Merge pull request #3517 from dbolack-ab/Issue_2688
...
Solve for .descriptive and .wide not getting along
2024-08-01 00:59:03 -04:00
Trevor Buckner
a4f17259e1
Merge branch 'master' into Issue_2688
2024-08-01 00:58:06 -04:00
Trevor Buckner
c2678e5f2c
Merge pull request #3564 from G-Ambatte/fixInkFriendlySnippet-#3563
...
Stop Ink Friendly snippet making text unselectable in output PDF
2024-08-01 00:48:21 -04:00
Trevor Buckner
d797333b97
Merge branch 'master' into fixInkFriendlySnippet-#3563
2024-08-01 00:48:14 -04:00
Trevor Buckner
40777a3794
Merge pull request #3580 from G-Ambatte/fixToCUpperCasing-#3572
...
Fix Table of Contents uppercasing
2024-08-01 00:47:23 -04:00
Trevor Buckner
ac1005c2b0
Merge branch 'master' into fixInkFriendlySnippet-#3563
2024-08-01 00:47:02 -04:00
Trevor Buckner
c77395149b
Tweak shadow values to match 5ePHB
...
box-shadows are a little smaller than drop-shadow. This just uses the same values we already found previously so the shadow size is not affected.
2024-08-01 00:46:08 -04:00
Trevor Buckner
fb0580fff1
Merge branch 'master' into fixToCUpperCasing-#3572
2024-08-01 00:41:47 -04:00
Trevor Buckner
0e953d08b2
Merge pull request #3609 from naturalcrit/dependabot/npm_and_yarn/babel/preset-env-7.25.3
...
Bump @babel/preset-env from 7.25.2 to 7.25.3
2024-07-31 23:54:21 -04:00
Trevor Buckner
3e7844ba6d
Merge pull request #3591 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-react-7.35.0
...
Bump eslint-plugin-react from 7.34.3 to 7.35.0
2024-07-31 23:45:53 -04:00
Trevor Buckner
7619f8f420
Merge branch 'master' into dependabot/npm_and_yarn/eslint-plugin-react-7.35.0
2024-07-31 22:43:52 -04:00
Trevor Buckner
bac52f8376
Merge pull request #3582 from naturalcrit/dependabot/npm_and_yarn/react-router-dom-6.25.1
...
Bump react-router-dom from 6.24.1 to 6.25.1
2024-07-31 22:43:39 -04:00
Trevor Buckner
5c72cd9d47
Merge branch 'master' into dependabot/npm_and_yarn/react-router-dom-6.25.1
2024-07-31 21:54:53 -04:00
Trevor Buckner
89b59a52bc
Merge pull request #3608 from G-Ambatte/fixTests
...
Fix tests post v3.14.0
2024-07-31 21:54:32 -04:00
Trevor Buckner
a6f2a1a4c8
Merge branch 'master' into fixTests
2024-07-31 21:51:46 -04:00
Trevor Buckner
e9e9fbe21c
Merge pull request #3592 from dbolack-ab/UpdateDocker
...
Update Node version for Docker
2024-07-31 21:51:16 -04:00
Trevor Buckner
8ed013cbb2
Merge pull request #3603 from naturalcrit/dependabot/npm_and_yarn/mongoose-8.5.2
...
Bump mongoose from 8.4.5 to 8.5.2
2024-07-31 19:34:29 -04:00
Trevor Buckner
0138c27863
Merge branch 'master' into dependabot/npm_and_yarn/mongoose-8.5.2
2024-07-31 19:34:00 -04:00
Trevor Buckner
7930c209ff
Merge pull request #3599 from naturalcrit/dependabot/npm_and_yarn/babel/preset-env-7.25.2
...
Bump @babel/preset-env from 7.24.7 to 7.25.2
2024-07-31 19:33:51 -04:00
Trevor Buckner
8681994747
Merge branch 'master' into dependabot/npm_and_yarn/babel/preset-env-7.25.2
2024-07-31 19:32:52 -04:00
Trevor Buckner
0e684b14a7
Merge pull request #3598 from naturalcrit/dependabot/npm_and_yarn/babel/core-7.25.2
...
Bump @babel/core from 7.24.7 to 7.25.2
2024-07-31 19:32:44 -04:00
Trevor Buckner
974f84d49f
Merge branch 'master' into dependabot/npm_and_yarn/babel/core-7.25.2
2024-07-31 19:32:28 -04:00
Trevor Buckner
5a6abef4fb
Merge pull request #3562 from naturalcrit/dependabot/npm_and_yarn/dompurify-3.1.6
...
Bump dompurify from 3.1.5 to 3.1.6
2024-07-31 19:32:09 -04:00
Trevor Buckner
15200e0c6e
Merge branch 'master' into dependabot/npm_and_yarn/dompurify-3.1.6
2024-07-31 19:31:25 -04:00
Trevor Buckner
79c22f383f
Allow renderer and pagecount into stubs
...
At this point, only text and textbin contents are still in google drive. Which is the majority of the file still. Renderer and Pagecount may become useful for Vault page, and Renderer is needed for themes.
2024-07-31 18:13:31 -04:00
Trevor Buckner
915f9aafa8
restore snippetBundle field somehow lost from /new and /home
2024-07-31 17:27:58 -04:00
Trevor Buckner
11f8809c5e
Merge pull request #3606 from naturalcrit/FixUserThemesCrashes
...
Fix user themes crashes
2024-07-31 17:05:52 -04:00
Trevor Buckner
27a4831ea0
Add a theme to our reference pages (changelog, FAQ, migrate)
2024-07-31 16:53:54 -04:00
Trevor Buckner
1abced20d6
Do not fetch user themes if there is no user.
2024-07-31 16:53:34 -04:00
Trevor Buckner
1c1d331df9
Merge pull request #3597 from naturalcrit/v3.14.0
...
Up to v3.14.0
2024-07-29 21:55:19 -04:00
Trevor Buckner
8609925da8
Merge branch 'master' into v3.14.0
2024-07-29 21:54:38 -04:00
Trevor Buckner
607244d6e1
Merge pull request #3321 from dbolack-ab/brew_themes_user_selection
...
Enable User Brew theme selection
2024-07-29 21:54:28 -04:00
Trevor Buckner
9cc81d2ff9
Up to v3.14.0
2024-07-29 21:52:09 -04:00
Trevor Buckner
32fa50d608
Fallback to showing "Blank" theme if themes fail to load.
2024-07-29 12:30:13 -04:00
Trevor Buckner
8221579b6a
Linting
2024-07-28 18:03:25 -04:00
Trevor Buckner
88eaebfd49
Raise test coverage threshold
...
This PR adds tests which means we are now covering a larger % of the codebase. Raise the coverage thresholds to match.
2024-07-28 18:00:33 -04:00
Trevor Buckner
ee9f2c8c83
Remove unused CSS endpoints in favor of #3075
...
Now that we have a dedicated /theme/ route for the recursive theming, the CSS endpoint can be simpler for only getting the `style` of a single brew. #3075 already has this simpler version, but no testing, so I have copied this into a comment there for implementation when it is ready.
2024-07-28 17:53:25 -04:00
Trevor Buckner
2870caaae6
Clean up metadataEditor theme dropdown
2024-07-28 17:18:30 -04:00
Trevor Buckner
e0425ec6c0
Simplify API call url
2024-07-28 16:47:16 -04:00
Trevor Buckner
8aa88a2e45
Add proper error popup when theme fails to load
2024-07-28 16:45:01 -04:00
Trevor Buckner
edec9369ec
Finish adding test cases
2024-07-27 19:17:19 -04:00
Trevor Buckner
f2d933410e
Add error handling for missing themes
2024-07-27 19:17:05 -04:00
Trevor Buckner
b64a0c5200
Start adding tests for /theme/ endpoint
2024-07-27 03:30:51 -04:00
Trevor Buckner
113f9b3fe3
No need to stringify Theme Bundle object
2024-07-27 02:00:38 -04:00
Trevor Buckner
8e7baca47d
Fix tests
2024-07-23 17:40:32 -04:00
Trevor Buckner
ddc5693778
revert package-lock
2024-07-23 17:31:07 -04:00
Trevor Buckner
82f73fb21d
cleanup
2024-07-23 17:24:50 -04:00
Trevor Buckner
27c52fc244
Fix loading CSS for Legacy
2024-07-23 17:11:48 -04:00
Trevor Buckner
ac82e3ecb2
Add to home page
2024-07-23 16:50:29 -04:00
Trevor Buckner
22b6aa14f0
Add to /new page
2024-07-23 16:43:23 -04:00
Trevor Buckner
24ab3d3392
Merge branch 'brew_themes_user_selection' of https://github.com/dbolack-ab/homebrewery into pr/3321
2024-07-23 16:26:35 -04:00
Trevor Buckner
0b01f27d11
Load theme bundles on /share page
2024-07-23 16:26:33 -04:00
Trevor Buckner
6ae249a527
Lint
2024-07-22 02:46:26 -04:00
Trevor Buckner
c0123b96eb
Support snippet compilation
...
Original handling of snippets only worked if the current selected theme was a staticTheme. This now fully merges all snippets through the theme chain no matter what the top-level theme is. So user themes built on 5ePHB can benefit from 5ePHB snippets too.
User input of user snippets will be a later PR, but merging them into static snippets is now supported.
2024-07-22 02:44:41 -04:00
Trevor Buckner
45f7080afd
Move loadAllBrewStylesAndSnippets to the parent page component
...
Themes contain both CSS and Snippets. The brewRenderer only cares about the CSS, but other components need the Snippets. Better to have the parent "editPage", etc. load the theme bundles and pass them down to each child that needs it, rather than trying to pass from the child up.
This also fixes the `metadataEditor.jsx` not being able to change themes live; A new theme bundle is now loaded when a new theme is selected, instead of only the first time the BrewRenderer mounts.
Also renamed to "fetchThemeBundle"
2024-07-21 16:25:24 -04:00
Trevor Buckner
0a5ff213de
use same theme endpoint for user and static themes
...
`getThemeBundle()` rework no longer needs two separate endpoints
2024-07-20 11:39:23 -04:00
Trevor Buckner
f364f054f8
restore renderStyle
...
`renderStyle` is still necessary; it allows us to update the style live in the component render step as the user types into the style tab. Otherwise the style is only rendered once and never updates.
React also discourages directly editing the DOM ourselves, because it makes changes to the DOM that react cannot track; we should aim to provide all DOM writes inside of the component render function instead of using `document.createElement`, etc.
Too that end, this commit reduces the `loadAllStylesAndSnippets` function to just fetch and parse the data; actual rendering is moved back to `renderStyle()`
2024-07-19 01:33:56 -04:00
Trevor Buckner
460358ce1f
Simplify some logic
2024-07-19 00:09:21 -04:00
Trevor Buckner
0448f15322
Classify user brews as V3 if they use V3
...
Each theme in the theme chain, including user brews, must use the same renderer. When moving to V4 or future versions, it will be important to distinguish which themes are compatible with each other
2024-07-19 00:05:45 -04:00
Trevor Buckner
d741878f78
Also remove userthemes from Brew object in sharePage
2024-07-19 00:00:06 -04:00
Trevor Buckner
d22cd88446
fix crash in metadataeditor
2024-07-15 23:47:19 -04:00
Trevor Buckner
1444581c86
pass userThemes prop to Editor -> MetadataEditor
2024-07-15 23:44:07 -04:00
Trevor Buckner
dfbd85a8ce
pass userThemes as a new prop, rather than inside of the brew
2024-07-15 23:29:16 -04:00
Trevor Buckner
af5434c9b7
cleanup
2024-07-15 16:45:55 -04:00
Trevor Buckner
484b0a6dff
simplify getThemeBundle() by using just one loop
...
Also, removes need for special handling of the "first" theme.
2024-07-15 16:38:19 -04:00
Trevor Buckner
4951b9bf1a
Add async error handler to /edit and /new
...
Since /edit and /new endpoints now have an `await` inside that could return an error (`getUsersBrewThemes()`), asyncHandler must be added to pass errors along instead of just crashing
2024-07-13 19:46:12 -04:00