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

332 Commits

Author SHA1 Message Date
G.Ambatte 8d49422061 Link clean up 2024-07-31 21:43:49 +12:00
G.Ambatte 59790bd005 Merge branch 'master' into fixLinks-#3547 2024-07-31 21:42:42 +12:00
Trevor Buckner 32fa50d608 Fallback to showing "Blank" theme if themes fail to load. 2024-07-29 12:30:13 -04:00
Trevor Buckner 82f73fb21d cleanup 2024-07-23 17:24:50 -04:00
Víctor Losada Hernández 24c950227a Merge branch 'master' into scroll-to-element 2024-07-22 22:43:43 +02:00
G.Ambatte c269d32247 Move headerNav to separate component 2024-07-22 18:45:36 +12: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
G.Ambatte 7fc0cadb81 Initial functionality pass 2024-07-21 23:11:21 +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
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
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
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 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
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 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 fdbec6d789 Merge branch 'master' into scroll-to-element 2024-06-12 18:08:26 +02:00
G.Ambatte 8685c5cae4 Break Dialog out of NotificationPopup, restore NotificationPopup to original position 2024-06-04 16:26:51 +12:00
Víctor Losada Hernández 202ea1d905 "Removed margin-bottom from brewRenderer style, added padding-bottom and updated styles in brewRenderer.less" 2024-06-02 15:59:09 +02:00
David Bolack 5442f232d5 Merge branch 'master' into brew_themes_user_selection 2024-05-31 22:32:14 -05:00
G.Ambatte a6ce36689c Shift NotificationPopup to shared components & update BrewRenderer ref 2024-06-01 12:38:01 +12:00
Víctor Losada Hernández 3fad8227a7 "Updated brewRenderer.jsx: added id 'zoomStyle' to style tag and changed margin-bottom from 7cm to 5cm." 2024-06-01 00:50:16 +02:00
Víctor Losada Hernández c60ddb701c this one works best 2024-05-31 21:06:39 +02:00
Víctor Losada Hernández 0e00460012 change margin bottom to fixed distance 2024-05-31 21:03:27 +02:00
Víctor Losada Hernández afa0571382 fix page displacement 2024-05-31 20:57:09 +02:00
Víctor Losada Hernández 90b504d67d Oops 2024-05-31 20:26:12 +02:00
Víctor Losada Hernández 8efea112b4 "Updated scrollToPage argument to add 1 to pageNumber" 2024-05-31 20:22:14 +02:00
Víctor Losada Hernández 000c3db8cd fixed page error 2024-05-31 20:14:41 +02:00
Víctor Losada Hernández 69db1e2cb7 change page works, added change zoom via input too 2024-05-31 19:43:09 +02:00
Víctor Losada Hernández acbdd1b801 "Removed iframe parameter from scrollToPage and getPageContainingElement functions, instead getting iframe element by id 'BrewRenderer' inside the functions." 2024-05-31 17:13:29 +02:00
Víctor Losada Hernández 933dc372d2 "Refactor scrollToPage function to retrieve iframe element internally and add page not found logging" 2024-05-31 17:10:35 +02:00
Víctor Losada Hernández d012a09346 "Refactor BrewRenderer: updated iframe handling and scrolling logic in useEffect and scrollToPage function" 2024-05-31 17:06:47 +02:00
Víctor Losada Hernández 3cca38302a "Refactor BrewRenderer component: removed unnecessary code, reorganized useEffect hooks, and simplified getPageContainingElement function." 2024-05-31 17:00:03 +02:00
Víctor Losada Hernández f9352a94c6 "Refactor BrewRenderer: simplify URL param extraction, remove iframe existence checks, and update scrollIntoView behavior" 2024-05-31 16:47:17 +02:00
Víctor Losada Hernández 1add97b1b2 scrolls to page 100 ms after page load 2024-05-31 16:38:08 +02:00
Víctor Losada Hernández 6fb185a964 Merge branch 'master' of https://github.com/naturalcrit/homebrewery into pdf-tools 2024-05-31 16:23:55 +02:00