From 96b839d97e01488354ad6c80d84de5f5138c482c Mon Sep 17 00:00:00 2001 From: rxdn <29165304+rxdn@users.noreply.github.com> Date: Wed, 1 Sep 2021 20:55:21 +0100 Subject: [PATCH] Permission select --- frontend/src/components/manage/SettingsCard.svelte | 11 ++++++++++- frontend/src/views/Transcripts.svelte | 14 +++++++++++++- go.mod | 2 +- locale | 2 +- 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/manage/SettingsCard.svelte b/frontend/src/components/manage/SettingsCard.svelte index 1df51be..9167461 100644 --- a/frontend/src/components/manage/SettingsCard.svelte +++ b/frontend/src/components/manage/SettingsCard.svelte @@ -19,12 +19,19 @@ -
+
+
+ + + + + +
@@ -49,6 +56,7 @@ import CategoryDropdown from "../CategoryDropdown.svelte"; import Button from "../Button.svelte"; import NamingScheme from "../NamingScheme.svelte"; + import Dropdown from "../form/Dropdown.svelte"; export let guildId; @@ -165,6 +173,7 @@ justify-content: space-between; width: 100%; height: 100%; + margin-top: 10px; } .settings-form { diff --git a/frontend/src/views/Transcripts.svelte b/frontend/src/views/Transcripts.svelte index 4339ea6..a0f9813 100644 --- a/frontend/src/views/Transcripts.svelte +++ b/frontend/src/views/Transcripts.svelte @@ -125,27 +125,39 @@ filterSettings.username = undefined; }; + + let loading = false; + async function loadPrevious() { + if (loading) return; + if (page === 1) { return; } - let paginationSettings = buildPaginationSettings(page - 1); + + loading = true; if (await loadData(paginationSettings)) { page--; } + loading = false; } async function loadNext() { + if (loading) return; + if (transcripts.length < pageLimit || transcripts[transcripts.length - 1].ticket_id === 1) { return; } let paginationSettings = buildPaginationSettings(page + 1); + + loading = true; if (await loadData(paginationSettings)) { page++; } + loading = false; } function buildPaginationSettings(page) { diff --git a/go.mod b/go.mod index 1c79e24..08f79ce 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/BurntSushi/toml v0.3.1 github.com/TicketsBot/archiverclient v0.0.0-20210220155137-a562b2f1bbbb github.com/TicketsBot/common v0.0.0-20210727134627-35eb7ed03a44 - github.com/TicketsBot/database v0.0.0-20210901165354-a7e41939592c + github.com/TicketsBot/database v0.0.0-20210901195306-fcfc088bc2f9 github.com/TicketsBot/worker v0.0.0-20210831230124-0f73f4a70602 github.com/apex/log v1.1.2 github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff // indirect diff --git a/locale b/locale index ce006c3..2d5a1b6 160000 --- a/locale +++ b/locale @@ -1 +1 @@ -Subproject commit ce006c345e84acdffd369878dc16b45048f5a92b +Subproject commit 2d5a1b686f1ea19a14968c424c4bb177b93c4e06