Skip to content

Commit 090efd6

Browse files
authored
Merge pull request #678 from kubero-dev/feature/fix-logs-view
fix logs view to use more of the screen
2 parents 66a8053 + 77657c8 commit 090efd6

File tree

4 files changed

+42
-21
lines changed

4 files changed

+42
-21
lines changed

client/src/components/apps/logs.vue

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<div :style="'height: ' + height + '; width: 100%;'">
2+
<div class="logs-container">
33
<v-tabs class="console-bar" style="position: relative;">
44
<v-tab v-if="logType == 'runlogs'" @click="getLogHistory('web')">run</v-tab>
55
<v-tab v-if="logType == 'runlogs' && deploymentstrategy == 'git' && buildstrategy=='plain'" @click="getLogHistory('builder')">build</v-tab>
@@ -9,7 +9,7 @@
99
<v-tab v-if="logType == 'buildlogs' && (buildstrategy=='nixpacks' || buildstrategy=='dockerfile')" @click="getBuildLogHistory('push')">push</v-tab>
1010
<v-tab v-if="logType == 'buildlogs'" @click="getBuildLogHistory('deploy')">deploy</v-tab>
1111
</v-tabs>
12-
<div class="console" id="console" style="height:100%; margin-top: -45px; z-index: 2000;">
12+
<div class="console" id="console">
1313
<div v-for="line in loglines" :key="line.id">
1414
{{ new Date(line.time).toLocaleDateString() }} {{ new Date(line.time).toLocaleTimeString()}} <span :style="'color:' +line.color">[{{ line.podID }}/{{ line.container.replace('kuberoapp-', '') }}]</span>
1515
{{ line.log }}
@@ -175,22 +175,30 @@ a:link { text-decoration: none;}
175175
vertical-align:inherit;
176176
}
177177
178-
.v-tabs.console-bar {
179-
color: #9F9F9F;
178+
.logs-container {
179+
/*height: calc(100vh - 400px);*/
180+
height: 100%;
181+
width: 100%;
182+
display: flex;
183+
flex-direction: column;
180184
}
181185
182186
.v-tabs.console-bar {
187+
color: #9F9F9F;
183188
background-color: #1E1E1E; /*#444*/
189+
flex-shrink: 0;
184190
}
185191
186192
.console {
187-
overflow-x: scroll;
193+
flex: 1;
194+
overflow-x: auto;
195+
overflow-y: auto;
188196
background-color: #333;
189197
color: #c0c0c0;
190198
padding: 5px;
191199
font: 0.85rem Inconsolata, monospace;
192-
193200
display: flex;
194201
flex-direction: column-reverse;
202+
min-height: 0;
195203
}
196204
</style>

client/src/components/apps/logstab.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</v-col>
2121
</v-row>
2222
<v-row>
23-
<v-col cols="12" sm="12" md="12">
23+
<v-col cols="12" sm="12" md="12" style="height: calc(100vh - 400px);">
2424
<Logs :pipeline=pipeline :phase=phase :app=app :deploymentstrategy=deploymentstrategy :buildstrategy=buildstrategy logType="runlogs" height="600px"/>
2525
</v-col>
2626
</v-row>

client/src/components/profile/index.vue

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
-->
3131
<v-select
3232
v-model="locale"
33-
:items="$i18n.availableLocales"
34-
item-text="name"
33+
:items="availableLanguages"
34+
item-title="name"
3535
item-value="code"
3636
variant="underlined"
3737
label-disabled="Select Language"
@@ -340,6 +340,18 @@ export default defineComponent({
340340
name: 'ProfilePage',
341341
setup() {
342342
const { locale, t } = useI18n()
343+
344+
345+
const availableLanguages = ref([
346+
{ code: 'en', name: 'English' },
347+
{ code: 'de', name: 'Deutsch' },
348+
//{ code: 'es', name: 'Español' },
349+
//{ code: 'fr', name: 'Français' },
350+
{ code: 'de-CH', name: 'Schwizerdütsch' },
351+
{ code: 'ja', name: '日本語' },
352+
{ code: 'zhHans', name: '简体中文' },
353+
{ code: 'pt', name: 'Português' },
354+
])
343355
344356
const user = ref<any>({
345357
firstName: '',
@@ -514,6 +526,7 @@ export default defineComponent({
514526
515527
return {
516528
locale,
529+
availableLanguages,
517530
user,
518531
defaultAvatar,
519532
tokens,

client/src/locale/de-CH.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ const messages = {
295295
warningMessage: 'Dä Token wird <strong>nümme aazeigt</strong>. Bitte kopier und speicher ihn jetzt sicher ab.',
296296
copyToken: 'Token kopiere',
297297
copiedMessage: 'Token i Zwüschealag kopiert!',
298-
close: 'Zueche',
298+
close: 'Zue',
299299
},
300300
actions: {
301301
editProfile: 'Profil bearbeite',
@@ -448,7 +448,7 @@ const messages = {
448448
title: 'Gitea',
449449
baseUrl: 'Gitea Basis-URL',
450450
personalAccessToken: 'Gitea Personal Access Token',
451-
instructions: 'Aleitig zum Erhalte von eme Personal Access Token für',
451+
instructions: 'Aleitig zum Erhalte vomene Personal Access Token für',
452452
},
453453
gogs: {
454454
title: 'Gogs',
@@ -468,7 +468,7 @@ const messages = {
468468
},
469469
general: {
470470
title: 'Allgemäini Kubero-Istellige',
471-
description: 'Einigi Konfigurationswärt bruche es Browser-Update(*) oder en Pod-Neustart(**), zum wirksam z wärde.',
471+
description: 'Einigi Konfigurationswärt bruched es Browser-Update(*) oder en Pod-Neustart(**), zum wirksam z wärde.',
472472
namespace: 'Kubero Namespace',
473473
readonlyMode: 'Nur-Läse-Modus (**)',
474474
adminDisabled: 'Admin deaktiviert',
@@ -510,25 +510,25 @@ const messages = {
510510
},
511511
},
512512
podsizes: {
513-
name: 'Pod-Grössen',
514-
helpTitle: 'Was sind Pod-Grössen?',
515-
helpText: '<p><strong>Pod-Grössen</strong> definieren die Ressourcenanforderungen und -limits für die Pods Ihrer Anwendung in Kubero. Sie können Pod-Grössen erstellen, bearbeiten und löschen, um sie an Ihre Workload-Anforderungen anzupassen.</p><p class="mt-2"><a href="https://www.kubero.dev/docs/usermanual/podsizes/" target="_blank" rel="noopener">Mehr in der Kubero-Dokumentation</a></p>',
513+
name: 'Pod-Grössene',
514+
helpTitle: 'Was sind Pod-Grössene?',
515+
helpText: '<p><strong>Pod-Grössene</strong> definieren die Ressourcenanforderige und -limits für die Pods Ihrer Anwendung in Kubero. Sie können Pod-Grössene erstellen, bearbeiten und löschen, um sie an Ihre Workload-Anforderungen anzupassen.</p><p class="mt-2"><a href="https://www.kubero.dev/docs/usermanual/podsizes/" target="_blank" rel="noopener">Mehr in der Kubero-Dokumentation</a></p>',
516516
form: {
517517
name: 'Pod-Grössenname',
518-
description: 'Beschreibung',
519-
cpuRequest: 'CPU-Anforderung (m)',
518+
description: 'Beschriibig',
519+
cpuRequest: 'CPU-Anforderig (m)',
520520
cpuLimit: 'CPU-Limit (m)',
521-
memoryRequest: 'Speicheranforderung (Gi)',
521+
memoryRequest: 'Speicheranforderig (Gi)',
522522
memoryLimit: 'Speicherlimit (Gi)',
523523
cpu: 'CPU',
524524
memory: 'Speicher',
525525
},
526526
actions: {
527-
create: 'Pod-Grösse erstellen',
528-
edit: 'Pod-Grösse bearbeiten',
527+
create: 'Pod-Grösse erstelle',
528+
edit: 'Pod-Grösse bearbeite',
529529
},
530530
errors: {
531-
loadinPodsize: 'Fehler beim Laden der Pod-Grössen',
531+
loadinPodsize: 'Fehler bim Lade vo de Pod-Grössene',
532532
},
533533
},
534534
templates: {

0 commit comments

Comments
 (0)