Merge branch 'develop' into feature/resources-for-navigation

Author: tobihagemann

assets/css/custom.css

@@ -140,7 +140,7 @@ ul.list-primary li::marker {
 }
 
 .input-box {
-  @apply rounded-sm border-gray-300 focus:ring-0 focus:border-secondary;
+  @apply rounded-sm border border-gray-300 focus:ring-0 focus:border-secondary px-3 py-2;
 }
 
 .pre-box {

assets/js/404.js

@@ -1,2 +1 @@
-document.addEventListener('DOMContentLoaded', function () { plausible('404', { props: { path: document.location.pathname } }); });
 umami.track('404', { path: document.location.pathname });

assets/js/androidkey.js

@@ -1,6 +1,5 @@
 "use strict";
 
-// requires store.js
 // requires newsletter.js
 
 class AndroidLicense {
@@ -22,10 +21,18 @@ class AndroidLicense {
   }
 
   loadPrice() {
-    this._paddle.then(paddle => {
-      paddle.Product.Prices(PADDLE_ANDROID_PRODUCT_ID, prices => {
-        this._checkoutData.price = prices.price.gross;
-      });
+    $.ajax({
+      url: PADDLE_PRICES_URL,
+      dataType: 'jsonp',
+      data: {
+        product_ids: PADDLE_ANDROID_PRODUCT_ID
+      },
+    }).done(data => {
+      this._checkoutData.price = {
+        amount: data.response.products[0].price.gross,
+        listAmount: data.response.products[0].list_price.gross,
+        currency: data.response.products[0].currency
+      };
     });
   }
 

assets/js/base.js

@@ -1,5 +1,3 @@
-window.plausible = window.plausible || function() { (window.plausible.q = window.plausible.q || []).push(arguments) }
-
 $('a').each(function() {
   const $a = $(this);
   if ($a[0].host !== window.location.host && !$a.attr('data-umami-event')) {
@@ -26,25 +24,39 @@ $('a').each(function() {
   }
 })();
 
+function determineGlobalData(locale, globalData) {
+  determineGitHubStargazersCount(locale, globalData);
+  determineMastodonFollowersCount(locale, globalData);
+}
+
 function determineGitHubStargazersCount(locale, globalData) {
   $.getJSON('https://api.cryptomator.org/desktop/repo.json', data => {
     globalData.githubStargazers = formatNumber(data.stargazers_count, locale);
   }).fail(() => {
     console.error('Error fetching repository data.');
   });
-  function formatNumber(num, locale) {
-    let formatted = num;
-    if (num >= 1000 && num < 1000000) {
-      formatted = (num / 1000).toFixed(1);
-      formatted = formatted.endsWith('.0') ? formatted.slice(0, -2) + 'k' : formatted + 'k';
-    } else if (num >= 1000000) {
-      formatted = (num / 1000000).toFixed(1);
-      formatted = formatted.endsWith('.0') ? formatted.slice(0, -2) + 'M' : formatted + 'M';
-    }
-    if (locale === 'de') {
-      return formatted.replace('.', ',');
-    } else {
-      return formatted;
-    }
+}
+
+function determineMastodonFollowersCount(locale, globalData) {
+  $.getJSON('https://api.cryptomator.org/social/mastodon.json', data => {
+    globalData.mastodonFollowers = formatNumber(data.followers_count, locale);
+  }).fail(() => {
+    console.error('Error fetching Mastodon data.');
+  });
+}
+
+function formatNumber(num, locale) {
+  let formatted = num;
+  if (num >= 1000 && num < 1000000) {
+    formatted = (num / 1000).toFixed(1);
+    formatted = formatted.endsWith('.0') ? formatted.slice(0, -2) + 'k' : formatted + 'k';
+  } else if (num >= 1000000) {
+    formatted = (num / 1000000).toFixed(1);
+    formatted = formatted.endsWith('.0') ? formatted.slice(0, -2) + 'M' : formatted + 'M';
+  }
+  if (locale === 'de') {
+    return formatted.replace('.', ',');
+  } else {
+    return formatted;
   }
 }

assets/js/cardpayments.js

@@ -1,6 +1,6 @@
 "use strict";
 
-// requires store.js
+const STRIPE_PHP_URL = BASE_API_URL + '/stripe/prepare_payment.php';
 
 class OneTimePayment {
 

assets/js/store.dev.js renamed to assets/js/const.dev.js

@@ -1,5 +1,6 @@
 "use strict";
 
+const BASE_API_URL = 'http://localhost';
 const PADDLE_ENABLE_SANDBOX = true;
 const PADDLE_VENDOR_ID = 1385;
 const PADDLE_DESKTOP_PRODUCT_IDS = [54582, 54583, 54584];
@@ -10,4 +11,3 @@ const PADDLE_PRICES_URL = 'https://sandbox-checkout.paddle.com/api/2.0/prices';
 const STORE_API_URL = 'http://localhost:8787/api';
 const STRIPE_PK = 'pk_test_JhF3MoFQGw2Is0DB3BSv345P';
 const STRIPE_PLANS = {'EUR': 'plan_GgVY2JfD49bc02', 'USD': 'plan_GgVZwj545E0uH3'};
-const STRIPE_PHP_URL = 'http://localhost/stripe/prepare_payment.php';

assets/js/store.prod.js renamed to assets/js/const.prod.js

@@ -1,5 +1,6 @@
 "use strict";
 
+const BASE_API_URL = 'https://api.cryptomator.org';
 const PADDLE_ENABLE_SANDBOX = false;
 const PADDLE_VENDOR_ID = 39223;
 const PADDLE_DESKTOP_PRODUCT_IDS = [840163, 840164, 840165];
@@ -10,4 +11,3 @@ const PADDLE_PRICES_URL = 'https://checkout.paddle.com/api/2.0/prices';
 const STORE_API_URL = 'https://store.cryptomator.org/api';
 const STRIPE_PK = 'pk_live_eSasX216vGvC26GdbVwA011V';
 const STRIPE_PLANS = {'EUR': 'plan_GgW4ovr7c6upzx', 'USD': 'plan_GejOEdJtfL3kdH'};
-const STRIPE_PHP_URL = 'https://api.cryptomator.org/stripe/prepare_payment.php';

assets/js/customerportal.js

@@ -1,8 +1,6 @@
 "use strict";
 
-const REQUEST_CUSTOMER_PORTAL_URL = 'https://api.cryptomator.org/stripe/request_customer_portal.php';
-
-// const REQUEST_CUSTOMER_PORTAL_URL = 'http://localhost/stripe/request_customer_portal.php';
+const REQUEST_CUSTOMER_PORTAL_URL = BASE_API_URL + '/stripe/request_customer_portal.php';
 
 class CustomerPortal {
 

assets/js/desktopkey.js

@@ -1,6 +1,5 @@
 "use strict";
 
-// requires store.js
 // requires newsletter.js
 
 class DesktopLicense {
@@ -33,6 +32,7 @@ class DesktopLicense {
         return {
           productId: product.product_id,
           amount: product.price.gross,
+          listAmount: product.list_price.gross,
           currency: product.currency
         }
       });

assets/js/hubdemo.js

@@ -1,6 +1,5 @@
 "use strict";
 
-// requires store.js
 const REQUEST_HUB_DEMO_URL = STORE_API_URL + '/hub/request-demo';
 
 class HubDemo {