0
0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2025-12-26 22:32:45 +00:00
Commit Graph

2782 Commits

Author SHA1 Message Date
Trevor Buckner
7843691c4b add "page" class to print page
With the style panel we added a `page` css class alongside the `phb` and `phb3` classes so users can write CSS that targets all pages no matter the base CSS loaded. This wasn't applied to the print page.

Funnily enough, the rest of the site uses `.page` just to display the website, and I didn't realize there was a conflict until now because otherwise, the brew is usually hidden in an iFrame.
2021-06-25 00:53:25 -04:00
Trevor Buckner
d9effacb20 Merge branch 'master' into pr/1410 2021-06-25 00:37:53 -04:00
Trevor Buckner
3efb0bf189 Merge branch 'master' into pr/1408 2021-06-25 00:18:27 -04:00
Trevor Buckner
00eb927538 Merge pull request #1401 from G-Ambatte/addStyleToLocalStorage
Add local storage key for Brew Style data
2021-06-25 00:17:11 -04:00
Trevor Buckner
0616ce62eb Rearrange so loading from one doesn't override the other 2021-06-25 00:15:49 -04:00
Trevor Buckner
a171de32d8 Merge branch 'master' into pr/1401 2021-06-25 00:03:49 -04:00
Trevor Buckner
cf7680bc86 Merge pull request #1397 from G-Ambatte/splitCSSatNewSave
Split codefenced CSS from in New Brews from Content to Style tab
2021-06-24 23:35:26 -04:00
Trevor Buckner
e07bb1b3c2 Don't save style tab if user never put anything in it 2021-06-24 23:29:01 -04:00
G.Ambatte
1f830b96b5 Inital pass at getting brew.style to apply when accessing /print from /new without saving. 2021-06-24 21:05:32 +12:00
G.Ambatte
ff7585b69d Clean up unnecessary code. 2021-06-23 21:16:33 +12:00
G.Ambatte
715ee88f38 Add dropdown to /share for source to unify options:
* "view" - View Source
* "download" - Download Source
* "clone to new" - Create New Brew from this Brew
2021-06-23 18:20:02 +12:00
G.Ambatte
142c9ad3b7 Fix loading Style data from local storage, and add fix for Linter. 2021-06-21 20:14:58 +12:00
G.Ambatte
e2280197b9 Unwinding hanging new line accidentally left after removing other code changes. 2021-06-21 19:49:35 +12:00
G.Ambatte
a74916d593 Removed CSS splitting from homebrew.api.js and back to newPage.jsx. 2021-06-21 19:46:54 +12:00
G.Ambatte
ad0e4a2099 Lint fixes. 2021-06-21 19:39:30 +12:00
G.Ambatte
2613d43f3c Shift CSS processing from newPage.jsx/save to homebrew.api.js/newBrew, as this function is only called when saving new Brews. 2021-06-21 19:38:02 +12:00
Sean Robertson
09c7f45c69 Clear data from new key when appropriate 2021-06-21 16:27:18 +12:00
Sean Robertson
0eaeb748f4 Add local storage key to store Brew Style data
Add local storage key for storing Brew Style data.
2021-06-21 16:15:37 +12:00
Sean Robertson
b72191ae68 Increase Linter max lines for newPage.jsx
Increase the maximum number of lines permitted by the Linter for the newPage.jsx file to 300 (was 200).
2021-06-21 13:04:29 +12:00
Sean Robertson
cf4bfc35ea Add new line before appending style data
Add a new line between the existing style data and the appended codefenced style data.
2021-06-21 13:00:12 +12:00
Sean Robertson
69231ba57a Initial pass at appending codefenced CSS to Style data at save time, only on /new brews (so only once per brew). 2021-06-21 12:34:51 +12:00
Trevor Buckner
d61fda9cff Fix regression with saving. 2021-06-20 16:05:36 -04:00
Trevor Buckner
6ecf546baf Fix github link in Edit Page error popup. 2021-06-20 15:04:23 -04:00
Trevor Buckner
ea8aa84009 Merge pull request #1392 from naturalcrit/dependabot/npm_and_yarn/marked-2.1.1
Bump marked from 2.0.6 to 2.1.1
2021-06-20 14:34:51 -04:00
Trevor Buckner
353f1ca42c Merge pull request #1370 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-react-7.24.0
Bump eslint-plugin-react from 7.23.2 to 7.24.0
2021-06-20 14:34:29 -04:00
Trevor Buckner
20053ad548 Merge pull request #1393 from G-Ambatte/updateSourcePage
Incorporate Brew.Style into Source + Download pages
2021-06-20 14:33:29 -04:00
Trevor Buckner
9b97e0dd87 redundant variable 2021-06-20 14:32:23 -04:00
Trevor Buckner
8e304fa483 tab 2021-06-20 14:30:00 -04:00
Trevor Buckner
0f5e2e5a60 Merge pull request #1353 from G-Ambatte/fixRedditLink
Fix 'Share to Reddit' link for Google brews
2021-06-20 14:21:28 -04:00
Trevor Buckner
f5bd7db388 Merge branch 'master' into pr/1353 2021-06-20 14:19:51 -04:00
Trevor Buckner
70832be810 Fix brews failing to sanitize on user page 2021-06-20 13:53:26 -04:00
G.Ambatte
68ed6019f6 Add new access type (raw) and simplify adding other types in the future. Add functionality for raw access to skip splitting Style data from Brew Content. 2021-06-19 15:50:48 +12:00
Sean Robertson
4638c3e1d9 Update server.js
Initial commit of incorporating `brew.style` into /source and /download pages
2021-06-18 11:24:20 +12:00
dependabot[bot]
53cb9a35ee Bump marked from 2.0.6 to 2.1.1
Bumps [marked](https://github.com/markedjs/marked) from 2.0.6 to 2.1.1.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/release.config.js)
- [Commits](https://github.com/markedjs/marked/compare/v2.0.6...v2.1.1)

---
updated-dependencies:
- dependency-name: marked
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-17 03:00:59 +00:00
Trevor Buckner
9d80f21ae7 Fix empty Google Brews crashing user page 2021-06-11 13:46:03 -04:00
Trevor Buckner
4d5653854a fix version number 2021-06-10 15:48:29 -04:00
Trevor Buckner
70cc8577e8 Fixing Heroku to work with NPM 7 2021-06-10 15:31:26 -04:00
Trevor Buckner
f80d5e6b52 Fix sanitizing brews in user page, hide own G brews on other profiles 2021-06-10 14:22:12 -04:00
Trevor Buckner
19456e8be0 Merge pull request #1384 from naturalcrit/StylePanel
Style panel
2021-06-10 10:41:19 -04:00
Trevor Buckner
c98cedc20f Merge branch 'master' into StylePanel 2021-06-10 10:39:39 -04:00
Trevor Buckner
2b1063c34d v2.12.0 bump version number 2021-06-10 10:38:03 -04:00
Trevor Buckner
fc8be9c8fb Babel to support ES6 Javascript in older browsers 2021-06-10 00:09:29 -04:00
G.Ambatte
70bdb07c1e Update client/homebrew/editor/metadataEditor/metadataEditor.jsx
Co-authored-by: Trevor Buckner <calculuschild@gmail.com>
2021-06-09 21:42:12 +12:00
Trevor Buckner
51aba937f5 Fix CSS highlighting 2021-06-07 11:51:02 -04:00
Trevor Buckner
9363a15daa Merge pull request #1376 from naturalcrit/StylePanel
Separate "style" and "metadata" panels
2021-06-05 16:09:37 -04:00
Trevor Buckner
1ef5bfed94 Remove default text 2021-06-05 16:09:23 -04:00
Trevor Buckner
e67fadef02 Separate "style" and "metadata" panels 2021-06-05 15:58:31 -04:00
Trevor Buckner
99825d10c4 Merge pull request #1373 from earlng/contribution
Update Dockerfile
2021-06-03 13:31:49 -04:00
Trevor Buckner
a7b52f9a96 Merge pull request #1375 from naturalcrit/dependabot/npm_and_yarn/googleapis-75.0.0
Bump googleapis from 74.2.0 to 75.0.0
2021-06-03 13:30:32 -04:00
dependabot[bot]
ef9d4d8525 Bump googleapis from 74.2.0 to 75.0.0
Bumps [googleapis](https://github.com/googleapis/google-api-nodejs-client) from 74.2.0 to 75.0.0.
- [Release notes](https://github.com/googleapis/google-api-nodejs-client/releases)
- [Changelog](https://github.com/googleapis/google-api-nodejs-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/googleapis/google-api-nodejs-client/compare/googleapis-v74.2.0...googleapis-v75.0.0)

---
updated-dependencies:
- dependency-name: googleapis
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-03 05:03:03 +00:00