Commit Graph
100 Commits
Author SHA1 Message Date
Trevor Buckner 3e78b03785 Remove lodash again 2025-01-28 00:28:46 -05:00
Trevor Buckner 6a31d612e6 Escape to HTML entities 2025-01-28 00:24:15 -05:00
Trevor Buckner ecd8869097 Add a comment 2025-01-28 00:17:08 -05:00
Trevor Buckner 73c2be147c Custom escape function 2025-01-28 00:13:51 -05:00
Trevor Buckner caa290f580 Merge branch 'master' into pr/3978 2025-01-27 23:34:59 -05:00
Trevor Buckner d69288076a Change to _.escape() to escape HTML characters 2025-01-27 23:34:50 -05:00
Trevor Buckner b94bb38922 Merge pull request #4012 from naturalcrit/dependabot/npm_and_yarn/babel/preset-env-7.26.7
Bump @babel/preset-env from 7.26.0 to 7.26.7
2025-01-27 13:12:28 -05:00
Trevor Buckner 4de0a11f1a Merge pull request #4009 from naturalcrit/dependabot/npm_and_yarn/babel/core-7.26.7
Bump @babel/core from 7.26.0 to 7.26.7
2025-01-27 13:08:16 -05:00
Trevor Buckner 2471de20a9 Merge pull request #4000 from naturalcrit/CurlyStylesAsKeyValues
Parse mustache "style" properties into object instead of string
2025-01-23 01:00:48 -05:00
Trevor Buckner 8e99d47869 Parse mustache "style" properties into object instead of string 2025-01-23 00:54:07 -05:00
Trevor Buckner 2a9945f09f Extract common function to merge HTML tags 2025-01-21 16:14:36 -05:00
Trevor Buckner 953c612830 Merge pull request #3992 from dbolack-ab/issue_3448
Implement suggested fix for 3448
2025-01-17 11:25:08 -05:00
Trevor Buckner ecc91af1d6 Merge pull request #3973 from naturalcrit/dependabot/npm_and_yarn/core-js-3.40.0
Bump core-js from 3.39.0 to 3.40.0
2025-01-10 15:53:33 -05:00
Trevor Buckner 4ff043f759 Merge branch 'master' into dependabot/npm_and_yarn/core-js-3.40.0 2025-01-10 15:09:51 -05:00
Trevor Buckner 84e18aae5a Merge pull request #3976 from naturalcrit/dependabot/npm_and_yarn/mongoose-8.9.4
Bump mongoose from 8.9.3 to 8.9.4
2025-01-10 15:09:05 -05:00
Trevor Buckner b53bda937a Merge pull request #3975 from dbolack-ab/issue_3974
Apply fix to clear error.
2025-01-10 15:08:52 -05:00
Trevor Buckner 914521cada Merge branch 'master' into experimentalHeaderNavigation 2025-01-07 22:49:05 -05:00
Trevor Buckner 70bda94033 Lint Toolbar.jsx 2025-01-07 22:47:18 -05:00
Trevor Buckner 915137af5e Lint BrewRenderer.jsx 2025-01-07 22:47:04 -05:00
Trevor Buckner fdfae9a771 Merge branch 'master' into experimentalHeaderNavigation 2025-01-07 22:43:29 -05:00
Trevor Buckner 8cc693461d Lint EditPage.jsx 2025-01-07 22:43:06 -05:00
Trevor Buckner 6ff0cfe383 Merge branch 'master' into refactor-errorBar-to-functional-and-using-dialog 2025-01-06 12:03:34 -05:00
Trevor Buckner 766ab8f10a Lint 2025-01-05 23:07:53 -05:00
Trevor Buckner aa4276a50e Move exit condition to start 2025-01-05 23:06:56 -05:00
Trevor Buckner fbedafb204 typo 2025-01-05 23:04:57 -05:00
Trevor Buckner 85cd7c7336 Move calculation of error states outside of render
Our previous approach was technically bad practice to calculate side-effects inside of the render step. We can separate that out as part of this refactor.

Also use native javascript map instead of lodash.
2025-01-05 23:04:48 -05:00
Trevor Buckner c137d40037 More alignment 2025-01-05 22:58:48 -05:00
Trevor Buckner 5a9e7850c2 space to tabs 2025-01-05 22:53:30 -05:00
Trevor Buckner 1598adfa67 Merge pull request #3971 from naturalcrit/dependabot/npm_and_yarn/babel-plugin-transform-import-meta-2.3.2
Bump babel-plugin-transform-import-meta from 2.2.1 to 2.3.2
2025-01-05 22:36:47 -05:00
Trevor Buckner 816f4f75f6 Merge pull request #3970 from naturalcrit/dependabot/npm_and_yarn/marked-extended-tables-1.1.0
Bump marked-extended-tables from 1.0.10 to 1.1.0
2025-01-05 22:12:36 -05:00
Trevor Buckner edadb3cb77 Merge pull request #3959 from dbolack-ab/updateDockerInstructions
Update Docker instructions in support of #1930
2025-01-05 15:06:12 -05:00
Trevor Buckner 3749a5c2b1 Merge branch 'master' into updateDockerInstructions 2025-01-05 15:06:03 -05:00
Trevor Buckner e9b5e4ab0c indent 2025-01-05 15:04:55 -05:00
Trevor Buckner 7f56797779 Merge pull request #3967 from naturalcrit/dependabot/npm_and_yarn/mongoose-8.9.3
Bump mongoose from 8.9.2 to 8.9.3
2025-01-03 17:51:38 -05:00
Trevor Buckner b20eb28a37 Merge pull request #3922 from 5e-Cleric/refactor-share-page-as-functional-comp
Refactor sharepage as functional comp
2024-12-26 19:21:55 -05:00
Trevor Buckner d84f071c62 Other small cleanup 2024-12-26 19:20:25 -05:00
Trevor Buckner bc7297de2e Mirror editId logic from shareId 2024-12-26 19:15:33 -05:00
Trevor Buckner a2c4f73e7d processShareId does not need useCallback() 2024-12-26 19:12:34 -05:00
Trevor Buckner 9804c3933f Remove unneeded dependencies for useEffect
UseEffect is only intended to be called once.

Similarly, handleControlKeys doesn't need "useCallBack" because it will never be passed to a child or trigger any re-render by changing.
2024-12-26 19:09:23 -05:00
Trevor Buckner e2b0da7830 Merge branch 'master' into refactor-share-page-as-functional-comp 2024-12-26 18:50:48 -05:00
Trevor Buckner 11bfdd89b8 Merge pull request #3965 from naturalcrit/ImplementContentVisibility
Implement content-visibility on pages
2024-12-26 14:59:22 -05:00
Trevor Buckner 6898425435 Merge branch 'master' into ImplementContentVisibility 2024-12-24 01:21:20 -05:00
Trevor Buckner be2557611e Merge pull request #3964 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-react-7.37.3
Bump eslint-plugin-react from 7.37.2 to 7.37.3
2024-12-24 01:12:46 -05:00
Trevor Buckner dbf82f69f1 Merge pull request #3963 from naturalcrit/dependabot/npm_and_yarn/react-router-7.1.1
Bump react-router from 7.0.2 to 7.1.1
2024-12-24 01:01:03 -05:00
Trevor Buckner 107e54688b Implement content-visibility on pages 2024-12-24 01:00:32 -05:00
Trevor Buckner b99282a5a7 Merge pull request #3845 from Gazook89/Intersection-Observer
Intersection Observers for getting "Current Page(s)"
2024-12-24 00:44:08 -05:00
Trevor Buckner 1c0eb720ad Undo 2024-12-24 00:38:36 -05:00
Trevor Buckner 93482f9022 Only list one page when in single page mode 2024-12-24 00:37:03 -05:00
Trevor Buckner 8159c408c8 Move formatVisiblePages
After simplifying, this has become a single-line function used in only one place. Can just be placed directly in the one place it is used.
2024-12-24 00:24:52 -05:00
Trevor Buckner 0632d78f71 Remove toolbar checks for empty visiblePages list
With `centerPage`, ToolBar will never receive an empty visiblePages array. No need to check if visiblepages.length == 0
2024-12-24 00:18:37 -05:00
Trevor Buckner c0155052ea Further simplifying 2024-12-24 00:06:30 -05:00
Trevor Buckner 628b2542a0 Simplify logic for previous/next buttons 2024-12-24 00:02:55 -05:00
Trevor Buckner 85f1da942f Restore looping over entries. Needed for very fast scrolling 2024-12-23 23:08:30 -05:00
Trevor Buckner 3909d5aef9 remove unused iFrameRef
iFrameRef is not used anywhere
2024-12-23 22:48:57 -05:00
Trevor Buckner f0e047e7cc Remove loop on intersectionObserver entries
Guaranteed to only be one entry each time, since we are attaching each page to its own observers.
2024-12-23 22:43:37 -05:00
Trevor Buckner d588a92147 Change page range to only display a single range
Having multiple page ranges visible is a weird edge case that only happens in two-page view. Simplifying logic to just group all page ranges together if a middle page is partly obscured.
2024-12-23 18:37:20 -05:00
Trevor Buckner 2b7a1e1cb2 Reduce overlapping observer handlers
Combine handlePageVisibilityChange and handleCenterPageChange to reduce some of the infrastructure burden for handling centerPage.
2024-12-23 18:35:36 -05:00
Trevor Buckner c8efca3120 useCallBack is not needed here. 2024-12-23 17:22:50 -05:00
Trevor Buckner a53eacf055 remove CenterPage from ToolBar props
centerPage is not used in the toolbar component.
2024-12-23 17:17:13 -05:00
Trevor Buckner 1b10a4001a Merge branch 'master' into pr/3845 2024-12-23 11:37:40 -05:00
Trevor Buckner 75e71dd6f5 Merge pull request #3960 from G-Ambatte/addGoogleRefreshInfoToErrorPage-#3955
Add google refresh info to error page #3955
2024-12-22 22:31:31 -05:00
Trevor Buckner 3f87b9f7d3 Merge branch 'master' into addGoogleRefreshInfoToErrorPage-#3955 2024-12-22 22:30:04 -05:00
Trevor Buckner 32561cf368 Moving to just HBErrorCode 01
02 is specifically for 404 errors when the file is actually missing. In that case, refreshing credentials probably won't work. (We should update the errorNav to make this distinction as well.)
2024-12-22 22:19:02 -05:00
Trevor Buckner bf94cdcb6f Merge pull request #3961 from naturalcrit/toWellFormedPolyfill
Use project babel config for buildHomebrew script
2024-12-22 21:39:14 -05:00
Trevor Buckner e8eedcf6d6 Import polyfill from core-js
Possible to have babel automatically detect and import polyfills as needed, but Browserify just can't handle it. Manually importing the one troublesome one into the root of our project.
2024-12-22 21:32:30 -05:00
Trevor Buckner 92d1238a46 Use project babel config for buildHomebrew script
Jest uses the babel.config file already. Might as well all use the same config.
2024-12-22 21:31:31 -05:00
Trevor Buckner dceb5e516b Merge pull request #3909 from dbolack-ab/horizontalSpace
V4 proposed non-breaking space token
2024-12-20 15:42:58 -05:00
Trevor Buckner adb1db1d3c Revert one more regex change 2024-12-20 15:39:57 -05:00
Trevor Buckner aae5367ad2 Add test case for single-line definition list 2024-12-20 11:01:55 -05:00
Trevor Buckner 40b0c1ce3a Merge pull request #3957 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-jest-28.10.0
Bump eslint-plugin-jest from 28.9.0 to 28.10.0
2024-12-20 10:38:26 -05:00
Trevor Buckner 2717e6a9a4 Merge pull request #3956 from naturalcrit/dependabot/npm_and_yarn/mongoose-8.9.2
Bump mongoose from 8.9.1 to 8.9.2
2024-12-19 23:25:40 -05:00
Trevor Buckner d576bddd32 Merge pull request #3958 from naturalcrit/Add-missing-test-suites-to-circleci
Add emoji tests to circleci
2024-12-19 23:25:26 -05:00
Trevor Buckner fde21868cd Add emoji tests to circleci 2024-12-19 23:20:01 -05:00
Trevor Buckner ed8c4d0eef Add tests to circleCi 2024-12-19 23:14:32 -05:00
Trevor Buckner 6e9d293bbe Rename tests to "Non-breaking Spaces"
Hard Breaks name was leftover from copying the `::::` test file.
2024-12-19 23:09:43 -05:00
Trevor Buckner 980a7bd57e Merge pull request #3954 from naturalcrit/dependabot/npm_and_yarn/globals-15.14.0
Bump globals from 15.13.0 to 15.14.0
2024-12-18 23:52:01 -05:00
Trevor Buckner 6b0022ad00 Merge branch 'master' into dependabot/npm_and_yarn/globals-15.14.0 2024-12-18 23:22:22 -05:00
Trevor Buckner 0f33973e58 Merge pull request #3953 from G-Ambatte/fixAdminAddedAsAuthor-#3952
Fix admin added as author #3952
2024-12-18 23:22:06 -05:00
Trevor Buckner 57467701d0 Fetch Google Brew if only stub requested but nothing found
/update/ requests only the stub for updating. But if no stub exists, we should fetch the full brew so we return *something*.
2024-12-18 23:00:01 -05:00
Trevor Buckner 5f14f656ef Logging 2024-12-18 17:23:38 -05:00
Trevor Buckner 6e8a0d7314 current user owns 0-author brew only if edit mode
Previous code was treating /share/ visits to google brews with no stub as visits by owner, thus using their own credentials to open the file instead of serviceaccount
2024-12-18 17:07:09 -05:00
Trevor Buckner e61144beb8 Mark as owner if stub doesn't exist
Old Google Drive files without a stub have no author, so if no stub exists, consider the current user the owner.
2024-12-18 13:45:53 -05:00
Trevor Buckner 64b792c645 Fix case where no stub is found
When retrieving a Google Brew with no stub yet, if the user is not logged in or has expired credentials, we enter this error handler. However, the error message itself tries to send a list of authors.

If there was no stub, we crash here with a 500 error.

This adds conditional operator to any stub value so we can send the actual "not logged in" error in case of no stub.
2024-12-18 13:02:14 -05:00
Trevor Buckner aee5b7a8cc Require user to be logged in to change name 2024-12-18 12:14:08 -05:00
Trevor Buckner 0148eafce0 Merge pull request #3951 from naturalcrit/dependabot/npm_and_yarn/mongoose-8.9.1
Bump mongoose from 8.9.0 to 8.9.1
2024-12-17 19:34:44 -05:00
Trevor Buckner 4ded48df1e Merge pull request #3905 from naturalcrit/fixContentNegotiationTestFail-#3904
Fixes #3904 - content negotiation test failure
2024-12-16 18:11:52 -05:00
Trevor Buckner bc14246fe7 fix import 2024-12-16 17:58:08 -05:00
Trevor Buckner fcf985a115 Restore content-negotiation test 2024-12-16 17:42:06 -05:00
Trevor Buckner a060fd123c Merge branch 'master' into fixContentNegotiationTestFail-#3904 2024-12-16 17:39:34 -05:00
Trevor Buckner 1a91c390f8 Merge pull request #3948 from naturalcrit/dependabot/npm_and_yarn/stylelint-16.12.0
Bump stylelint from 16.11.0 to 16.12.0
2024-12-16 00:09:18 -05:00
Trevor Buckner af98cb3867 Merge pull request #3947 from naturalcrit/dependabot/npm_and_yarn/eslint-9.17.0
Bump eslint from 9.16.0 to 9.17.0
2024-12-16 00:00:08 -05:00
Trevor Buckner eb0fa28a03 Merge pull request #3946 from naturalcrit/dependabot/npm_and_yarn/mongoose-8.9.0
Bump mongoose from 8.8.4 to 8.9.0
2024-12-15 23:58:09 -05:00
Trevor Buckner 4ab1a22eb3 Merge pull request #3863 from 5e-Cleric/fix-reddit-link-generation-crashing-website-if-encodeURI-fails
Fix crashes if title is invalid as URI
2024-12-15 23:57:38 -05:00
Trevor Buckner 962a46a670 Merge branch 'master' into fix-reddit-link-generation-crashing-website-if-encodeURI-fails 2024-12-15 23:46:54 -05:00
Trevor Buckner cb16b32016 tabs 2024-12-15 23:45:54 -05:00
Trevor Buckner 56f348f7ed Replace with toWellFormed() 2024-12-15 23:44:56 -05:00
Trevor Buckner 889f80f537 Replace react-router-dom with react-router
react-router-dom has been replaced by react-router, so changing packages
2024-12-14 21:48:13 -05:00
Trevor Buckner c270a69bb9 Merge pull request #3933 from naturalcrit/dependabot/npm_and_yarn/react-router-dom-7.0.2
Bump react-router-dom from 6.28.0 to 7.0.2
2024-12-14 21:36:20 -05:00
Trevor Buckner db0df82202 Change imports 2024-12-14 21:31:49 -05:00
Trevor Buckner 1346361f80 Merge branch 'dependabot/npm_and_yarn/react-router-dom-7.0.2' of https://github.com/naturalcrit/homebrewery into dependabot/npm_and_yarn/react-router-dom-7.0.2 2024-12-14 19:13:44 -05:00