jude/reminder-bot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Reposition "options"

Browse Source 
Fix import/export
This commit is contained in:
jude 2023-09-23 23:38:16 +01:00
parent 56ffc43616
commit bd1462a00c
5 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -2173,7 +2173,7 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
[[package]] [[package]]
name = "reminder-rs" name = "reminder-rs"
version = "1.6.40" version = "1.6.41"
dependencies = [ dependencies = [
"base64 0.21.4", "base64 0.21.4",
"chrono", "chrono",

2
Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "reminder-rs" name = "reminder-rs"
version = "1.6.40" version = "1.6.41"
authors = ["Jude Southworth <judesouthworth@pm.me>"] authors = ["Jude Southworth <judesouthworth@pm.me>"]
edition = "2021" edition = "2021"
license = "AGPL-3.0 only" license = "AGPL-3.0 only"

2
web/src/routes/dashboard/export.rs
View File

@ -70,7 +70,7 @@ pub async fn export_reminders(
reminders.utc_time reminders.utc_time
FROM reminders FROM reminders
LEFT JOIN channels ON channels.id = reminders.channel_id LEFT JOIN channels ON channels.id = reminders.channel_id
WHERE FIND_IN_SET(channels.channel, ?)", WHERE FIND_IN_SET(channels.channel, ?) AND status = 'pending'",
channels channels
) )
.fetch_all(pool.inner()) .fetch_all(pool.inner())

8
web/static/css/style.css
View File

@ -304,11 +304,6 @@ div.dashboard-sidebar {
padding-right: 0; padding-right: 0;
} }
div.dashboard-sidebar:not(.mobile-sidebar) {
display: flex;
flex-direction: column;
}
ul.guildList { ul.guildList {
flex-grow: 1; flex-grow: 1;
flex-shrink: 1; flex-shrink: 1;
@ -318,6 +313,9 @@ ul.guildList {
div.dashboard-sidebar:not(.mobile-sidebar) .aside-footer { div.dashboard-sidebar:not(.mobile-sidebar) .aside-footer {
flex-shrink: 0; flex-shrink: 0;
flex-grow: 0; flex-grow: 0;
position: fixed;
bottom: 0;
width: 226px;
} }
div.dashboard-sidebar svg { div.dashboard-sidebar svg {

4
web/templates/dashboard.html.tera
View File

@ -257,11 +257,9 @@
</p> </p>
<ul class="menu-list"> <ul class="menu-list">
<li> <li>
{#
<a class="show-modal" data-modal="dataManagerModal"> <a class="show-modal" data-modal="dataManagerModal">
<span class="icon"><i class="fas fa-exchange"></i></span> Import/Export <span class="icon"><i class="fas fa-exchange"></i></span> Import/Export
</a> </a>
#}
<a class="show-modal" data-modal="chooseTimezoneModal"> <a class="show-modal" data-modal="chooseTimezoneModal">
<span class="icon"><i class="fas fa-map-marked"></i></span> Timezone <span class="icon"><i class="fas fa-map-marked"></i></span> Timezone
</a> </a>
@ -303,11 +301,9 @@
</p> </p>
<ul class="menu-list"> <ul class="menu-list">
<li> <li>
{#
<a class="show-modal" data-modal="dataManagerModal"> <a class="show-modal" data-modal="dataManagerModal">
<span class="icon"><i class="fas fa-exchange"></i></span> Import/Export <span class="icon"><i class="fas fa-exchange"></i></span> Import/Export
</a> </a>
#}
<a class="show-modal" data-modal="chooseTimezoneModal"> <a class="show-modal" data-modal="chooseTimezoneModal">
<span class="icon"><i class="fas fa-map-marked"></i></span> Timezone <span class="icon"><i class="fas fa-map-marked"></i></span> Timezone
</a> </a>