From f5a6adc43b4c81460bb5460ce8c38d6b740a07db Mon Sep 17 00:00:00 2001
From: mntmn <lukas@mntre.com>
Date: Thu, 9 Apr 2020 21:46:23 +0200
Subject: [PATCH 1/2] remove unused modals

---
 views/partials/modal/create-space.html | 35 -----------
 views/partials/modal/login.html        | 84 --------------------------
 views/partials/modal/pdfoptions.html   | 36 -----------
 views/partials/modal/space-share.html  | 24 --------
 views/partials/modal/support.html      | 31 ----------
 views/spacedeck.html                   |  2 -
 6 files changed, 212 deletions(-)
 delete mode 100644 views/partials/modal/create-space.html
 delete mode 100644 views/partials/modal/login.html
 delete mode 100644 views/partials/modal/pdfoptions.html
 delete mode 100644 views/partials/modal/space-share.html
 delete mode 100644 views/partials/modal/support.html

diff --git a/views/partials/modal/create-space.html b/views/partials/modal/create-space.html
deleted file mode 100644
index 28397cb..0000000
--- a/views/partials/modal/create-space.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<div class="modal" v-if="active_modal == 'create-space'" v-cloak>
-  <div class="modal-wrapper">
-    <div class="modal-dialog">
-
-      <button type="button" class="btn btn-icon btn-light btn-round close" v-on="click : close_modal()">
-        <span class="icon icon-cross-1"></span> 
-      </button>
-
-      <div class="modal-content">
-        <div class="modal-body labels-inline">
-          <div class="modal-section p-5">
-            What would you like to create?
-
-            <div>
-              <input type="text" v-model="create_space_title" placeholder="Title">
-            </div>
-
-            <div>
-              <button class="btn" v-on="click: create_space('space','whiteboard')">Whiteboard</button>
-            </div>
-
-            <div>
-              <button class="btn" v-on="click: create_space('space','collection')">Note Collection</button>
-            </div>
-
-            <div>
-              <button class="btn" v-on="click: create_space('space','article')">Article</button>
-            </div>
-            
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/views/partials/modal/login.html b/views/partials/modal/login.html
deleted file mode 100644
index bebac28..0000000
--- a/views/partials/modal/login.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<div class="modal" v-if="active_modal == 'login'" v-cloak>
-  <div class="modal-wrapper">
-    <div class="modal-dialog">
-
-      <button type="button" class="btn btn-icon btn-light btn-round close" v-on:click="close_modal()">
-        <span class="icon icon-cross-1"></span> 
-      </button>
-
-      <div class="modal-content">
-        <div class="modal-body">
-          <div class="modal-section no-b">
-
-            <div id="account-forms-modal">
-              <div v-show="active_modal_view != 'signup'">
-                <div class="content">
-                  <form>
-                    <h4>Login</h4>
-
-                    <div class="tight">
-                      <div class="form-group">
-                        <input class="input" type="text" focus-me="true" v-model="login_email" placeholder="Email">
-                      </div>
-                      <div class="form-group">
-                        <input class="input" type="password" v-model="login_password" placeholder="Password">
-                      </div>
-                    </div>
-
-                    <span type="submit" class="btn btn-primary btn-xl btn-block btn-round" v-on:click="login_submit_modal(login_email, login_password, $event)">
-                      <span v-show="!loading_user">Log In</span>
-                      <span v-show="loading_user">Logging in…</span>
-                    </span>  
-
-                    <div class="center alert alert-danger" v-if="login_error" v-model="login_error"></div>
-
-                    <span class="btn btn-link btn-block" v-on:click="active_modal_view='signup'">Create a new account</span>
-                  </form>
-                </div>
-              </div>
-
-              <div v-show="active_modal_view == 'signup'">
-                <div class="content">
-                  <form>
-                    <h4>Sign Up</h4>
-
-                    <div class="tight">
-                      <div class="form-group">
-                        <input class="input" type="text" id="user-name" v-model="name" placeholder="Name">
-                      </div>
-
-                      <div class="form-group">
-                        <input class="input" type="email" id="user-email" v-model="email" placeholder="Email">
-                      </div>
-
-                      <div class="form-group">
-                        <input class="input" id="user-password" type="password" v-model="password" placeholder="Password">
-                      </div>
-
-                      <div class="form-group">
-                        <input class="input" id="user-password-confirmation" type="password" v-model="password_confirmation" placeholder="Repeat Password">
-                      </div>
-                    </div>
-
-                    <div class="text-center" style="margin-top: -7px; margin-bottom: 30px;"><small>By signing up you agree to our <a href="/terms.html" target="_blank">TOS</a> and <a href="/privacy.html" target="_blank">Privacy Policy.</a></small><br/>
-                    </div>
-
-                    <span class="btn btn-primary btn-xl btn-round btn-block" v-on:click="signup_submit_modal($event, name, email, password, password_confirmation)">
-                      <span v-if="!creating_user">Sign Up</span>
-                      <span v-if="creating_user">Signing Up…</span>
-                    </span>
-                    
-                    <div class="center alert alert-danger" v-if="signup_error">{{signup_error}}</div>
-
-                    <span class="btn btn-link btn-block" v-on:click="active_modal_view='login'">I already have an account</span>
-                  </form>
-                </div>
-              </div>
-            </div>
-          </div>
-
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/views/partials/modal/pdfoptions.html b/views/partials/modal/pdfoptions.html
deleted file mode 100644
index 409f46b..0000000
--- a/views/partials/modal/pdfoptions.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<div class="modal" v-if="active_modal == 'pdfoptions'" v-cloak>
-  <div class="modal-wrapper">
-    <div class="modal-dialog">
-      <div class="modal-content">
-        <div class="modal-header">
-          <button type="button" class="btn btn-icon btn-light btn-round close" v-on:click=" close_modal()">
-            <span class="icon icon-cross-1"></span>
-          </button>
-        </div>
-
-        <div class="modal-body">
-          <p class="lead text-center">PDF Import</p>
-          <div class="plans-box">
-            <table class="plans-table">
-              <tr>
-                <td>
-                  <p>Thumbnail and Download Link</p>
-
-                  <button class="btn btn-primary btn-round btn-sm" v-on:click=" approve_pdf_upload($event, null, 'classic')">Classic Import</button>
-
-                </td>
-                <td>
-                  <p>Each Page as Image, displayed as Grid</p>
-                  <button class="btn btn-primary btn-round btn-sm" v-on:click=" approve_pdf_upload($event, pdf_export_with_zones, 'grid')">Grid Import</button><br>
-                  <input type="checkbox" v-model="pdf_export_with_zones" /> With Zones?
-                </td>
-              </tr>
-            </table>
-          </div>
-        </div>
-
-
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/views/partials/modal/space-share.html b/views/partials/modal/space-share.html
deleted file mode 100644
index a9f5911..0000000
--- a/views/partials/modal/space-share.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<div class="modal" v-if="active_modal == 'space-share'" v-cloak>
-  <div class="modal-wrapper">
-    <div class="modal-dialog">
-
-      <button type="button" class="btn btn-icon btn-light btn-round close" v-on="click : close_modal()">
-        <span class="icon icon-cross-1"></span> 
-      </button>
-
-      <div class="modal-content">
-        <div class="modal-body">
-          <div class="modal-section no-b">
-            <p class="lead">Share &quot;{{active_space.name}}&quot;</p>
-          </div>
-          <div class="modal-section no-b">
-            <p class="lead">Or Copy &amp; Paste this Link</p>
-            <p>
-              <span class="input">{{share_base_url}}{{active_space._id}}</span>
-            </p>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/views/partials/modal/support.html b/views/partials/modal/support.html
deleted file mode 100644
index 8f8306b..0000000
--- a/views/partials/modal/support.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<div class="modal" v-if="active_modal == 'support'" v-cloak>
-  <div class="modal-wrapper">
-    <div class="modal-dialog">
-      <div class="modal-content">
-        <div class="modal-header">
-          <button type="button" class="btn btn-icon btn-light btn-round close" v-on:click="close_modal()">
-            <span class="icon icon-cross-1"></span>
-          </button>
-          <h4 class="modal-title">Send Feedback</h4>
-        </div>
-
-        <div class="modal-body">
-          <div class="modal-section">
-
-            <p>
-              Have a question, feedback or an idea for improvement? Send us a quick message using the box below and we'll get back to you as soon as possible.
-            </p>
-
-            <div class="form-group">
-              <textarea v-model="feedback_text" class="input" autofocus></textarea>
-            </div>
-
-            <div class="form-group">
-              <button class="btn btn-primary btn-round btn-sm" v-on:click="send_feedback(feedback_text)">Send Feedback</button>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/views/spacedeck.html b/views/spacedeck.html
index 4c08739..218c5e8 100644
--- a/views/spacedeck.html
+++ b/views/spacedeck.html
@@ -77,8 +77,6 @@
 
     {% include "./partials/modal/access.html" %}
     {% include "./partials/modal/folder-settings.html" %}
-    {% include "./partials/modal/support.html" %}
-    {% include "./partials/modal/login.html" %}
   </body>
 
   <script type="text/javascript">

From a92b915bc373d8e3cb24ee73645f78702f106e61 Mon Sep 17 00:00:00 2001
From: mntmn <lukas@mntre.com>
Date: Thu, 9 Apr 2020 22:21:55 +0200
Subject: [PATCH 2/2] fix password recovery

---
 public/javascripts/spacedeck_users.js | 14 ++++++++------
 routes/api/users.js                   |  9 ++-------
 views/partials/login.html             | 10 +++++-----
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/public/javascripts/spacedeck_users.js b/public/javascripts/spacedeck_users.js
index 1b62363..7f2a9ad 100644
--- a/public/javascripts/spacedeck_users.js
+++ b/public/javascripts/spacedeck_users.js
@@ -196,27 +196,29 @@ SpacedeckUsers = {
       this.password_reset_confirm_error = null;
       this.password_reset_send = false;
 
-      if(password != password_confirmation) {
+      if (password != password_confirmation) {
         this.password_reset_confirm_error = "Passwords do not match.";
         return;
       }
 
-      if(password.length < 5) {
+      if (password.length < 5) {
         this.password_reset_confirm_error = "Password too short (must have at least 5 characters).";
         return;
       }
 
       confirm_password_reset(password, this.reset_token, function(parsed,req) {
-        if(req.status==201){
+        if (req.status==201) {
+          alert("New password set successfully.");
           this.active_view = "login";
+        } else {
+          alert("An unknown error occured.");
         }
       }.bind(this), function(req) {
         if (req.status==404) {
-          var msg = "user not found";
+          alert("Error: Unknown user.");
         } else {
-          var msg = "error: " + req.statusText;
+          alert("Error: "+req.statusText);
         }
-        this.password_reset_confirm_error = msg;
       }.bind(this));
     },
 
diff --git a/routes/api/users.js b/routes/api/users.js
index 187b925..99ba793 100644
--- a/routes/api/users.js
+++ b/routes/api/users.js
@@ -289,15 +289,10 @@ router.post('/password_reset_requests/:confirm_token/confirm', function(req, res
       if (user) {
         bcrypt.genSalt(10, (err, salt) => {
           bcrypt.hash(password, salt, function(err, hash) {
-
             user.password_hash = hash;
             user.password_token = null;
-            user.save(function(err, updatedUser){
-              if (err) {
-                res.sendStatus(400);
-              } else {
-                res.sendStatus(201);
-              }
+            user.save().then(function(updatedUser) {
+              res.sendStatus(201);
             });
           });
         });
diff --git a/views/partials/login.html b/views/partials/login.html
index a0c80c7..de19912 100644
--- a/views/partials/login.html
+++ b/views/partials/login.html
@@ -57,7 +57,7 @@
           </div>
 
           <div class="form-group">
-            <input class="input" id="user-password-confirmation" required type="password" v-model="signup_password_confirmation" placeholder="[[__("password_confirmation")]]">
+            <input class="input" id="user-password-confirmation" required type="password" v-model="signup_password_confirmation" placeholder="Repeat Password">
           </div>
         </div>
         
@@ -98,8 +98,8 @@
       </form>
     </div>
     <div class="content" v-if="password_reset_send==true">
-      <h4>[[__("password_confirmation")]]</h4>
-      [[__("password_check_inbox")]]
+      <h4>Reset Password</h4>
+      Please check your email inbox.
     </div>
   </div>
 
@@ -110,11 +110,11 @@
 
         <div class="tight">
           <div class="form-group">
-            <input class="input" id="user-password" type="password" v-model="signup_password" placeholder="[[__("password")]]">
+            <input class="input" id="user-password" type="password" v-model="signup_password" placeholder="New Password">
           </div>
 
           <div class="form-group">
-            <input class="input" id="user-password" type="password" v-model="signup_password_confirmation" placeholder="[[__("password_confirmation")]]">
+            <input class="input" id="user-password" type="password" v-model="signup_password_confirmation" placeholder="Repeat Password">
           </div>
         </div>