From 3f0bf4090a4c32be7c2481fc9e40e0a9eddfdf16 Mon Sep 17 00:00:00 2001
From: sanjayk03-dev <imsanjay003@gmail.com>
Date: Thu, 28 Mar 2024 16:08:06 +0530
Subject: [PATCH] ui fix

---
 src/js/macros.js                   | 6 ++----
 src/pug/templates/control-view.pug | 6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/js/macros.js b/src/js/macros.js
index 06e5414..1df8970 100644
--- a/src/js/macros.js
+++ b/src/js/macros.js
@@ -199,11 +199,9 @@ module.exports = {
       const macros = [...this.config.macros];
       macros.splice(this.tab - 1, 1);
       const macros_list = macros.map(item => item.name);
-      console.log(this.macrosName);
-      var macrosName = document.getElementById("macros-name").value;
       var macrosColor = document.getElementById("macros-color").value;
       var macrosAlert = this.isChecked;
-      const formattedFilename = macrosName
+      const formattedFilename = this.macrosName
         .replace(/\\/g, "_")
         .replace(/\//g, "_")
         .replace(/#/g, "-")
@@ -222,7 +220,7 @@ module.exports = {
         this.uploadGCode(file_name, file);
       }
 
-      this.config.macros[this.tab - 1].name = macrosName;
+      this.config.macros[this.tab - 1].name = this.macrosName;
       this.config.macros[this.tab - 1].color = macrosColor;
       this.config.macros[this.tab - 1].file_name = file_name;
       this.config.macros[this.tab - 1].alert = macrosAlert;
diff --git a/src/pug/templates/control-view.pug b/src/pug/templates/control-view.pug
index 9ed564c..5caeb9c 100644
--- a/src/pug/templates/control-view.pug
+++ b/src/pug/templates/control-view.pug
@@ -328,12 +328,12 @@ script#control-view-template(type="text/x-template")
               option( selected='' value='Unorganized files')  Unorganized files
               option(v-for="file in gcode_folders", :value="file") {{file}}
             
-            button.config-button.button-blue(title="Create a new folder.", @click="create_folder=true",
+            button.pure-button(title="Create a new folder.", @click="create_folder=true",
               :disabled="!is_ready")
               .fa.fa-plus
               | Create Folder
             
-            button.config-button.button-blue(title="Upload a new folder.", @click="open_folder",
+            button.pure-button(title="Upload a new folder.", @click="open_folder",
               :disabled="!is_ready")
               .fa.fa-plus
               | Upload Folder
@@ -343,7 +343,7 @@ script#control-view-template(type="text/x-template")
               style="max-width:100%")
               option(v-for="file in gcode_files", :value="file") {{file}}
             
-            button.config-button.button-blue(title="Upload a new GCode program.", @click="open_file",
+            button.pure-button(title="Upload a new GCode program.", @click="open_file",
               :disabled="!is_ready")
               .fa.fa-plus
               | Upload File