From 94e69ad09094218a1e14a637ceffb013183fb392 Mon Sep 17 00:00:00 2001
From: Harvey Tindall <harveyltindall@gmail.com>
Date: Tue, 7 Jul 2020 15:30:16 +0100
Subject: [PATCH] Small CSS tweaks, add days input

---
 jellyfin_accounts/__init__.py               |  2 +-
 jellyfin_accounts/data/templates/admin.html | 10 +++++++++-
 jellyfin_accounts/data/templates/admin.js   | 22 ++++++++++++++-------
 jellyfin_accounts/web_api.py                |  5 ++++-
 pyproject.toml                              |  2 +-
 scss/bs4/bs4-jf.scss                        |  4 ++++
 scss/bs5/bs5-jf.scss                        |  4 ++++
 7 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/jellyfin_accounts/__init__.py b/jellyfin_accounts/__init__.py
index 4c23d6d..065cb07 100755
--- a/jellyfin_accounts/__init__.py
+++ b/jellyfin_accounts/__init__.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-__version__ = "0.3.3"
+__version__ = "0.3.4"
 
 import secrets
 import configparser
diff --git a/jellyfin_accounts/data/templates/admin.html b/jellyfin_accounts/data/templates/admin.html
index c0f1aa1..1336931 100644
--- a/jellyfin_accounts/data/templates/admin.html
+++ b/jellyfin_accounts/data/templates/admin.html
@@ -35,17 +35,20 @@
             {% else %}
             var bsVersion = 4;
             {% endif %}
+            console.log('create');
             var css = document.createElement('link');
             css.setAttribute('rel', 'stylesheet');
             css.setAttribute('type', 'text/css');
             var cssCookie = getCookie("css");
             if (cssCookie.includes('bs' + bsVersion)) {
+                console.log('href');
                 css.setAttribute('href', cssCookie);
             } else {
+                console.log('href');
                 css.setAttribute('href', '{{ css_file }}');
             };
+            console.log('append');
             document.head.appendChild(css);
-                // document.querySelectorAll('link[rel="stylesheet"][type="text/css"]')[0].href = cssCookie;
         </script>
         {% if not bs5 %}
         <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
@@ -235,6 +238,11 @@
                     <div class="card-header">Generate Invite</div>
                     <div class="card-body">
                         <form action="#" method="POST" id="inviteForm">
+                                <div class="form-group">
+                                    <label for="days">Days</label>
+                                    <select class="form-control" id="days" name="days">
+                                    </select>
+                                </div>
                                 <div class="form-group">
                                     <label for="hours">Hours</label>
                                     <select class="form-control" id="hours" name="hours">
diff --git a/jellyfin_accounts/data/templates/admin.js b/jellyfin_accounts/data/templates/admin.js
index 9326c4e..9150e64 100644
--- a/jellyfin_accounts/data/templates/admin.js
+++ b/jellyfin_accounts/data/templates/admin.js
@@ -150,15 +150,19 @@ function parseInvite(invite, empty = false) {
     } else {
         var i = ["", "", "0", invite['email']];
         i[0] = invite['code'];
-        if (invite['hours'] == 0) {
-            i[1] = invite['minutes'] + 'm';
-        } else if (invite['minutes'] == 0) {
-            i[1] = invite['hours'] + 'h';
-        } else {
-            i[1] = invite['hours'] + 'h ' + invite['minutes'] + 'm';
+        var time = ""
+        if (invite['days'] != 0) {
+            time += invite['days'] + 'd ';
         }
-        i[1] = "Expires in " + i[1] + "  ";
+        if (invite['hours'] != 0) {
+            time += invite['hours'] + 'h ';
+        }
+        if (invite['minutes'] != 0) {
+            time += invite['minutes'] + 'm ';
+        }
+        i[1] = "Expires in " + time.slice(0, -1);
         return i
+
     }
 }
 function addItem(invite) {
@@ -176,6 +180,7 @@ function addItem(invite) {
     var listRight = document.createElement('div');
     listText = document.createElement('span');
     listText.id = invite[0] + '_expiry'
+    listText.setAttribute('style', 'margin-right: 1rem;');
     listText.appendChild(document.createTextNode(invite[1]));
     listRight.appendChild(listText);
     if (invite[2] == 0) {
@@ -359,6 +364,9 @@ document.getElementById('loginForm').onsubmit = function() {
                 window.token = data['token'];
                 generateInvites();
                 var interval = setInterval(function() { generateInvites(); }, 60 * 1000);
+                var day = document.getElementById('days');
+                addOptions(30, day);
+                day.selected = "0";
                 var hour = document.getElementById('hours');
                 addOptions(24, hour);
                 hour.selected = "0";
diff --git a/jellyfin_accounts/web_api.py b/jellyfin_accounts/web_api.py
index 598e6da..97bd3e0 100644
--- a/jellyfin_accounts/web_api.py
+++ b/jellyfin_accounts/web_api.py
@@ -200,7 +200,9 @@ def newUser():
 def generateInvite():
     current_time = datetime.datetime.now()
     data = request.get_json()
-    delta = datetime.timedelta(hours=int(data["hours"]), minutes=int(data["minutes"]))
+    delta = datetime.timedelta(
+        days=int(data["days"]), hours=int(data["hours"]), minutes=int(data["minutes"])
+    )
     invite_code = secrets.token_urlsafe(16)
     invite = {}
     log.debug(f"Creating new invite: {invite_code}")
@@ -245,6 +247,7 @@ def getInvites():
         valid_for = expiry - current_time
         invite = {
             "code": code,
+            "days": valid_for.days,
             "hours": valid_for.seconds // 3600,
             "minutes": (valid_for.seconds // 60) % 60,
         }
diff --git a/pyproject.toml b/pyproject.toml
index 9a115f0..1afd889 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "jellyfin-accounts"
-version = "0.3.3"
+version = "0.3.4"
 readme = "README.md"
 description = "A simple account management system for Jellyfin"
 authors = ["Harvey Tindall <harveyltindall@gmail.com>"]
diff --git a/scss/bs4/bs4-jf.scss b/scss/bs4/bs4-jf.scss
index 9322b54..690f515 100644
--- a/scss/bs4/bs4-jf.scss
+++ b/scss/bs4/bs4-jf.scss
@@ -120,6 +120,10 @@ $list-group-action-active-bg: $jf-blue-focus;
     color: $jf-text-bold;
 }
 
+.icon-button {
+    color: $text-muted;
+}
+
 .text-bright {
     color: $jf-text-bold;
 }
diff --git a/scss/bs5/bs5-jf.scss b/scss/bs5/bs5-jf.scss
index 50b1e0f..781a724 100644
--- a/scss/bs5/bs5-jf.scss
+++ b/scss/bs5/bs5-jf.scss
@@ -120,6 +120,10 @@ $list-group-action-active-bg: $jf-blue-focus;
     color: $jf-text-bold;
 }
 
+.icon-button:active {
+    color: $text-muted;
+}
+
 .text-bright {
     color: $jf-text-bold;
 }