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

Merge branch 'master' into SwappableThemes-ReorganizeFolderStructure

Browse Source
This commit is contained in:
Trevor Buckner
2022-08-31 23:57:46 -04:00
parent a383995522 98e2d57691
commit 66a5f51927
7 changed files with 22831 additions and 22776 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/homebrew/homebrew.jsx
View File

@@ -14,13 +14,17 @@ const PrintPage = require('./pages/printPage/printPage.jsx');
const WithRoute = (props)=>{
const params = useParams();
const searchParams = useSearchParams();
const [searchParams] = useSearchParams();
const queryParams = {};
for (const [key, value] of searchParams?.entries() || []) {
queryParams[key] = value;
}
const Element = props.el;
const allProps = {
...props,
...params,
...searchParams,
el : undefined
query : queryParams,
el : undefined
};
return <Element {...allProps} />;
};

5
client/homebrew/pages/basePages/listPage/listPage.jsx
View File

@@ -100,7 +100,6 @@ const ListPage = createClass({
<i className='fas fa-search'></i>
<input
type='search'
autoFocus={true}
placeholder='filter title/description'
onChange={this.handleFilterTextChange}
value={this.state.filterString}
@@ -161,11 +160,11 @@ const ListPage = createClass({
render : function(){
return <div className='listPage sitePage'>
<link href='/themes/Legacy/5ePHB/style.css' rel='stylesheet'/>
<link href='/themes/V3/5ePHB/style.css' rel='stylesheet'/>
{this.props.navItems}
<div className='content V3'>
<div className='phb'>
<div className='phb page'>
{this.renderSortOptions()}
{this.renderBrewCollection(this.props.brewCollection)}
</div>

4
client/homebrew/pages/basePages/listPage/listPage.less
View File

@@ -13,7 +13,7 @@
}
.listPage{
.content{
overflow-y : scroll;
overflow-y : overlay;
.phb{
.noColumns();
height : auto;
@@ -34,7 +34,7 @@
font-family : 'Open Sans', sans-serif;
position : fixed;
top : 35px;
left : calc(50vw - 408px);
left : calc(50vw - 400px);
border : 2px solid #58180D;
width : 800px;
background-color : #EEE5CE;

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

@@ -50,21 +50,6 @@ const NewPage = createClass({
getInitialState : function() {
const brew = this.props.brew;
if(typeof window !== 'undefined') { //Load from localStorage if in client browser
const brewStorage = localStorage.getItem(BREWKEY);
const styleStorage = localStorage.getItem(STYLEKEY);
const metaStorage = JSON.parse(localStorage.getItem(METAKEY));
if(!brew.text || !brew.style){
brew.text = brew.text || (brewStorage ?? '');
brew.style = brew.style || (styleStorage ?? undefined);
// brew.title = metaStorage?.title || this.state.brew.title;
// brew.description = metaStorage?.description || this.state.brew.description;
brew.renderer = metaStorage?.renderer || brew.renderer;
brew.theme = metaStorage?.theme || brew.theme;
}
}
return {
brew : {
text : brew.text || '',
@@ -89,6 +74,32 @@ const NewPage = createClass({
componentDidMount : function() {
document.addEventListener('keydown', this.handleControlKeys);
const brew = this.props.brew;
if(typeof window !== 'undefined') { //Load from localStorage if in client browser
const brewStorage = localStorage.getItem(BREWKEY);
const styleStorage = localStorage.getItem(STYLEKEY);
const metaStorage = JSON.parse(localStorage.getItem(METAKEY));
if(!brew.text || !brew.style){
brew.text = brew.text || (brewStorage ?? '');
brew.style = brew.style || (styleStorage ?? undefined);
// brew.title = metaStorage?.title || this.state.brew.title;
// brew.description = metaStorage?.description || this.state.brew.description;
brew.renderer = brew.renderer || metaStorage?.renderer;
brew.theme = brew.theme || metaStorage?.theme;
this.setState({
brew : brew
});
}
}
localStorage.setItem(BREWKEY, brew.text);
localStorage.setItem(STYLEKEY, brew.style);
localStorage.setItem(METAKEY, JSON.stringify({'renderer' : brew.renderer}));
},
componentWillUnmount : function() {
document.removeEventListener('keydown', this.handleControlKeys);