upload, save request order buig fixed

static/app.js

@@ -962,7 +962,10 @@ function getFeatureSettings() {
     case 5:
       s = getWeatherSettings(page);
       break;
-    case 6:
+    case 6:fetch("/upload", {
+      method: "POST",
+      body: data,
+    });
       s = getNewsSettings(page);
       break;
     case 7:
@@ -980,44 +983,47 @@ function getFeatureSettings() {
       break;
   }
   
-  //send uploaded images and gifs
-  if (pageNum == 11) {
-    var data = new FormData();
-
-    for (var i = 0; i < uploaded_images.length; i++) {
-      data.append(uploaded_images[i].name, uploaded_images[i]);
-    }
-
-    fetch("/upload", {
-      method: "POST",
-      body: data,
-    });
-  } else if (pageNum == 12) {
-    var data = new FormData();
-
-    for (var i = 0; i < uploaded_GIFs.length; i++) {
-      data.append(uploaded_GIFs[i].name, uploaded_GIFs[i]);
-    }
-
-    fetch("/upload", {
-      method: "POST",
-      body: data,
-    });
-  }
- 
   settings = { ...settings, ...s }; // merge both sets of settings
+  
+    
 
   return settings;
 }
 
+function getFiles() {
+  var data = new FormData();
+
+    for (var i = 0; i < uploaded_images.length; i++) {
+      data.append(uploaded_images[i].name, uploaded_images[i]);
+      console.log(uploaded_images[i].name);
+    }
+     for (var i = 0; i < uploaded_GIFs.length; i++) {
+      data.append(uploaded_GIFs[i].name, uploaded_GIFs[i]);
+    }
+    
+  
+    //return data;
+    
+    fetch("/upload", {
+      method: "POST",
+      body: data,
+    });
+}
 
 function saveSettings() {
   
-  displaying = getDisplaying();
-  feature_settings = getFeatureSettings();
-  console.log(displaying)
+  let displaying = getDisplaying();
+  let feature_settings = getFeatureSettings();
+  let files = getFiles();
+  
+
+ 
+  console.log(JSON.stringify({'displaying': displaying, 'feature_settings': feature_settings, 'files':files}));
+  
+  
+  
   fetch("/save", {
-    method: "PUT",
+    method: "POST",
     body: JSON.stringify({'displaying': displaying, 'feature_settings': feature_settings}),
   });