f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-03-24 04:18:10 +00:00
Code Wiki Activity

Merge pull request #1292 from naturalcrit/master

Browse Source 
V2.11.1
This commit is contained in:
Trevor Buckner
2021-03-20 23:59:32 -04:00
committed by GitHub
parent 522fcda547 3ade40f2d9
commit 7c92aae61b
9 changed files with 90 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
changelog.md
View File

@@ -6,6 +6,13 @@ h5 {
# changelog
### Saturday, 20/3/2021 - v2.11.1
- Warning when opening brew in your Google Drive trash
##### 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.
@@ -45,13 +52,14 @@ h5 {
### Monday, 19/10/2020 - v2.10.2
- Fixed issue with "recent" item links not updating when transferring between Google Drive.
### Monday, 12/10/2020 - v2.10.1
- Fixed issue with users unable to create new brews
- Fixing brews being lost when loaded via back button
```
```
### Monday, 12/10/2020 - v2.10.1
- Fixed issue with users unable to create new brews
- Fixing brews being lost when loaded via back button
### Wednesday, 07/10/2020 - v2.10.0
- Google Drive integration -- Sign in with your Google account to link it with your Homebrewery profile. A new button in the Edit page will let you transfer your file to your personal Google Drive storage, and Google will keep a backup of each version! No more lost work surprises!
@@ -92,11 +100,12 @@ h5 {
### Saturday, 22/04/2017 - v2.7.4
- Give ability to hide the render warning notification
### Friday, 03/03/2017 - v2.7.3
- Increasing the range on the Partial Page Rendering for a quick-fix for it getting out of sync on long brews.
\page
### Friday, 03/03/2017 - v2.7.3
- Increasing the range on the Partial Page Rendering for a quick-fix for it getting out of sync on long brews.
### Saturday, 18/02/2017 - v2.7.2
- Adding ability to delete a brew from the user page, incase the user creates a brew that makes the edit page unrender-able. (re:309)

23
client/homebrew/editor/snippetbar/snippets/snippets.js
View File

@@ -77,6 +77,29 @@ module.exports = [
icon : 'fas fa-book',
gen : TableOfContentsGen
},
{
name : 'Remove Drop Cap',
icon : 'fas fa-remove-format',
gen : '<style>\n' +
' .phb3 h1+p:first-letter {\n' +
' all: unset;\n' +
' }\n' +
'</style>'
},
{
name : 'Tweak Drop Cap',
icon : 'fas fa-sliders-h',
gen : '<style>\n' +
' /* Drop Cap settings */\n' +
' .phb3 h1 + p::first-letter {\n' +
' float: left;\n' +
' font-family: SolberaImitationRemake;\n' +
' font-size: 3.5cm;\n' +
' color: #222;\n' +
' line-height: .8em;\n' +
' }\n' +
'</style>'
},
]
},

25
client/homebrew/editor/snippetbar/snippetsLegacy/snippets.js
View File

@@ -77,8 +77,29 @@ module.exports = [
icon : 'fas fa-book',
gen : TableOfContentsGen
},
{
name : 'Remove Drop Cap',
icon : 'fas fa-remove-format',
gen : '<style>\n' +
' .phb h1+p:first-letter {\n' +
' all: unset;\n' +
' }\n' +
'</style>'
},
{
name : 'Tweak Drop Cap',
icon : 'fas fa-sliders-h',
gen : '<style>\n' +
' /* Drop Cap settings */\n' +
' .phb h1 + p::first-letter {\n' +
' float: left;\n' +
' font-family: Solberry;\n' +
' font-size: 10em;\n' +
' color: #222;\n' +
' line-height: .8em;\n' +
' }\n' +
'</style>'
},
]
},

46
client/homebrew/pages/editPage/editPage.jsx
View File

@@ -36,6 +36,7 @@ const EditPage = createClass({
createdAt : null,
updatedAt : null,
gDrive : false,
trashed : false,
title : '',
description : '',
@@ -50,15 +51,15 @@ const EditPage = createClass({
getInitialState : function() {
return {
brew : this.props.brew,
isSaving : false,
isPending : false,
alertRenderChange : false,
saveGoogle : this.props.brew.googleId ? true : false,
confirmGoogleTransfer : false,
errors : null,
htmlErrors : Markdown.validate(this.props.brew.text),
url : ''
brew : this.props.brew,
isSaving : false,
isPending : false,
alertTrashedGoogleBrew : this.props.brew.trashed,
saveGoogle : this.props.brew.googleId ? true : false,
confirmGoogleTransfer : false,
errors : null,
htmlErrors : Markdown.validate(this.props.brew.text),
url : ''
};
},
savedBrew : null,
@@ -105,11 +106,6 @@ const EditPage = createClass({
},
handleMetadataChange : function(metadata){
if(metadata.renderer != this.savedBrew.renderer){
this.setState({
alertRenderChange : true
});
}
this.setState((prevState)=>({
brew : _.merge({}, prevState.brew, metadata),
isPending : true,
@@ -152,7 +148,7 @@ const EditPage = createClass({
closeAlerts : function(){
this.setState({
alertRenderChange : false
alertTrashedGoogleBrew : false
});
},
@@ -349,15 +345,6 @@ const EditPage = createClass({
}
},
// {this.state.alertRenderChange &&
// <div className='errorContainer' onClick={this.closeAlerts}>
// Rendering mode for this brew has been changed! Refresh the page to load the new renderer.<br />
// <div className='confirm'>
// OK
// </div>
// </div>
// }
processShareId : function() {
return this.state.brew.googleId ?
this.state.brew.googleId + this.state.brew.shareId :
@@ -366,6 +353,16 @@ const EditPage = createClass({
renderNavbar : function(){
return <Navbar>
{this.state.alertTrashedGoogleBrew &&
<div className='errorContainer' onClick={this.closeAlerts}>
This brew is currently in your Trash folder on Google Drive!<br />If you want to keep it, make sure to move it before it is deleted permanently!<br />
<div className='confirm'>
OK
</div>
</div>
}
<Nav.section>
<Nav.item className='brewTitle'>{this.state.brew.title}</Nav.item>
</Nav.section>
@@ -382,6 +379,7 @@ const EditPage = createClass({
<RecentNavItem brew={this.state.brew} storageKey='edit' />
<Account />
</Nav.section>
</Navbar>;
},

3
client/homebrew/pages/editPage/editPage.less
View File

@@ -41,6 +41,9 @@
border-radius : 5px;
transform : translate(-50% + 3px, 10px);
text-align : center;
font-size : 10px;
font-weight : 800;
text-transform : uppercase;
a{
color : @teal;
}

2
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "homebrewery",
"version": "2.11.0",
"version": "2.11.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

2
package.json
View File

@@ -1,7 +1,7 @@
{
"name": "homebrewery",
"description": "Create authentic looking D&D homebrews using only markdown",
"version": "2.11.0",
"version": "2.11.1",
"engines": {
"node": "14.15.x"
},

3
server/googleActions.js
View File

@@ -244,7 +244,7 @@ GoogleActions = {
const obj = await drive.files.get({
fileId : id,
fields : 'properties, createdTime, modifiedTime, description'
fields : 'properties, createdTime, modifiedTime, description, trashed'
})
.catch((err)=>{
console.log('Error loading from Google');
@@ -291,6 +291,7 @@ GoogleActions = {
systems : obj.data.properties.systems ? obj.data.properties.systems.split(',') : [],
authors : [],
published : obj.data.properties.published ? obj.data.properties.published == 'true' : false,
trashed : obj.data.trashed,
createdAt : obj.data.createdTime,
updatedAt : obj.data.modifiedTime,

1
shared/naturalcrit/nav/nav.less
View File

@@ -1,6 +1,7 @@
nav{
background-color : #333;
.navContent{
position : relative;
display : flex;
justify-content : space-between;
}