Skip to content

Commit 900efec

Browse files
tobihagemanntobihagemann
committed
Merge branch 'develop' into feature/success-story-wahlbusch
2 parents ff31746 + 2b09e8a commit 900efec

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1470
-379
lines changed

‎.github/workflows/gh-pages.yml‎

Lines changed: 41 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,27 @@ jobs:
3131
npm ci --ignore-scripts
3232
env:
3333
NODE_AUTH_TOKEN: ${{ secrets.FONTAWESOME_AUTH_TOKEN }}
34-
- name: Build
35-
run: hugo --minify
36-
- name: Upload artifact
34+
- name: Build production
35+
run: hugo --minify --destination public/prod
36+
- name: Build staging
37+
run: hugo --baseURL=https://staging.cryptomator.org/ --environment=staging --minify --destination public/staging
38+
- name: Add robots.txt for staging
39+
run: 'echo -e "User-agent: *\nDisallow: /" > public/staging/robots.txt'
40+
- name: Upload Prod Pages artifact
3741
uses: actions/upload-pages-artifact@v3
3842
with:
39-
path: 'public'
43+
name: prod-site
44+
path: ./public/prod
45+
- name: Upload Staging artifacts
46+
uses: actions/upload-artifact@v4
47+
with:
48+
name: staging-site
49+
path: ./public/staging
4050

41-
# DEPLOY
42-
deploy:
51+
# DEPLOY PROD
52+
deploy-prod:
4353
if: github.ref == 'refs/heads/main'
44-
name: Deploy to GitHub Pages
54+
name: Deploy Prod to GitHub Pages
4555
runs-on: ubuntu-latest
4656
needs: [build]
4757
permissions: # Grant GITHUB_TOKEN the permissions required to make a Pages deployment
@@ -51,6 +61,30 @@ jobs:
5161
- name: Deploy to GitHub Pages
5262
id: deployment
5363
uses: actions/deploy-pages@v4 # or specific "vX.X.X" version tag for this action
64+
with:
65+
artifact_name: prod-site
5466
environment: # Deploy to the github-pages environment
5567
name: github-pages
5668
url: ${{ steps.deployment.outputs.page_url }}
69+
70+
# DEPLOY STAGING
71+
deploy-staging:
72+
if: github.ref == 'refs/heads/feature/api-migration'
73+
name: Deploy Staging to GitHub Pages
74+
runs-on: ubuntu-latest
75+
needs: [build]
76+
steps:
77+
- name: Download build
78+
uses: actions/download-artifact@v4
79+
with:
80+
name: staging-site
81+
path: ./public
82+
- name: Deploy to Staging Repository
83+
uses: peaceiris/actions-gh-pages@v3
84+
with:
85+
personal_token: ${{ secrets.CRYPTOBOT_DEPLOY_STAGING_WEBSITE }}
86+
external_repository: cryptomator/staging.cryptomator.github.io
87+
publish_dir: ./public
88+
publish_branch: main
89+
cname: staging.cryptomator.org
90+

‎assets/js/cardpayments.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22

3-
const STRIPE_PHP_URL = BASE_API_URL + '/stripe/prepare_payment.php';
3+
const STRIPE_PHP_URL = LEGACY_API_URL + '/stripe/prepare_payment.php';
44

55
class OneTimePayment {
66

‎assets/js/const.template.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
"use strict";
22

3-
const BASE_API_URL = '{{ .Site.Params.baseApiUrl }}';
3+
const API_BASE_URL = '{{ .Site.Params.apiBaseURL }}';
4+
const LEGACY_API_URL = '{{ .Site.Params.legacyApiUrl }}';
45
const PADDLE_ENABLE_SANDBOX = {{ .Site.Params.paddleEnableSandbox }};
56
const PADDLE_VENDOR_ID = {{ .Site.Params.paddleVendorId }};
67
const PADDLE_DESKTOP_PRODUCT_IDS = {{ .Site.Params.paddleDesktopProductIds | jsonify }};
78
const PADDLE_ANDROID_PRODUCT_ID = {{ .Site.Params.paddleAndroidProductId }};
89
const PADDLE_HUB_SELF_HOSTED_SUBSCRIPTION_PLAN_ID = {{ .Site.Params.paddleHubSelfHostedSubscriptionPlanId }};
910
const PADDLE_HUB_MANAGED_SUBSCRIPTION_PLAN_ID = {{ .Site.Params.paddleHubManagedSubscriptionPlanId }};
1011
const PADDLE_PRICES_URL = '{{ .Site.Params.paddlePricesUrl }}';
11-
const STORE_API_URL = '{{ .Site.Params.storeApiUrl }}';
12+
const LEGACY_STORE_URL = '{{ .Site.Params.legacyStoreUrl }}';
1213
const STRIPE_PK = '{{ .Site.Params.stripePk }}';
1314
const STRIPE_PLANS = {{ .Site.Params.stripePlans | jsonify }};

‎assets/js/customerportal.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22

3-
const REQUEST_CUSTOMER_PORTAL_URL = BASE_API_URL + '/stripe/request_customer_portal.php';
3+
const REQUEST_CUSTOMER_PORTAL_URL = LEGACY_API_URL + '/stripe/request_customer_portal.php';
44

55
class CustomerPortal {
66

‎assets/js/hubcontact.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22

3-
const REQUEST_HUB_CONTACT_URL = STORE_API_URL + '/hub/request-contact';
3+
const REQUEST_HUB_CONTACT_URL = LEGACY_STORE_URL + '/hub/request-contact';
44

55
class HubContact {
66

‎assets/js/hubdemo.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22

3-
const REQUEST_HUB_DEMO_URL = STORE_API_URL + '/hub/request-demo';
3+
const REQUEST_HUB_DEMO_URL = LEGACY_STORE_URL + '/hub/request-demo';
44

55
class HubDemo {
66

‎assets/js/hubmanaged.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
"use strict";
22

33
// requires newsletter.js
4-
const REQUEST_HUB_MANAGED_URL = STORE_API_URL + '/hub/request-managed';
5-
const VALIDATE_HUB_MANAGED_REQUEST_URL = STORE_API_URL + '/hub/validate-managed-request';
4+
const REQUEST_HUB_MANAGED_URL = LEGACY_STORE_URL + '/hub/request-managed';
5+
const VALIDATE_HUB_MANAGED_REQUEST_URL = LEGACY_STORE_URL + '/hub/validate-managed-request';
66

77
class HubManaged {
88

‎assets/js/hubsetup.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ EOF`;
428428
'init-config': {condition: 'service_completed_successfully'},
429429
'postgres': {condition: 'service_healthy'}
430430
},
431-
image: 'ghcr.io/cryptomator/keycloak:26.3.3',
431+
image: 'ghcr.io/cryptomator/keycloak:26.3.5',
432432
command: startCmd,
433433
volumes: ['kc-config:/opt/keycloak/data/import'],
434434
deploy: {
@@ -799,7 +799,7 @@ class KubernetesConfigBuilder extends ConfigBuilder {
799799
}],
800800
containers: [{
801801
name: 'keycloak',
802-
image: 'ghcr.io/cryptomator/keycloak:26.3.3',
802+
image: 'ghcr.io/cryptomator/keycloak:26.3.5',
803803
command: startCmd,
804804
ports: [{containerPort: 8080}],
805805
resources: {

‎assets/js/hubsubscription.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
"use strict";
22

3-
const BILLING_PORTAL_SESSION_URL = STORE_API_URL + '/hub/billing-portal-session';
4-
const CUSTOM_BILLING_URL = STORE_API_URL + '/hub/custom-billing';
5-
const GENERATE_PAY_LINK_URL = STORE_API_URL + '/hub/generate-pay-link';
6-
const MANAGE_SUBSCRIPTION_URL = STORE_API_URL + '/hub/manage-subscription';
7-
const UPDATE_PAYMENT_METHOD_URL = STORE_API_URL + '/hub/update-payment-method';
3+
const BILLING_PORTAL_SESSION_URL = LEGACY_STORE_URL + '/hub/billing-portal-session';
4+
const CUSTOM_BILLING_URL = LEGACY_STORE_URL + '/hub/custom-billing';
5+
const GENERATE_PAY_LINK_URL = LEGACY_STORE_URL + '/hub/generate-pay-link';
6+
const MANAGE_SUBSCRIPTION_URL = LEGACY_STORE_URL + '/hub/manage-subscription';
7+
const UPDATE_PAYMENT_METHOD_URL = LEGACY_STORE_URL + '/hub/update-payment-method';
88

99
class HubSubscription {
1010

‎assets/js/newsletter.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22

3-
const SUBSCRIBE_NEWSLETTER_URL = BASE_API_URL + '/listmonk/subscribe.php';
3+
const SUBSCRIBE_NEWSLETTER_URL = LEGACY_API_URL + '/listmonk/subscribe.php';
44

55
class Newsletter {
66

0 commit comments

Comments
 (0)