Skip to content

Commit cb6edcd

Browse files
committed
FIX: missing closing tag
1 parent 27c1a66 commit cb6edcd

File tree

3 files changed

+41
-141
lines changed

3 files changed

+41
-141
lines changed

launcher/public/output.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
}
164164

165165
/*
166-
! tailwindcss v3.4.16 | MIT License | https://tailwindcss.com
166+
! tailwindcss v3.4.17 | MIT License | https://tailwindcss.com
167167
*/
168168

169169
/*

launcher/src/components/UI/edit-page/EditScreen.vue

Lines changed: 39 additions & 140 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
<template>
22
<base-layout>
3-
<!-- Start Node main layouts -->
4-
53
<div class="w-full h-full grid grid-cols-24 relative select-none">
64
<div class="col-start-1 col-span-1 flex justify-center items-center">
7-
<SidebarSection
8-
@network-modal="displaySwitchNetwork"
9-
@nuke-node="openNukeNodeModal"
10-
/>
5+
<SidebarSection @network-modal="displaySwitchNetwork" @nuke-node="openNukeNodeModal" />
116
</div>
127
<div class="col-start-2 col-end-17 w-full h-full relative">
138
<EditBody
@@ -24,16 +19,10 @@
2419
</div>
2520
<div class="col-start-17 col-end-21 ml-1 grid grid-cols-2 grid-rows-9">
2621
<NetworkStatus />
27-
<ServiceSection
28-
@change-connection="serviceModifyHandler"
29-
@delete-service="selectedServiceToRemove"
30-
/>
22+
<ServiceSection @change-connection="serviceModifyHandler" @delete-service="selectedServiceToRemove" />
3123
</div>
3224
<div class="col-start-21 col-end-25 px-1 flex flex-col justify-between">
33-
<ChangesSection
34-
@remove-change="cancelChangeHandler"
35-
@confirm-changes="confirmHandler"
36-
/>
25+
<ChangesSection @remove-change="cancelChangeHandler" @confirm-changes="confirmHandler" />
3726
</div>
3827
</div>
3928
<!-- End Node main layout -->
@@ -62,23 +51,15 @@
6251
@create-devnet="createDevnetModal"
6352
@get-network="getSetupNetwork"
6453
/>
65-
<ServicesDrawer
66-
v-else-if="manageStore.isServicesDrawerActive"
67-
:dragging="startDrag"
68-
@add-services="addServices"
69-
/>
54+
<ServicesDrawer v-else-if="manageStore.isServicesDrawerActive" :dragging="startDrag" @add-services="addServices" />
7055
</template>
7156
</drawer-box>
7257
</transition>
7358
<!-- End drawer layout -->
7459
<!-- Custom Modals -->
7560
<TransitionGroup name="fadeModal">
7661
<!-- Start Network Switch Modal -->
77-
<NetworkModal
78-
v-if="manageStore.displayNetworkList"
79-
@close-window="closeNetworkModal"
80-
@switch-confirm="switchNetworkConfirm"
81-
/>
62+
<NetworkModal v-if="manageStore.displayNetworkList" @close-window="closeNetworkModal" @switch-confirm="switchNetworkConfirm" />
8263
<!-- End Switch Network Modal -->
8364
<!-- Start Switch Client Modal -->
8465
<SwitchModal
@@ -89,12 +70,7 @@
8970
/>
9071
<!-- End Switch Client Modal -->
9172
<!-- Start Info Modal -->
92-
<InfoModal
93-
v-if="isInfoModalOpen"
94-
:client="clientForInfo"
95-
@close-window="closeInfoModal"
96-
@ok-button="isInfoModalOpen = false"
97-
/>
73+
<InfoModal v-if="isInfoModalOpen" :client="clientForInfo" @close-window="closeInfoModal" @ok-button="isInfoModalOpen = false" />
9874
<!-- End Info Modal -->
9975
<!-- Start Modify Services Modal -->
10076
<ModifyModal
@@ -134,33 +110,22 @@
134110
<!-- End Nuke Modal -->
135111

136112
<!-- Start Import Setup -->
137-
<ImportSetup
138-
v-if="manageStore.isImportSetupYamlActive"
139-
@confirm-import="confirmImportSingleSetup"
140-
/>
113+
<ImportSetup v-if="manageStore.isImportSetupYamlActive" @confirm-import="confirmImportSingleSetup" />
141114
<!-- End Import Setup -->
142115
<!-- Start Create Setup -->
143-
<CreateSetup
144-
v-if="setupStore.isCreateSetupModalActive"
145-
:network="selectedSetupNetwork"
146-
/>
116+
<CreateSetup v-if="setupStore.isCreateSetupModalActive" :network="selectedSetupNetwork" />
147117
<!-- End Create Setup -->
148118

149119
<!-- Start Setup Infos -->
150120
<SetupInfos v-if="setupStore.selectedSetupInfos" />
151121
<!-- End Setup Infos -->
152122
<!-- Start Devnet Configs Modal -->
153-
<DevnetSetup
154-
v-if="setupStore.isDevnetSetupModalActive"
155-
@confirm-devnet="setupDevnet"
156-
/>
123+
<DevnetSetup v-if="setupStore.isDevnetSetupModalActive" @confirm-devnet="setupDevnet" />
157124
</TransitionGroup>
158-
<LoaderAnime
159-
v-if="manageStore.disableConfirmButton || setupStore.isImportAnimeActive"
160-
:anime="getAimationSrc"
161-
/>
125+
<LoaderAnime v-if="manageStore.disableConfirmButton || setupStore.isImportAnimeActive" :anime="getAimationSrc" />
162126
</base-layout>
163127
</template>
128+
164129
<script setup>
165130
import { useFrontendServices } from "@/composables/services";
166131
import { useDeepClone } from "@/composables/utils";
@@ -353,9 +318,7 @@ const switchClientModalhandler = (item) => {
353318
354319
const switchClientConfirm = (properties) => {
355320
isSwitchModalOpen.value = false;
356-
const current = manageStore.newConfiguration.find(
357-
(e) => e?.config.serviceID === properties.itemToReplace.config.serviceID
358-
);
321+
const current = manageStore.newConfiguration.find((e) => e?.config.serviceID === properties.itemToReplace.config.serviceID);
359322
360323
const currentClientIndex = manageStore.newConfiguration.indexOf(current);
361324
@@ -392,9 +355,7 @@ const switchClientConfirm = (properties) => {
392355
executionClients: [],
393356
consensusClients: [],
394357
otherServices: [],
395-
checkpointURL: properties.checkPointSyncUrl
396-
? properties.checkPointSyncUrl
397-
: false,
358+
checkpointURL: properties.checkPointSyncUrl ? properties.checkPointSyncUrl : false,
398359
},
399360
},
400361
});
@@ -433,7 +394,6 @@ const hideModifyModal = () => {
433394
isModifyModalOpen.value = false;
434395
435396
manageStore.newConfiguration = useDeepClone(serviceStore.installedServices);
436-
437397
};
438398
const confirmConsensusConnection = (item) => {
439399
clientToConnect.value.isNotConnectedToConsensus = false;
@@ -509,17 +469,13 @@ const createDevnetModal = () => {
509469
const setupDevnet = async () => {
510470
manageStore.disableConfirmButton = true;
511471
try {
512-
setupStore.genesisFile = useDeepClone(
513-
setupStore.uploadedGenesisConfig || genesisStore.genesis
514-
);
472+
setupStore.genesisFile = useDeepClone(setupStore.uploadedGenesisConfig || genesisStore.genesis);
515473
516474
setupStore.isDevnetSetupModalActive = false;
517475
setupStore.currentStep = 1;
518476
519477
await ControlService.writeGenesisJsonDevnet(useDeepClone(setupStore.genesisFile));
520-
const existDepositContract = setupStore.genesisFile.alloc.hasOwnProperty(
521-
"4242424242424242424242424242424242424242"
522-
);
478+
const existDepositContract = setupStore.genesisFile.alloc.hasOwnProperty("4242424242424242424242424242424242424242");
523479
524480
const writeConfigData = {
525481
configYaml: genesisStore.configYaml,
@@ -550,13 +506,10 @@ const setupDevnet = async () => {
550506
const executionClients = services.filter((e) => e.category === "execution");
551507
const consensusClients = services.filter((e) => e.category === "consensus");
552508
553-
const installPromises = services.map((client) =>
554-
installService(client, setupId, executionClients, consensusClients)
555-
);
509+
const installPromises = services.map((client) => installService(client, setupId, executionClients, consensusClients));
556510
557511
await Promise.all(installPromises);
558512
559-
560513
await ControlService.handleServiceChanges(useDeepClone(manageStore.confirmChanges));
561514
562515
await ControlService.startServicesForSetup(setupId);
@@ -577,10 +530,8 @@ const installService = async (client, setupId, executionClients, consensusClient
577530
network: "devnet",
578531
chainId: useDeepClone(setupStore.genesisFile?.config?.chainId),
579532
installDir: client.installDir || "/opt/stereum",
580-
executionClients:
581-
client.category === "consensus" ? executionClients : client.executionClients,
582-
consensusClients:
583-
client.category === "validator" ? consensusClients : client.consensusClients,
533+
executionClients: client.category === "consensus" ? executionClients : client.executionClients,
534+
consensusClients: client.category === "validator" ? consensusClients : client.consensusClients,
584535
otherServices: client.otherServices,
585536
relays: null,
586537
checkpointURL: client.checkPointSyncUrl || false,
@@ -630,7 +581,6 @@ const cancelChangeHandler = (item) => {
630581
manageStore.newConfiguration.splice(eventIdx, 1);
631582
632583
manageStore.newConfiguration = useDeepClone(serviceStore.installedServices);
633-
634584
}
635585
636586
if (item.content === "MODIFY") {
@@ -670,10 +620,7 @@ const addServices = (service) => {
670620
const addServerServices = (service) => {
671621
let item = useDeepClone(service);
672622
673-
if (
674-
item.category === "service" &&
675-
manageStore.newConfiguration.map((s) => s?.service).includes(item?.service)
676-
) {
623+
if (item.category === "service" && manageStore.newConfiguration.map((s) => s?.service).includes(item?.service)) {
677624
return;
678625
} else {
679626
item.id = manageStore.newConfiguration.length;
@@ -683,9 +630,7 @@ const addServerServices = (service) => {
683630
};
684631
manageStore.newConfiguration.push(newItem);
685632
686-
setupStore.editSetups
687-
.find((s) => s.setupId === setupStore.selectedSetup?.setupId)
688-
?.services.push(newItem);
633+
setupStore.editSetups.find((s) => s.setupId === setupStore.selectedSetup?.setupId)?.services.push(newItem);
689634
690635
clientToInstall.value = newItem;
691636
clientToInstall.value.addPanel = true;
@@ -708,10 +653,7 @@ const onDrop = (event) => {
708653
const allServices = useDeepClone(serviceStore.allServices);
709654
const itemId = event.dataTransfer.getData("itemId");
710655
let item = allServices.find((item) => item.id == itemId);
711-
if (
712-
item.category === "service" &&
713-
manageStore.newConfiguration.map((s) => s.service).includes(item.service)
714-
) {
656+
if (item.category === "service" && manageStore.newConfiguration.map((s) => s.service).includes(item.service)) {
715657
return;
716658
} else {
717659
item.id = manageStore.newConfiguration.length;
@@ -798,9 +740,7 @@ const switchNetworkConfirm = (network) => {
798740
manageStore.displayNetworkList = false;
799741
if (network?.network != setupStore.selectedSetup?.network) {
800742
if (manageStore.confirmChanges.map((j) => j.content).includes("CHANGE NETWORK")) {
801-
let index = manageStore.confirmChanges.findIndex((j) =>
802-
j.content.includes("CHANGE NETWORK")
803-
);
743+
let index = manageStore.confirmChanges.findIndex((j) => j.content.includes("CHANGE NETWORK"));
804744
if (setupStore.selectedSetup.network === network.network) {
805745
manageStore.confirmChanges.splice(index, 1);
806746
} else {
@@ -844,12 +784,7 @@ const selectedServiceToRemove = (item) => {
844784
let commonService = setupStore.editSetups.find((s) => {
845785
return s.setupName === "commonServices";
846786
});
847-
if (
848-
item.isNotConnectedToConsensus ||
849-
item.isNotConnectedToValidator ||
850-
item.isNotConnectedToMevboost ||
851-
item.isDisplayPluginMenu
852-
) {
787+
if (item.isNotConnectedToConsensus || item.isNotConnectedToValidator || item.isNotConnectedToMevboost || item.isDisplayPluginMenu) {
853788
return;
854789
} else {
855790
clientToRemove.value = item;
@@ -864,9 +799,7 @@ const selectedServiceToRemove = (item) => {
864799
content: "DELETE",
865800
contentIcon: "/img/icon/edit-node-icons/delete-service.png",
866801
service: item,
867-
setupId: commonServiceExistance
868-
? commonService.setupId
869-
: setupStore.selectedSetup?.setupId,
802+
setupId: commonServiceExistance ? commonService.setupId : setupStore.selectedSetup?.setupId,
870803
};
871804
const itemExists = manageStore.confirmChanges.some(
872805
(e) => (e.id === item.config?.serviceID || e.id === item.id) && e.content === "DELETE"
@@ -942,41 +875,26 @@ const confirmHandler = async () => {
942875
manageStore.disableConfirmButton = true;
943876
944877
const setupExists = manageStore.confirmChanges.some(
945-
(item) =>
946-
item.service?.hasOwnProperty("setupName") &&
947-
item.service?.hasOwnProperty("setupId") &&
948-
item.service.setupId == item.id
878+
(item) => item.service?.hasOwnProperty("setupName") && item.service?.hasOwnProperty("setupId") && item.service.setupId == item.id
949879
);
950880
951881
const serverServiceExists = manageStore.confirmChanges.some(
952-
(change) =>
953-
change.content === "INSTALL" &&
954-
setupStore.serverServices.includes(change.service.service)
882+
(change) => change.content === "INSTALL" && setupStore.serverServices.includes(change.service.service)
955883
);
956884
957885
try {
958886
if (serverServiceExists) {
959887
await handleServerServiceChanges();
960-
} else if (
961-
setupExists &&
962-
manageStore.confirmChanges.some((e) => e.content === "DELETE")
963-
) {
888+
} else if (setupExists && manageStore.confirmChanges.some((e) => e.content === "DELETE")) {
964889
await handleSetupChanges();
965890
} else if (manageStore.confirmChanges.some((e) => e.content === "NETWORK")) {
966891
await handleSwitchSetupNetwork();
967892
968-
await ControlService.handleServiceChanges(
969-
JSON.parse(JSON.stringify(manageStore.confirmChanges))
970-
);
893+
await ControlService.handleServiceChanges(JSON.parse(JSON.stringify(manageStore.confirmChanges)));
971894
} else if (manageStore.confirmChanges.some((e) => e.content === "MODIFY")) {
972-
await ControlService.handleServiceChanges(
973-
JSON.parse(JSON.stringify(manageStore.confirmChanges))
974-
);
895+
await ControlService.handleServiceChanges(JSON.parse(JSON.stringify(manageStore.confirmChanges)));
975896
} else {
976-
await ControlService.handleServiceChanges(
977-
JSON.parse(JSON.stringify(manageStore.confirmChanges))
978-
);
979-
897+
await ControlService.handleServiceChanges(JSON.parse(JSON.stringify(manageStore.confirmChanges)));
980898
}
981899
} catch (error) {
982900
console.error("Error processing changes:", error);
@@ -988,28 +906,18 @@ const confirmHandler = async () => {
988906
};
989907
990908
const handleServerServiceChanges = async () => {
991-
const commonServicesId = setupStore.editSetups.find(
992-
(s) => s.setupName === "commonServices"
993-
)?.setupId;
909+
const commonServicesId = setupStore.editSetups.find((s) => s.setupName === "commonServices")?.setupId;
994910
manageStore.confirmChanges.forEach((change) => {
995911
change.data.setupId = commonServicesId ?? change.data.setupId;
996912
});
997913
998-
await ControlService.handleServiceChanges(
999-
JSON.parse(JSON.stringify(manageStore.confirmChanges))
1000-
);
1001-
914+
await ControlService.handleServiceChanges(JSON.parse(JSON.stringify(manageStore.confirmChanges)));
915+
};
1002916
1003917
const handleSetupChanges = async () => {
1004-
const setupsToRemoveIds = new Set(
1005-
setupStore.selectedSetupToRemove.map((s) => s.setupId)
1006-
);
1007-
setupStore.allSetups = setupStore.allSetups.filter(
1008-
(e) => !setupsToRemoveIds.has(e.setupId)
1009-
);
1010-
setupStore.editSetups = setupStore.editSetups.filter(
1011-
(e) => !setupsToRemoveIds.has(e.setupId)
1012-
);
918+
const setupsToRemoveIds = new Set(setupStore.selectedSetupToRemove.map((s) => s.setupId));
919+
setupStore.allSetups = setupStore.allSetups.filter((e) => !setupsToRemoveIds.has(e.setupId));
920+
setupStore.editSetups = setupStore.editSetups.filter((e) => !setupsToRemoveIds.has(e.setupId));
1013921
1014922
let subtasks = manageStore.confirmChanges.flatMap((e) => e.subTasks);
1015923
await ControlService.handleServiceChanges(useDeepClone(subtasks));
@@ -1074,11 +982,7 @@ const deleteSetup = async (item) => {
1074982
});
1075983
const subtasks =
1076984
item?.services.flatMap((service) => {
1077-
1078-
const matchedServices = manageStore.newConfiguration.filter(
1079-
(e) => e.config?.serviceID === service.config?.serviceID
1080-
);
1081-
985+
const matchedServices = manageStore.newConfiguration.filter((e) => e.config?.serviceID === service.config?.serviceID);
1082986
1083987
return matchedServices.map((e) => ({
1084988
id: e.config?.serviceID,
@@ -1098,9 +1002,7 @@ const deleteSetup = async (item) => {
10981002
subTasks: subtasks,
10991003
};
11001004
1101-
const itemExists = manageStore.confirmChanges.some(
1102-
(e) => e.id === item.setupId && e.content === "DELETE"
1103-
);
1005+
const itemExists = manageStore.confirmChanges.some((e) => e.id === item.setupId && e.content === "DELETE");
11041006
if (!itemExists) {
11051007
manageStore.confirmChanges.push(confirmDelete);
11061008
}
@@ -1125,10 +1027,7 @@ const closeSwitchModal = () => {
11251027
isSwitchModalOpen.value = false;
11261028
manageStore.isLineHidden = false;
11271029
1128-
manageStore.newConfiguration = JSON.parse(
1129-
JSON.stringify(serviceStore.installedServices)
1130-
);
1131-
1030+
manageStore.newConfiguration = JSON.parse(JSON.stringify(serviceStore.installedServices));
11321031
};
11331032
11341033
const closeInfoModal = () => {

0 commit comments

Comments
 (0)