mirror of
https://github.com/amir20/dozzle.git
synced 2026-01-04 20:14:59 +01:00
* Adds settings for timestamp. Fixes #360 * Fixes test * Updates actions
This commit is contained in:
12
.github/workflows/push.yml
vendored
12
.github/workflows/push.yml
vendored
@@ -2,17 +2,19 @@ on: push
|
||||
name: Test
|
||||
jobs:
|
||||
npm-test:
|
||||
name: npm test
|
||||
name: JavaScript Tests
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v2
|
||||
- name: Install Node
|
||||
uses: actions/setup-node@v1
|
||||
- name: Run NPM Tests
|
||||
run: npm it
|
||||
- name: Install depdencies
|
||||
run: yarn
|
||||
- name: Run Tests
|
||||
run: yarn test
|
||||
go-test:
|
||||
name: go test
|
||||
name: Go Tests
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Install Go
|
||||
@@ -21,7 +23,7 @@ jobs:
|
||||
go-version: 1.14.x
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v2
|
||||
- name: Run Go Tests
|
||||
- name: Run Go Tests with Coverage
|
||||
run: go test -cover ./...
|
||||
docker-build:
|
||||
name: Integration Tests
|
||||
|
||||
@@ -37,7 +37,7 @@ describe("<LogEventSource />", () => {
|
||||
|
||||
localVue.component("log-viewer", LogViewer);
|
||||
|
||||
const state = { searchFilter, settings: { size: "medium" } };
|
||||
const state = { searchFilter, settings: { size: "medium", showTimestamp: true } };
|
||||
|
||||
const store = new Vuex.Store({
|
||||
state,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<template lang="html">
|
||||
<ul class="events" :class="settings.size">
|
||||
<li v-for="item in filtered" :key="item.key">
|
||||
<span class="date">{{ item.date | relativeTime }}</span>
|
||||
<span class="date" v-if="settings.showTimestamp">{{ item.date | relativeTime }}</span>
|
||||
<span class="text" v-html="colorize(item.message)"></span>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
@@ -31,6 +31,12 @@
|
||||
</b-switch>
|
||||
</div>
|
||||
|
||||
<div class="item">
|
||||
<b-switch v-model="showTimestamp">
|
||||
Show timestamps
|
||||
</b-switch>
|
||||
</div>
|
||||
|
||||
<div class="item">
|
||||
<h2 class="title is-6 is-marginless">Font size</h2>
|
||||
Modify the font size when viewing logs.
|
||||
@@ -92,7 +98,7 @@ export default {
|
||||
},
|
||||
computed: {
|
||||
...mapState(["settings"]),
|
||||
...["search", "size", "smallerScrollbars"].reduce((map, name) => {
|
||||
...["search", "size", "smallerScrollbars", "showTimestamp"].reduce((map, name) => {
|
||||
map[name] = {
|
||||
get() {
|
||||
return this.settings[name];
|
||||
|
||||
@@ -4,4 +4,5 @@ export const DEFAULT_SETTINGS = {
|
||||
size: "medium",
|
||||
menuWidth: 15,
|
||||
smallerScrollbars: false,
|
||||
showTimestamp: true,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user