Skip to content

Commit 9bc599a

Browse files
committed
add returnUrl
1 parent 20e195c commit 9bc599a

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

assets/js/hubce.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ class HubCE {
1212
this._submitData = submitData;
1313
this._searchParams = searchParams;
1414
this._submitData.oldLicense = searchParams.get('oldLicense');
15+
this._submitData.returnUrl = searchParams.get('returnUrl');
1516

1617
// continue after email verified:
1718
if (searchParams.get('verifiedEmail')) {
@@ -66,6 +67,7 @@ class HubCE {
6667
data: {
6768
email: this._submitData.email,
6869
oldLicense: this._submitData.oldLicense,
70+
returnUrl: this._submitData.returnUrl,
6971
verifyCaptcha: this._submitData.captcha,
7072
verifyEmail: this._submitData.email,
7173
verifyTarget: 'registerhubce'

layouts/hub-register/single.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{{ partial "altcha-css.html" . }}
33
{{ end }}
44
{{ define "main" }}
5-
<section x-data="{steps: ['{{ i18n "hub_ce_registration_step_1_nav_title" }}', '{{ i18n "hub_ce_registration_step_2_confirmation_nav_title" }}', '{{ i18n "hub_ce_registration_step_3_license_nav_title" }}'], feedbackData: {currentStep: 0, success: false, inProgress: false, errorMessage: '', licenseText: null, emailSent: false, emailVerified: false}, submitData: {captcha: null, oldLicense: '', email: '', acceptNewsletter: false}, acceptTerms: false, hubCE: null, captchaState: null}" x-init="hubCE = new HubCE($refs.form, feedbackData, submitData, new URLSearchParams(location.hash.substring(1)))" class="container py-12">
5+
<section x-data="{steps: ['{{ i18n "hub_ce_registration_step_1_nav_title" }}', '{{ i18n "hub_ce_registration_step_2_confirmation_nav_title" }}', '{{ i18n "hub_ce_registration_step_3_license_nav_title" }}'], feedbackData: {currentStep: 0, success: false, inProgress: false, errorMessage: '', licenseText: null, emailSent: false, emailVerified: false}, submitData: {captcha: null, oldLicense: '', email: '', acceptNewsletter: false}, acceptTerms: false, hubCE: null, captchaState: null, returnUrl: null}" x-init="const params = new URLSearchParams(location.hash.substring(1)); returnUrl = params.get('returnUrl'); hubCE = new HubCE($refs.form, feedbackData, submitData, params)" class="container py-12">
66
<header class="mb-6">
77
<h1 class="font-h1 mb-8">{{ .Title }}</h1>
88
<p class="lead">{{ i18n "hub_ce_registration_description" }}</p>
@@ -202,7 +202,7 @@ <h2 class="font-h2 mb-6">
202202
<p class="font-p mb-4">{{ i18n "hub_ce_registration_step_3_success" }}</p>
203203
<textarea class="block input-box w-full h-32 md:h-48 mb-8" x-text="feedbackData.licenseText" readonly></textarea>
204204
<div class="mt-auto">
205-
<button class="btn btn-primary w-full md:w-64" data-umami-event="hub-ce-registration-step-1">
205+
<button @click="window.location.href = returnUrl + '/app/admin/settings?token=' + encodeURIComponent(feedbackData.licenseText)" class="btn btn-primary w-full md:w-64" data-umami-event="hub-ce-registration-return-to-hub">
206206
<i :class="{'fa-chevron-right': !feedbackData.inProgress, 'fa-spinner fa-spin': feedbackData.inProgress}" class="fa-solid" aria-hidden="true"></i>
207207
Todo: Return to Hub
208208
</button>

0 commit comments

Comments
 (0)