This is a change being applied to the configuration file (conf.json). Are you sure you want to do this? You must restart Shinobi for these changes to take effect. The JSON below is what you are about to save.
' + html += `${newConfiguration}`
+ $.confirm.create({
+ title: 'Save Configuration conf.json',
+ body: html,
+ clickOptions: {
+ class: 'btn-success',
+ title: lang.Save,
+ },
+ clickCallback: function(){
+ $.post('<%=originalURL%><%=config.webPaths.superApiPrefix%>'+$user.sessionKey+'/system/configure',{
+ data: newConfiguration
+ },function(data){
+ // console.log(data)
+ })
+ }
+ })
+ }else{
+ new PNotify({text:'Invalid JSON Syntax, Cannot Save.',type:'error'})
}
- },
- "detectorMergePamRegionTriggers": {
- "type": "boolean",
- "default": true
- },
- "doSnapshot": {
- "type": "boolean",
- "default": true
- },
- "discordBot": {
- "type": "boolean",
- "default": false
- },
- "dropInEventServer": {
- "type": "boolean",
- "default": false
- },
- "ftpServer": {
- "type": "boolean",
- "default": false
- },
- "oldPowerVideo": {
- "type": "boolean",
- "default": false
- },
- "defaultMjpeg": {
- "type": "string",
- },
- "streamDir": {
- "type": "string",
- },
- "videosDir": {
- "type": "string",
- },
- "windowsTempDir": {
- "type": "string",
}
- }
-};
-
-// Set default options
-JSONEditor.defaults.options.theme = 'bootstrap3';
-JSONEditor.defaults.options.iconlib = 'fontawesome4';
-
-// Initialize the editor
-var editor = new JSONEditor(document.getElementById("configForHumans"),{
- theme: 'bootstrap3',
- schema: schema,
- //schema: {
- // type: "object",
- // properties: {
- // name: { "type": "string" }
- // }
- //}
-});
-
-// Set the value
-editor.setValue(shinobiConfig);
-//editor.setValue({
-// name: "John Smith"
-//});
-
-// Get the value
-var data = editor.getValue();
-console.log(data); // "John Smith"
-
-// Validate
-var errors = editor.validate();
-if(errors.length) {
- // Not valid
-}
-
-// Listen for changes
-editor.on("change", function() {
- // Do something...
-});
+ configurationTab.find('.submit').click(function(){
+ submitConfiguration()
+ })
+ configurationForm.submit(function(e){
+ e.preventDefault()
+ submitConfiguration()
+ return false;
+ })
+ window.configurationEditor = configurationEditor
+})
diff --git a/web/libs/js/super.preferences.js b/web/libs/js/super.preferences.js
new file mode 100644
index 00000000..e31b2b93
--- /dev/null
+++ b/web/libs/js/super.preferences.js
@@ -0,0 +1,18 @@
+$(document).ready(function(){
+ var changeSuperPreferencesTab = $('#changeSuperPreferences')
+ var changeSuperPreferencesForm = changeSuperPreferencesTab.find('form')
+ changeSuperPreferencesTab.find('.submit').click(function(){
+ changeSuperPreferencesForm.submit()
+ })
+ changeSuperPreferencesForm.submit(function(e){
+ e.preventDefault()
+ var formValues = $(this).serializeObject()
+ // $.ccio.cx({f:'accounts',ff:'saveSuper',form:formValues})
+ $.post(superApiPrefix + $user.sessionKey + '/accounts/saveSettings',{
+ data: JSON.stringify(formValues)
+ },function(data){
+ console.log(data)
+ })
+ return false
+ })
+})
diff --git a/web/libs/js/super.systemTab.js b/web/libs/js/super.systemTab.js
new file mode 100644
index 00000000..196891bf
--- /dev/null
+++ b/web/libs/js/super.systemTab.js
@@ -0,0 +1,70 @@
+$(document).ready(function(){
+ var systemsControlsTab = $('#system')
+ systemsControlsTab.find('[system]').click(function(e){
+ switch($(this).attr('system')){
+ case'deleteLogs':
+ var html = 'Do you want to delete these logs? User logs will not be deleted.'
+ $.confirm.create({
+ title: `${lang['Delete Logs']} ${e.u}`,
+ body: html,
+ clickOptions: {
+ class: 'btn-danger',
+ title: lang.Delete,
+ },
+ clickCallback: function(){
+ $.get(superApiPrefix + $user.sessionKey + '/logs/delete',function(data){
+ console.log(data)
+ })
+ $.logs.e.find('table').empty()
+ }
+ })
+ break;
+ case'update':
+ var html = 'Updating Shinobi means overwriting files. If you have modified any files yourself you should update Shinobi manually.'
+ $.confirm.create({
+ title: `${lang.Update} Shinobi?`,
+ body: html,
+ clickOptions: {
+ class: 'btn-danger',
+ title: lang.Update,
+ },
+ clickCallback: function(){
+ $.get(superApiPrefix + $user.sessionKey + '/system/update',function(data){
+ console.log(data)
+ })
+ }
+ })
+ break;
+ }
+ })
+ systemsControlsTab.find('[restart]').click(function(e){
+ var html = ''
+ var target = $(this).attr('restart').split(',')
+ target.forEach(function(v){
+ switch(v){
+ case'system':
+ html += 'Do you want to restart the core (camera.js)? plugins will not be restarted. They will reconnect when Shinobi is back online.
' + break; + case'cron': + html += 'Do you want to restart the CRON (cron.js)?
' + break; + case'logs': + html += 'Flush PM2 console logs? The logs saved in the database will not be deleted.
' + break; + } + }) + $.confirm.create({ + title: `${lang.Restart}?`, + body: html, + clickOptions: { + class: 'btn-danger', + title: lang.Restart, + }, + clickCallback: function(){ + $.get(superApiPrefix + $user.sessionKey + '/system/restart/'+encodeURIComponent(target),function(data){ + console.log(data) + }) + } + }) + }) +}) diff --git a/web/pages/blocks/changeSuperPreferences.ejs b/web/pages/blocks/changeSuperPreferences.ejs index a668083f..af088f10 100644 --- a/web/pages/blocks/changeSuperPreferences.ejs +++ b/web/pages/blocks/changeSuperPreferences.ejs @@ -37,3 +37,4 @@ + diff --git a/web/pages/blocks/superConfigEditor.ejs b/web/pages/blocks/superConfigEditor.ejs index c3bd404c..b2402dfe 100644 --- a/web/pages/blocks/superConfigEditor.ejs +++ b/web/pages/blocks/superConfigEditor.ejs @@ -15,12 +15,7 @@ diff --git a/web/pages/blocks/superSystemTab.ejs b/web/pages/blocks/superSystemTab.ejs new file mode 100644 index 00000000..400cac34 --- /dev/null +++ b/web/pages/blocks/superSystemTab.ejs @@ -0,0 +1,33 @@ + +This is a change being applied to the configuration file (conf.json). Are you sure you want to do this? You must restart Shinobi for these changes to take effect. The JSON below is what you are about to save.
' - e.html+=''+JSON.stringify($.parseJSON($.conf.draw.val()),null,3)+'' - $.confirm.body.html(e.html) - $.confirm.click({title:lang.Save,class:'btn-success'},function(){ - $.post('<%=originalURL%><%=config.webPaths.superApiPrefix%>'+$user.sessionKey+'/system/configure',{ - data: $.conf.draw.val() - },function(data){ - // console.log(data) - }) - // $.ccio.cx({f:'system',ff:'configure',data:$.parseJSON($.conf.draw.val())}) - }); - }else{ - new PNotify({text:'Invalid JSON Syntax, Cannot Save.',type:'error'}) - } - return false; -}) -//sys controls -$.system={e:$('#system')} -$.system.e.find('[system]').click(function(e){ - switch($(this).attr('system')){ - case'deleteLogs': - $.confirm.e.modal('show'); - $.confirm.title.html('<%=lang['Delete Logs']%> '+e.u+'') - e.html='Do you want to delete these logs? User logs will not be deleted.' - $.confirm.body.html(e.html) - $.confirm.click({title:lang.Delete,class:'btn-danger'},function(){ - // $.ccio.cx({f:'logs',ff:'delete',ke:'$'}) - $.get('<%=originalURL%><%=config.webPaths.superApiPrefix%>'+$user.sessionKey+'/logs/delete',function(data){ - console.log(data) - }) - $.logs.e.find('table').empty() - }); - break; - case'update': - $.confirm.e.modal('show') - $.confirm.title.html('<%=lang.Update%> Shinobi?') - $.confirm.body.html('Updating Shinobi means overwriting files. If you have modified any files yourself you should update Shinobi manually.') - $.confirm.click({title:lang.Update,class:'btn-danger'},function(){ - // $.ccio.cx({f:'system',ff:'update'}) - $.get('<%=originalURL%><%=config.webPaths.superApiPrefix%>'+$user.sessionKey+'/system/update',function(data){ - console.log(data) - }) - }) - break; - } -}) -$.system.e.find('[restart]').click(function(e){ - $.confirm.e.modal('show'); - e.html='' - e.title='' - e.target=$(this).attr('restart').split(',') - e.target.forEach(function(v){ - switch(v){ - case'system': - e.html+='
Do you want to restart the core (camera.js)? plugins will not be restarted. They will reconnect when Shinobi is back online.
' - break; - case'cron': - e.html+='Do you want to restart the CRON (cron.js)?
' - break; - case'logs': - e.html+='Flush PM2 console logs? The logs saved in the database will not be deleted.
' - break; - } - }) - $.confirm.title.html('<%=lang.Restart%>?') - $.confirm.body.html(e.html) - $.confirm.click({title:lang.Restart,class:'btn-danger'},function(){ - // $.ccio.cx({f:'system',ff:'restart',target:e.target}) - $.get('<%=originalURL%><%=config.webPaths.superApiPrefix%>'+$user.sessionKey+'/system/restart/'+encodeURIComponent(e.target),function(data){ - console.log(data) - }) - }); -}) -$.changeSuperPreferences = { - window : $('#changeSuperPreferences') -} -$.changeSuperPreferences.form = $.changeSuperPreferences.window.find('form') -$.changeSuperPreferences.form.find('.submit').click(function(){ - $.changeSuperPreferences.form.submit() -}) -$.changeSuperPreferences.form.submit(function(e){ - e.preventDefault() - var formValues = $(this).serializeObject() - // $.ccio.cx({f:'accounts',ff:'saveSuper',form:formValues}) - $.post('<%=originalURL%><%=config.webPaths.superApiPrefix%>'+$user.sessionKey+'/accounts/saveSettings',{ - data: JSON.stringify(formValues) - },function(data){ - console.log(data) - }) - return false -}) //// $(document).ready(function(){ <% if(!users || !(users instanceof Array)){ %>