From ef6f7725322d6f7e2edc4f2c9ae88a9ac8e0a039 Mon Sep 17 00:00:00 2001 From: jamesread Date: Fri, 16 Jul 2021 14:28:26 +0100 Subject: [PATCH] Rebase to main --- OliveTin.proto | 17 +++++++++++++++++ webui/index.html | 21 +++++++++++++++++++-- webui/js/ActionButton.js | 8 ++++++++ webui/js/marshaller.js | 2 +- webui/main.js | 23 ++++++++++++++++++++++- webui/style.css | 39 +++++++++++++++++++++++++++++++++++++-- 6 files changed, 104 insertions(+), 6 deletions(-) diff --git a/OliveTin.proto b/OliveTin.proto index 2e46f06..7094296 100644 --- a/OliveTin.proto +++ b/OliveTin.proto @@ -28,6 +28,17 @@ message StartActionResponse { int32 exitCode = 4; } +message GetLogsRequest{}; + +message LogEntry { + string datetime = 1; + string content = 2; +} + +message GetLogsResponse { + repeated LogEntry logs = 1; +} + service OliveTinApi { rpc GetButtons(GetButtonsRequest) returns (GetButtonsResponse) { option (google.api.http) = { @@ -41,4 +52,10 @@ service OliveTinApi { }; } + rpc GetLogs(GetLogsRequst) returns (GetLogsResponse) { + option (google.api.http) = { + get: "/api/GetLogs" + } + } + } diff --git a/webui/index.html b/webui/index.html index 21c5b8f..0eae6e3 100644 --- a/webui/index.html +++ b/webui/index.html @@ -12,9 +12,26 @@
-
- OliveTin Actions +
+ +
+ + + +