Skip to content

Commit

Permalink
ADD: new flags & animation (#327)
Browse files Browse the repository at this point in the history 
* bump to 2.0.2 [skip ci]

* Squashed commit of the following:

commit 956cabd
Author: Michael Ferjancic <[email protected]>
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 6b1ce53
Author: Michael Ferjancic <[email protected]>
Date:   Sat May 21 11:38:55 2022 +0200

    Upgrade electron builder because of electron-userland/electron-builder#3559

commit 94075ce
Author: Michael Ferjancic <[email protected]>
Date:   Sat May 21 10:44:46 2022 +0200

    AppImage target for linux until we support snap

commit 8a4d2fb
Merge: 4bef8fd ac17166
Author: Michael Ferjancic <[email protected]>
Date:   Fri May 20 13:31:19 2022 +0200

    Change to 2.0.3-beta

commit 4bef8fd
Author: Michael Ferjancic <[email protected]>
Date:   Fri May 20 13:30:14 2022 +0200

    Change to 2.0.0-beta

commit ac17166
Author: gbayasgalan <[email protected]>
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 <[email protected]>
    Co-authored-by: stefa2k <[email protected]>
    Co-authored-by: stefa2k <[email protected]>

commit 35e55d7
Author: NeoPlays <[email protected]>
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 <[email protected]>
    Co-authored-by: stefa2k <[email protected]>

commit a297e0e
Author: Michael Ferjancic <[email protected]>
Date:   Fri May 20 12:44:41 2022 +0200

    Trigger build to test artifact upload in github

commit 66c7866
Author: Michael Ferjancic <[email protected]>
Date:   Fri May 20 12:27:16 2022 +0200

    Just an electron builder error?

commit 6e5f012
Author: Michael Ferjancic <[email protected]>
Date:   Fri May 20 12:24:53 2022 +0200

    Just an electron builder error?

commit 95ad36d
Author: Michael Ferjancic <[email protected]>
Date:   Fri May 20 12:08:06 2022 +0200

    Trying an automated version bump

* FIX: task manager checkStatus func fixed

* ADD: static validator key

* REFACTOR:language page changed to new version

* DELETE: second button

* ADD:animated connecting to formSetup

Co-authored-by: Automated Version Bump <[email protected]>
  • Loading branch information
@MaxTheGeeek
MaxTheGeeek and Automated Version Bump authored May 26, 2022
1 parent d3f9540 commit 5d7fdbb
Show file tree
Hide file tree
Showing 22 changed files with 543 additions and 304 deletions.
Binary file removed launcher/public/img/flag/ENGLISH.png
View file
Binary file not shown.
Binary file removed launcher/public/img/flag/FRENCH.png
View file
Binary file not shown.
Binary file removed launcher/public/img/flag/GERMAN.png
View file
Binary file not shown.
Binary file removed launcher/public/img/flag/PORTUGUESE.png
View file
Binary file not shown.
Binary file removed launcher/public/img/flag/SPANISH.png
View file
Binary file not shown.
Binary file added launcher/public/img/flag/france.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added launcher/public/img/flag/germany.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added launcher/public/img/flag/iran.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added launcher/public/img/flag/netherlands.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added launcher/public/img/flag/saudi-arabia.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added launcher/public/img/flag/spain.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added launcher/public/img/flag/turkey.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added launcher/public/img/flag/united-arab-emirates.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added launcher/public/img/flag/united-kingdom.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added launcher/public/img/icon/task-manager-icons/turning_circle.gif
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion launcher/public/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="">
<html lang="gr">
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
Expand Down
29 changes: 18 additions & 11 deletions launcher/src/components/UI/LangDialog.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,30 @@

<script>
export default {
name: 'LangDialog',
props: ['open']
}
name: "LangDialog",
props: ["open"],
};
</script>

<style scoped>
dialog {
position: fixed;
top: 40%;
min-width: 20rem;
margin: auto;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.26);
top: 30%;
width: 60%;
height: 35%;
margin: 0 auto;
box-shadow: 1px 1px 5px 1px rgba(31, 31, 31, 0.26);
border: 5px solid #7e7777;
border-radius: 20px;
padding: 1rem;
background-color: white;
border: solid 5px rgba(15, 15, 15, 0.5);
background-color: rgba(76, 72, 72, 0.5);
resize: both;
background-color: #33393ed7;
display: grid;
grid-template-columns: repeat(4, 1fr);
grid-template-rows: auto;
overflow-x: hidden;
overflow-y: auto;
}
dialog::-webkit-scrollbar {
width: 1px;
}
</style>
149 changes: 64 additions & 85 deletions launcher/src/components/UI/task-manager/TaskManager.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,17 @@
v-for="(item, index) in playbookTasks"
:key="index"
>
<!-- <div class="table-row-active">
<div class="table-row-active" v-if="item.status == null">
<div class="active-icon">
<img :src="installIconSrc.activeInstallIcon" alt="icon" />
</div>
<span>AKTIVE TASK</span>
</div> -->
<div
class="table-row-success"
v-if="item.status === 'success' || item.status === 'changed'"
>
<span>{{ item.playbook }}</span>
<drop-tasks
:item="item"
@droptaskActive="openDropDown"
></drop-tasks>
</div>
<div class="table-row-success" v-if="item.status === 'success'">
<div class="success-icon">
<img :src="installIconSrc.successInstallIcon" alt="icon" />
</div>
Expand Down Expand Up @@ -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: [
{
Expand All @@ -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"),
Expand All @@ -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;
},
Expand Down Expand Up @@ -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%;
Expand All @@ -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;
Expand All @@ -346,7 +326,6 @@ export default {
.active-icon img {
width: 20px;
height: 20px;
margin-top: 2px;
}
.table-row-failed span,
Expand Down
9 changes: 5 additions & 4 deletions launcher/src/components/UI/the-staking/KeyTable.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
>
<span class="key-circle"></span>
<span class="file-name">{{ item.name }}</span>
<div @click="removeKeyHandler(item.uuid)" class="key-remove-icon">
<div @click="removeKeyHandler(item.name)" class="key-remove-icon">
<img
src="../../../../public/img/icon/task-manager-icons/close3.png"
alt="icon"
Expand Down Expand Up @@ -153,6 +153,7 @@
</div>
</template>
<script>
import LangButtonVue from "../LangButton.vue";
import ShowKey from "./DropZone.vue";
import DropZone from "./ShowKey.vue";
export default {
Expand Down Expand Up @@ -181,14 +182,14 @@ export default {
dropFileHandler(event) {
console.log("drop", event);
let droppedFiles = event.dataTransfer.files;
console.log(droppedFiles);
this.keyFiles.push(...droppedFiles);
this.insertFilePage = false;
this.enterPasswordPage = true;
this.isDragOver = false;
},
removeKeyHandler(id) {
this.keyFiles = this.keyFiles.filter((item) => item.uuid !== id);
console.log(this.keyFiles);
removeKeyHandler(key_name) {
this.keyFiles = this.keyFiles.filter((item) => item.name != key_name);
},
openUploadHandler() {
this.$refs.fileInput.click();
Expand Down
Loading

0 comments on commit 5d7fdbb

Please sign in to comment.