Reposition "options"

Fix import/export

Cargo.lock

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

Cargo.toml

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

web/src/routes/dashboard/export.rs

@@ -70,7 +70,7 @@ pub async fn export_reminders(
                  reminders.utc_time
                 FROM reminders
                 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
             )
             .fetch_all(pool.inner())

web/static/css/style.css

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

web/templates/dashboard.html.tera

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