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

Hide themes behind flag "enable_themes"

Browse Source
This commit is contained in:
Trevor Buckner
2022-09-05 17:05:37 -04:00
parent c2a5aad1e8
commit eae5fc9be9
6 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/homebrew/brewRenderer/brewRenderer.jsx
View File

@@ -1,3 +1,4 @@
/*eslint max-lines: ["warn", {"max": 300, "skipBlankLines": true, "skipComments": true}]*/
require('./brewRenderer.less'); require('./brewRenderer.less');
const React = require('react'); const React = require('react');
const createClass = require('create-react-class'); const createClass = require('create-react-class');

2
client/homebrew/editor/metadataEditor/metadataEditor.jsx
View File

@@ -152,6 +152,8 @@ const MetadataEditor = createClass({
}, },
renderThemeDropdown : function(){ renderThemeDropdown : function(){
if(!global.enable_themes) return;
const listThemes = (renderer)=>{ const listThemes = (renderer)=>{
return _.map(_.values(Themes[renderer]), (theme)=>{ return _.map(_.values(Themes[renderer]), (theme)=>{
return <div className='item' key={''} onClick={()=>this.handleTheme(theme)} title={''}> return <div className='item' key={''} onClick={()=>this.handleTheme(theme)} title={''}>

11
client/homebrew/editor/snippetbar/snippetbar.jsx
View File

@@ -67,7 +67,7 @@ const Snippetbar = createClass({
}, },
mergeCustomizer : function(valueA, valueB, key) { mergeCustomizer : function(valueA, valueB, key) {
if(key == "snippets") { if(key == 'snippets') {
const result = _.reverse(_.unionBy(_.reverse(valueB), _.reverse(valueA), 'name')); // Join snippets together, with preference for the current theme over the base theme const result = _.reverse(_.unionBy(_.reverse(valueB), _.reverse(valueA), 'name')); // Join snippets together, with preference for the current theme over the base theme
return _.filter(result, 'gen'); //Only keep snippets with a 'gen' property. return _.filter(result, 'gen'); //Only keep snippets with a 'gen' property.
} }
@@ -77,15 +77,14 @@ const Snippetbar = createClass({
let compiledSnippets = snippets; let compiledSnippets = snippets;
const baseSnippetsPath = Themes[rendererPath][themePath].baseSnippets; const baseSnippetsPath = Themes[rendererPath][themePath].baseSnippets;
let objB = _.keyBy(compiledSnippets, 'groupName'); const objB = _.keyBy(compiledSnippets, 'groupName');
if(baseSnippetsPath) { if(baseSnippetsPath) {
let objA = _.keyBy(_.cloneDeep(ThemeSnippets[`${rendererPath}_${baseSnippetsPath}`]), 'groupName'); const objA = _.keyBy(_.cloneDeep(ThemeSnippets[`${rendererPath}_${baseSnippetsPath}`]), 'groupName');
compiledSnippets = _.values(_.mergeWith(objA, objB, this.mergeCustomizer)); compiledSnippets = _.values(_.mergeWith(objA, objB, this.mergeCustomizer));
compiledSnippets = this.compileSnippets(rendererPath, baseSnippetsPath, _.cloneDeep(compiledSnippets)); compiledSnippets = this.compileSnippets(rendererPath, baseSnippetsPath, _.cloneDeep(compiledSnippets));
} } else {
else { const objA = _.keyBy(_.cloneDeep(ThemeSnippets[`${rendererPath}_Blank`]), 'groupName');
let objA = _.keyBy(_.cloneDeep(ThemeSnippets[`${rendererPath}_Blank`]), 'groupName');
compiledSnippets = _.values(_.mergeWith(objA, objB, this.mergeCustomizer)); compiledSnippets = _.values(_.mergeWith(objA, objB, this.mergeCustomizer));
} }
return compiledSnippets; return compiledSnippets;

1
client/homebrew/homebrew.jsx
View File

@@ -54,6 +54,7 @@ const Homebrew = createClass({
global.account = this.props.account; global.account = this.props.account;
global.version = this.props.version; global.version = this.props.version;
global.enable_v3 = this.props.enable_v3; global.enable_v3 = this.props.enable_v3;
global.enable_themes = this.props.enable_themes;
global.config = this.props.config; global.config = this.props.config;
return {}; return {};

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

@@ -75,7 +75,7 @@ const NewPage = createClass({
// brew.title = metaStorage?.title || this.state.brew.title; // brew.title = metaStorage?.title || this.state.brew.title;
// brew.description = metaStorage?.description || this.state.brew.description; // brew.description = metaStorage?.description || this.state.brew.description;
brew.renderer = metaStorage?.renderer ?? brew.renderer; brew.renderer = metaStorage?.renderer ?? brew.renderer;
brew.renderer = metaStorage?.theme ?? brew.theme; brew.theme = metaStorage?.theme ?? brew.theme;
this.setState({ this.setState({
brew : brew brew : brew

17
server/app.js
View File

@@ -287,14 +287,15 @@ app.use(asyncHandler(async (req, res, next)=>{
environment : nodeEnv environment : nodeEnv
}; };
const props = { const props = {
version : require('./../package.json').version, version : require('./../package.json').version,
url : req.originalUrl, url : req.originalUrl,
brew : req.brew, brew : req.brew,
brews : req.brews, brews : req.brews,
googleBrews : req.googleBrews, googleBrews : req.googleBrews,
account : req.account, account : req.account,
enable_v3 : config.get('enable_v3'), enable_v3 : config.get('enable_v3'),
config : configuration enable_themes : config.get('enable_themes'),
config : configuration
}; };
const title = req.brew ? req.brew.title : ''; const title = req.brew ? req.brew.title : '';
const page = await templateFn('homebrew', title, props) const page = await templateFn('homebrew', title, props)