Skip to content

Commit 6a1f88a

Browse files
tobihagemanntobihagemann
committed
Merge branch 'develop'
2 parents 3b8afbd + b23e8a8 commit 6a1f88a

File tree

19 files changed

+29
-31
lines changed

19 files changed

+29
-31
lines changed

‎assets/js/const.template.js‎

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

33
const API_BASE_URL = '{{ .Site.Params.apiBaseUrl }}';
4-
const LEGACY_API_URL = '{{ .Site.Params.legacyApiUrl }}';
54
const PADDLE_ENABLE_SANDBOX = {{ .Site.Params.paddleEnableSandbox }};
65
const PADDLE_TOKEN = '{{ .Site.Params.paddleToken }}';
76
const PADDLE_VENDOR_ID = {{ .Site.Params.paddleVendorId }};

‎config/development/params.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# API
22
apiBaseUrl: http://localhost:3300
3-
legacyApiUrl: http://localhost
43
legacyStoreUrl: http://localhost:8787/api
54

65
# UMAMI

‎config/production/params.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# API
22
apiBaseUrl: https://api.cryptomator.org
3-
legacyApiUrl: https://api.cryptomator.org
43
legacyStoreUrl: https://store.cryptomator.org/api
54

65
# UMAMI

‎config/staging/params.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# API
22
apiBaseUrl: https://api.staging.cryptomator.org
3-
legacyApiUrl: https://api.cryptomator.org
43
legacyStoreUrl: https://store.staging.cryptomator.org/api
54

65
# UMAMI

‎layouts/become-a-partner/single.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ <h1 class="font-h1 mb-8">{{ .Title }}</h1>
9595
<i :class="{'fa-paper-plane': !feedbackData.inProgress, 'fa-spinner fa-spin': feedbackData.inProgress}" class="fa-solid" aria-hidden="true"></i>
9696
{{ i18n "partner_submit" }}
9797
</button>
98-
{{ $captchaUrl := printf "%s/connect/contact/challenge" .Site.Params.apiBaseUrl }}
99-
{{ partial "captcha.html" (dict "challengeUrl" $captchaUrl "captchaPayload" "submitData.captcha" "captchaState" "captchaState") }}
98+
{{ $challengeUrl := printf "%s/connect/contact/challenge" .Site.Params.apiBaseUrl }}
99+
{{ partial "captcha.html" (dict "challengeUrl" $challengeUrl "captchaPayload" "submitData.captcha" "captchaState" "captchaState") }}
100100
</div>
101101
</div>
102102
</div>

‎layouts/book-a-demo/single.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ <h1 class="font-h1 mb-8">{{ .Title }}</h1>
134134
<i :class="{'fa-paper-plane': !feedbackData.inProgress, 'fa-spinner fa-spin': feedbackData.inProgress}" class="fa-solid" aria-hidden="true"></i>
135135
{{ i18n "book_demo_submit" }}
136136
</button>
137-
{{ $captchaUrl := printf "%s/connect/contact/challenge" .Site.Params.apiBaseUrl }}
138-
{{ partial "captcha.html" (dict "challengeUrl" $captchaUrl "captchaPayload" "submitData.captcha" "captchaState" "captchaState") }}
137+
{{ $challengeUrl := printf "%s/connect/contact/challenge" .Site.Params.apiBaseUrl }}
138+
{{ partial "captcha.html" (dict "challengeUrl" $challengeUrl "captchaPayload" "submitData.captcha" "captchaState" "captchaState") }}
139139
</div>
140140
</div>
141141
</div>

‎layouts/contact-sales/single.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ <h1 class="font-h1 mb-8">{{ .Title }}</h1>
8686
<i :class="{'fa-paper-plane': !feedbackData.inProgress, 'fa-spinner fa-spin': feedbackData.inProgress}" class="fa-solid" aria-hidden="true"></i>
8787
{{ i18n "contact_sales_submit" }}
8888
</button>
89-
{{ $captchaUrl := printf "%s/connect/contact/challenge" .Site.Params.apiBaseUrl }}
90-
{{ partial "captcha.html" (dict "challengeUrl" $captchaUrl "captchaPayload" "submitData.captcha" "captchaState" "captchaState") }}
89+
{{ $challengeUrl := printf "%s/connect/contact/challenge" .Site.Params.apiBaseUrl }}
90+
{{ partial "captcha.html" (dict "challengeUrl" $challengeUrl "captchaPayload" "submitData.captcha" "captchaState" "captchaState") }}
9191
</div>
9292
</div>
9393
</div>

‎layouts/for-individuals/single.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,8 @@ <h2 id="newsletter" class="font-h2 mb-4">{{ i18n "home_newsletter_title" . }}</h
184184
<i :class="{'fa-envelope': !data.inProgress, 'fa-spinner fa-spin': data.inProgress}" class="fa-solid" aria-hidden="true"></i> {{ i18n "home_newsletter_subscribe" }}
185185
</button>
186186

187-
{{ $captchaUrl := printf "%s/connect/newsletter/challenge" .Site.Params.apiBaseUrl }}
188-
{{ partial "captcha.html" (dict "challengeUrl" $captchaUrl "captchaPayload" "data.captcha" "captchaState" "captchaState") }}
187+
{{ $challengeUrl := printf "%s/connect/newsletter/challenge" .Site.Params.apiBaseUrl }}
188+
{{ partial "captcha.html" (dict "challengeUrl" $challengeUrl "captchaPayload" "data.captcha" "captchaState" "captchaState") }}
189189
</div>
190190
<p class="font-p">{{ partial "checkbox.html" (dict "context" . "alpineVariable" "data.acceptTerms" "label" (i18n "accept_newsletter_privacy" | safeHTML)) }}</p>
191191
<p :class="{'hidden': !data.errorMessage}" class="text-sm text-red-600 mt-2" x-text="data.errorMessage"></p>

‎layouts/for-teams/single.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,8 @@ <h2 id="newsletter" class="font-h2 mb-4">{{ i18n "hub_newsletter_title" . }}</h2
292292
<i :class="{'fa-envelope': !data.inProgress, 'fa-spinner fa-spin': data.inProgress}" class="fa-solid" aria-hidden="true"></i> {{ i18n "hub_newsletter_subscribe" }}
293293
</button>
294294

295-
{{ $captchaUrl := printf "%s/connect/newsletter/challenge" .Site.Params.apiBaseUrl }}
296-
{{ partial "captcha.html" (dict "challengeUrl" $captchaUrl "captchaPayload" "data.captcha" "captchaState" "captchaState") }}
295+
{{ $challengeUrl := printf "%s/connect/newsletter/challenge" .Site.Params.apiBaseUrl }}
296+
{{ partial "captcha.html" (dict "challengeUrl" $challengeUrl "captchaPayload" "data.captcha" "captchaState" "captchaState") }}
297297
</div>
298298
<p class="font-p">{{ partial "checkbox.html" (dict "context" . "alpineVariable" "data.acceptTerms" "label" (i18n "accept_hub_newsletter_privacy" | safeHTML)) }}</p>
299299
<p :class="{'hidden': !data.errorMessage}" class="text-sm text-red-600 mt-2" x-text="data.errorMessage"></p>

‎layouts/hub-billing/single.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ <h3 class="font-headline text-xl md:text-2xl leading-relaxed mb-4">
4242
<i :class="{'fa-paper-plane': !subscriptionData.inProgress, 'fa-spinner fa-spin': subscriptionData.inProgress}" class="fa-solid" aria-hidden="true"></i>
4343
{{ i18n "hub_billing_createsession_submit" . }}
4444
</button>
45-
{{ partial "captcha.html" (dict "captchaPayload" "subscriptionData.captcha" "captchaState" "captchaState") }}
45+
{{ $challengeUrl := printf "%s/connect/store/challenge" .Site.Params.apiBaseUrl }}
46+
{{ partial "captcha.html" (dict "challengeUrl" $challengeUrl "captchaPayload" "subscriptionData.captcha" "captchaState" "captchaState") }}
4647
<p :class="{'hidden': !subscriptionData.errorMessage}" class="text-sm text-red-600 mt-2" x-text="subscriptionData.errorMessage"></p>
4748
</div>
4849
</template>

0 commit comments

Comments
 (0)