web-manager 3.2.38 → 3.2.40

package/index.js

@@ -707,14 +707,14 @@ function Manager() {
   Manager.prototype.auth = function() {
     var self = this;
     var firebaseActive = typeof firebase !== 'undefined';
-    var erel = '.auth-error-message-element';
+    var $error = select('.auth-error-message-element');
 
     function _displayError(msg) {
       console.error(msg);
-      select(erel).show().setInnerHTML(msg);
+      $error.show().setInnerHTML(msg);
     }
     function _preDisplayError() {
-      select(erel).hide().setInnerHTML('');
+      $error.hide().setInnerHTML('');
     }
 
     function setAuthButtonDisabled(button, status) {
@@ -727,15 +727,33 @@ function Manager() {
       }
     }
 
-    function resolveAuthInput(existing, mode, input) {
-      var authSelector = '.auth-';
-      var inputSelector = authSelector + input + '-input';
-      var formSelector = authSelector + mode + '-form ';
-      var result = existing || select(formSelector + inputSelector).getValue() || select(inputSelector).getValue();
+    function selectAuthInput(mode, input) {
+      var prefix = '.auth-';
+      var inputSelector = prefix + input + '-input';
+      var formSelector = prefix + mode + '-form ';
+      var formInput = select(formSelector + inputSelector);
+      var input = select(inputSelector);
+
+      return formInput.exists() ? formInput : input;
+    }
+
+    function resolveAuthInputValue(existing, mode, input) {
+      var result = existing || selectAuthInput(mode, input).getValue();
 
       return input === 'email' ? result.trim().toLowerCase() : result;
     }
 
+    function uxHandler(email, password, passwordConfirm, mode) {
+      if (!email) {
+        selectAuthInput(mode, 'email').get(0).focus();
+      } else {
+        selectAuthInput(mode, 'password').get(0).focus();
+        if (mode === 'signup') {
+          selectAuthInput(mode, 'password-confirm').get(0).focus();
+        }
+      }
+    }
+
     return {
       isAuthenticated: function () {
         return firebaseActive ? !!firebase.auth().currentUser : false;
@@ -778,11 +796,14 @@ function Manager() {
         // self.log('Signin attempt: ', method, email, password);
         if (method === 'email') {
           // email = (email || select('.auth-email-input').getValue()).trim().toLowerCase();
-          email = resolveAuthInput(email, mode, 'email');
+          email = resolveAuthInputValue(email, mode, 'email');
           // password = password || select('.auth-password-input').getValue();
-          password = resolveAuthInput(password, mode, 'password');
+          password = resolveAuthInputValue(password, mode, 'password');
           // console.log('Signin attempt: ', method, email, password);
 
+          // Handler
+          uxHandler(email, password, undefined, mode);
+
           // signinButtonDisabled(true);
           setAuthButtonDisabled(mode, true);
 
@@ -832,13 +853,16 @@ function Manager() {
 
         if (method === 'email') {
           // email = (email || select('.auth-email-input').getValue()).trim().toLowerCase();
-          email = resolveAuthInput(email, mode, 'email');
+          email = resolveAuthInputValue(email, mode, 'email');
           // password = password || select('.auth-password-input').getValue();
-          password = resolveAuthInput(password, mode, 'password');
+          password = resolveAuthInputValue(password, mode, 'password');
           // passwordConfirm = passwordConfirm || select('.auth-password-confirm-input').getValue();
-          passwordConfirm = resolveAuthInput(passwordConfirm, mode, 'password-confirm');
+          passwordConfirm = resolveAuthInputValue(passwordConfirm, mode, 'password-confirm');
           // console.log('Signup attempt: ', method, email, password, passwordConfirm);
 
+          // Handler
+          uxHandler(email, password, passwordConfirm, mode);
+
           if (password === passwordConfirm) {
             // signupButtonDisabled(true);
             setAuthButtonDisabled(mode, true);
@@ -883,7 +907,7 @@ function Manager() {
         // self.log('forgot()');
         var mode = 'forgot';
         // email = email || select('.auth-email-input').getValue();
-        email = resolveAuthInput(email, mode, 'email')
+        email = resolveAuthInputValue(email, mode, 'email')
 
         // forgotButtonDisabled(true);
         setAuthButtonDisabled(mode, true);

package/lib/account.js

@@ -240,6 +240,9 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
   console.log('++++++account', JSON.stringify(account, null, 2));
   console.log('++++++options', JSON.stringify(options, null, 2));
 
+  // @@@DEVELOPER
+  // account.plan = {};
+
   // Resolve auth
   account.auth = account.auth || {};
   account.auth.uid = account.auth.uid || firebaseUser.uid || null;
@@ -262,6 +265,17 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
   account.plan.trial.expires.timestamp = new Date(account.plan.trial.expires.timestamp || 0).toISOString()
   account.plan.trial.expires.timestampUNIX = Math.round(new Date(account.plan.trial.expires.timestamp || 0).getTime() / 1000);
 
+  // @@@DEVELOPER
+  // account.plan.id = 'basic';
+  // account.plan.trial = {
+  //   activated: false,
+  //   expires: {
+  //     timestamp: new Date('2024-04-23T00:07:29.183Z').toISOString(),
+  //     timestampUNIX: Math.round(new Date('2024-04-23T00:07:29.183Z').getTime() / 1000),
+  //   }
+  // }
+  // account.plan.status = 'suspended';
+
   account.plan.limits = account.plan.limits || {};
   // account.plan.devices = account.plan.devices || 1;
 
@@ -324,6 +338,8 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
     account.plan.id = defaultPlanId;
   }
 
+  var isBasicPlan = account.plan.id === defaultPlanId;
+
   // Resolve oAuth2
   account.oauth2 = account.oauth2 || {};
   // account.oauth2.google = account.oauth2.google || {};
@@ -331,7 +347,6 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
 
   // Resolve roles
   account.roles = account.roles || {};
-  // account.roles.betaTester = account.plan.id === defaultPlanId ? false : account.roles.betaTester === true || account.roles.betaTester === 'true';
   account.roles.betaTester = account.roles.betaTester === true || account.roles.betaTester === 'true';
   account.roles.developer = account.roles.developer === true || account.roles.developer === 'true';
   account.roles.admin = account.roles.admin === true || account.roles.admin === 'true';
@@ -397,9 +412,9 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
   account.personal.gender = account.personal.gender || '';
 
   account.personal.location = account.personal.location || {};
-  account.personal.location.city = account.personal.location.city || '';
   account.personal.location.country = account.personal.location.country || '';
   account.personal.location.region = account.personal.location.region || '';
+  account.personal.location.city = account.personal.location.city || '';
 
   account.personal.name = account.personal.name || {};
   account.personal.name.first = account.personal.name.first || '';
@@ -418,6 +433,8 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
     var billingUpdateBtn = self.dom.select('.auth-billing-update-btn');
     var billingPlanId = self.dom.select('.auth-billing-plan-id-element');
     var billingFrequencyEl = self.dom.select('.auth-billing-frequency-element');
+    var billingStatusEl = self.dom.select('.auth-billing-status-element');
+    var billingStatusColorEl = self.dom.select('.auth-billing-status-color-element');
     var billingStartDateEl = self.dom.select('.auth-billing-start-date-element');
     var billingExpirationDateEl = self.dom.select('.auth-billing-expiration-date-element');
     var billingSuspendedMessageEl = self.dom.select('.auth-billing-suspended-message-element');
@@ -488,11 +505,32 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
       .setInnerHTML('<i class="fas fa-gift mr-1"></i> Your free trial expires in ' + daysTillTrialExpire + ' days');
     }
 
+    // Change the status to 'failed' if the plan is suspended because room temperature IQ people think 'suspended' means 'cancelled'
+    var visibleStatus = uppercase(account.plan.status === 'suspended' ? 'failed payment' : account.plan.status);
+    // If user is on trial, start date is trial exp date
+    var visibleStartDate = account.plan.trial.activated ? account.plan.trial.expires.timestamp : account.plan.payment.startDate.timestamp;
+    if (isBasicPlan) {
+      // Set as start of this month
+      visibleStartDate = new Date(now.getFullYear(), now.getMonth(), 1).toISOString();
+    }
+    var visibleFrequency = account.plan.payment.frequency === 'unknown' ? 'monthly' : account.plan.payment.frequency;
+
     // Update billing UI
     billingPlanId.setInnerHTML(splitDashesAndUppercase(account.plan.id));
-    billingFrequencyEl.setInnerHTML(account.plan.id !== defaultPlanId ? ' (billed ' + uppercase(account.plan.payment.frequency) + ')' : '');
-    billingStartDateEl.setInnerHTML(account.plan.id !== defaultPlanId ? ' - Purchased ' + getMonth(startDate) + ' ' + startDate.getDate() + ', ' + startDate.getFullYear() : '');
-    billingExpirationDateEl.setInnerHTML(account.plan.id !== defaultPlanId && daysTillExpire < 366
+    billingFrequencyEl.setInnerHTML(visibleFrequency);
+    billingStatusEl.setInnerHTML(visibleStatus);
+    billingStatusColorEl
+      .removeClass('bg-soft-success').removeClass('bg-soft-danger').removeClass('bg-soft-warning')
+      .removeClass('text-success').removeClass('text-danger').removeClass('text-warning')
+    if (account.plan.status === 'active') {
+      billingStatusColorEl.addClass('bg-soft-success').addClass('text-success');
+    } else {
+      billingStatusColorEl.addClass('bg-soft-danger').addClass('text-danger');
+    }
+    billingStartDateEl.setInnerHTML(new Date(visibleStartDate).toLocaleString(undefined, {
+      weekday: 'long', year: 'numeric', month: 'long', day: 'numeric',
+    }));
+    billingExpirationDateEl.setInnerHTML(isBasicPlan && daysTillExpire < 366
       ? '<i class="fas fa-exclamation-triangle mr-1"></i> Expires in ' + daysTillExpire + ' days '
       : '');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-manager",
-  "version": "3.2.38",
+  "version": "3.2.40",
   "description": "Easily access important variables such as the query string, current domain, and current page in a single object.",
   "main": "index.js",
   "scripts": {
@@ -36,4 +36,4 @@
     "firebase": "^9.23.0",
     "lazysizes": "^5.3.2"
   }
-}
+}