diff --git a/messages/en.json b/messages/en.json index f22100fd..40bab0c0 100644 --- a/messages/en.json +++ b/messages/en.json @@ -172,7 +172,9 @@ "auth_terms_of_service": "Terms of Service", "auth_privacy_policy": "Privacy Policy", "auth_cookie_policy": "Cookie Policy", - "auth_all_three_required": "All three agreements are required to register.", + "auth_eula": "End User License Agreement", + "auth_open_link_first": "Open each policy link to enable its checkbox.", + "auth_all_three_required": "All agreements are required to register.", "auth_all_fields_required": "All fields are required.", "auth_must_agree_all_policies": "You must agree to all required policies to register.", "auth_account_exists": "An account with this email already exists.", diff --git a/messages/ja.json b/messages/ja.json index f7f37eb0..f7318683 100644 --- a/messages/ja.json +++ b/messages/ja.json @@ -172,7 +172,9 @@ "auth_terms_of_service": "利用規約に同意する", "auth_privacy_policy": "プライバシーポリシーに同意する", "auth_cookie_policy": "Cookie ポリシーに同意する", - "auth_all_three_required": "登録には 3 つすべてへの同意が必要です。", + "auth_eula": "エンドユーザー使用許諾契約に同意する", + "auth_open_link_first": "各ポリシーのリンクを開くとチェックボックスが有効になります。", + "auth_all_three_required": "登録にはすべての同意が必要です。", "auth_all_fields_required": "すべての項目を入力してください。", "auth_must_agree_all_policies": "登録するには必須ポリシーすべてに同意してください。", "auth_account_exists": "このメールアドレスのアカウントはすでに存在します。", diff --git a/src/routes/auth/create-account/+page.server.ts b/src/routes/auth/create-account/+page.server.ts index 124c89f4..f69b9ef4 100644 --- a/src/routes/auth/create-account/+page.server.ts +++ b/src/routes/auth/create-account/+page.server.ts @@ -23,9 +23,9 @@ export const actions: Actions = { const company = readNonEmptyString(data.get('company')); const recaptchaToken = readNonEmptyString(data.get('recaptchaToken')); - const agreedTerms = data.get('agreedTerms') === 'true'; const agreedPrivacy = data.get('agreedPrivacy') === 'true'; - const agreedCookies = data.get('agreedCookies') === 'true'; + const agreedTerms = data.get('agreedTerms') === 'true'; + const agreedEula = data.get('agreedEula') === 'true'; // ── Validation ───────────────────────────────────────────── if (!firstName || !lastName || !email || !password || !confirmPassword || !company) { @@ -58,7 +58,7 @@ export const actions: Actions = { }); } - if (!agreedTerms || !agreedPrivacy || !agreedCookies) { + if (!agreedPrivacy || !agreedTerms || !agreedEula) { return fail(400, { message: m.auth_must_agree_all_policies(), firstName, @@ -95,9 +95,9 @@ export const actions: Actions = { first_name: firstName, last_name: lastName, company, - agreed_terms: true, agreed_privacy: true, - agreed_cookies: true + agreed_terms: true, + agreed_eula: true } } }); diff --git a/src/routes/auth/create-account/+page.svelte b/src/routes/auth/create-account/+page.svelte index 44edec91..1c926bd4 100644 --- a/src/routes/auth/create-account/+page.svelte +++ b/src/routes/auth/create-account/+page.svelte @@ -40,9 +40,9 @@ let password: string = $state(''); let confirmPassword: string = $state(''); - let agreedTerms: boolean = $state(false); let agreedPrivacy: boolean = $state(false); - let agreedCookies: boolean = $state(false); + let agreedTerms: boolean = $state(false); + let agreedEula: boolean = $state(false); let passwordValidation: IPasswordValidationResult = $derived(isStrongPassword(password)); @@ -50,7 +50,7 @@ password.length > 0 && confirmPassword.length > 0 && password === confirmPassword ); - let allConsentsGiven: boolean = $derived(agreedTerms && agreedPrivacy && agreedCookies); + let allConsentsGiven: boolean = $derived(agreedPrivacy && agreedTerms && agreedEula); let redirectPath = $derived(readRedirectPath(page.url.searchParams, '')); let canSubmit: boolean = $derived( @@ -123,9 +123,9 @@ return; } - formData.set('agreedTerms', String(agreedTerms)); formData.set('agreedPrivacy', String(agreedPrivacy)); - formData.set('agreedCookies', String(agreedCookies)); + formData.set('agreedTerms', String(agreedTerms)); + formData.set('agreedEula', String(agreedEula)); return async ({ result }) => { try { @@ -210,9 +210,9 @@ diff --git a/src/routes/auth/create-account/CreateAccountConsentFields.svelte b/src/routes/auth/create-account/CreateAccountConsentFields.svelte index adc765ce..c946db06 100644 --- a/src/routes/auth/create-account/CreateAccountConsentFields.svelte +++ b/src/routes/auth/create-account/CreateAccountConsentFields.svelte @@ -2,63 +2,83 @@ import { m } from '$lib/paraglide/messages.js'; interface Props { - agreedCookies: boolean; agreedPrivacy: boolean; agreedTerms: boolean; + agreedEula: boolean; allConsentsGiven: boolean; } let { - agreedCookies = $bindable(false), agreedPrivacy = $bindable(false), agreedTerms = $bindable(false), + agreedEula = $bindable(false), allConsentsGiven }: Props = $props(); + + // The matching checkbox stays disabled until its policy link has been opened. + let visitedPrivacy = $state(false); + let visitedTerms = $state(false); + let visitedEula = $state(false);
{m.auth_required_agreements_label()} +

{m.auth_open_link_first()}

+ - {#if !allConsentsGiven && (agreedTerms || agreedPrivacy || agreedCookies)} + {#if !allConsentsGiven && (agreedPrivacy || agreedTerms || agreedEula)}

{m.auth_all_three_required()}

{/if}
@@ -77,6 +97,12 @@ padding: 0 0.4rem; } + .consent-note { + margin: 0; + font-size: 0.82rem; + color: rgb(160 180 205); + } + .consent-item { display: flex; align-items: flex-start; @@ -95,6 +121,11 @@ flex-shrink: 0; } + .consent-checkbox:disabled { + cursor: not-allowed; + opacity: 0.45; + } + .consent-hint { margin: 0; font-size: 0.82rem;