Skip to content

Commit

Permalink
Merge branch 'main' into staking_issues
Browse files Browse the repository at this point in the history
  • Loading branch information
MaxTheGeeek committed Jan 7, 2025
2 parents 9f56863 + d60b79e commit 5a2a2d3
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 3 deletions.
19 changes: 17 additions & 2 deletions launcher/src/components/UI/control-page/ControlScreen.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
<div class="Control-screen w-full h-full grid grid-cols-24 grid-rows-12 items-center bg-[#242529]">
<ControlHeader />
<CommonSidebar />
<AlertSection />
<AlertSection @expert-handler="expertModeHandlerAlert" />
<StakingSidebar />
<SidebarRight />
<ExpertWindow v-if="isExpertWindowOpen" :item="expertModeClient" bg-opacity="opacity-25" @hide-modal="hideExpertMode(item)" />
</div>
</base-layout>
</template>
Expand All @@ -15,18 +16,32 @@ import { useSetups } from "@/store/setups";
import { useFooter } from "@/store/theFooter";
import { useServices } from "@/store/services";
import { watch, computed } from "vue";
import { watch, computed, ref } from "vue";
import ControlHeader from "./sections/ControlHeader.vue";
import CommonSidebar from "./sections/CommonSidebar.vue";
import AlertSection from "./sections/AlertSection.vue";
import StakingSidebar from "./sections/StakingSidebar.vue";
import SidebarRight from "./sections/SidebarRight.vue";
import ExpertWindow from "../node-page/sections/ExpertWindow.vue";
const setupStore = useSetups();
const footerStore = useFooter();
const serviceStore = useServices();
const isExpertWindowOpen = ref(false);
const expertModeClient = ref(null);
const hideExpertMode = (el) => {
expertModeClient.value = el;
isExpertWindowOpen.value = false;
};
const expertModeHandlerAlert = (validator) => {
expertModeClient.value = validator;
isExpertWindowOpen.value = true;
};
const selectedConfigServices = computed(() => {
let services = [];
const selectedSetup = setupStore.selectedSetup;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@
</template>

<!-- csm green end -->

<div
v-if="synchronizationErrorControl && !alertShowState.includes('red')"
class="alert-message_red"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
<template>
<div class="w-full h-full col-start-7 col-end-10 row-start-2 row-span-full flex justify-center items-center pt-2 pb-1">
<ControlAlert />
<ControlAlert @expert-handler="expertHandler" />
</div>
</template>

<script setup>
import ControlAlert from "../components/alert/ControlAlert.vue";
const emit = defineEmits(["expertHandler"]);
const expertHandler = (data) => {
emit("expertHandler", data);
};
</script>
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,7 @@ export default {
bgOpacity: {
type: String,
required: false,
default: "opacity-100",
},
leftDistance: {
type: String,
Expand Down

0 comments on commit 5a2a2d3

Please sign in to comment.