Skip to content

Commit e3d5441

Browse files
committed
Revert "Merge branch 'develop'"
This reverts commit 4e38439, reversing changes made to dce3073.
1 parent 4e38439 commit e3d5441

File tree

13 files changed

+202
-288
lines changed

13 files changed

+202
-288
lines changed

.github/workflows/gh-pages.yml

Lines changed: 7 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -31,27 +31,17 @@ jobs:
3131
npm ci --ignore-scripts
3232
env:
3333
NODE_AUTH_TOKEN: ${{ secrets.FONTAWESOME_AUTH_TOKEN }}
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
34+
- name: Build
35+
run: hugo --minify
36+
- name: Upload artifact
4137
uses: actions/upload-pages-artifact@v3
4238
with:
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
39+
path: 'public'
5040

51-
# DEPLOY PROD
52-
deploy-prod:
41+
# DEPLOY
42+
deploy:
5343
if: github.ref == 'refs/heads/main'
54-
name: Deploy Prod to GitHub Pages
44+
name: Deploy to GitHub Pages
5545
runs-on: ubuntu-latest
5646
needs: [build]
5747
permissions: # Grant GITHUB_TOKEN the permissions required to make a Pages deployment
@@ -61,30 +51,6 @@ jobs:
6151
- name: Deploy to GitHub Pages
6252
id: deployment
6353
uses: actions/deploy-pages@v4 # or specific "vX.X.X" version tag for this action
64-
with:
65-
artifact_name: prod-site
6654
environment: # Deploy to the github-pages environment
6755
name: github-pages
6856
url: ${{ steps.deployment.outputs.page_url }}
69-
70-
# DEPLOY STAGING
71-
deploy-staging:
72-
if: github.ref == 'refs/heads/develop'
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/const.dev.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
"use strict";
2+
3+
const BASE_API_URL = 'http://localhost';
4+
const PADDLE_ENABLE_SANDBOX = true;
5+
const PADDLE_VENDOR_ID = 1385;
6+
const PADDLE_DESKTOP_PRODUCT_IDS = [54582, 54583, 54584];
7+
const PADDLE_ANDROID_PRODUCT_ID = 9642;
8+
const PADDLE_HUB_SELF_HOSTED_SUBSCRIPTION_PLAN_ID = 23141;
9+
const PADDLE_HUB_MANAGED_SUBSCRIPTION_PLAN_ID = 42235;
10+
const PADDLE_PRICES_URL = 'https://sandbox-checkout.paddle.com/api/2.0/prices';
11+
const STORE_API_URL = 'http://localhost:8787/api';
12+
const STRIPE_PK = 'pk_test_JhF3MoFQGw2Is0DB3BSv345P';
13+
const STRIPE_PLANS = {'EUR': 'plan_GgVY2JfD49bc02', 'USD': 'plan_GgVZwj545E0uH3'};

assets/js/const.prod.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
"use strict";
2+
3+
const BASE_API_URL = 'https://api.cryptomator.org';
4+
const PADDLE_ENABLE_SANDBOX = false;
5+
const PADDLE_VENDOR_ID = 39223;
6+
const PADDLE_DESKTOP_PRODUCT_IDS = [840163, 840164, 840165];
7+
const PADDLE_ANDROID_PRODUCT_ID = 578277;
8+
const PADDLE_HUB_SELF_HOSTED_SUBSCRIPTION_PLAN_ID = 770132;
9+
const PADDLE_HUB_MANAGED_SUBSCRIPTION_PLAN_ID = 807339;
10+
const PADDLE_PRICES_URL = 'https://checkout.paddle.com/api/2.0/prices';
11+
const STORE_API_URL = 'https://store.cryptomator.org/api';
12+
const STRIPE_PK = 'pk_live_eSasX216vGvC26GdbVwA011V';
13+
const STRIPE_PLANS = {'EUR': 'plan_GgW4ovr7c6upzx', 'USD': 'plan_GejOEdJtfL3kdH'};

assets/js/const.template.js

Lines changed: 0 additions & 13 deletions
This file was deleted.

config/_default/hugo.yaml

Lines changed: 0 additions & 95 deletions
This file was deleted.

config/_default/params.yaml

Lines changed: 0 additions & 52 deletions
This file was deleted.

config/development/params.yaml

Lines changed: 0 additions & 24 deletions
This file was deleted.

config/production/params.yaml

Lines changed: 0 additions & 24 deletions
This file was deleted.

config/staging/params.yaml

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)