ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update object tracker version and update branding defaults

fix-mariadb-no-password-install
Moe 2024-03-12 13:38:00 -07:00
parent f32924de3b
commit 4972d485c6
4 changed files with 48 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libs/basic/utils.js
View File

@ -228,6 +228,18 @@ module.exports = (processCwd,config) => {
return s; return s;
} }
function setDefaultIfUndefined(config, key, defaultValue) {
const mustDoDefault = !config.userHasSubscribed;
if (Array.isArray(defaultValue)) {
if (config[key] === undefined || mustDoDefault) {
config[key] = [...defaultValue]; // Spread operator to clone the array
}
} else {
if (config[key] === undefined || mustDoDefault) {
config[key] = defaultValue;
}
}
}
return { return {
parseJSON: parseJSON, parseJSON: parseJSON,
stringJSON: stringJSON, stringJSON: stringJSON,
@ -248,5 +260,6 @@ module.exports = (processCwd,config) => {
asyncSetTimeout: asyncSetTimeout, asyncSetTimeout: asyncSetTimeout,
copyFile: copyFile, copyFile: copyFile,
hmsToSeconds, hmsToSeconds,
setDefaultIfUndefined,
} }
} }

69
libs/branding.js
View File

@ -1,46 +1,31 @@
module.exports = function(s,config,lang,app,io){ module.exports = function(s,config,lang,app,io){
if(config.showPoweredByShinobi === undefined){config.showPoweredByShinobi=true} const processCwd = process.cwd();
if(config.poweredByShinobi === undefined){config.poweredByShinobi='Powered by Shinobi.Systems'} const { setDefaultIfUndefined } = require('./basic/utils.js')(processCwd,config);
if(config.showLoginCardHeader === undefined){config.showLoginCardHeader=true} setDefaultIfUndefined(config, 'showPoweredByShinobi', true);
if(config.webFavicon === undefined){config.webFavicon = 'libs/img/icon/favicon.ico'} setDefaultIfUndefined(config, 'poweredByShinobi', 'Powered by Shinobi.Systems');
if(!config.logoLocationAppleTouchIcon)config.logoLocationAppleTouchIcon = 'libs/img/icon/apple-touch-icon.png'; setDefaultIfUndefined(config, 'showLoginCardHeader', true);
if(!config.logoLocation57x57)config.logoLocation57x57 = 'libs/img/icon/apple-touch-icon-57x57.png'; setDefaultIfUndefined(config, 'webFavicon', 'libs/img/icon/favicon.ico');
if(!config.logoLocation72x72)config.logoLocation72x72 = 'libs/img/icon/apple-touch-icon-72x72.png'; setDefaultIfUndefined(config, 'logoLocationAppleTouchIcon', 'libs/img/icon/apple-touch-icon.png');
if(!config.logoLocation76x76)config.logoLocation76x76 = 'libs/img/icon/apple-touch-icon-76x76.png'; setDefaultIfUndefined(config, 'logoLocation57x57', 'libs/img/icon/apple-touch-icon-57x57.png');
if(!config.logoLocation114x114)config.logoLocation114x114 = 'libs/img/icon/apple-touch-icon-114x114.png'; setDefaultIfUndefined(config, 'logoLocation72x72', 'libs/img/icon/apple-touch-icon-72x72.png');
if(!config.logoLocation120x120)config.logoLocation120x120 = 'libs/img/icon/apple-touch-icon-120x120.png'; setDefaultIfUndefined(config, 'logoLocation76x76', 'libs/img/icon/apple-touch-icon-76x76.png');
if(!config.logoLocation144x144)config.logoLocation144x144 = 'libs/img/icon/apple-touch-icon-144x144.png'; setDefaultIfUndefined(config, 'logoLocation114x114', 'libs/img/icon/apple-touch-icon-114x114.png');
if(!config.logoLocation152x152)config.logoLocation152x152 = 'libs/img/icon/apple-touch-icon-152x152.png'; setDefaultIfUndefined(config, 'logoLocation120x120', 'libs/img/icon/apple-touch-icon-120x120.png');
if(!config.logoLocation196x196)config.logoLocation196x196 = 'libs/img/icon/favicon-196x196.png'; setDefaultIfUndefined(config, 'logoLocation144x144', 'libs/img/icon/apple-touch-icon-144x144.png');
if(config.logoLocation76x76Link === undefined){config.logoLocation76x76Link='https://shinobi.video'} setDefaultIfUndefined(config, 'logoLocation152x152', 'libs/img/icon/apple-touch-icon-152x152.png');
if(config.logoLocation76x76Style === undefined){config.logoLocation76x76Style='border-radius:50%'} setDefaultIfUndefined(config, 'logoLocation196x196', 'libs/img/icon/favicon-196x196.png');
if(config.loginScreenBackground === undefined){config.loginScreenBackground='assets/img/splash.avif'} setDefaultIfUndefined(config, 'logoLocation76x76Link', 'https://shinobi.video');
if(config.showLoginSelector === undefined){config.showLoginSelector=true} setDefaultIfUndefined(config, 'logoLocation76x76Style', 'border-radius:50%');
if(config.defaultTheme === undefined)config.defaultTheme = 'Ice-v3'; setDefaultIfUndefined(config, 'loginScreenBackground', 'assets/img/splash.avif');
if(config.socialLinks === undefined){ setDefaultIfUndefined(config, 'showLoginSelector', true);
config.socialLinks = [ setDefaultIfUndefined(config, 'defaultTheme', 'Ice-v3');
{ setDefaultIfUndefined(config, 'socialLinks', [
icon: 'home', { icon: 'home', href: 'https://shinobi.video', title: 'Homepage' },
href: 'https://shinobi.video', { icon: 'facebook', href: 'https://www.facebook.com/ShinobiCCTV', title: 'Facebook' },
title: 'Homepage' { icon: 'twitter', href: 'https://twitter.com/ShinobiCCTV', title: 'Twitter' },
}, { icon: 'youtube', href: 'https://www.youtube.com/channel/UCbgbBLTK-koTyjOmOxA9msQ', title: 'YouTube' }
{ ]);
icon: 'facebook',
href: 'https://www.facebook.com/ShinobiCCTV',
title: 'Facebook'
},
{
icon: 'twitter',
href: 'https://twitter.com/ShinobiCCTV',
title: 'Twitter'
},
{
icon: 'youtube',
href: 'https://www.youtube.com/channel/UCbgbBLTK-koTyjOmOxA9msQ',
title: 'YouTube'
}
]
}
s.getConfigWithBranding = function(domain){ s.getConfigWithBranding = function(domain){
var configCopy = Object.assign({},config) var configCopy = Object.assign({},config)
if(config.brandingConfig && config.brandingConfig[domain]){ if(config.brandingConfig && config.brandingConfig[domain]){

14
package-lock.json generated
View File

@ -47,7 +47,7 @@
"pixel-change": "^1.1.0", "pixel-change": "^1.1.0",
"pushover-notifications": "^1.2.2", "pushover-notifications": "^1.2.2",
"sat": "^0.7.1", "sat": "^0.7.1",
"shinobi-node-moving-things-tracker": "^0.9.1", "shinobi-node-moving-things-tracker": "^0.9.3",
"shinobi-onvif": "0.1.9", "shinobi-onvif": "0.1.9",
"shinobi-sound-detection": "^0.1.13", "shinobi-sound-detection": "^0.1.13",
"shinobi-zwave": "^1.0.11", "shinobi-zwave": "^1.0.11",
@ -6687,9 +6687,9 @@
"integrity": "sha1-aP0CXrBJC09WegJ/C/IkgLX4QTM=" "integrity": "sha1-aP0CXrBJC09WegJ/C/IkgLX4QTM="
}, },
"node_modules/shinobi-node-moving-things-tracker": { "node_modules/shinobi-node-moving-things-tracker": {
"version": "0.9.1", "version": "0.9.3",
"resolved": "https://registry.npmjs.org/shinobi-node-moving-things-tracker/-/shinobi-node-moving-things-tracker-0.9.1.tgz", "resolved": "https://registry.npmjs.org/shinobi-node-moving-things-tracker/-/shinobi-node-moving-things-tracker-0.9.3.tgz",
"integrity": "sha512-pcI/IJ9D87RJiTGEsBYvtb2FTQXkHCkuyv6dYaXB5KVpnhQJGyf37BvAbvCNuCJmlffBGTMClY2dg84ZwHl/Ow==", "integrity": "sha512-SdOOu8vww6zulWL1R3Fx6kXkAbY0YEsRtJ/XrvioIKFykA1OV88/kzjJ4qmUM/d29DqurauqBH+18UtPe98ZVg==",
"dependencies": { "dependencies": {
"lodash.isequal": "^4.5.0", "lodash.isequal": "^4.5.0",
"minimist": "^1.2.0", "minimist": "^1.2.0",
@ -13292,9 +13292,9 @@
"integrity": "sha1-aP0CXrBJC09WegJ/C/IkgLX4QTM=" "integrity": "sha1-aP0CXrBJC09WegJ/C/IkgLX4QTM="
}, },
"shinobi-node-moving-things-tracker": { "shinobi-node-moving-things-tracker": {
"version": "0.9.1", "version": "0.9.3",
"resolved": "https://registry.npmjs.org/shinobi-node-moving-things-tracker/-/shinobi-node-moving-things-tracker-0.9.1.tgz", "resolved": "https://registry.npmjs.org/shinobi-node-moving-things-tracker/-/shinobi-node-moving-things-tracker-0.9.3.tgz",
"integrity": "sha512-pcI/IJ9D87RJiTGEsBYvtb2FTQXkHCkuyv6dYaXB5KVpnhQJGyf37BvAbvCNuCJmlffBGTMClY2dg84ZwHl/Ow==", "integrity": "sha512-SdOOu8vww6zulWL1R3Fx6kXkAbY0YEsRtJ/XrvioIKFykA1OV88/kzjJ4qmUM/d29DqurauqBH+18UtPe98ZVg==",
"requires": { "requires": {
"lodash.isequal": "^4.5.0", "lodash.isequal": "^4.5.0",
"minimist": "^1.2.0", "minimist": "^1.2.0",

2
package.json
View File

@ -53,7 +53,7 @@
"pixel-change": "^1.1.0", "pixel-change": "^1.1.0",
"pushover-notifications": "^1.2.2", "pushover-notifications": "^1.2.2",
"sat": "^0.7.1", "sat": "^0.7.1",
"shinobi-node-moving-things-tracker": "^0.9.1", "shinobi-node-moving-things-tracker": "^0.9.3",
"shinobi-onvif": "0.1.9", "shinobi-onvif": "0.1.9",
"shinobi-sound-detection": "^0.1.13", "shinobi-sound-detection": "^0.1.13",
"shinobi-zwave": "^1.0.11", "shinobi-zwave": "^1.0.11",