From 98794e99718a8752e7612e9933ac7d40f985cb73 Mon Sep 17 00:00:00 2001 From: Max Behzadi <69126271+MaxTheGeeek@users.noreply.github.com> Date: Thu, 28 Dec 2023 13:29:09 +0100 Subject: [PATCH] FIX: logs export & search (#1618) --- launcher/public/output.css | 102 +++++++++--------- .../components/UI/node-page/NodeScreen.vue | 4 +- .../UI/node-page/components/logs/LogBody.vue | 4 +- 3 files changed, 57 insertions(+), 53 deletions(-) diff --git a/launcher/public/output.css b/launcher/public/output.css index 991462f55..8c32f502c 100755 --- a/launcher/public/output.css +++ b/launcher/public/output.css @@ -836,6 +836,10 @@ video { left: 40%; } +.left-\[920px\]{ + left: 920px; +} + .right-0{ right: 0px; } @@ -916,10 +920,6 @@ video { top: -2px; } -.left-\[920px\]{ - left: 920px; -} - .z-0{ z-index: 0; } @@ -1689,6 +1689,10 @@ video { max-height: 35px; } +.max-h-\[409px\]{ + max-height: 409px; +} + .max-h-\[40px\]{ max-height: 40px; } @@ -1721,8 +1725,12 @@ video { max-height: 100%; } -.max-h-\[409px\]{ - max-height: 409px; +.max-h-12{ + max-height: 3rem; +} + +.min-h-11{ + min-height: 2.75rem; } .min-h-\[100px\]{ @@ -1753,10 +1761,6 @@ video { min-height: 450px; } -.min-h-11{ - min-height: 2.75rem; -} - .w-1\/2{ width: 50%; } @@ -2225,6 +2229,10 @@ video { grid-template-rows: repeat(1, minmax(0, 1fr)); } +.grid-rows-10{ + grid-template-rows: repeat(10, minmax(0, 1fr)); +} + .grid-rows-12{ grid-template-rows: repeat(12 , minmax(0,1fr)); } @@ -2257,10 +2265,6 @@ video { grid-template-rows: repeat(8 , minmax(0,1fr)); } -.grid-rows-10{ - grid-template-rows: repeat(10, minmax(0, 1fr)); -} - .flex-col{ -webkit-box-orient: vertical; -webkit-box-direction: normal; @@ -3030,6 +3034,11 @@ video { background-color: rgb(38 38 38 / var(--tw-bg-opacity)); } +.bg-\[\#263238\]{ + --tw-bg-opacity: 1; + background-color: rgb(38 50 56 / var(--tw-bg-opacity)); +} + .bg-\[\#264744\]{ --tw-bg-opacity: 1; background-color: rgb(38 71 68 / var(--tw-bg-opacity)); @@ -3170,6 +3179,21 @@ video { background-color: rgb(168 70 184 / var(--tw-bg-opacity)); } +.bg-\[\#bcc0c2\]{ + --tw-bg-opacity: 1; + background-color: rgb(188 192 194 / var(--tw-bg-opacity)); +} + +.bg-\[\#caced1\]{ + --tw-bg-opacity: 1; + background-color: rgb(202 206 209 / var(--tw-bg-opacity)); +} + +.bg-\[\#e8ebeb\]{ + --tw-bg-opacity: 1; + background-color: rgb(232 235 235 / var(--tw-bg-opacity)); +} + .bg-amber-400{ --tw-bg-opacity: 1; background-color: rgb(251 191 36 / var(--tw-bg-opacity)); @@ -3334,26 +3358,6 @@ video { background-color: rgb(255 255 255 / var(--tw-bg-opacity)); } -.bg-\[\#263238\]{ - --tw-bg-opacity: 1; - background-color: rgb(38 50 56 / var(--tw-bg-opacity)); -} - -.bg-\[\#bcc0c2\]{ - --tw-bg-opacity: 1; - background-color: rgb(188 192 194 / var(--tw-bg-opacity)); -} - -.bg-\[\#caced1\]{ - --tw-bg-opacity: 1; - background-color: rgb(202 206 209 / var(--tw-bg-opacity)); -} - -.bg-\[\#e8ebeb\]{ - --tw-bg-opacity: 1; - background-color: rgb(232 235 235 / var(--tw-bg-opacity)); -} - .bg-gradient-to-b{ background-image: -webkit-gradient(linear, left top, left bottom, from(var(--tw-gradient-stops))); background-image: linear-gradient(to bottom, var(--tw-gradient-stops)); @@ -3699,11 +3703,26 @@ video { color: rgb(20 23 26 / var(--tw-text-opacity)); } +.text-\[\#333333\]{ + --tw-text-opacity: 1; + color: rgb(51 51 51 / var(--tw-text-opacity)); +} + .text-\[\#4B878D\]{ --tw-text-opacity: 1; color: rgb(75 135 141 / var(--tw-text-opacity)); } +.text-\[\#dee3e3\]{ + --tw-text-opacity: 1; + color: rgb(222 227 227 / var(--tw-text-opacity)); +} + +.text-\[\#ffffff\]{ + --tw-text-opacity: 1; + color: rgb(255 255 255 / var(--tw-text-opacity)); +} + .text-amber-300{ --tw-text-opacity: 1; color: rgb(252 211 77 / var(--tw-text-opacity)); @@ -3869,21 +3888,6 @@ video { color: rgb(234 179 8 / var(--tw-text-opacity)); } -.text-\[\#333333\]{ - --tw-text-opacity: 1; - color: rgb(51 51 51 / var(--tw-text-opacity)); -} - -.text-\[\#dee3e3\]{ - --tw-text-opacity: 1; - color: rgb(222 227 227 / var(--tw-text-opacity)); -} - -.text-\[\#ffffff\]{ - --tw-text-opacity: 1; - color: rgb(255 255 255 / var(--tw-text-opacity)); -} - .placeholder-gray-400\/70::-webkit-input-placeholder{ color: rgb(156 163 175 / 0.7); } diff --git a/launcher/src/components/UI/node-page/NodeScreen.vue b/launcher/src/components/UI/node-page/NodeScreen.vue index 7724fd20c..bbc8b0b9a 100755 --- a/launcher/src/components/UI/node-page/NodeScreen.vue +++ b/launcher/src/components/UI/node-page/NodeScreen.vue @@ -174,8 +174,8 @@ const closeExpertMode = () => { // ********** LOGS ********** const exportLogs = async () => { - const data = this.logsList.slice(-150).reverse(); - const fileName = this.logsItem.name; + const data = nodeStore.serviceLogs.slice(-150).reverse(); + const fileName = nodeStore.clientToLogs.name; const lineByLine = data.map((line, index) => `#${data.length - index}: ${line}`).join("\n\n"); diff --git a/launcher/src/components/UI/node-page/components/logs/LogBody.vue b/launcher/src/components/UI/node-page/components/logs/LogBody.vue index 8fe83f4d9..ecd2d36d5 100644 --- a/launcher/src/components/UI/node-page/components/logs/LogBody.vue +++ b/launcher/src/components/UI/node-page/components/logs/LogBody.vue @@ -9,9 +9,9 @@