web-manager 3.2.41 → 3.2.43

package/index.js

@@ -87,6 +87,7 @@ function Manager() {
     global: {
       version: '',
       url: '',
+      buildTime: 0,
       cacheBreaker: '',
       brand: {
         name: 'default'
@@ -555,6 +556,7 @@ function Manager() {
           self.properties.global.app = configuration.global.app;
           self.properties.global.version = configuration.global.version;
           self.properties.global.url = configuration.global.url;
+          self.properties.global.buildTime = new Date(+configuration.global.buildTime * 1000);
           self.properties.global.cacheBreaker = configuration.global.cacheBreaker;
 
           self.properties.global.brand = configuration.global.brand;
@@ -1192,7 +1194,8 @@ function Manager() {
   function refreshNewVersion(self) {
     console.log('refreshNewVersion()');
 
-    fetch('/@output/build/build.json' + '?cb=' + new Date().getTime())
+    // Make request to get the build time (live)
+    fetch('/@output/build/build.json?cb=' + new Date().getTime())
     .then(function (res) {
       if (res.ok) {
         return res.json();
@@ -1201,15 +1204,22 @@ function Manager() {
       }
     })
     .then(function (data) {
-      var buildTime = new Date(data['npm-build'].timestamp_utc);
-      var startTime = self.properties.page.startTime;
+      var buildTimeCurrent = self.properties.global.buildTime;
+      var buildTimeLive = new Date(data['npm-build'].timestamp);
 
-      if (buildTime > startTime) {
-        // console.log('refreshNewVersion(): Refreshing...');
+      // Log
+      console.log('refreshNewVersion()', data, buildTimeCurrent, buildTimeLive);
 
+      // If the live time is newer, refresh
+      if (buildTimeCurrent < buildTimeLive) {
+        console.log('refreshNewVersion(): Refreshing...');
+
+        // Force page reload
         window.onbeforeunload = function () {
           return undefined;
         }
+
+        // Refresh
         window.location.reload(true);
       }
     })

package/lib/account.js

@@ -450,6 +450,7 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
 
     var updateURL = new URL(cancelURL);
     var referralURL = new URL(window.location.origin || window.location.host);
+    var accountCreationDate = new Date(+self.utilities.get(firebaseUser, 'metadata.createdAt', '0'));
 
     function _setAuthItem(selector, value) {
       self.dom.select(selector).each(function(e, i) {
@@ -465,9 +466,9 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
     referralURL.searchParams.set('aff', account.affiliate.code)
 
     authCreatedEl.setInnerHTML(
-      new Date(+self.utilities.get(firebaseUser, 'metadata.createdAt', '0'))
+      new Date(accountCreationDate)
       .toLocaleString(undefined, {
-        weekday: 'long', year: 'numeric', month: 'long', day: 'numeric',
+        year: 'numeric', month: 'long', day: 'numeric',
       })
     )
     authPhoneInput.setInnerHTML(firebaseUser.phoneNumber).setValue(firebaseUser.phoneNumber)
@@ -509,9 +510,9 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
     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 basic, just show account creation date
     if (isBasicPlan) {
-      // Set as start of this month
-      visibleStartDate = new Date(now.getFullYear(), now.getMonth(), 1).toISOString();
+      visibleStartDate = accountCreationDate;
     }
     var visibleFrequency = account.plan.payment.frequency === 'unknown' ? 'monthly' : account.plan.payment.frequency;
 
@@ -528,7 +529,7 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
       billingStatusColorEl.addClass('bg-soft-danger').addClass('text-danger');
     }
     billingStartDateEl.setInnerHTML(new Date(visibleStartDate).toLocaleString(undefined, {
-      weekday: 'long', year: 'numeric', month: 'long', day: 'numeric',
+      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.41",
+  "version": "3.2.43",
   "description": "Easily access important variables such as the query string, current domain, and current page in a single object.",
   "main": "index.js",
   "scripts": {