Merge branch 'develop'

tobihagemann · tobihagemann · commit 051e55de4138 · 2025-03-06T10:02:39.000+01:00
diff --git a/assets/js/androidkey.js b/assets/js/androidkey.js
@@ -1,6 +1,5 @@
 "use strict";
 
-// requires store.js
 // requires newsletter.js
 
 class AndroidLicense {
diff --git a/assets/js/cardpayments.js b/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 {
 
diff --git a/assets/js/const.dev.js b/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';
diff --git a/assets/js/const.prod.js b/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';
diff --git a/assets/js/customerportal.js b/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 {
 
diff --git a/assets/js/desktopkey.js b/assets/js/desktopkey.js
@@ -1,6 +1,5 @@
 "use strict";
 
-// requires store.js
 // requires newsletter.js
 
 class DesktopLicense {
diff --git a/assets/js/hubdemo.js b/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 {
diff --git a/assets/js/hubmanaged.js b/assets/js/hubmanaged.js
@@ -1,6 +1,5 @@
 "use strict";
 
-// requires store.js
 // requires newsletter.js
 const REQUEST_HUB_MANAGED_URL = STORE_API_URL + '/hub/request-managed';
 const VALIDATE_HUB_MANAGED_REQUEST_URL = STORE_API_URL + '/hub/validate-managed-request';
diff --git a/assets/js/hubpricing.js b/assets/js/hubpricing.js
@@ -1,7 +1,5 @@
 "use strict";
 
-// requires store.js
-
 class HubPricing {
 
   constructor(data) {
diff --git a/assets/js/hubsubscription.js b/assets/js/hubsubscription.js
@@ -1,6 +1,5 @@
 "use strict";
 
-// requires store.js
 const BILLING_PORTAL_SESSION_URL = STORE_API_URL + '/hub/billing-portal-session';
 const CUSTOM_BILLING_URL = STORE_API_URL + '/hub/custom-billing';
 const GENERATE_PAY_LINK_URL = STORE_API_URL + '/hub/generate-pay-link';
diff --git a/assets/js/keyrecovery.js b/assets/js/keyrecovery.js
@@ -1,7 +1,5 @@
 "use strict";
 
-// requires store.js
-
 class KeyRecovery {
 
   constructor(form, data) {
diff --git a/assets/js/newsletter.js b/assets/js/newsletter.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const SUBSCRIBE_NEWSLETTER_URL = 'https://api.cryptomator.org/listmonk/subscribe.php';
+const SUBSCRIBE_NEWSLETTER_URL = BASE_API_URL + '/listmonk/subscribe.php';
 
 class Newsletter {
 
diff --git a/assets/js/supportercert.js b/assets/js/supportercert.js
@@ -1,6 +1,5 @@
 "use strict";
 
-// requires store.js
 const REQUEST_SUPPORTER_CERT_URL = STORE_API_URL + '/desktop/request-supporter-cert';
 
 class SupporterCertificate {
diff --git a/hugo.toml b/hugo.toml
@@ -125,6 +125,6 @@ block = true
   [[server.headers]]
       for = '/**'
       [server.headers.values]
-        Content-Security-Policy = "default-src 'none'; script-src 'self' 'unsafe-eval' https://umami.skymatic.de/ https://plausible.skymatic.de/ https://community.cryptomator.org/ https://js.stripe.com/ https://*.paddle.com/; style-src 'self' 'unsafe-inline' https://*.paddle.com/; img-src 'self' data: https://static.cryptomator.org/ https://*.paddle.com/ https://paddle.s3.amazonaws.com/; connect-src 'self' https://api.cryptomator.org/ https://store.cryptomator.org/ https://umami.skymatic.de/ https://plausible.skymatic.de/ http://localhost:8787/ http://localhost/; font-src 'self'; media-src https://static.cryptomator.org/; frame-src https://community.cryptomator.org/ https://js.stripe.com/ https://*.paddle.com/; base-uri 'self'; form-action 'self' https://www.paypal.com/ https://www.coinpayments.net/; frame-ancestors 'none';"
+        Content-Security-Policy = "default-src 'none'; script-src 'self' 'unsafe-eval' https://umami.skymatic.de/ https://plausible.skymatic.de/ https://community.cryptomator.org/ https://js.stripe.com/ https://*.paddle.com/; style-src 'self' 'unsafe-inline' https://*.paddle.com/; img-src 'self' data: https://static.cryptomator.org/ https://*.paddle.com/ https://paddle.s3.amazonaws.com/; connect-src 'self' https://api.cryptomator.org/ https://store.cryptomator.org/ https://umami.skymatic.de/ https://plausible.skymatic.de/ http://localhost/ http://localhost:8787/; font-src 'self'; media-src https://static.cryptomator.org/; frame-src https://community.cryptomator.org/ https://js.stripe.com/ https://*.paddle.com/; base-uri 'self'; form-action 'self' https://www.paypal.com/ https://www.coinpayments.net/; frame-ancestors 'none';"
         Strict-Transport-Security = "max-age=31536000; includeSubDomains"
         X-Content-Type-Options = "nosniff"
diff --git a/i18n/de.yaml b/i18n/de.yaml
@@ -614,11 +614,11 @@
   translation: "Weiter"
 
 - id: hub_managed_step_1_nav_title
-  translation: "Arbeits-E-Mail"
+  translation: "E-Mail-Adresse"
 - id: hub_managed_step_1_title
-  translation: "Wie lautet die E-Mail-Adresse für deine Arbeit?"
+  translation: "Wie lautet deine E-Mail-Adresse?"
 - id: hub_managed_step_1_email_placeholder
-  translation: "E-Mail-Adresse für die Arbeit"
+  translation: "E-Mail-Adresse"
 
 - id: hub_managed_step_2_nav_title
   translation: "Team-Name"
diff --git a/i18n/en.yaml b/i18n/en.yaml
@@ -614,11 +614,11 @@
   translation: "Next"
 
 - id: hub_managed_step_1_nav_title
-  translation: "Work Email"
+  translation: "Email Address"
 - id: hub_managed_step_1_title
-  translation: "What's your email address for work?"
+  translation: "What's your email address?"
 - id: hub_managed_step_1_email_placeholder
-  translation: "Email address for work"
+  translation: "Email address"
 
 - id: hub_managed_step_2_nav_title
   translation: "Team Name"
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
@@ -98,9 +98,13 @@
       </script>
     {{ end }}
     {{ if hugo.IsDevelopment }}
+      {{ $constJs := resources.Get "js/const.dev.js" | resources.ExecuteAsTemplate "js/const.js" . }}
+      <script type="text/javascript" src="{{ $constJs.RelPermalink }}" defer></script>
       {{ $baseJs := resources.Get "js/base.js" }}
       <script type="text/javascript" src="{{ $baseJs.RelPermalink }}" defer></script>
     {{ else }}
+      {{ $constJs := resources.Get "js/const.prod.js" | resources.ExecuteAsTemplate "js/const.js" . | minify | fingerprint }}
+      <script type="text/javascript" src="{{ $constJs.RelPermalink }}" integrity="{{ $constJs.Data.Integrity }}" defer></script>
       {{ $baseJs := resources.Get "js/base.js" | minify | fingerprint }}
       <script type="text/javascript" src="{{ $baseJs.RelPermalink }}" integrity="{{ $baseJs.Data.Integrity }}" defer></script>
     {{ end }}
diff --git a/layouts/android/single.html b/layouts/android/single.html
@@ -48,17 +48,13 @@ <h3 id="keyrecovery" class="font-headline text-xl md:text-2xl leading-relaxed mb
 {{ end }}
 {{ define "script" }}
   {{ if hugo.IsDevelopment }}
-    {{ $storeJs := resources.Get "js/store.dev.js" | resources.ExecuteAsTemplate "js/store.js" . }}
-    <script type="text/javascript" src="{{ $storeJs.RelPermalink }}" defer></script>
     {{ $newsletterJs := resources.Get "js/newsletter.js" }}
     <script type="text/javascript" src="{{ $newsletterJs.RelPermalink }}" defer></script>
     {{ $keyRecoveryJs := resources.Get "js/keyrecovery.js" }}
     <script type="text/javascript" src="{{ $keyRecoveryJs.RelPermalink }}" defer></script>
     {{ $androidKeyJs := resources.Get "js/androidkey.js" }}
     <script type="text/javascript" src="{{ $androidKeyJs.RelPermalink }}" defer></script>
   {{ else }}
-    {{ $storeJs := resources.Get "js/store.prod.js" | resources.ExecuteAsTemplate "js/store.js" . | minify | fingerprint }}
-    <script type="text/javascript" src="{{ $storeJs.RelPermalink }}" integrity="{{ $storeJs.Data.Integrity }}" defer></script>
     {{ $newsletterJs := resources.Get "js/newsletter.js" | minify | fingerprint }}
     <script type="text/javascript" src="{{ $newsletterJs.RelPermalink }}" integrity="{{ $newsletterJs.Data.Integrity }}" defer></script>
     {{ $keyRecoveryJs := resources.Get "js/keyrecovery.js" | minify | fingerprint }}
diff --git a/layouts/donate/list.html b/layouts/donate/list.html
@@ -70,8 +70,6 @@ <h3 class="font-headline text-xl md:text-2xl leading-relaxed mb-4">{{ i18n "dona
 {{ end }}
 {{ define "script" }}
   {{ if hugo.IsDevelopment }}
-    {{ $storeJs := resources.Get "js/store.dev.js" | resources.ExecuteAsTemplate "js/store.js" . }}
-    <script type="text/javascript" src="{{ $storeJs.RelPermalink }}" defer></script>
     {{ $customerPortalJs := resources.Get "js/customerportal.js" }}
     <script type="text/javascript" src="{{ $customerPortalJs.RelPermalink }}" defer></script>
     {{ $altchaJs := resources.Get "js/altcha/altcha.js" }}
@@ -81,8 +79,6 @@ <h3 class="font-headline text-xl md:text-2xl leading-relaxed mb-4">{{ i18n "dona
     {{ $cardPaymentsJs := resources.Get "js/cardpayments.js" }}
     <script type="text/javascript" src="{{ $cardPaymentsJs.RelPermalink }}" defer></script>
   {{ else }}
-    {{ $storeJs := resources.Get "js/store.prod.js" | resources.ExecuteAsTemplate "js/store.js" . | minify | fingerprint }}
-    <script type="text/javascript" src="{{ $storeJs.RelPermalink }}" integrity="{{ $storeJs.Data.Integrity }}" defer></script>
     {{ $customerPortalJs := resources.Get "js/customerportal.js" | minify | fingerprint }}
     <script type="text/javascript" src="{{ $customerPortalJs.RelPermalink }}" integrity="{{ $customerPortalJs.Data.Integrity }}" defer></script>
     {{ $altchaJs := resources.Get "js/altcha/altcha.js" }}
diff --git a/layouts/hub-billing/single.html b/layouts/hub-billing/single.html
@@ -449,17 +449,13 @@ <h3 class="font-headline text-xl md:text-2xl leading-relaxed mb-4">
 {{ end }}
 {{ define "script" }}
   {{ if hugo.IsDevelopment }}
-    {{ $storeJs := resources.Get "js/store.dev.js" | resources.ExecuteAsTemplate "js/store.js" . }}
-    <script type="text/javascript" src="{{ $storeJs.RelPermalink }}" defer></script>
     {{ $hubSubscriptionJs := resources.Get "js/hubsubscription.js" }}
     <script type="text/javascript" src="{{ $hubSubscriptionJs.RelPermalink }}" defer></script>
     {{ $altchaJs := resources.Get "js/altcha/altcha.js" }}
     <script type="module" type="text/javascript" src="{{ $altchaJs.RelPermalink }}" defer></script>
     {{ $altchaWorkerJs := resources.Get "js/altcha/worker.js" }}
     <script type="module" type="text/javascript" src="{{ $altchaWorkerJs.RelPermalink }}" defer></script>
   {{ else }}
-    {{ $storeJs := resources.Get "js/store.prod.js" | resources.ExecuteAsTemplate "js/store.js" . | minify | fingerprint }}
-    <script type="text/javascript" src="{{ $storeJs.RelPermalink }}" integrity="{{ $storeJs.Data.Integrity }}" defer></script>
     {{ $hubSubscriptionJs := resources.Get "js/hubsubscription.js" | minify | fingerprint }}
     <script type="text/javascript" src="{{ $hubSubscriptionJs.RelPermalink }}" integrity="{{ $hubSubscriptionJs.Data.Integrity }}" defer></script>
     {{ $altchaJs := resources.Get "js/altcha/altcha.js" }}
diff --git a/layouts/hub-demo/single.html b/layouts/hub-demo/single.html
@@ -77,17 +77,13 @@ <h2 class="font-h2 mb-4">{{ i18n "hub_demo_contact_us_title" . }}</h2>
 {{ end }}
 {{ define "script" }}
   {{ if hugo.IsDevelopment }}
-    {{ $storeJs := resources.Get "js/store.dev.js" | resources.ExecuteAsTemplate "js/store.js" . }}
-    <script type="text/javascript" src="{{ $storeJs.RelPermalink }}" defer></script>
     {{ $hubDemoJs := resources.Get "js/hubdemo.js" }}
     <script type="text/javascript" src="{{ $hubDemoJs.RelPermalink }}" defer></script>
     {{ $altchaJs := resources.Get "js/altcha/altcha.js" }}
     <script type="module" type="text/javascript" src="{{ $altchaJs.RelPermalink }}" defer></script>
     {{ $altchaWorkerJs := resources.Get "js/altcha/worker.js" }}
     <script type="module" type="text/javascript" src="{{ $altchaWorkerJs.RelPermalink }}" defer></script>
   {{ else }}
-    {{ $storeJs := resources.Get "js/store.prod.js" | resources.ExecuteAsTemplate "js/store.js" . | minify | fingerprint }}
-    <script type="text/javascript" src="{{ $storeJs.RelPermalink }}" integrity="{{ $storeJs.Data.Integrity }}" defer></script>
     {{ $hubDemoJs := resources.Get "js/hubdemo.js" | minify | fingerprint }}
     <script type="text/javascript" src="{{ $hubDemoJs.RelPermalink }}" integrity="{{ $hubDemoJs.Data.Integrity }}" defer></script>
     {{ $altchaJs := resources.Get "js/altcha/altcha.js" }}
diff --git a/layouts/hub-managed/single.html b/layouts/hub-managed/single.html
@@ -56,7 +56,7 @@ <h1 class="font-h1 mb-8">{{ .Title }}</h1>
             </nav>
           </header>
 
-          <!-- Step 1: Work Email -->
+          <!-- Step 1: Email Address -->
           <template x-if="feedbackData.currentStep == 0">
             <div class="md:col-span-2 grid grid-cols-6 gap-6">
               <div class="flex flex-col col-span-6 lg:col-span-4">
@@ -231,8 +231,6 @@ <h2 class="font-h2 mb-4">{{ i18n "hub_managed_contact_us_title" . }}</h2>
 {{ end }}
 {{ define "script" }}
   {{ if hugo.IsDevelopment }}
-    {{ $storeJs := resources.Get "js/store.dev.js" | resources.ExecuteAsTemplate "js/store.js" . }}
-    <script type="text/javascript" src="{{ $storeJs.RelPermalink }}" defer></script>
     {{ $newsletterJs := resources.Get "js/newsletter.js" }}
     <script type="text/javascript" src="{{ $newsletterJs.RelPermalink }}" defer></script>
     {{ $hubManagedJs := resources.Get "js/hubmanaged.js" }}
@@ -242,8 +240,6 @@ <h2 class="font-h2 mb-4">{{ i18n "hub_managed_contact_us_title" . }}</h2>
     {{ $altchaWorkerJs := resources.Get "js/altcha/worker.js" }}
     <script type="module" type="text/javascript" src="{{ $altchaWorkerJs.RelPermalink }}" defer></script>
   {{ else }}
-    {{ $storeJs := resources.Get "js/store.prod.js" | resources.ExecuteAsTemplate "js/store.js" . | minify | fingerprint }}
-    <script type="text/javascript" src="{{ $storeJs.RelPermalink }}" integrity="{{ $storeJs.Data.Integrity }}" defer></script>
     {{ $newsletterJs := resources.Get "js/newsletter.js" | minify | fingerprint }}
     <script type="text/javascript" src="{{ $newsletterJs.RelPermalink }}" integrity="{{ $newsletterJs.Data.Integrity }}" defer></script>
     {{ $hubManagedJs := resources.Get "js/hubmanaged.js" | minify | fingerprint }}
diff --git a/layouts/pricing/single.html b/layouts/pricing/single.html
@@ -406,15 +406,11 @@ <h2 class="font-h2 mb-4">{{ i18n "faq_title" . }}</h2>
 {{ end }}
 {{ define "script" }}
   {{ if hugo.IsDevelopment }}
-    {{ $storeJs := resources.Get "js/store.dev.js" | resources.ExecuteAsTemplate "js/store.js" . }}
-    <script type="text/javascript" src="{{ $storeJs.RelPermalink }}" defer></script>
     {{ $hubPricingJs := resources.Get "js/hubpricing.js" }}
     <script type="text/javascript" src="{{ $hubPricingJs.RelPermalink }}" defer></script>
     {{ $newsletterJs := resources.Get "js/newsletter.js" }}
     <script type="text/javascript" src="{{ $newsletterJs.RelPermalink }}" defer></script>
   {{ else }}
-    {{ $storeJs := resources.Get "js/store.prod.js" | resources.ExecuteAsTemplate "js/store.js" . | minify | fingerprint }}
-    <script type="text/javascript" src="{{ $storeJs.RelPermalink }}" integrity="{{ $storeJs.Data.Integrity }}" defer></script>
     {{ $hubPricingJs := resources.Get "js/hubpricing.js" | minify | fingerprint }}
     <script type="text/javascript" src="{{ $hubPricingJs.RelPermalink }}" integrity="{{ $hubPricingJs.Data.Integrity }}" defer></script>
     {{ $newsletterJs := resources.Get "js/newsletter.js" | minify | fingerprint }}
diff --git a/layouts/supporter-cert/list.html b/layouts/supporter-cert/list.html
@@ -87,8 +87,6 @@ <h2 id="faq" class="font-h2 mb-4">{{ i18n "faq_title" . }}</h2>
 {{ end }}
 {{ define "script" }}
   {{ if hugo.IsDevelopment }}
-    {{ $storeJs := resources.Get "js/store.dev.js" | resources.ExecuteAsTemplate "js/store.js" . }}
-    <script type="text/javascript" src="{{ $storeJs.RelPermalink }}" defer></script>
     {{ $newsletterJs := resources.Get "js/newsletter.js" }}
     <script type="text/javascript" src="{{ $newsletterJs.RelPermalink }}" defer></script>
     {{ $desktopKeyJs := resources.Get "js/desktopkey.js" }}
@@ -102,8 +100,6 @@ <h2 id="faq" class="font-h2 mb-4">{{ i18n "faq_title" . }}</h2>
     {{ $keyRecoveryJs := resources.Get "js/keyrecovery.js" }}
     <script type="text/javascript" src="{{ $keyRecoveryJs.RelPermalink }}" defer></script>
   {{ else }}
-    {{ $storeJs := resources.Get "js/store.prod.js" | resources.ExecuteAsTemplate "js/store.js" . | minify | fingerprint }}
-    <script type="text/javascript" src="{{ $storeJs.RelPermalink }}" integrity="{{ $storeJs.Data.Integrity }}" defer></script>
     {{ $newsletterJs := resources.Get "js/newsletter.js" | minify | fingerprint }}
     <script type="text/javascript" src="{{ $newsletterJs.RelPermalink }}" integrity="{{ $newsletterJs.Data.Integrity }}" defer></script>
     {{ $desktopKeyJs := resources.Get "js/desktopkey.js" | minify | fingerprint }}
