renamed appCard fields

renamed appCard fields. added model for server settings.

components/appCard.js

@@ -340,7 +340,7 @@ function appCard(data) {
 
                               <div class="row mb-1 align-items-end">
                                 <div class="col-auto">
-                                  <input class="form-check-input" name="port_0_check" type="checkbox" ${ports_data[0].check}>
+                                  <input class="form-check-input" name="port0" type="checkbox" ${ports_data[0].check}>
                                 </div>
                                 <div class="col">
                                   <label class="form-label">External Port</label>
@@ -362,7 +362,7 @@ function appCard(data) {
             
                               <div class="row mb-1 align-items-end">
                                 <div class="col-auto">
-                                  <input class="form-check-input" name="port_1_check" type="checkbox" ${ports_data[1].check}>
+                                  <input class="form-check-input" name="port1" type="checkbox" ${ports_data[1].check}>
                                 </div>
                                 <div class="col">
                                   <input type="text" class="form-control" name="port_1_external" value="${ports_data[1].external}"/>
@@ -381,7 +381,7 @@ function appCard(data) {
             
                               <div class="row mb-1 align-items-end">
                                 <div class="col-auto">
-                                  <input class="form-check-input" name="port_2_check" type="checkbox" ${ports_data[2].check}>
+                                  <input class="form-check-input" name="port2" type="checkbox" ${ports_data[2].check}>
                                 </div>
                                 <div class="col">
                                   <input type="text" class="form-control" name="port_2_external" value="${ports_data[2].external}"/>
@@ -400,7 +400,7 @@ function appCard(data) {
             
                               <div class="row mb-1 align-items-end">
                                 <div class="col-auto">
-                                  <input class="form-check-input" name="port_3_check" type="checkbox" ${ports_data[3].check}>
+                                  <input class="form-check-input" name="port3" type="checkbox" ${ports_data[3].check}>
                                 </div>
                                 <div class="col">
                                   <input type="text" class="form-control" name="port_3_external" value="${ports_data[3].external}"/>
@@ -419,7 +419,7 @@ function appCard(data) {
             
                               <div class="row mb-1 align-items-end">
                                 <div class="col-auto">
-                                  <input class="form-check-input" name="port_4_check" type="checkbox" ${ports_data[4].check}>
+                                  <input class="form-check-input" name="port4" type="checkbox" ${ports_data[4].check}>
                                 </div>
                                 <div class="col">
                                   <input type="text" class="form-control" name="port_4_external" value="${ports_data[4].external}"/>
@@ -438,7 +438,7 @@ function appCard(data) {
             
                               <div class="row mb-1 align-items-end">
                                 <div class="col-auto">
-                                  <input class="form-check-input" name="port_5_check" type="checkbox" ${ports_data[5].check}>
+                                  <input class="form-check-input" name="port5" type="checkbox" ${ports_data[5].check}>
                                 </div>
                                 <div class="col">
                                   <input type="text" class="form-control" name="port_5_external" value="${ports_data[5].external}"/>
@@ -471,7 +471,7 @@ function appCard(data) {
             
                             <div class="row mb-1 align-items-end">
                             <div class="col-auto">
-                              <input class="form-check-input" name="volume_0_check" type="checkbox" ${volumes_data[0].check}>
+                              <input class="form-check-input" name="volume0" type="checkbox" ${volumes_data[0].check}>
                             </div>
                             <div class="col">
                               <input type="text" class="form-control" name="volume_0_bind" value="${volumes_data[0].bind}"/>
@@ -490,7 +490,7 @@ function appCard(data) {
             
                           <div class="row mb-1 align-items-end">
                             <div class="col-auto">
-                              <input class="form-check-input" name="volume_1_check" type="checkbox" ${volumes_data[1].check}>
+                              <input class="form-check-input" name="volume1" type="checkbox" ${volumes_data[1].check}>
                             </div>
                             <div class="col">
                               <input type="text" class="form-control" name="volume_1_bind" value="${volumes_data[1].bind}"/>
@@ -509,7 +509,7 @@ function appCard(data) {
             
                           <div class="row mb-1 align-items-end">
                             <div class="col-auto">
-                              <input class="form-check-input" name="volume_2_check" type="checkbox" ${volumes_data[2].check}>
+                              <input class="form-check-input" name="volume2" type="checkbox" ${volumes_data[2].check}>
                             </div>
                             <div class="col">
                               <input type="text" class="form-control" name="volume_2_bind" value="${volumes_data[2].bind}"/>
@@ -528,7 +528,7 @@ function appCard(data) {
             
                           <div class="row mb-1 align-items-end">
                             <div class="col-auto">
-                              <input class="form-check-input" name="volume_3_check" type="checkbox" ${volumes_data[3].check}>
+                              <input class="form-check-input" name="volume3" type="checkbox" ${volumes_data[3].check}>
                             </div>
                             <div class="col">
                               <input type="text" class="form-control" name="volume_3_bind" value="${volumes_data[3].bind}"/>
@@ -547,7 +547,7 @@ function appCard(data) {
             
                           <div class="row mb-1 align-items-end">
                             <div class="col-auto">
-                              <input class="form-check-input" name="volume_4_check" type="checkbox" ${volumes_data[4].check}>
+                              <input class="form-check-input" name="volume4" type="checkbox" ${volumes_data[4].check}>
                             </div>
                             <div class="col">
                               <input type="text" class="form-control" name="volume_4_bind" value="${volumes_data[4].bind}"/>
@@ -566,7 +566,7 @@ function appCard(data) {
             
                           <div class="row mb-1 align-items-end">
                           <div class="col-auto">
-                            <input class="form-check-input" name="volume_5_check" type="checkbox" ${volumes_data[5].check}>
+                            <input class="form-check-input" name="volume5" type="checkbox" ${volumes_data[5].check}>
                           </div>
                           <div class="col">
                             <input type="text" class="form-control" name="volume_5_bind" value="${volumes_data[5].bind}"/>
@@ -599,7 +599,7 @@ function appCard(data) {
             
                               <div class="row mb-1 align-items-end">
                                 <div class="col-auto">
-                                  <input class="form-check-input" type="checkbox" name="env_0_check" ${env_data[0].check}>
+                                  <input class="form-check-input" type="checkbox" name="env0" ${env_data[0].check}>
                                 </div>
                                 <div class="col">
                                   <label class="form-label">Variable</label>
@@ -613,7 +613,7 @@ function appCard(data) {
             
                               <div class="row mb-1 align-items-end">
                                 <div class="col-auto">
-                                  <input class="form-check-input" type="checkbox" name="env_1_check" ${env_data[1].check}>
+                                  <input class="form-check-input" type="checkbox" name="env1" ${env_data[1].check}>
                                 </div>
                                 <div class="col">
                                   <input type="text" class="form-control" name="env_1_name" value="${env_data[1].name}"/>
@@ -625,7 +625,7 @@ function appCard(data) {
             
                               <div class="row mb-1 align-items-end">
                                 <div class="col-auto">
-                                  <input class="form-check-input" type="checkbox" name="env_2_check" ${env_data[2].check}>
+                                  <input class="form-check-input" type="checkbox" name="env2" ${env_data[2].check}>
                                 </div>
                                 <div class="col">
                                   <input type="text" class="form-control" name="env_2_name" value="${env_data[2].name}"/>
@@ -637,7 +637,7 @@ function appCard(data) {
             
                               <div class="row mb-1 align-items-end">
                                 <div class="col-auto">
-                                  <input class="form-check-input" type="checkbox" name="env_3_check" ${env_data[3].check}>
+                                  <input class="form-check-input" type="checkbox" name="env3" ${env_data[3].check}>
                                 </div>
                                 <div class="col">
                                   <input type="text" class="form-control" name="env_3_name" value="${env_data[3].name}"/>
@@ -649,7 +649,7 @@ function appCard(data) {
             
                               <div class="row mb-1 align-items-end">
                                 <div class="col-auto">
-                                  <input class="form-check-input" type="checkbox" name="env_4_check" ${env_data[4].check}>
+                                  <input class="form-check-input" type="checkbox" name="env4" ${env_data[4].check}>
                                 </div>
                                 <div class="col">
                                   <input type="text" class="form-control" name="env_4_name" value="${env_data[4].name}"/>
@@ -661,7 +661,7 @@ function appCard(data) {
             
                               <div class="row mb-1 align-items-end">
                                 <div class="col-auto">
-                                  <input class="form-check-input" type="checkbox" name="env_5_check" ${env_data[5].check}>
+                                  <input class="form-check-input" type="checkbox" name="env5" ${env_data[5].check}>
                                 </div>
                                 <div class="col">
                                   <input type="text" class="form-control" name="env_5_name" value="${env_data[5].name}"/>
@@ -673,7 +673,7 @@ function appCard(data) {
             
                               <div class="row mb-1 align-items-end">
                                 <div class="col-auto">
-                                  <input class="form-check-input" type="checkbox" name="env_6_check" ${env_data[6].check}>
+                                  <input class="form-check-input" type="checkbox" name="env6" ${env_data[6].check}>
                                 </div>
                                 <div class="col">
                                   <input type="text" class="form-control" name="env_6_name" value="${env_data[6].name}"/>
@@ -686,7 +686,7 @@ function appCard(data) {
             
                               <div class="row mb-1 align-items-end">
                                 <div class="col-auto">
-                                  <input class="form-check-input" type="checkbox" name="env_7_check" ${env_data[7].check}>
+                                  <input class="form-check-input" type="checkbox" name="env7" ${env_data[7].check}>
                                 </div>
                                 <div class="col">
                                   <input type="text" class="form-control" name="env_7_name" value="${env_data[7].name}"/>
@@ -699,7 +699,7 @@ function appCard(data) {
             
                               <div class="row mb-1 align-items-end">
                                 <div class="col-auto">
-                                  <input class="form-check-input" type="checkbox" name="env_8_check" ${env_data[8].check}>
+                                  <input class="form-check-input" type="checkbox" name="env8" ${env_data[8].check}>
                                 </div>
                                 <div class="col">
                                   <input type="text" class="form-control" name="env_8_name" value="${env_data[8].name}"/>
@@ -712,7 +712,7 @@ function appCard(data) {
             
                               <div class="row mb-1 align-items-end">
                                 <div class="col-auto">
-                                  <input class="form-check-input" type="checkbox" name="env_9_check" ${env_data[9].check}>
+                                  <input class="form-check-input" type="checkbox" name="env9" ${env_data[9].check}>
                                 </div>
                                 <div class="col">
                                   <input type="text" class="form-control" name="env_9_name" value="${env_data[9].name}"/>
@@ -725,7 +725,7 @@ function appCard(data) {
             
                               <div class="row mb-1 align-items-end">
                                 <div class="col-auto">
-                                  <input class="form-check-input" type="checkbox" name="env_10_check" ${env_data[10].check}>
+                                  <input class="form-check-input" type="checkbox" name="env10" ${env_data[10].check}>
                                 </div>
                                 <div class="col">
                                   <input type="text" class="form-control" name="env_10_name" value="${env_data[10].name}"/>
@@ -738,7 +738,7 @@ function appCard(data) {
             
                               <div class="row mb-1 align-items-end">
                                 <div class="col-auto">
-                                  <input class="form-check-input" type="checkbox" name="env_11_check" ${env_data[11].check}>
+                                  <input class="form-check-input" type="checkbox" name="env11" ${env_data[11].check}>
                                 </div>
                                 <div class="col">
                                   <input type="text" class="form-control" name="env_11_name" value="${env_data[11].name}"/>
@@ -766,7 +766,7 @@ function appCard(data) {
             
                             <div class="row mb-1 align-items-end">
                               <div class="col-auto">
-                                <input class="form-check-input" type="checkbox" name="label_0_check" ${label_data[0].check}>
+                                <input class="form-check-input" type="checkbox" name="label0" ${label_data[0].check}>
                               </div>
                               <div class="col">
                                 <label class="form-label">Variable</label>
@@ -780,7 +780,7 @@ function appCard(data) {
             
                             <div class="row mb-1 align-items-end">
                               <div class="col-auto">
-                                <input class="form-check-input" type="checkbox" name="label_1_check" ${label_data[1].check}>
+                                <input class="form-check-input" type="checkbox" name="label1" ${label_data[1].check}>
                               </div>
                               <div class="col">
                                 <input type="text" class="form-control" name="label_1_name" value="${label_data[1].name}"/>
@@ -793,7 +793,7 @@ function appCard(data) {
                               
                             <div class="row mb-1 align-items-end">
                               <div class="col-auto">
-                                <input class="form-check-input" type="checkbox" name="label_2_check" ${label_data[2].check}>
+                                <input class="form-check-input" type="checkbox" name="label2" ${label_data[2].check}>
                               </div>
                               <div class="col">
                                 <input type="text" class="form-control" name="label_2_name" value="${label_data[2].name}"/>
@@ -805,7 +805,7 @@ function appCard(data) {
             
                             <div class="row mb-1 align-items-end">
                               <div class="col-auto">
-                                <input class="form-check-input" type="checkbox" name="label_3_check" ${label_data[3].check}>
+                                <input class="form-check-input" type="checkbox" name="label3" ${label_data[3].check}>
                               </div>
                               <div class="col">
                                 <input type="text" class="form-control" name="label_3_name" value="${label_data[3].name}"/>
@@ -817,7 +817,7 @@ function appCard(data) {
             
                             <div class="row mb-1 align-items-end">
                               <div class="col-auto">
-                                <input class="form-check-input" type="checkbox" name="label_4_check" ${label_data[4].check}>
+                                <input class="form-check-input" type="checkbox" name="label4" ${label_data[4].check}>
                               </div>
                               <div class="col">
                                 <input type="text" class="form-control" name="label_4_name" value="${label_data[4].name}"/>
@@ -829,7 +829,7 @@ function appCard(data) {
 
                             <div class="row mb-1 align-items-end">
                               <div class="col-auto">
-                                <input class="form-check-input" type="checkbox" name="label_5_check" ${label_data[5].check}>
+                                <input class="form-check-input" type="checkbox" name="label5" ${label_data[5].check}>
                               </div>
                               <div class="col">
                                 <input type="text" class="form-control" name="label_5_name" value="${label_data[5].name}"/>
@@ -841,7 +841,7 @@ function appCard(data) {
 
                             <div class="row mb-1 align-items-end">
                               <div class="col-auto">
-                                <input class="form-check-input" type="checkbox" name="label_6_check" ${label_data[6].check}>
+                                <input class="form-check-input" type="checkbox" name="label6" ${label_data[6].check}>
                               </div>
                               <div class="col">
                                 <input type="text" class="form-control" name="label_6_name" value="${label_data[6].name}"/>
@@ -853,7 +853,7 @@ function appCard(data) {
 
                             <div class="row mb-1 align-items-end">
                               <div class="col-auto">
-                                <input class="form-check-input" type="checkbox" name="label_7_check" ${label_data[7].check}>
+                                <input class="form-check-input" type="checkbox" name="label7" ${label_data[7].check}>
                               </div>
                               <div class="col">
                                 <input type="text" class="form-control" name="label_7_name" value="${label_data[7].name}"/>
@@ -865,7 +865,7 @@ function appCard(data) {
 
                             <div class="row mb-1 align-items-end">
                               <div class="col-auto">
-                                <input class="form-check-input" type="checkbox" name="label_8_check" ${label_data[8].check}>
+                                <input class="form-check-input" type="checkbox" name="label8" ${label_data[8].check}>
                               </div>
                               <div class="col">
                                 <input type="text" class="form-control" name="label_8_name" value="${label_data[8].name}"/>
@@ -877,7 +877,7 @@ function appCard(data) {
 
                             <div class="row mb-1 align-items-end">
                               <div class="col-auto">
-                                <input class="form-check-input" type="checkbox" name="label_9_check" ${label_data[9].check}>
+                                <input class="form-check-input" type="checkbox" name="label9" ${label_data[9].check}>
                               </div>
                               <div class="col">
                                 <input type="text" class="form-control" name="label_9_name" value="${label_data[9].name}"/>
@@ -889,7 +889,7 @@ function appCard(data) {
 
                             <div class="row mb-1 align-items-end">
                               <div class="col-auto">
-                                <input class="form-check-input" type="checkbox" name="label_10_check" ${label_data[10].check}>
+                                <input class="form-check-input" type="checkbox" name="label10" ${label_data[10].check}>
                               </div>
                               <div class="col">
                                 <input type="text" class="form-control" name="label_10_name" value="${label_data[10].name}"/>
@@ -901,7 +901,7 @@ function appCard(data) {
 
                             <div class="row mb-1 align-items-end">
                               <div class="col-auto">
-                                <input class="form-check-input" type="checkbox" name="label_11_check" ${label_data[11].check}>
+                                <input class="form-check-input" type="checkbox" name="label11" ${label_data[11].check}>
                               </div>
                               <div class="col">
                                 <input type="text" class="form-control" name="label_11_name" value="${label_data[11].name}"/>

controllers/app_actions.js

@@ -12,10 +12,10 @@ exports.Install = async function (req, res) {
         
         let { service_name, name, image, command_check, command, net_mode, restart_policy } = req.body;
 
-        let { port_0_check, port_1_check, port_2_check, port_3_check, port_4_check, port_5_check } = req.body;
-        let { volume_0_check, volume_1_check, volume_2_check, volume_3_check, volume_4_check, volume_5_check } = req.body;
-        let { env_0_check, env_1_check, env_2_check, env_3_check, env_4_check, env_5_check, env_6_check, env_7_check, env_8_check, env_9_check, env_10_check, env_11_check } = req.body;
-        let { label_0_check, label_1_check, label_2_check, label_3_check, label_4_check, label_5_check, label_6_check, label_7_check, label_8_check, label_9_check, label_10_check, label_11_check } = req.body;
+        let { port0, port1, port2, port3, port4, port5 } = req.body;
+        let { volume0, volume1, volume2, volume3, volume4, volume5 } = req.body;
+        let { env0, env1, env2, env3, env4, env5, env6, env7, env8, env9, env10, env11 } = req.body;
+        let { label0, label1, label2, label3, label4, label5, label6, label7, label8, label9, label10, label11 } = req.body;
 
 
         let installCard = dashCard(req.body.name, req.body.service_name, '', 'installing', req.body.image, 0, 0);
@@ -46,44 +46,44 @@ exports.Install = async function (req, res) {
         }
 
         // Ports
-        if ((port_0_check == 'on' || port_1_check == 'on' || port_2_check == 'on' || port_3_check == 'on' || port_4_check == 'on' || port_5_check == 'on') && (net_mode != 'host')) {
+        if ((port0 == 'on' || port1 == 'on' || port2 == 'on' || port3 == 'on' || port4 == 'on' || port5 == 'on') && (net_mode != 'host')) {
             compose_file += `\n    ports:`
 
                 for (let i = 0; i < 6; i++) {
-                    if (req.body[`port_${i}_check`] == 'on') {
+                    if (req.body[`port${i}`] == 'on') {
                         compose_file += `\n      - ${req.body[`port_${i}_external`]}:${req.body[`port_${i}_internal`]}/${req.body[`port_${i}_protocol`]}`
                     }
                 }
         }
 
         // Volumes
-        if (volume_0_check == 'on' || volume_1_check == 'on' || volume_2_check == 'on' || volume_3_check == 'on' || volume_4_check == 'on' || volume_5_check == 'on') {
+        if (volume0 == 'on' || volume1 == 'on' || volume2 == 'on' || volume3 == 'on' || volume4 == 'on' || volume5 == 'on') {
             compose_file += `\n    volumes:`
 
             for (let i = 0; i < 6; i++) {
-                if (req.body[`volume_${i}_check`] == 'on') {
+                if (req.body[`volume${i}`] == 'on') {
                     compose_file += `\n      - ${req.body[`volume_${i}_bind`]}:${req.body[`volume_${i}_container`]}:${req.body[`volume_${i}_readwrite`]}`
                 }
             }
         }
 
         // Environment variables
-        if (env_0_check == 'on' || env_1_check == 'on' || env_2_check == 'on' || env_3_check == 'on' || env_4_check == 'on' || env_5_check == 'on' || env_6_check == 'on' || env_7_check == 'on' || env_8_check == 'on' || env_9_check == 'on' || env_10_check == 'on' || env_11_check == 'on') {
+        if (env0 == 'on' || env1 == 'on' || env2 == 'on' || env3 == 'on' || env4 == 'on' || env5 == 'on' || env6 == 'on' || env7 == 'on' || env8 == 'on' || env9 == 'on' || env10 == 'on' || env11 == 'on') {
             compose_file += `\n    environment:`
         }
         for (let i = 0; i < 12; i++) {
-            if (req.body[`env_${i}_check`] == 'on') {
+            if (req.body[`env${i}`] == 'on') {
                 compose_file += `\n      - ${req.body[`env_${i}_name`]}=${req.body[`env_${i}_default`]}`
 
             }
         }
 
         // Add labels
-        if (label_0_check == 'on' || label_1_check == 'on' || label_2_check == 'on' || label_3_check == 'on' || label_4_check == 'on' || label_5_check == 'on' || label_6_check == 'on' || label_7_check == 'on' || label_8_check == 'on' || label_9_check == 'on' || label_10_check == 'on' || label_11_check == 'on') {
+        if (label0 == 'on' || label1 == 'on' || label2 == 'on' || label3 == 'on' || label4 == 'on' || label5 == 'on' || label6 == 'on' || label7 == 'on' || label8 == 'on' || label9 == 'on' || label10 == 'on' || label11 == 'on') {
             compose_file += `\n    labels:`
         }   
         for (let i = 0; i < 12; i++) {
-            if (req.body[`label_${i}_check`] == 'on') {
+            if (req.body[`label${i}`] == 'on') {
                 compose_file += `\n      - ${req.body[`label_${i}_name`]}=${req.body[`label_${i}_value`]}`
             }
         }
@@ -96,9 +96,9 @@ exports.Install = async function (req, res) {
 
 
         // Add hardware acceleration to the docker-compose file if one of the environment variables has the label DRINODE
-        if (env_0_check == 'on' || env_1_check == 'on' || env_2_check == 'on' || env_3_check == 'on' || env_4_check == 'on' || env_5_check == 'on' || env_6_check == 'on' || env_7_check == 'on' || env_8_check == 'on' || env_9_check == 'on' || env_10_check == 'on' || env_11_check == 'on') {
+        if (env0 == 'on' || env1 == 'on' || env2 == 'on' || env3 == 'on' || env4 == 'on' || env5 == 'on' || env6 == 'on' || env7 == 'on' || env8 == 'on' || env9 == 'on' || env10 == 'on' || env11 == 'on') {
             for (let i = 0; i < 12; i++) {
-                if (req.body[`env_${i}_check`] == 'on') {
+                if (req.body[`env${i}`] == 'on') {
                     if (req.body[`env_${i}_name`] == 'DRINODE') {
                         compose_file += `\n    deploy:`
                         compose_file += `\n      resources:`

controllers/settings.js

@@ -1,4 +1,5 @@
 const User = require('../database/UserModel.js');
+const Server = require('../database/ServerSettings.js');
 
 exports.Settings = async function(req, res) {
     if (req.session.role == "admin") {

database/ServerSettings.js

@@ -0,0 +1,42 @@
+const { Sequelize, DataTypes } = require('sequelize');
+
+const sequelize = new Sequelize({
+  dialect: 'sqlite',
+  storage: 'database/db.sqlite',
+  logging: false
+});
+
+
+const Server = sequelize.define('Server', {
+  // Model attributes are defined here
+  timezone: {
+    type: DataTypes.STRING,
+    allowNull: false
+  },
+  hwa: {
+    type: DataTypes.STRING
+    // allowNull defaults to true
+  },
+  media: {
+    type: DataTypes.STRING
+    // allowNull defaults to true
+  },
+  pgid: {
+    type: DataTypes.STRING
+    // allowNull defaults to true
+  },
+  puid: {
+    type: DataTypes.STRING
+    // allowNull defaults to true
+  }
+});
+
+async function syncModel() {
+  await sequelize.sync();
+  console.log('Server model synced');
+}
+
+syncModel();
+
+
+module.exports = Server;