Merge branch 'develop' into feature/hub-experiments

Author: tobihagemann

.github/workflows/gh-pages.yml

@@ -31,17 +31,27 @@ jobs:
         npm ci --ignore-scripts
       env:
         NODE_AUTH_TOKEN: ${{ secrets.FONTAWESOME_AUTH_TOKEN }}
-    - name: Build
-      run: hugo --minify
-    - name: Upload artifact
+    - name: Build production
+      run: hugo --minify --destination public/prod
+    - name: Build staging
+      run: hugo --baseURL=https://staging.cryptomator.org/ --environment=staging --minify --destination public/staging
+    - name: Add robots.txt for staging
+      run: 'echo -e "User-agent: *\nDisallow: /" > public/staging/robots.txt'
+    - name: Upload Prod Pages artifact
       uses: actions/upload-pages-artifact@v3
       with:
-        path: 'public'
+        name: prod-site
+        path: ./public/prod
+    - name: Upload Staging artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: staging-site
+        path: ./public/staging
 
-  # DEPLOY
-  deploy:
+  # DEPLOY PROD
+  deploy-prod:
     if: github.ref == 'refs/heads/main'
-    name: Deploy to GitHub Pages
+    name: Deploy Prod to GitHub Pages
     runs-on: ubuntu-latest
     needs: [build]
     permissions: # Grant GITHUB_TOKEN the permissions required to make a Pages deployment
@@ -51,6 +61,30 @@ jobs:
       - name: Deploy to GitHub Pages
         id: deployment
         uses: actions/deploy-pages@v4 # or specific "vX.X.X" version tag for this action
+        with:
+          artifact_name: prod-site
     environment: # Deploy to the github-pages environment
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
+
+  # DEPLOY STAGING
+  deploy-staging:
+    if: github.ref == 'refs/heads/develop'
+    name: Deploy Staging to GitHub Pages
+    runs-on: ubuntu-latest
+    needs: [build]
+    steps:
+      - name: Download build
+        uses: actions/download-artifact@v4
+        with:
+          name: staging-site
+          path: ./public
+      - name: Deploy to Staging Repository
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          personal_token: ${{ secrets.CRYPTOBOT_DEPLOY_STAGING_WEBSITE }}
+          external_repository: cryptomator/staging.cryptomator.github.io
+          publish_dir: ./public
+          publish_branch: main
+          cname: staging.cryptomator.org
+

assets/css/custom.css

@@ -200,7 +200,7 @@ textarea:read-only {
 [id]::before {
   content: '';
   display: block;
-  height: 138px;
-  margin-top: -138px;
+  height: 96px;
+  margin-top: -96px;
   visibility: hidden;
 }

assets/js/cardpayments.js

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

assets/js/const.dev.js

@@ -0,0 +1,14 @@
+"use strict";
+
+const API_BASE_URL = '{{ .Site.Params.apiBaseURL }}';
+const LEGACY_API_URL = '{{ .Site.Params.legacyApiUrl }}';
+const PADDLE_ENABLE_SANDBOX = {{ .Site.Params.paddleEnableSandbox }};
+const PADDLE_VENDOR_ID = {{ .Site.Params.paddleVendorId }};
+const PADDLE_DESKTOP_PRODUCT_IDS = {{ .Site.Params.paddleDesktopProductIds | jsonify }};
+const PADDLE_ANDROID_PRODUCT_ID = {{ .Site.Params.paddleAndroidProductId }};
+const PADDLE_HUB_SELF_HOSTED_SUBSCRIPTION_PLAN_ID = {{ .Site.Params.paddleHubSelfHostedSubscriptionPlanId }};
+const PADDLE_HUB_MANAGED_SUBSCRIPTION_PLAN_ID = {{ .Site.Params.paddleHubManagedSubscriptionPlanId }};
+const PADDLE_PRICES_URL = '{{ .Site.Params.paddlePricesUrl }}';
+const LEGACY_STORE_URL = '{{ .Site.Params.legacyStoreUrl }}';
+const STRIPE_PK = '{{ .Site.Params.stripePk }}';
+const STRIPE_PLANS = {{ .Site.Params.stripePlans | jsonify }};

assets/js/const.prod.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const REQUEST_CUSTOMER_PORTAL_URL = BASE_API_URL + '/stripe/request_customer_portal.php';
+const REQUEST_CUSTOMER_PORTAL_URL = LEGACY_API_URL + '/stripe/request_customer_portal.php';
 
 class CustomerPortal {
 

assets/js/const.template.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const REQUEST_HUB_CONTACT_URL = STORE_API_URL + '/hub/request-contact';
+const REQUEST_HUB_CONTACT_URL = LEGACY_STORE_URL + '/hub/request-contact';
 
 class HubContact {
 

assets/js/customerportal.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const REQUEST_HUB_DEMO_URL = STORE_API_URL + '/hub/request-demo';
+const REQUEST_HUB_DEMO_URL = LEGACY_STORE_URL + '/hub/request-demo';
 
 class HubDemo {
 

assets/js/hubcontact.js

@@ -1,8 +1,8 @@
 "use strict";
 
 // 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';
+const REQUEST_HUB_MANAGED_URL = LEGACY_STORE_URL + '/hub/request-managed';
+const VALIDATE_HUB_MANAGED_REQUEST_URL = LEGACY_STORE_URL + '/hub/validate-managed-request';
 
 class HubManaged {