f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2025-12-24 20:42:43 +00:00
Code Wiki Activity

Merge branch 'master' into v3-Artist-Snippet

Browse Source
This commit is contained in:
Gazook89
2021-08-10 13:34:26 -05:00
parent a46370b81e 3cf5dc74bb
commit 9120c1d0eb
6 changed files with 49 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
changelog.md
View File

@@ -6,6 +6,15 @@ h5 {
# changelog
### Monday, 09/08/2021 - v2.13.3
##### G-Ambatte :
- Tooltips hovering over brews in dropdowns / user page.
- Fixed sort-by created date on user page.
##### Gazook89 :
- Hotkey Ctrl-/ and snippets to add HTML comments; use for notes that won't appear in your brew.
### Friday, 30/07/2021 - v2.13.2
- Background work to allow new themes in the future
@@ -57,9 +66,6 @@ myStyle {color: black}
##### G-Ambatte :
- Snippet to remove drop caps (fancy first letter after title)
```
```
### Saturday, 13/3/2021 - v2.11.0
- Many background things for upcoming v3. Get pumped.

4
client/homebrew/pages/homePage/welcome_msg.md
View File

@@ -14,7 +14,7 @@ When you create your own homebrew you will be given a *edit url* and a *share ur
Anyone with the *share url* will be able to access a read-only version of your homebrew.
## Helping out
Like this tool? Want to buy me a beer? [Head here](https://www.patreon.com/stolksdorf) to help me keep the servers running.
Like this tool? Want to buy me a beer? [Head here](https://www.patreon.com/Naturalcrit) to help me keep the servers running.
This tool will **always** be free, never have ads, and I will never offer any "premium" features or whatever.
@@ -96,5 +96,3 @@ If you'd like to credit The Homebrewery in your brew, I'd be flattered! Just ref
<div class='pageNumber'>2</div>
<div class='footnote'>PART 2 | BORING STUFF</div>

19
client/homebrew/pages/newPage/newPage.jsx
View File

@@ -19,6 +19,7 @@ const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
const BREWKEY = 'homebrewery-new';
const STYLEKEY = 'homebrewery-new-style';
const METAKEY = 'homebrewery-new-meta';
const NewPage = createClass({
@@ -68,12 +69,16 @@ const NewPage = createClass({
componentDidMount : function() {
const brewStorage = localStorage.getItem(BREWKEY);
const styleStorage = localStorage.getItem(STYLEKEY);
const metaStorage = JSON.parse(localStorage.getItem(METAKEY));
const brew = this.state.brew;
if(!this.props.brew.text || !this.props.brew.style){
brew.text = this.props.brew.text || (brewStorage ?? '');
brew.style = this.props.brew.style || (styleStorage ?? undefined);
if(!this.state.brew.text || !this.state.brew.style){
brew.text = this.state.brew.text || (brewStorage ?? '');
brew.style = this.state.brew.style || (styleStorage ?? undefined);
// brew.title = metaStorage?.title || this.state.brew.title;
// brew.description = metaStorage?.description || this.state.brew.description;
brew.renderer = metaStorage?.renderer || this.state.brew.renderer;
}
this.setState((prevState)=>({
@@ -126,7 +131,11 @@ const NewPage = createClass({
this.setState((prevState)=>({
brew : _.merge({}, prevState.brew, metadata),
}));
localStorage.setItem(METAKEY, JSON.stringify({
// 'title' : this.state.brew.title,
// 'description' : this.state.brew.description,
'renderer' : this.state.brew.renderer
}));
},
save : async function(){
@@ -159,6 +168,7 @@ const NewPage = createClass({
brew = res.body;
localStorage.removeItem(BREWKEY);
localStorage.removeItem(STYLEKEY);
localStorage.removeItem(METAKEY);
window.location = `/edit/${brew.googleId}${brew.editId}`;
} else {
request.post('/api')
@@ -174,6 +184,7 @@ const NewPage = createClass({
brew = res.body;
localStorage.removeItem(BREWKEY);
localStorage.removeItem(STYLEKEY);
localStorage.removeItem(METAKEY);
window.location = `/edit/${brew.editId}`;
});
}

34
package-lock.json generated
View File

@@ -1,11 +1,11 @@
{
"name": "homebrewery",
"version": "2.13.2",
"version": "2.13.3",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"version": "2.13.2",
"version": "2.13.3",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
@@ -30,7 +30,7 @@
"marked": "2.1.3",
"markedLegacy": "npm:marked@^0.3.19",
"moment": "^2.29.1",
"mongoose": "^5.13.5",
"mongoose": "^5.13.6",
"nanoid": "3.1.23",
"nconf": "^0.11.3",
"prop-types": "15.7.2",
@@ -6283,9 +6283,9 @@
}
},
"node_modules/mongodb": {
"version": "3.6.10",
"resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.6.10.tgz",
"integrity": "sha512-fvIBQBF7KwCJnDZUnFFy4WqEFP8ibdXeFANnylW19+vOwdjOAvqIzPdsNCEMT6VKTHnYu4K64AWRih0mkFms6Q==",
"version": "3.6.11",
"resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.6.11.tgz",
"integrity": "sha512-4Y4lTFHDHZZdgMaHmojtNAlqkvddX2QQBEN0K//GzxhGwlI9tZ9R0vhbjr1Decw+TF7qK0ZLjQT292XgHRRQgw==",
"dependencies": {
"bl": "^2.2.1",
"bson": "^1.1.4",
@@ -6321,14 +6321,14 @@
}
},
"node_modules/mongoose": {
"version": "5.13.5",
"resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.13.5.tgz",
"integrity": "sha512-sSUAk9GWgA8r3w3nVNrNjBaDem86aevwXO8ltDMKzCf+rjnteMMQkXHQdn1ePkt7alROEPZYCAjiRjptWRSPiQ==",
"version": "5.13.6",
"resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.13.6.tgz",
"integrity": "sha512-IyswXkgxnnl+rpiU+lzXl5/BOEle2llDfuPBrN6K+Eb5vS6a/HN/A9zrdtOcSTb0tVoCZ0QN5PfDSwa/EEGBuQ==",
"dependencies": {
"@types/mongodb": "^3.5.27",
"bson": "^1.1.4",
"kareem": "2.3.2",
"mongodb": "3.6.10",
"mongodb": "3.6.11",
"mongoose-legacy-pluralize": "1.0.2",
"mpath": "0.8.3",
"mquery": "3.2.5",
@@ -14332,9 +14332,9 @@
"integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
},
"mongodb": {
"version": "3.6.10",
"resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.6.10.tgz",
"integrity": "sha512-fvIBQBF7KwCJnDZUnFFy4WqEFP8ibdXeFANnylW19+vOwdjOAvqIzPdsNCEMT6VKTHnYu4K64AWRih0mkFms6Q==",
"version": "3.6.11",
"resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.6.11.tgz",
"integrity": "sha512-4Y4lTFHDHZZdgMaHmojtNAlqkvddX2QQBEN0K//GzxhGwlI9tZ9R0vhbjr1Decw+TF7qK0ZLjQT292XgHRRQgw==",
"requires": {
"bl": "^2.2.1",
"bson": "^1.1.4",
@@ -14345,14 +14345,14 @@
}
},
"mongoose": {
"version": "5.13.5",
"resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.13.5.tgz",
"integrity": "sha512-sSUAk9GWgA8r3w3nVNrNjBaDem86aevwXO8ltDMKzCf+rjnteMMQkXHQdn1ePkt7alROEPZYCAjiRjptWRSPiQ==",
"version": "5.13.6",
"resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.13.6.tgz",
"integrity": "sha512-IyswXkgxnnl+rpiU+lzXl5/BOEle2llDfuPBrN6K+Eb5vS6a/HN/A9zrdtOcSTb0tVoCZ0QN5PfDSwa/EEGBuQ==",
"requires": {
"@types/mongodb": "^3.5.27",
"bson": "^1.1.4",
"kareem": "2.3.2",
"mongodb": "3.6.10",
"mongodb": "3.6.11",
"mongoose-legacy-pluralize": "1.0.2",
"mpath": "0.8.3",
"mquery": "3.2.5",

4
package.json
View File

@@ -1,7 +1,7 @@
{
"name": "homebrewery",
"description": "Create authentic looking D&D homebrews using only markdown",
"version": "2.13.2",
"version": "2.13.3",
"engines": {
"node": "14.15.x"
},
@@ -61,7 +61,7 @@
"marked": "2.1.3",
"markedLegacy": "npm:marked@^0.3.19",
"moment": "^2.29.1",
"mongoose": "^5.13.5",
"mongoose": "^5.13.6",
"nanoid": "3.1.23",
"nconf": "^0.11.3",
"prop-types": "15.7.2",

9
server/googleActions.js
View File

@@ -190,10 +190,11 @@ GoogleActions = {
'description' : `${brew.description}`,
'parents' : [folderId],
'properties' : { //AppProperties is not accessible
'shareId' : nanoid(12),
'editId' : nanoid(12),
'title' : brew.title,
'views' : '0'
'shareId' : nanoid(12),
'editId' : nanoid(12),
'title' : brew.title,
'views' : '0',
'renderer' : brew.renderer || 'legacy'
}
};