From 52511b18fa727c929dda3a97f47911a7cd12f81c Mon Sep 17 00:00:00 2001 From: sanjayk03-dev Date: Wed, 10 Jan 2024 00:55:15 +0530 Subject: [PATCH] trying an textarea to get new input --- src/js/macros.js | 13 ++++++- src/pug/templates/macros.pug | 29 +++++++++----- src/stylus/style.styl | 75 ++++++++++++++++++++---------------- 3 files changed, 73 insertions(+), 44 deletions(-) diff --git a/src/js/macros.js b/src/js/macros.js index 01c53cc..8101d5e 100644 --- a/src/js/macros.js +++ b/src/js/macros.js @@ -12,6 +12,7 @@ module.exports = { tab: "1", confirmReset: false, confirmSave: false, + newGcode: "", }; }, components: { @@ -33,6 +34,11 @@ module.exports = { }, }, methods: { + updateNewGcode(event) { + console.log(event) + this.newGcode = event.target.value; + console.log(this.newGcode); + }, open: function () { utils.clickFileInput("gcode-file-input"); }, @@ -41,15 +47,20 @@ module.exports = { const file = this.state.selected; this.$broadcast("gcode-load", file); this.$broadcast("gcode-line", this.state.line); + this.newGCode = ""; }, upload: function (e) { const files = e.target.files || e.dataTransfer.files; + console.log(e); + console.log(files); if (!files.length) { return; } const file = files[0]; + console.log(file) const extension = file.name.split(".").pop(); + console.log(extension) switch (extension.toLowerCase()) { case "nc": case "ngc": @@ -115,7 +126,7 @@ module.exports = { gcode_file_time: 0, }, { - name: "Park", + name: "Perk", color: "#e6e6e6", gcode_file_name: " ", gcode_file_time: 0, diff --git a/src/pug/templates/macros.pug b/src/pug/templates/macros.pug index 1102c9d..9e55388 100644 --- a/src/pug/templates/macros.pug +++ b/src/pug/templates/macros.pug @@ -16,8 +16,8 @@ script#macros-template(type="text/x-template") p Are you sure you want to save the current settings? div(slot="footer") - button.pure-button(@click="confirmSave=false") Cancel - button.pure-button.pure-button-primary(@click="saveMacros") + button.pure-button(@click="confirmSave=false") Cancel + button.pure-button.pure-button-primary(@click="saveMacros") | Confirm h1 Macros Configuration @@ -75,7 +75,9 @@ script#macros-template(type="text/x-template") input(type="file", @change="upload", :disabled="!is_ready", accept=".nc,.ngc,.gcode,.gc") br - gcode-viewer + .gcodeContainer + textarea.new-gcode( v-if="state.selected=='default",:value='newGcode' @input="updateNewGcode") + gcode-viewer(v-if="state.selected !== 'default'") button.submit-macros(title="Save Macros",@click="confirmSave=true", style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border:0;margin-top:30px") Save button.submit-macros(title="Cancel Macros",@click="cancelMacros", @@ -103,7 +105,8 @@ script#macros-template(type="text/x-template") input(type="file", @change="upload", :disabled="!is_ready", accept=".nc,.ngc,.gcode,.gc") br - gcode-viewer + .gcodeContainer + gcode-viewer button.submit-macros(title="Save Macros",@click="confirmSave=true", style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border:0;margin-top:30px") Save button.submit-macros(title="Cancel Macros",@click="cancelMacros", @@ -131,7 +134,8 @@ script#macros-template(type="text/x-template") input(type="file", @change="upload", :disabled="!is_ready", accept=".nc,.ngc,.gcode,.gc") br - gcode-viewer + .gcodeContainer + gcode-viewer button.submit-macros(title="Save Macros",@click="confirmSave=true", style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border:0;margin-top:30px") Save button.submit-macros(title="Cancel Macros",@click="cancelMacros", @@ -159,7 +163,8 @@ script#macros-template(type="text/x-template") input(type="file", @change="upload", :disabled="!is_ready", accept=".nc,.ngc,.gcode,.gc") br - gcode-viewer + .gcodeContainer + gcode-viewer button.submit-macros(title="Save Macros",@click="confirmSave=true", style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border:0;margin-top:30px") Save button.submit-macros(title="Cancel Macros",@click="cancelMacros", @@ -187,7 +192,8 @@ script#macros-template(type="text/x-template") input(type="file", @change="upload", :disabled="!is_ready", accept=".nc,.ngc,.gcode,.gc") br - gcode-viewer + .gcodeContainer + gcode-viewer button.submit-macros(title="Save Macros",@click="confirmSave=true", style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border:0;margin-top:30px") Save button.submit-macros(title="Cancel Macros",@click="cancelMacros", @@ -215,7 +221,8 @@ script#macros-template(type="text/x-template") input(type="file", @change="upload", :disabled="!is_ready", accept=".nc,.ngc,.gcode,.gc") br - gcode-viewer + .gcodeContainer + gcode-viewer button.submit-macros(title="Save Macros",@click="confirmSave=true", style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border:0;margin-top:30px") Save button.submit-macros(title="Cancel Macros",@click="cancelMacros", @@ -243,7 +250,8 @@ script#macros-template(type="text/x-template") input(type="file", @change="upload", :disabled="!is_ready", accept=".nc,.ngc,.gcode,.gc") br - gcode-viewer + .gcodeContainer + gcode-viewer button.submit-macros(title="Save Macros",@click="confirmSave=true", style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border:0;margin-top:30px") Save button.submit-macros(title="Cancel Macros",@click="cancelMacros", @@ -271,7 +279,8 @@ script#macros-template(type="text/x-template") input(type="file", @change="upload", :disabled="!is_ready", accept=".nc,.ngc,.gcode,.gc") br - gcode-viewer + .gcodeContainer + gcode-viewer button.submit-macros(title="Save Macros",@click="confirmSave=true", style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border:0;margin-top:30px") Save button.submit-macros(title="Cancel Macros",@click="cancelMacros", diff --git a/src/stylus/style.styl b/src/stylus/style.styl index f448caf..5965bfc 100644 --- a/src/stylus/style.styl +++ b/src/stylus/style.styl @@ -631,35 +631,52 @@ span.unit border 0 color #fff -.macros - width 90% +#macros + width 104% -.warning-box - display flex - background-color #F3FF00 - border-radius 5px - border 0 - margin-bottom 10px - margin-top 10px - align-items center - justify-content center + .gcodeContainer + width 25rem + height 15rem + border-width 1px + border-radius 10px + border-color #424242 + border-style solid + + .new-gcode + display flex -.select-upload-gcode - display flex - flex-direction row + .warning-box + display flex + background-color #F3FF00 + border-radius 5px + border 0 + margin-bottom 10px + margin-top 10px + align-items center + justify-content center -.tabs - margin-top 5px - width 51.8rem + .select-upload-gcode + display flex + flex-direction row - .submit-macros - height 50px - width 140px - margin-top 30px - font-weight normal - background-color #add1ad - color #fff - border 0 + .tabs + margin-top 5px + + .macros-view + padding 30px + width 95% + + .macros-form + padding-left 30px + + .submit-macros + height 50px + width 140px + margin-top 30px + font-weight normal + background-color #add1ad + color #fff + border 0 .path-viewer @@ -1084,14 +1101,6 @@ tt.save .pure-form-aligned .pure-control-group label.extra width 8em - -.macros-view - padding 30px - width 95% - - .macros-form - padding 30px - input.input-name width 300px