From e6d4d96693bfa8a8b8dd9464895667d82e139714 Mon Sep 17 00:00:00 2001
From: Bobby Wibowo <bobbywibowo98@gmail.com>
Date: Tue, 17 Sep 2019 12:14:25 +0700
Subject: [PATCH] Fixed URLs uploader being disabled & updated todo

etc.
---
 todo.md        | 2 ++
 views/auth.njk | 4 ----
 views/faq.njk  | 8 ++++----
 views/home.njk | 8 ++++----
 views/nojs.njk | 4 ++--
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/todo.md b/todo.md
index 0b11a6b..95d0347 100644
--- a/todo.md
+++ b/todo.md
@@ -17,6 +17,8 @@ Normal priority:
 * [x] Show expiry date in thumbs view.
 * [ ] Add Select all checkbox somewhere in thumbs view.
 * [x] Display renders after API check.
+* [ ] Enforce pass min/max lengths in dashboard's change password form.
+* [ ] Add a copy all links to clipboard when there are more than 2 uploads in history.
 
 Low priority:
 
diff --git a/views/auth.njk b/views/auth.njk
index 143cef0..20976ff 100644
--- a/views/auth.njk
+++ b/views/auth.njk
@@ -41,10 +41,6 @@
             </div>
             <div class="field is-grouped is-grouped-right">
               <div class="control">
-                {#-
-                  Explicitly use "button" for type attribute
-                  to prevent browsers from treating this button as the "submit" button.
-                #}
                 <button id="registerBtn" type="button" class="button">
                   <span class="icon">
                     <i class="icon-user-plus"></i>
diff --git a/views/faq.njk b/views/faq.njk
index ef4d417..52239ce 100644
--- a/views/faq.njk
+++ b/views/faq.njk
@@ -1,8 +1,8 @@
 {% set title = "FAQ" %}
 {% extends "_layout.njk" %}
 
-{% set noJsMaxSize = config.cloudflare.noJsMaxSize | int %}
-{% set chunkSize = config.uploads.chunkSize | int %}
+{% set noJsMaxSizeInt = config.cloudflare.noJsMaxSize | int %}
+{% set chunkSizeInt = config.uploads.chunkSize | int %}
 {% set extensionsFilterMode = config.extensionsFilterMode %}
 {% set extensionsFilter = config.extensionsFilter %}
 
@@ -96,7 +96,7 @@
       </div>
     </article>
 
-    {% if noJsMaxSize and chunkSize -%}
+    {% if noJsMaxSizeInt and chunkSizeInt -%}
     <h2 class='subtitle'>Why is the maximum file size in the No-JS uploader form smaller?</h2>
     <article class="message">
       <div class="message-body">
@@ -106,7 +106,7 @@
     </article>
     {%- endif %}
 
-    {% if chunkSize -%}
+    {% if chunkSizeInt -%}
     <h2 class='subtitle'>So your API supports chunked uploads?</h2>
     <article class="message">
       <div class="message-body">
diff --git a/views/home.njk b/views/home.njk
index b052d6a..f3f2e2a 100644
--- a/views/home.njk
+++ b/views/home.njk
@@ -1,7 +1,7 @@
 {% extends "_layout.njk" %}
 
-{% set maxSizeInt = config.maxSize | int %}
-{% set urlMaxSizeInt = config.urlMaxSize | int %}
+{% set maxSizeInt = config.uploads.maxSize | int %}
+{% set urlMaxSizeInt = config.uploads.urlMaxSize | int %}
 {% set urlDisclaimerMessage = config.uploads.urlDisclaimerMessage %}
 {% set urlExtensionsFilterMode = config.uploads.urlExtensionsFilterMode %}
 {% set urlExtensionsFilter = config.uploads.urlExtensionsFilter %}
@@ -75,7 +75,7 @@
                   <span>Files</span>
                 </a>
               </li>
-              {% if urlMaxSize -%}
+              {% if urlMaxSizeInt -%}
               <li data-id="tab-urls">
                 <a>
                   <span class="icon is-small"><i class="icon-link"></i></span>
@@ -95,7 +95,7 @@
             <div class="field dz-container"></div>
             <div class="field uploads"></div>
           </div>
-          {% if urlMaxSize -%}
+          {% if urlMaxSizeInt -%}
           <div id="tab-urls" class="tab-content is-hidden">
             <div class="field">
               <div class="control">
diff --git a/views/nojs.njk b/views/nojs.njk
index 60e4342..8ffe392 100644
--- a/views/nojs.njk
+++ b/views/nojs.njk
@@ -9,7 +9,7 @@
   Running in private mode.
   {%- endif %}
 {%- endset %}
-{% set maxSizeInt = config.maxSize | int %}
+{% set maxSizeInt = config.uploads.maxSize | int %}
 {% set noJsMaxSizeInt = config.cloudflare.noJsMaxSize | int %}
 
 {% block stylesheets %}
@@ -35,7 +35,7 @@
       <div class="columns is-gapless">
         <div class="column is-hidden-mobile"></div>
         <div class="column">
-          {% if config.private -%}
+          {% if private -%}
           <a class="button is-danger is-flex" href="auth">
             {{ disabledMessage }}
           </a>