0
0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-01 02:02:43 +00:00
Commit Graph

709 Commits

Author SHA1 Message Date
Trevor Buckner
a171de32d8 Merge branch 'master' into pr/1401 2021-06-25 00:03:49 -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
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
6ecf546baf Fix github link in Edit Page error popup. 2021-06-20 15:04:23 -04:00
Trevor Buckner
fc8be9c8fb Babel to support ES6 Javascript in older browsers 2021-06-10 00:09:29 -04:00
Trevor Buckner
51aba937f5 Fix CSS highlighting 2021-06-07 11:51:02 -04:00
Trevor Buckner
e67fadef02 Separate "style" and "metadata" panels 2021-06-05 15:58:31 -04:00
G.Ambatte
2ba10655a8 Update to include brew title, description, systems, etc. on the new page 2021-05-01 14:38:54 +12:00
Trevor Buckner
c9a84a1813 Prevent accidental transfers from google to HB when not signed in 2021-04-25 23:38:44 -04:00
Trevor Buckner
7186a94c27 Do not force brew back to Homebrew if a Google save fails 2021-04-23 22:10:56 -04:00
Trevor Buckner
a1dbf0f2e5 Popup warning when opening a trashed google brew 2021-03-20 23:33:22 -04:00
Trevor Buckner
c4db94e86f Tweaks to work with current Master 2021-03-07 00:34:47 -05:00
Trevor Buckner
08492b943b Merge branch 'master' into pr/1198 2021-03-06 22:42:15 -05:00
Trevor Buckner
a55548d471 Merge pull request #1208 from G-Ambatte/addNewToNavBar
Adds a `New` button to the Nav bar
2021-03-05 22:33:07 -05:00
Trevor Buckner
f5d5f8cf67 Simplify Nav Item 2021-03-05 22:31:59 -05:00
Trevor Buckner
5b242989da Handle cached text
The NEW page saves to the browser LocalStorage the current text in case the user goes to a different page before saving. The new "import" function wasn't working since it was being overwritten by any cached values if they existed from an earlier "new" page.
2021-03-04 22:58:40 -05:00
G.Ambatte
3358094319 Fix issues arising post-merge 2021-03-04 22:01:37 -05:00
G.Ambatte
2f9bd00d70 Merge importPage functions into newPage. 2021-03-04 22:01:11 -05:00
G.Ambatte
ed23578dcf Lint fixes. 2021-03-04 21:57:33 -05:00
G.Ambatte
32ef36d7f7 Initial commit: Import from Share ID appears to be functioning correctly. 2021-03-04 21:57:32 -05:00
Trevor Buckner
468b7319d1 Unify brew structure in all pages 2021-02-20 21:59:18 -05:00
Rasmus Bækgaard
009a11a9f5 Add QR-Code as snippet under Editor (#539)
* Add snippet for QR-code

* Add snippet for QR-code

* Refactor to expose metadata to snippets

* Lint

Co-authored-by: Rasmus Bækgaard <git@bakgaard.net>
Co-authored-by: Trevor Buckner <calculuschild@gmail.com>
2021-02-19 23:39:29 -05:00
Trevor Buckner
146da57ba3 Apply Legacy\v3 renderer to print page (#1235) 2021-02-08 22:06:53 -05:00
Trevor Buckner
ee4ecc0b41 Default 'legacy' if not set. Auto-change styles.
* Fix brew styles overwriting each other.

* Word wrapping, start fixing spacing on Title letter

* Fix \page in legacy brews when not at line start

* Fix Page Padding

* Set 'legacy' as default value if not set in brew saved file.
2021-02-08 15:09:09 -05:00
Trevor Buckner
e2cd7d9f07 Legacy renderer (#1184)
* Include two versions of Marked.js

* Include two versions of Marked.js

* Working two different render pipelines

Adds stylesheet "styleLegacy.less"
Adds markdownHandler "markdownLegacy.js"
The BrewRenderer will switch between these and the new pipeline dependent on the "version" prop passed in.

* Mustache-style div blocks

* Legacy snippets & columnbreak

* Codemirror styling for Div Blocks

* Lint

* Codemirror highlights for inline Divs as well

These will turn red `{{class Content}}`

Multi-line divs will turn purple

```
{{class,class2
content
}}
```

No real need for these to be different colors. Just for testing.

* More lint

* Update dependencies.

* Adding Button to switch render pipelines

* Update Marked.js

* Popup alert to refresh page when renderer changed

* Don't compress files in Development (very slow)

* Block DIV or inline Span depending on {{ placement

* \column emits a Div instead of Span

* Allow share page to use new renderer

* {{ divs no longer need empty lines. Spans work in lists.

* Typo

* Typo

* Enforce \page must be at start of line. Code cleanup.

* Inject newlines after/before {{/}} to avoid needing blank lines

* Fixes issues with tables.

* Remove console.log

* Fix spacing issue for Spans

* Move things from Brewrenderer to Markdown

Try to keep all custom text fiddling in one spot.

* Rename variables

* Update Font-Awesome to v5.15. Fix style issues on popups.

* Update {{ Divs/Spans, Fix nested hilighting

* Fixed Spans/divs with no tags or just commas

* Use blacklist for {{ to allow more characters

* Update package-lock.json

* Update all icons to Font-awesome 5

* V3 hidden behind config variable

Add "globalThis.enable_v3 = true" in the console to enable.

* lint
2021-02-02 20:38:25 -05:00
G.Ambatte
e367cb2152 Initial commit - adds a New button to the Nav bar on the Home, User, and Edit pages. 2021-01-23 00:36:10 +13:00
G.Ambatte
bcbf596aa8 Increase minimum height of brewItem in CSS so all four items are always visible.
Adjust eslint line in `server.js` to re-enable the test with a slightly higher maximum value.
2021-01-22 21:24:22 +13:00
G.Ambatte
6d219aa701 Unwinding refactored code + corrections. 2021-01-22 17:29:26 +13:00
G.Ambatte
da32845dd1 (WIP) Unwinding refactoring to improve clarity and readability of new functions 2021-01-22 16:44:34 +13:00
Sean Robertson
4073536d96 (WIP) Remove target=_blank and rel=noopener noreferrer from brewItem.jsx to eliminate white flash on User page when clicking link to download source of a brew. 2021-01-22 13:59:15 +13:00
G.Ambatte
5c7a9c92d1 Integrated download function into server.js
Remove new function from `Homebrew.Model.js`
Remove `sourceFunctions.jsx` module
2021-01-21 20:27:46 +13:00
G.Ambatte
0e8348f360 Catch zero length filenames 2021-01-21 07:39:08 +13:00
G.Ambatte
e8135fcbb4 Added sanitizeHtml function to Homebrew model to generate HTML from the brew for the source page.
Moved `source` page generation function to a new function module. Added option to function to create plain text download with a sanitized filename and made it accessible from a new page: `download`.
Added the `download` item to the BrewItem so it appears on each brew on the User page.
Added `sanitize-filename` dependency to `package.json`.
2021-01-21 00:02:15 +13:00
G.Ambatte
7fccb7e03e Shift functionality to new file in attempt to reduce code duplication in server.js 2021-01-17 22:07:26 +13:00
G.Ambatte
715ddf2b8c Initial commit 2021-01-17 18:52:56 +13:00
Alexey Sachkov
19ca1db674 Tweak spelling of username on user page (#1175)
Fixes #575
2020-12-31 14:12:16 -05:00
Alexey Sachkov
a58384d8d1 Cleanup unneeded "require" (#1169) 2020-12-26 21:29:49 -05:00
Trevor Buckner
3dba731dd7 Popup confirmation when switching between google and hb (#1155)
* Popup confirmation when switching between google and hb

* Allow closing error popup.

* Up version.
2020-12-18 23:51:08 -05:00
Trevor Buckner
8ffea70b2f Remove metadata on the Homepage (#1121)
* Remove the metadata button on home page

1) Hopefully make it more clear that the Homepage is meant as a sandbox to test out the site, not a real brew that will be saved.

2) Also, avoid errors resulting from trying to modify the metadata of a brew that doesn't really exist yet.

* Lint
2020-11-27 21:14:15 -05:00