diff --git a/launcher/public/img/flag/ENGLISH.png b/launcher/public/img/flag/ENGLISH.png deleted file mode 100644 index feb55e4e1..000000000 Binary files a/launcher/public/img/flag/ENGLISH.png and /dev/null differ diff --git a/launcher/public/img/flag/FRENCH.png b/launcher/public/img/flag/FRENCH.png deleted file mode 100644 index 8d4f42cd0..000000000 Binary files a/launcher/public/img/flag/FRENCH.png and /dev/null differ diff --git a/launcher/public/img/flag/GERMAN.png b/launcher/public/img/flag/GERMAN.png deleted file mode 100644 index 82d0bdcb6..000000000 Binary files a/launcher/public/img/flag/GERMAN.png and /dev/null differ diff --git a/launcher/public/img/flag/PORTUGUESE.png b/launcher/public/img/flag/PORTUGUESE.png deleted file mode 100644 index 90e776774..000000000 Binary files a/launcher/public/img/flag/PORTUGUESE.png and /dev/null differ diff --git a/launcher/public/img/flag/SPANISH.png b/launcher/public/img/flag/SPANISH.png deleted file mode 100644 index 3ad7b5f49..000000000 Binary files a/launcher/public/img/flag/SPANISH.png and /dev/null differ diff --git a/launcher/public/img/flag/france.png b/launcher/public/img/flag/france.png new file mode 100644 index 000000000..659bb052f Binary files /dev/null and b/launcher/public/img/flag/france.png differ diff --git a/launcher/public/img/flag/germany.png b/launcher/public/img/flag/germany.png new file mode 100644 index 000000000..73e476465 Binary files /dev/null and b/launcher/public/img/flag/germany.png differ diff --git a/launcher/public/img/flag/iran.png b/launcher/public/img/flag/iran.png new file mode 100644 index 000000000..ce47508f3 Binary files /dev/null and b/launcher/public/img/flag/iran.png differ diff --git a/launcher/public/img/flag/netherlands.png b/launcher/public/img/flag/netherlands.png new file mode 100644 index 000000000..ff8d4d751 Binary files /dev/null and b/launcher/public/img/flag/netherlands.png differ diff --git a/launcher/public/img/flag/saudi-arabia.png b/launcher/public/img/flag/saudi-arabia.png new file mode 100644 index 000000000..259b7b916 Binary files /dev/null and b/launcher/public/img/flag/saudi-arabia.png differ diff --git a/launcher/public/img/flag/spain.png b/launcher/public/img/flag/spain.png new file mode 100644 index 000000000..809c5d8d3 Binary files /dev/null and b/launcher/public/img/flag/spain.png differ diff --git a/launcher/public/img/flag/turkey.png b/launcher/public/img/flag/turkey.png new file mode 100644 index 000000000..398a7337e Binary files /dev/null and b/launcher/public/img/flag/turkey.png differ diff --git a/launcher/public/img/flag/united-arab-emirates.png b/launcher/public/img/flag/united-arab-emirates.png new file mode 100644 index 000000000..3fcbdd43e Binary files /dev/null and b/launcher/public/img/flag/united-arab-emirates.png differ diff --git a/launcher/public/img/flag/united-kingdom.png b/launcher/public/img/flag/united-kingdom.png new file mode 100644 index 000000000..437fd803e Binary files /dev/null and b/launcher/public/img/flag/united-kingdom.png differ diff --git a/launcher/public/img/icon/task-manager-icons/turning_circle.gif b/launcher/public/img/icon/task-manager-icons/turning_circle.gif new file mode 100644 index 000000000..74fb705b3 Binary files /dev/null and b/launcher/public/img/icon/task-manager-icons/turning_circle.gif differ diff --git a/launcher/public/index.html b/launcher/public/index.html index 386ea6bd4..a1a337dd6 100644 --- a/launcher/public/index.html +++ b/launcher/public/index.html @@ -1,5 +1,5 @@ - + diff --git a/launcher/src/components/UI/LangDialog.vue b/launcher/src/components/UI/LangDialog.vue index d966c1aab..ea6ffe7b0 100644 --- a/launcher/src/components/UI/LangDialog.vue +++ b/launcher/src/components/UI/LangDialog.vue @@ -6,23 +6,30 @@ diff --git a/launcher/src/components/UI/task-manager/TaskManager.vue b/launcher/src/components/UI/task-manager/TaskManager.vue index ca8e9eeb8..d5b5085f9 100644 --- a/launcher/src/components/UI/task-manager/TaskManager.vue +++ b/launcher/src/components/UI/task-manager/TaskManager.vue @@ -11,16 +11,17 @@ v-for="(item, index) in playbookTasks" :key="index" > - -
+ {{ item.playbook }} + +
+
icon
@@ -66,40 +67,42 @@ export default { return { isTaskModalActive: false, showDropDownList: false, + isTaskFailed: false, + isTaskSuccess: false, playbookTasks: [], dataTasks: [ - { - id: 1, - playbook: "Geth", - status: "success", - showDropDown: false, - tasks: [ - { - name: "Preparing node", - action: "SUB TASK SUCCEEDED", - status: "failed", - }, - { - name: "Writing service configs", - action: "SUB TASK SUCCEEDED", - status: "success", - }, - { - name: "Set firewall rules", - action: "SUB TASK SUCCEEDED", - status: "success", - }, - { - name: "Enable service docker", - action: "SUB TASK SUCCEEDED", - status: "success", - }, - ], - }, + // { + // id: 1, + // playbook: "Geth", + // status: null, + // showDropDown: false, + // tasks: [ + // { + // name: "Preparing node", + // action: "SUB TASK SUCCEEDED", + // status: "failed", + // }, + // { + // name: "Writing service configs", + // action: "SUB TASK SUCCEEDED", + // status: "success", + // }, + // { + // name: "Set firewall rules", + // action: "SUB TASK SUCCEEDED", + // status: "success", + // }, + // { + // name: "Enable service docker", + // action: "SUB TASK SUCCEEDED", + // status: "success", + // }, + // ], + // }, { id: 2, playbook: "Nimbus", - status: "success", + status: null, showDropDown: false, tasks: [ { @@ -124,34 +127,6 @@ export default { }, ], }, - { - id: 3, - playbook: "Lighthouse", - status: "failed", - showDropDown: false, - tasks: [ - { - name: "Removing conflicts", - action: "SUB TASK SUCCEEDED", - status: "success", - }, - { - name: "Writing service configs", - action: "SUB TASK FAILED", - status: "failed", - }, - { - name: "Set firewall rules", - action: "SUB TASK SUCCEEDED", - status: "success", - }, - { - name: "Install docker", - action: "SUB TASK SUCCEEDED", - status: "success", - }, - ], - }, ], taskManagerIcons: { progressIcon: require("../../../../public/img/icon/task-manager-icons/task-manager-icon.png"), @@ -160,39 +135,51 @@ export default { failedIcon: require("../../../../public/img/icon/task-manager-icons/task-red-icon.png"), }, installIconSrc: { - activeInstallIcon: require("../../../../public/img/icon/task-manager-icons/turning_circle_alt2.gif"), + activeInstallIcon: require("../../../../public/img/icon/task-manager-icons/turning_circle.gif"), successInstallIcon: require("../../../../public/img/icon/task-manager-icons/check3.png"), failedInstallIcon: require("../../../../public/img/icon/task-manager-icons/close3.png"), }, }; }, + beforeUpdate() { + this.checkTaskStatus(); + }, mounted() { this.playbookTasks = this.dataTasks; }, computed: { - checkTaskStatus() { - this.playbookTasks.map((el) => { - let taskStatus = el.tasks.some((task) => { - return task.status === "failed"; - }); - if (taskStatus) { - el.status === "failed"; - } - }); - }, mainTaskIcon() { let mainIconColor = this.playbookTasks.some( (el) => el.status === "failed" ); + let mainIconColorActive = this.playbookTasks.some( + (el) => el.status == null + ); if (mainIconColor) { return this.taskManagerIcons.failedIcon; + } else if (mainIconColorActive) { + return this.taskManagerIcons.activeIcon; } else { return this.taskManagerIcons.successIcon; } }, }, methods: { + checkTaskStatus() { + setTimeout(() => { + this.playbookTasks.map((el) => { + let taskStatus = el.tasks.every((task) => { + return task.status == "success"; + }); + if (taskStatus) { + el.status = "success"; + } else { + el.status = "failed"; + } + }); + }, 3000); + }, taskModalHandler() { this.isTaskModalActive = !this.isTaskModalActive; }, @@ -304,15 +291,7 @@ export default { justify-content: space-between; align-items: center; } -.table-content .table-row-progress { - width: 100%; - height: 100%; - border-radius: 15px; - background-color: rgb(104, 104, 104); - display: flex; - justify-content: space-between; - align-items: center; -} + .table-content .table-row-active { width: 100%; height: 100%; @@ -323,6 +302,7 @@ export default { align-items: center; } .table-row-failed .failed-icon, +.table-row-active .active-icon, .table-row-success .success-icon { width: 16px; height: 16px; @@ -346,7 +326,6 @@ export default { .active-icon img { width: 20px; height: 20px; - margin-top: 2px; } .table-row-failed span, diff --git a/launcher/src/components/UI/the-staking/KeyTable.vue b/launcher/src/components/UI/the-staking/KeyTable.vue index c727f1bf1..045870075 100644 --- a/launcher/src/components/UI/the-staking/KeyTable.vue +++ b/launcher/src/components/UI/the-staking/KeyTable.vue @@ -85,7 +85,7 @@ > {{ item.name }} -
+
icon diff --git a/launcher/src/pages/TheFirst.vue b/launcher/src/pages/TheFirst.vue index 14d1ae596..956c96d98 100644 --- a/launcher/src/pages/TheFirst.vue +++ b/launcher/src/pages/TheFirst.vue @@ -6,73 +6,94 @@
- -
    -
  • + choose your language + Click to continue +
+ +
+
- - + {{ link.langName }} +
+
-
- -
+
+
+ +
+
+ {{ selectedLanguage.lang }} +
+
diff --git a/launcher/src/store/flagDialog/index.js b/launcher/src/store/flagDialog/index.js index a0b4bcd4a..e85529e4f 100644 --- a/launcher/src/store/flagDialog/index.js +++ b/launcher/src/store/flagDialog/index.js @@ -1,36 +1,56 @@ -import flagDialMutations from './mutations.js' -import flagDialActions from './actions' -import flagDialGetters from './getters' +import flagDialMutations from "./mutations.js"; +import flagDialActions from "./actions"; +import flagDialGetters from "./getters"; export default { - state () { + state() { return { dialogIsVisible: false, linkFlags: [ { - langImg: 'img/flag/ENGLISH.png', - langSelect: 'img/flag/En.png', - langName: 'english' + langImg: "img/flag/united-kingdom.png", + langSelect: "img/flag/united-kingdom.png", + langName: "english", }, { - langImg: 'img/flag/GERMAN.png', - langSelect: 'img/flag/Gr.png', - langName: 'german' + langImg: "img/flag/germany.png", + langSelect: "img/flag/germany.png", + langName: "german", }, { - langImg: 'img/flag/FRENCH.png', - langSelect: 'img/flag/Fr.png', - langName: 'french' + langImg: "img/flag/france.png", + langSelect: "img/flag/france.png", + langName: "french", }, { - langImg: 'img/flag/SPANISH.png', - langSelect: 'img/flag/Sp.png', - langName: 'spanish' - } - ] - } + langImg: "img/flag/spain.png", + langSelect: "img/flag/spain.png", + langName: "spanish", + }, + { + langImg: "img/flag/iran.png", + langSelect: "img/flag/iran.png", + langName: "persian", + }, + { + langImg: "img/flag/saudi-arabia.png", + langSelect: "img/flag/saudi-arabia.png", + langName: "arabic", + }, + { + langImg: "img/flag/turkey.png", + langSelect: "img/flag/turkey.png", + langName: "turkish", + }, + { + langImg: "img/flag/netherlands.png", + langSelect: "img/flag/netherlands.png", + langName: "dutch", + }, + ], + }; }, mutations: flagDialMutations, actions: flagDialActions, - getters: flagDialGetters -} + getters: flagDialGetters, +};