0
0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-05-09 14:08:40 +00:00
Commit Graph

540 Commits

Author SHA1 Message Date
David Bolack 184462616f Merge branch 'master' into Issue_241_Part_II 2024-07-30 02:31:14 -05:00
Trevor Buckner 8221579b6a Linting 2024-07-28 18:03:25 -04:00
Trevor Buckner 2870caaae6 Clean up metadataEditor theme dropdown 2024-07-28 17:18:30 -04:00
Trevor Buckner 27c52fc244 Fix loading CSS for Legacy 2024-07-23 17:11:48 -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 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 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 2fa3c0f311 themeClass is never used 2024-07-11 00:26:50 -04:00
Trevor Buckner 5c0a072115 userThemes passed to SnippetBar.jsx is never used 2024-07-11 00:25:11 -04:00
David Bolack 656edb07ea Rework detection of user brews to look up themeid in static themes list before assuming is a user brew.
Ended up being a fairly straightforward change. A few ternaries got smooshed or inverted. Passes builtin and local tests. Need to compare on the test instance.
2024-07-08 18:12:58 -05:00
David Bolack 510d8f410d Resolve timing issue with liveScroll on linking.
Checks to see if prevProps.livescroll has a proper Bool value. If not, do not brewJump() in editor.componantSDidUpdate.
2024-06-03 22:45:22 -05:00
David Bolack ea9f9a8c36 Missed a couple of variable repalcements. 2024-06-03 02:39:20 -05:00
David Bolack cca79d4b17 Merge branch 'master' into Issue_241_Part_II 2024-06-03 02:29:19 -05:00
David Bolack a715c9e1e6 Store livescrolling in local storage
Small fixes for loading the correct current state.
2024-06-03 02:26:56 -05:00
David Bolack 5442f232d5 Merge branch 'master' into brew_themes_user_selection 2024-05-31 22:32:14 -05:00
Trevor Buckner 2453b623db tweak names in editor.jsx 2024-05-21 17:45:50 -04:00
Trevor Buckner 783e88b5e6 Merge branch 'master' into pr/3477 2024-05-21 17:42:03 -04:00
Trevor Buckner e62e185214 Lint a bunch of things 2024-05-21 17:32:17 -04:00
David Bolack 835ca0de32 WIP 2024-05-20 16:21:02 -05:00
David Bolack bacdd65025 Add a CR. 2024-05-19 11:52:16 -05:00
David Bolack 86887b536e Update Jump keys to match parent PR and shift live scrolling to scroll-lock.
Needs non-PC testing.
2024-05-19 11:16:50 -05:00
David Bolack b7dc47fe9e Add a Live Scroll lock/unlock below Brew/Source Jump buttons.
The button displays the *next* state of the toggle. IE, if the current state is locked ( Live scrolling is active ) the icon is unlock with a corresponding mouse-over.

It may be desirable to invert this.
2024-05-18 22:17:29 -05:00
David Bolack 8ece54701d Add live scrolling to keep the preview in sync with editor position.
This catchs CTRL-HOME, CTRL-END, and mouseclicks.

It tests for changes on arrow keys and enter.

Not sure if it's the best way to do this, but it works quickly on a large, crappy brew.
2024-05-18 01:44:42 -05:00
David Bolack 9b0db15083 Add Jump To hotkeys
This binds CTRL/META-J to brewJump and SHIFT-CTRL/META-J to sourceJump.
2024-05-17 22:10:28 -05:00
Víctor Losada Hernández b64c835706 Aparently it wasn't redundant as VSCode said
This reverts commit aef6605225.
2024-05-17 22:38:54 +02:00
Víctor Losada Hernández 92e27cda6c "Removed unused imports of 'classnames' and 'create-react-class' from various JSX files. in the Client folder" 2024-05-17 22:31:55 +02:00
Víctor Losada Hernández aef6605225 Remove redundant snippetBar import from editor.jsx 2024-05-17 22:28:01 +02:00
Gazook89 46c14ef23b fix refs in editor.jsx
now has refs `editorWrapper` and `editor`-- the former includes the snippet bar and codemirror editor, and the latter includes only the codemirror editor.
2024-05-16 23:12:10 -05:00
David Bolack 69f01b282a CSS Tweaks for Theme Selector
Add 5e-Cleric's suggestsions to acvoid the title overflowing over the preview.
2024-05-13 22:33:58 -05:00
David Bolack 66e39d9c65 Update Theme Selector display
For User/Brew Themes, display the first author instead of Brew/V3 in the first column.
2024-05-13 22:24:41 -05:00
David Bolack 8c5f4e0605 Brew Theme Fixes.
This adds the User Brew themes, where applicible, to the /new path.

This adds a semi-graceful failure to the metadata panel when a Brew Theme is declared as used but is not present.

More gracefully handles loading with themes not present.
2024-05-13 11:14:35 -05:00
David Bolack ed210da4af Merge branch 'master' into brew_themes_user_selection 2024-05-12 12:08:16 -05:00
Gazook89 295fea7581 Add dropdownTexture for user theme options
If a user theme document has a thumbnail, this will include that thumbnail as a dropdown texture in the options.
2024-05-07 11:00:20 -05:00
Trevor Buckner d695648d9b Tweaks to Editor highlighting. Maybe still ugly. 2024-05-03 21:40:09 -04:00
Trevor Buckner 72160f5daf missed one commit 2024-05-03 21:40:09 -04:00
Trevor Buckner 0751da42b6 Add emoji highlighting to editor 2024-05-03 21:40:08 -04:00
David Bolack 1292d9ad9b Merge branch 'master' into brew_themes_user_selection 2024-04-18 21:13:01 -05:00
Gazook89 3b2a48eabf remove + 1 from editor height 2024-04-03 22:52:16 -05:00
Gazook89 7954ae8692 set a min-width on icons, reduce font sizes 2024-04-03 12:57:24 -05:00
David Bolack 57f0aefbc8 Merge branch 'master' into brew_themes_user_selection 2024-03-25 20:38:28 -05:00
David Bolack d9dade7181 Fix User Brew display label in metadata editor 2024-03-06 19:04:12 -06:00
David Bolack 7f16da110f Merge branch 'master' into Extended_DD 2024-03-04 11:01:49 -06:00
David Bolack a924f53320 Merge branch 'master' into brew_themes_user_selection 2024-03-03 22:11:35 -06:00
Trevor Buckner 774b555a61 Rework to fix 5eCleric's tests 2024-02-29 17:17:38 -05:00
David Bolack 4f90f92b38 Additional theme based error checking. 2024-02-28 15:08:00 -06:00
David Bolack 8f15887c03 Cleanup of console logging 2024-02-27 20:51:59 -06:00