From ea89975b14cd018aa9628e56d4955baaa8bb9e3e Mon Sep 17 00:00:00 2001
From: Gisle Aune <dev@gisle.me>
Date: Sun, 28 Oct 2018 14:21:17 +0100
Subject: [PATCH] logs: Added logs-table that looks like old logs site.

---
 .../components/logs-table-row/component.js    | 10 +++++++++
 .../components/logs-table-row/index.marko     | 22 +++++++++++++++++++
 .../logs/components/logs-table-row/style.less | 19 ++++++++++++++++
 .../logs/components/logs-table/index.marko    | 11 ++++++++++
 .../logs/components/logs-table/style.less     | 11 ++++++++++
 marko/page/logs/components/page/component.js  |  3 +--
 marko/page/logs/components/page/index.marko   |  2 +-
 7 files changed, 75 insertions(+), 3 deletions(-)
 create mode 100644 marko/page/logs/components/logs-table-row/component.js
 create mode 100644 marko/page/logs/components/logs-table-row/index.marko
 create mode 100644 marko/page/logs/components/logs-table-row/style.less
 create mode 100644 marko/page/logs/components/logs-table/index.marko
 create mode 100644 marko/page/logs/components/logs-table/style.less

diff --git a/marko/page/logs/components/logs-table-row/component.js b/marko/page/logs/components/logs-table-row/component.js
new file mode 100644
index 0000000..83cb82b
--- /dev/null
+++ b/marko/page/logs/components/logs-table-row/component.js
@@ -0,0 +1,10 @@
+const moment = require("moment")
+
+module.exports = class {
+  onCreate(input) {
+    this.state = {
+      expand: false,
+      dateStr: moment(input.log.date).format("MMM D, YYYY"),
+    }
+  }
+}
\ No newline at end of file
diff --git a/marko/page/logs/components/logs-table-row/index.marko b/marko/page/logs/components/logs-table-row/index.marko
new file mode 100644
index 0000000..1a69c0d
--- /dev/null
+++ b/marko/page/logs/components/logs-table-row/index.marko
@@ -0,0 +1,22 @@
+$ const fullNames = (input.log.characters.length < 4);
+
+<tr key=input.log.shortId class="logs-table-row color-text">
+  <td class="date color-primary">
+    <a href=("/logs/"+input.log.id)>${state.dateStr}</a>
+  </td>
+  <td class="channel color-menu">
+    <a on-click("emit", "addfilter", "channels", input.log.channelName)>${input.log.channelName}</a>
+  </td>
+  <td class="event color-tag-event">
+    <a on-click("emit", "addfilter", "events", input.log.eventName)>${(input.log.eventName || "").replace(/\s/g, " ")}</a>
+  </td>
+  <td class="characters color-menu">
+    <span for(character in input.log.characters | status-var=loop)>
+      <a on-click("emit", "addfilter", "characters", character.id) class="name">${fullNames ? character.name : character.shortName}</a>
+      <span class="comma" if(loop.getIndex() < (loop.getLength() - 1))>, </span>
+    </span>
+  </td>
+</tr>
+<tr if(state.expand) key=(input.log.shortId + "_expand") class="logs-table-row-expanded">
+
+</tr>
\ No newline at end of file
diff --git a/marko/page/logs/components/logs-table-row/style.less b/marko/page/logs/components/logs-table-row/style.less
new file mode 100644
index 0000000..04e4cbd
--- /dev/null
+++ b/marko/page/logs/components/logs-table-row/style.less
@@ -0,0 +1,19 @@
+tr.logs-table-row {
+  td {
+    padding: 0.25em 1ch;
+    text-align: center;
+    border-bottom: 1px solid rgba(51, 51, 51, 0.5);
+
+    a {
+      color: inherit;
+    }
+  }
+
+  td.expand {
+    width: 2%;
+  }
+
+  td.channel, td.date, td.event {
+    width: 12%;
+  }
+}
\ No newline at end of file
diff --git a/marko/page/logs/components/logs-table/index.marko b/marko/page/logs/components/logs-table/index.marko
new file mode 100644
index 0000000..5842b1e
--- /dev/null
+++ b/marko/page/logs/components/logs-table/index.marko
@@ -0,0 +1,11 @@
+import moment from "moment"
+
+<table class="logs-table color-highlight-dark color-primary">
+  <tr key="_header">
+    <th>Date</th>
+    <th>Channel</th>
+    <th>Event</th>
+    <th>Characters</th>
+  </tr>
+  <logs-table-row for(log in input.logs) key=log.shortId log=log on-addfilter("emit", "addfilter") />
+</table>
\ No newline at end of file
diff --git a/marko/page/logs/components/logs-table/style.less b/marko/page/logs/components/logs-table/style.less
new file mode 100644
index 0000000..9e37038
--- /dev/null
+++ b/marko/page/logs/components/logs-table/style.less
@@ -0,0 +1,11 @@
+table.logs-table {
+  outline: 1px solid;
+  margin: 1em auto;
+  width: 90%;
+  max-width: 140ch;
+
+  a:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
\ No newline at end of file
diff --git a/marko/page/logs/components/page/component.js b/marko/page/logs/components/page/component.js
index 0dc6761..61aa792 100644
--- a/marko/page/logs/components/page/component.js
+++ b/marko/page/logs/components/page/component.js
@@ -21,14 +21,13 @@ module.exports = class {
     if (type === "search") {
       this.state.filter = Object.assign({}, this.state.filter, {search: filter})
     } else {
-      this.state.filter = Object.assign({}, this.state.filter, {[type]: (this.state.filter[type] || []).concat(filter)})
+      this.state.filter = Object.assign({}, this.state.filter, {[type]: (this.state.filter[type] || []).filter(f => f !== filter).concat(filter)})
     }
 
     this.refresh()
   }
 
   removeFilter(type, filter) {
-
     if (type === "search") {
       this.state.filter = Object.assign({}, this.state.filter, {search: null})
       this.refresh()
diff --git a/marko/page/logs/components/page/index.marko b/marko/page/logs/components/page/index.marko
index dbf9daa..2c438f8 100644
--- a/marko/page/logs/components/page/index.marko
+++ b/marko/page/logs/components/page/index.marko
@@ -1,7 +1,7 @@
 <background src="/assets/images/bg.png" opacity=0.25 />
 <logs-menu key="menu" on-select("open") on-removefilter("removeFilter") selected=(input.selected || {}) user=input.user filter=state.filter characters=input.characters />
 <main>
-  <logs-list logs=state.logs />
+  <logs-table logs=state.logs on-addfilter("addFilter") />
 </main>
 <add-log-modal enabled=(state.modal === "log.add") on-close("close") />
 <add-filter-modal enabled=(state.modal === "filter.add") characters=input.characters filter=state.filter on-add("addFilter") on-close("close") />