0
0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2025-12-28 15:42:38 +00:00
Commit Graph

2796 Commits

Author SHA1 Message Date
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
G.Ambatte
17b081b18b Added showHeaderNav prop to make nav menu conditional 2024-07-22 17:30:29 +12: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
Víctor Losada Hernández
ddf2006285 Merge branch 'master' of https://github.com/naturalcrit/homebrewery into experimental-development 2024-07-21 18:06:08 +02:00
G.Ambatte
7fc0cadb81 Initial functionality pass 2024-07-21 23:11:21 +12:00
G.Ambatte
17f8de48a8 Add disableMeta prop to SharePage 2024-07-21 13:33:23 +12: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
David Bolack
c82b62f953 Add Code folding on CSS style tab 2024-07-19 16:03:44 -05: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
G.Ambatte
b55db94822 Merge branch 'master' into fixLinks-#3547 2024-07-17 15:07:47 +12: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
David Bolack
ade819c70c A not so light rework.
This removes the existing endpoints and replaces them with /theme.

/theme/:id - return a theme bundle containing all styling from this USER theme and any parents.
/theme/:engine/:id - return a theme bundle containing all styling from this STATIC theme and any parents

The theme bundle returns a marshalled JSON object containing:
  styles - an array of strings representing the collected styles in loading order
  snippets - an array ( currently empty ) of collected snippets.

The various bits of theme rendering code for <style> an style <link> have been swapped out with an 'onDidMount' call that loads the thendpoint and appends a series of <style> blocks to the brewRender's head.

This loses some caching advantages, but probably won't matter in the long run.
2024-07-13 12:12:05 -05:00
G.Ambatte
cb9d24d5b4 Remove text-decoration from Brew Item links 2024-07-11 20:03:17 +12: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
Trevor Buckner
7eb96ee6be Simplify brewRenderer output to only emit current theme
Instead of Blank, Parent, and Theme, just make use of the @include chaining, to handle all parent themes down to and including Blank
2024-07-10 17:46:51 -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
4b05bcac69 Merge branch 'master' into Issue_241 2024-07-08 10:16:57 -05:00
David Bolack
19ee3d6dbb Merge branch 'master' into Issue_241_Part_II 2024-07-08 10:14:43 -05:00
David Bolack
ea6595d4d6 Merge branch 'master' into brew_themes_user_selection
Fixes a regression for legacy brews.
2024-07-07 12:03:15 -05:00
David Bolack
645da7ae5f Merge branch 'brew_themes_user_selection' of github.com:dbolack-ab/homebrewery into brew_themes_user_selection 2024-07-05 16:54:11 -05:00
David Bolack
8570335d79 Consolidate variable redundancy. 2024-07-05 16:53:21 -05:00
G.Ambatte
b638cca547 Stop evaluation tests as soon as one returns true 2024-07-04 09:32:29 +12:00
Trevor Buckner
e4bde91f6a Merge branch 'master' into brew_themes_user_selection 2024-07-02 12:04:17 -04:00
G.Ambatte
52658d6e44 Remove vue-html-secure package 2024-07-02 15:34:40 +12:00
G.Ambatte
9f3a4dc6bb Functional vue-html-secure version 2024-07-02 08:21:42 +12:00
G.Ambatte
acb10d7695 Exclude tags in FORBID_TAGS 2024-07-01 09:35:48 +12:00
G.Ambatte
fa4ced0592 Explicitly forbid script tags 2024-07-01 09:30:50 +12:00
G.Ambatte
3f1d6a5459 Re-enable DOMPurify cleaning 2024-07-01 09:30:26 +12:00
G.Ambatte
d60d902e27 Merge branch 'master' into fixLinks-#3547 2024-07-01 09:18:02 +12:00
G.Ambatte
e1c1e32a4b Return to official package; use custom addHook 2024-07-01 09:14:57 +12:00
G.Ambatte
5c2f603860 Probably terrible solution 2024-06-30 23:30:40 +12:00
Trevor Buckner
2cdd65b083 revert DOMPURIFY for now 2024-06-29 11:29:31 -04:00
G.Ambatte
47b78510df Change DOMPurify config 2024-06-29 15:35:37 +12:00
David Bolack
7e3f2a3deb Merge branch 'master' into Issue_241_Part_II 2024-06-27 10:24:48 -05:00
David Bolack
060f28a0a6 Merge branch 'master' into Issue_241 2024-06-19 18:41:02 -05:00
David Bolack
a3f146cd53 Change the last Boneheaded hot change to something better
CTRL-SHIFT-LEFTARROW - Source Jump
CTRL-SHIFT-RIGHTARROW - Brew Jump
2024-06-19 18:39:20 -05:00
Víctor Losada Hernández
f07252d670 errors for access denied and authorization required 2024-06-16 17:14:27 +02:00
Víctor Losada Hernández
f15c831b70 proper error page 2024-06-16 17:06:18 +02:00
David Bolack
7a349ae26d Remove weirdly redundant error box. 2024-06-13 18:13:32 -05:00
David Bolack
0945a5e47e Merge branch 'master' into brew_themes_user_selection 2024-06-13 15:15:30 -05:00
Víctor Losada Hernández
5232c16eb2 change div to form 2024-06-13 01:32:34 +02:00
Víctor Losada Hernández
bdfd194672 changed order of params per request 2024-06-13 01:13:38 +02:00
Víctor Losada Hernández
cb0cb32860 minor style changes & lint less file 2024-06-13 01:04:39 +02:00
Víctor Losada Hernández
1e080b30fd finally fixed the damn issue 2024-06-13 00:41:40 +02:00