From 3e1132b86d61e2a42c5fe76b361351b5083e070b Mon Sep 17 00:00:00 2001
From: NimbusEngine523 <rulanchen97@gmail.com>
Date: Mon, 23 May 2022 08:06:11 +0200
Subject: [PATCH] ADD: Validator password page (#307)

* bump to 2.0.2 [skip ci]

* bump to 2.0.2 [skip ci]

* ADD:enter password to keyStore

* bump to 2.0.3 [skip ci]

* ADD: Validator key confirm password

* bump to 2.0.4 [skip ci]

* Squashed commit of the following:

commit 00ad10013c1b09088beade3daf2a6fb07a66b21c
Author: Automated Version Bump <gh-action-bump-version@users.noreply.github.com>
Date:   Fri May 20 10:13:14 2022 +0000

    bump to 2.0.2 [skip ci]

* Squashed commit of the following:

commit 956cabd6922a6cc73d0988a4e3804a1eb3784357
Author: Michael Ferjancic <michael.ferjancic@gmail.com>
Date:   Sat May 21 11:55:06 2022 +0200

    Releasing just onTag - github sends a 422 when overwriting artifacts, waiting until electron-builder finds a solution

commit 6b1ce53acc7d561e5c4534fb5485631da51db976
Author: Michael Ferjancic <michael.ferjancic@gmail.com>
Date:   Sat May 21 11:38:55 2022 +0200

    Upgrade electron builder because of https://github.com/electron-userland/electron-builder/issues/3559

commit 94075ceb94ae687fb0e0d7dd7db886b2b776ef09
Author: Michael Ferjancic <michael.ferjancic@gmail.com>
Date:   Sat May 21 10:44:46 2022 +0200

    AppImage target for linux until we support snap

commit 8a4d2fb979d65a495fe181bc4afaabd7c684e4d8
Merge: 4bef8fd ac17166
Author: Michael Ferjancic <michael.ferjancic@gmail.com>
Date:   Fri May 20 13:31:19 2022 +0200

    Change to 2.0.3-beta

commit 4bef8fdde1d6bca4635d174a29a61540f07fa8ee
Author: Michael Ferjancic <michael.ferjancic@gmail.com>
Date:   Fri May 20 13:30:14 2022 +0200

    Change to 2.0.0-beta

commit ac171669ae9e28c0fdc37ace85c533daf5ebfef6
Author: gbayasgalan <73820006+gbayasgalan@users.noreply.github.com>
Date:   Fri May 20 13:19:48 2022 +0200

    FIX: replace stereum/* docker images (#303)

    * EDIT: replace stereum/lighthouse image

    * bump to 2.0.2 [skip ci]

    * EDIT: replace stereum/nimbus image

    * EDIT: comment out

    * bump to 2.0.3 [skip ci]

    Co-authored-by: Automated Version Bump <gh-action-bump-version@users.noreply.github.com>
    Co-authored-by: stefa2k <54934211+stefa2k@users.noreply.github.com>
    Co-authored-by: stefa2k <stefan.kobrc@rocklogic.at>

commit 35e55d7c051384f28bc78f68b9c0296f1c2e93ff
Author: NeoPlays <80448387+NeoPlays@users.noreply.github.com>
Date:   Fri May 20 13:10:01 2022 +0200

    ADD: CPU usage monitoring command (#304)

    * ADD: CPU usage monitoring command

    * bump to v2.0.2 [skip ci]

    Co-authored-by: Automated Version Bump <gh-action-bump-version@users.noreply.github.com>
    Co-authored-by: stefa2k <54934211+stefa2k@users.noreply.github.com>

commit a297e0e22774dd2f0afe2eb057ccd79176155021
Author: Michael Ferjancic <michael.ferjancic@gmail.com>
Date:   Fri May 20 12:44:41 2022 +0200

    Trigger build to test artifact upload in github

commit 66c78664a7ae219e437a17446a5b5c31579ad056
Author: Michael Ferjancic <michael.ferjancic@gmail.com>
Date:   Fri May 20 12:27:16 2022 +0200

    Just an electron builder error?

commit 6e5f0121bd42cc25d3311b68be13def9af449c95
Author: Michael Ferjancic <michael.ferjancic@gmail.com>
Date:   Fri May 20 12:24:53 2022 +0200

    Just an electron builder error?

commit 95ad36dfb97c1475e60c6a277c70656a1d653701
Author: Michael Ferjancic <michael.ferjancic@gmail.com>
Date:   Fri May 20 12:08:06 2022 +0200

    Trying an automated version bump

* ADD:validator password routing

Co-authored-by: Automated Version Bump <gh-action-bump-version@users.noreply.github.com>
---
 launcher/src/background.js                    |  16 +-
 .../components/UI/the-staking/DropZone.vue    |  15 +
 .../components/UI/the-staking/KeyTable.vue    | 346 ++++++++++++------
 .../src/components/UI/the-staking/ShowKey.vue |  49 +++
 .../components/UI/the-staking/TheUpload.vue   |   3 -
 5 files changed, 302 insertions(+), 127 deletions(-)
 create mode 100644 launcher/src/components/UI/the-staking/DropZone.vue
 create mode 100644 launcher/src/components/UI/the-staking/ShowKey.vue
 delete mode 100644 launcher/src/components/UI/the-staking/TheUpload.vue

diff --git a/launcher/src/background.js b/launcher/src/background.js
index 89ff6fd7..cc715f06 100644
--- a/launcher/src/background.js
+++ b/launcher/src/background.js
@@ -151,21 +151,7 @@ app.on("activate", () => {
   if (BrowserWindow.getAllWindows().length === 0) createWindow();
 });
 
-// //electron drag&drop codes
-// promiseIpc.on('ondragstart', (event, filePath) => {
-//   readFile(filePath);
-//   function readFile(filepath) {
-//     fs.readFile(filepath, 'utf-8', (err, data) => {
-//        if(err){
-//           alert("An error ocurred reading the file :" + err.message)
-//           return
-//        }
-//        // handle the file content
-//        event.sender.send('fileData', data)
-//     })
-//  }
-
-// })
+
 
 app.on("web-contents-created", (event, contents) => {
   // open every new window in the OS's default browser instead of a
diff --git a/launcher/src/components/UI/the-staking/DropZone.vue b/launcher/src/components/UI/the-staking/DropZone.vue
new file mode 100644
index 00000000..586babae
--- /dev/null
+++ b/launcher/src/components/UI/the-staking/DropZone.vue
@@ -0,0 +1,15 @@
+<template>
+
+</template>
+<script>
+export default {
+  props: ["keyFiles"],
+  data() {
+    return {};
+  },
+  methods: {},
+};
+</script>
+<style scoped>
+
+</style>
diff --git a/launcher/src/components/UI/the-staking/KeyTable.vue b/launcher/src/components/UI/the-staking/KeyTable.vue
index 7423d1e3..c727f1bf 100644
--- a/launcher/src/components/UI/the-staking/KeyTable.vue
+++ b/launcher/src/components/UI/the-staking/KeyTable.vue
@@ -2,7 +2,7 @@
   <div class="keys-parent">
     <div class="keys-table-box">
       <div class="keys-table">
-        <div class="table-header">
+        <div class="table-header" v-if="insertFilePage">
           <span id="name">NAME</span>
           <span id="service">SERVICE</span>
           <span id="active">ACTIVE SINCE</span>
@@ -12,9 +12,10 @@
         </div>
         <div
           class="table-content"
-          :class="{ 'drop-active': isDragOver }"
-          @drag.prevent.stop
-          @dragstart.prevent.stop
+          v-if="insertFilePage"
+          :class="{ dropActive: isDragOver }"
+          @drag.prevent.stop=""
+          @dragstart.prevent.stop=""
           @dragend.prevent.stop="isDragOver = false"
           @dragover.prevent.stop="isDragOver = true"
           @dragenter.prevent.stop="isDragOver = true"
@@ -23,8 +24,8 @@
         >
           <div class="table-row" v-for="(item, index) in keyFiles" :key="index">
             <span class="circle"></span>
-            <span class="category">{{ item.pubkey }}</span>
-            <span class="username">Max Behzadi</span>
+            <span class="category">{{ item.name }}</span>
+            <span class="username"></span>
             <img
               class="service-icon"
               src="../../../../public/img/icon/the-staking/blox-service.png"
@@ -73,9 +74,28 @@
             </div>
           </div>
         </div>
+        <div class="table-header" v-if="enterPasswordPage">
+          <span id="active">FILE NAME</span>
+        </div>
+        <div class="table-content" v-if="enterPasswordPage">
+          <div
+            class="key-table-row"
+            v-for="(item, index) in keyFiles"
+            :key="index"
+          >
+            <span class="key-circle"></span>
+            <span class="file-name">{{ item.name }}</span>
+            <div @click="removeKeyHandler(item.uuid)" class="key-remove-icon">
+              <img
+                src="../../../../public/img/icon/task-manager-icons/close3.png"
+                alt="icon"
+              />
+            </div>
+          </div>
+        </div>
       </div>
     </div>
-    <div class="middle-icon">
+    <div class="middle-icon" v-if="insertFilePage">
       <img
         class="rename"
         src="../../../../public/img/icon/the-staking/rename-icon.png"
@@ -91,7 +111,7 @@
         src="../../../../public/img/icon/the-staking/staking-filter.png"
         alt="icon"
       />
-      <div class="insert-key" @click="openUploader">
+      <div class="insert-key" @click="openUploadHandler">
         <input
           type="file"
           @change="uploadFileHandler"
@@ -108,33 +128,80 @@
         />
       </div>
     </div>
+    <div class="password-box" v-if="enterPasswordPage">
+      <img
+        class="rename"
+        src="../../../../public/img/icon/the-staking/rename-icon.png"
+        alt="icon"
+      />
+      <img
+        class="folder"
+        src="../../../../public/img/icon/the-staking/newfolder-icon.png"
+        alt="icon"
+      />
+      <img
+        class="filter"
+        src="../../../../public/img/icon/the-staking/staking-filter.png"
+        alt="icon"
+      />
+      <div class="enter-password" @click="confirmPasswordHandler">
+        <input v-if="passwordInputActive" type="password" />
+        <button v-if="passwordInputActive">CONFIRM</button>
+        <span v-else>ENTER PASSWORD & IMPORT</span>
+      </div>
+    </div>
   </div>
 </template>
 <script>
+import ShowKey from "./DropZone.vue";
+import DropZone from "./ShowKey.vue";
 export default {
+  components: { ShowKey, DropZone },
   data() {
     return {
       isDragOver: false,
       keyFiles: [],
+      insertFilePage: true,
+      enterPasswordPage: false,
+      passwordInputActive: false,
     };
   },
-  mounted() {},
+  updated() {
+    this.checkKeyExists();
+  },
   methods: {
-    openUploader() {
-      this.$refs.fileInput.click();
-    },
     uploadFileHandler(event) {
+      console.log("upload", event);
       let uploadedFiles = event.target.files;
-      this.keyFiles.push(uploadedFiles);
+      this.keyFiles.push(...uploadedFiles);
+      this.insertFilePage = false;
+      this.enterPasswordPage = true;
       this.isDragOver = false;
-      console.log(uploadedFiles);
     },
     dropFileHandler(event) {
       console.log("drop", event);
       let droppedFiles = event.dataTransfer.files;
-      this.keyFiles.push(droppedFiles);
+      this.keyFiles.push(...droppedFiles);
+      this.insertFilePage = false;
+      this.enterPasswordPage = true;
       this.isDragOver = false;
-      console.log(droppedFiles);
+    },
+    removeKeyHandler(id) {
+      this.keyFiles = this.keyFiles.filter((item) => item.uuid !== id);
+      console.log(this.keyFiles);
+    },
+    openUploadHandler() {
+      this.$refs.fileInput.click();
+    },
+    confirmPasswordHandler() {
+      this.passwordInputActive = true;
+    },
+    checkKeyExists() {
+      if (this.keyFiles.length <= 0) {
+        this.insertFilePage = true;
+        this.enterPasswordPage = false;
+        this.passwordInputActive = false;
+      }
     },
   },
 };
@@ -156,56 +223,23 @@ export default {
   margin: 10px 10px 0 0;
   border: 4px solid #bfbfbf;
   border-radius: 20px;
-}
-.keys-table {
-  width: 100%;
-  height: 100%;
-}
-
-.table-header {
-  height: 30px;
-  border-bottom: 7px solid #bfbfbf;
-  display: grid;
-  grid-template-columns: 3% 17% 13% 8% 13% 6% 10% 30%;
-}
-.table-header span {
-  color: #fff;
-  font-size: 10px;
-  font-weight: 900;
   display: flex;
   justify-content: center;
-  align-items: flex-end;
-}
-.table-header #name {
-  grid-column: 3;
-}
-.table-header #service {
-  grid-column: 4;
-}
-.table-header #active {
-  grid-column: 5;
-}
-.table-header #state {
-  grid-column: 6;
-}
-.table-header #balance {
-  grid-column: 7;
-}
-.table-header #option {
-  grid-column: 8;
-}
-.table-content {
-  height: 92%;
-  overflow-x: hidden;
-  overflow-y: auto;
+  align-items: center;
 }
-.drop-active {
+.dropActive {
   width: 100%;
   height: 92%;
   background-color: rgb(44, 151, 128);
   opacity: 0.2;
   border-radius: 20px;
 }
+.table-content {
+  height: 92%;
+  overflow-x: hidden;
+  overflow-y: auto;
+}
+
 .table-row {
   width: 99%;
   height: 30px;
@@ -319,6 +353,45 @@ export default {
   justify-content: center;
   align-items: center;
 }
+.keys-table {
+  width: 100%;
+  height: 100%;
+}
+
+.table-header {
+  height: 30px;
+  border-bottom: 7px solid #bfbfbf;
+  display: grid;
+  grid-template-columns: 3% 17% 13% 8% 13% 6% 10% 30%;
+}
+.table-header span {
+  color: #fff;
+  font-size: 10px;
+  font-weight: 700;
+  display: flex;
+  justify-content: center;
+  align-items: flex-end;
+}
+.table-header #name {
+  grid-column: 3;
+}
+.table-header #service {
+  grid-column: 4;
+}
+.table-header #active {
+  grid-column: 5;
+}
+.table-header #state {
+  grid-column: 6;
+}
+.table-header #balance {
+  grid-column: 7;
+}
+.table-header #option {
+  grid-column: 8;
+}
+
+.password-box,
 .middle-icon {
   width: 60%;
   height: 40px;
@@ -329,14 +402,18 @@ export default {
   bottom: 6%;
   left: 2%;
 }
+.password-box img,
 .middle-icon img {
   width: 30px;
   height: 30px;
 }
+.password-box .rename,
+.password-box .folder,
 .middle-icon .rename,
 .middle-icon .folder {
   margin-right: 10px;
 }
+.password-box .filter,
 .middle-icon .filter {
   margin-right: 20px;
 }
@@ -350,64 +427,115 @@ export default {
   align-items: center;
   cursor: pointer;
 }
-.middle-icon .insert-key span {
+.password-box .enter-password {
+  width: 70%;
+  height: 32px;
+  border: 1px solid #bfbfbf;
+  background-color: #336666;
+  border-radius: 40px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  cursor: pointer;
+  position: relative;
+}
+.password-box .enter-password span {
+  color: rgb(227, 227, 227);
+  font-size: 1.1rem;
+  font-weight: 500;
+}
+.password-box .enter-password input {
+  width: 80%;
+  height: 60%;
+  border: 1px solid #878787;
+  border-radius: 35px 0 0 35px;
+  background-color: #002828;
+  outline-style: none;
+  padding-left: 10px;
+  position: absolute;
+  left: 5px;
+  font-size: 1.5rem;
   color: #fff;
-  font-size: 20px;
-  font-weight: 900;
+  font-weight: 300;
+  padding-top: 2px;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
 }
-.middle-icon .insert-key img {
-  width: 28px;
-  height: 28px;
+.password-box .enter-password button {
+  width: 20%;
+  height: 100%;
+  border: none;
+  border-right: 1px solid #bfbfbf;
+  border-left: 1px solid #bfbfbf;
+  border-radius: 0 35px 35px 0;
+  background-color: #3f4449;
+  outline-style: none;
+  position: absolute;
+  right: 0;
+  font-size: 0.7rem;
+  color: #fff;
+  font-weight: 400;
+  cursor: pointer;
+  box-shadow: inset 1px 1px 10px #33393e;
+}
+.password-box .enter-password button:hover {
+  background-color: #23272a;
+  box-shadow: none;
+}
+.password-box .enter-password button:active {
+  background-color: #181b1d;
+  box-shadow: inset 1px 1px 3px #070708;
 }
 
-.grafiti-text {
-  color: #fff;
-  position: absolute;
-  bottom: -20px;
-  left: 50px;
-  font-size: 10px;
-  font-weight: 600;
-  background-color: rgb(23, 22, 22);
-  opacity: 0.7;
-  display: none;
+.middle-icon .insert-key span {
+  color: #336666;
+  font-size: 1.1rem;
+  font-weight: 700;
 }
-.copy-text {
-  color: #fff;
-  position: absolute;
-  bottom: -20px;
-  left: 10px;
-  font-size: 10px;
-  font-weight: 600;
-  background-color: rgb(23, 22, 22);
-  opacity: 0.7;
-  display: none;
+.middle-icon .insert-key img {
+  width: 28px;
+  height: 28px;
 }
-.exit-text {
-  color: #fff;
-  position: absolute;
-  bottom: -20px;
-  right: 12px;
-  font-size: 10px;
-  font-weight: 600;
-  background-color: rgb(23, 22, 22);
-  opacity: 0.7;
-  display: none;
+.key-table-row {
+  width: 99%;
+  height: 30px;
+  margin: 5px auto 0 auto;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  background-color: rgb(89, 89, 89);
+  border-radius: 30px;
+  padding: 1px;
 }
-.remove-text {
-  color: #fff;
-  position: absolute;
-  bottom: -20px;
-  right: 49px;
-  font-size: 10px;
-  font-weight: 600;
-  background-color: rgb(23, 22, 22);
-  opacity: 0.7;
-  display: none;
-}
-.option-box div:hover > .grafiti-text,
-.option-box div:hover > .copy-text,
-.option-box div:hover > .exit-text,
-.option-box div:hover > .remove-text {
-  display: block;
+.key-table-row .file-name {
+  width: 90%;
+  color: #fff !important;
+  font-size: 1rem !important;
+  font-weight: 400 !important;
+}
+.key-table-row .key-remove-icon {
+  display: flex !important;
+  justify-content: center !important;
+  align-items: center !important;
+  border: 1px solid #4a4a4a !important;
+  border-radius: 50px !important;
+  width: 20px !important;
+  height: 20px !important;
+  margin-right: 4px;
+  padding: 1px;
+  background-color: #343434;
+  box-shadow: 0 0 3px 1px rgb(0, 0, 0);
+}
+.key-table-row .key-remove-icon img {
+  width: 70% !important;
+  height: 70% !important;
+}
+.key-table-row .key-circle {
+  width: 20px !important;
+  height: 20px !important;
+  border-radius: 50% !important;
+  background-color: #fff !important;
+  margin-left: 5px;
 }
 </style>
diff --git a/launcher/src/components/UI/the-staking/ShowKey.vue b/launcher/src/components/UI/the-staking/ShowKey.vue
new file mode 100644
index 00000000..9473dc38
--- /dev/null
+++ b/launcher/src/components/UI/the-staking/ShowKey.vue
@@ -0,0 +1,49 @@
+<template>
+
+</template>
+<script>
+export default {
+  props: ["keyFiles"],
+  data() {
+    return {};
+  },
+};
+</script>
+<style scoped>
+.table-content {
+  height: 92%;
+  overflow-x: hidden;
+  overflow-y: auto;
+}
+.table-row {
+  width: 99%;
+  height: 30px;
+  margin: 5px auto 0 auto;
+  display: grid;
+  grid-template-columns: 10% 80% 10%;
+  background-color: rgb(89, 89, 89);
+  border-radius: 30px;
+  padding: 1px;
+  position: relative;
+}
+.table-row span {
+  color: #fff;
+  font-size: 10px;
+  font-weight: 700;
+}
+.table-row .circle {
+  grid-column: 1;
+  width: 15px;
+  height: 15px;
+  border-radius: 50%;
+  background-color: #fff;
+  margin: 0 auto;
+  align-self: center;
+}
+.table-row 
+.table-row .remove-icon {
+  grid-column: 3;
+  width: 20px;
+  justify-self: flex-end;
+}
+</style>
diff --git a/launcher/src/components/UI/the-staking/TheUpload.vue b/launcher/src/components/UI/the-staking/TheUpload.vue
deleted file mode 100644
index 27e0f695..00000000
--- a/launcher/src/components/UI/the-staking/TheUpload.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-<template>
-    
-</template>
\ No newline at end of file