From ca51e93ab1bd505270d3d95b7c4f9c5320f7c4a8 Mon Sep 17 00:00:00 2001 From: Allan Otodi Opeto <103313919+AllanOXDi@users.noreply.github.com> Date: Wed, 21 Dec 2022 21:15:15 +0300 Subject: [PATCH 1/8] refactored signup page --- .../frontend/accounts/pages/Create.vue | 78 +++++++++++-------- 1 file changed, 45 insertions(+), 33 deletions(-) diff --git a/contentcuration/contentcuration/frontend/accounts/pages/Create.vue b/contentcuration/contentcuration/frontend/accounts/pages/Create.vue index 361ffce01d..a066b76477 100644 --- a/contentcuration/contentcuration/frontend/accounts/pages/Create.vue +++ b/contentcuration/contentcuration/frontend/accounts/pages/Create.vue @@ -132,39 +132,45 @@ - + +
+ + - - - + + | + + + +
-

- {{ $tr('contactMessage') }} -

- +
+ + {{ $tr('contactMessage') }} + + + + +
+ + {{ $tr('finishButton') }} @@ -241,9 +247,7 @@ tosRules() { return [value => (value ? true : this.$tr('ToSRequiredMessage'))]; }, - policyRules() { - return [value => (value ? true : this.$tr('privacyPolicyRequiredMessage'))]; - }, + usageOptions() { return [ { @@ -492,15 +496,14 @@ otherSourcePlaceholder: 'Please describe', // Privacy policy + terms of service - viewToSLink: 'View terms of service', - ToSCheck: 'I have read and agree to the terms of service', + viewToSLink: 'View Terms of Service', ToSRequiredMessage: 'Please accept our terms of service', - viewPrivacyPolicyLink: 'View privacy policy', - privacyPolicyCheck: 'I have read and agree to the privacy policy', - privacyPolicyRequiredMessage: 'Please accept our privacy policy', - contactMessage: 'Questions or concerns? Please email us at content@learningequality.org', + viewPrivacyPolicyLink: 'View Privacy Policy', + contactMessage: 'Questions or concerns? Please email us at ', finishButton: 'Finish', + contentlink: 'content@learningequality.org', + agreement: 'I have read and agree to terms of service and the privacy policy', }, }; @@ -529,4 +532,13 @@ border: 0; } + .span-spacing { + display: flex; + margin-left: 40px; + } + + .span-spacing span { + margin-left: 5px; + } + From 46a987251344cdfaec7d40eca232d2f5efedd5be Mon Sep 17 00:00:00 2001 From: Allan Otodi Opeto <103313919+AllanOXDi@users.noreply.github.com> Date: Thu, 29 Dec 2022 14:46:10 +0300 Subject: [PATCH 2/8] adding responsiveness to creat account --- .../frontend/accounts/pages/Create.vue | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/contentcuration/contentcuration/frontend/accounts/pages/Create.vue b/contentcuration/contentcuration/frontend/accounts/pages/Create.vue index a066b76477..526ad06284 100644 --- a/contentcuration/contentcuration/frontend/accounts/pages/Create.vue +++ b/contentcuration/contentcuration/frontend/accounts/pages/Create.vue @@ -164,8 +164,9 @@ @@ -217,6 +218,7 @@ valid: true, registrationFailed: false, emailErrors: [], + email: 'content@learningequality.org', form: { first_name: '', last_name: '', @@ -443,6 +445,7 @@ return Promise.resolve(); }, }, + $trs: { backToLoginButton: 'Sign in', createAnAccountTitle: 'Create an account', @@ -502,7 +505,7 @@ viewPrivacyPolicyLink: 'View Privacy Policy', contactMessage: 'Questions or concerns? Please email us at ', finishButton: 'Finish', - contentlink: 'content@learningequality.org', + mailtolink: 'content@learningequality.org', agreement: 'I have read and agree to terms of service and the privacy policy', }, }; @@ -538,7 +541,13 @@ } .span-spacing span { - margin-left: 5px; + margin-left: 2px; + font-size: 16px; + } + + .btn-space-mobile-2 { + position: absolute; + font-size: 16px; } From 974b9d27ccc8e3907dee98037d599332eb7aa253 Mon Sep 17 00:00:00 2001 From: Allan Otodi Opeto <103313919+AllanOXDi@users.noreply.github.com> Date: Tue, 3 Jan 2023 20:12:07 +0300 Subject: [PATCH 3/8] code cleanup --- .../frontend/accounts/pages/Create.vue | 19 +++++++++++-------- .../shared/layouts/ImmersiveModalLayout.vue | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/contentcuration/contentcuration/frontend/accounts/pages/Create.vue b/contentcuration/contentcuration/frontend/accounts/pages/Create.vue index 526ad06284..9187f8e552 100644 --- a/contentcuration/contentcuration/frontend/accounts/pages/Create.vue +++ b/contentcuration/contentcuration/frontend/accounts/pages/Create.vue @@ -15,7 +15,7 @@

{{ $tr('createAnAccountTitle') }}

- + {{ registrationFailed ? $tr('registrationFailed') : $tr('errorsMessage') }} @@ -159,16 +159,15 @@
- +
{{ $tr('contactMessage') }} - - + - +
@@ -545,9 +544,13 @@ font-size: 16px; } - .btn-space-mobile-2 { - position: absolute; + .span-spacing-email { + margin-left: 3px; font-size: 16px; } + .align-items { + display: block; + } + diff --git a/contentcuration/contentcuration/frontend/shared/layouts/ImmersiveModalLayout.vue b/contentcuration/contentcuration/frontend/shared/layouts/ImmersiveModalLayout.vue index 1c211128ee..89f53056a9 100644 --- a/contentcuration/contentcuration/frontend/shared/layouts/ImmersiveModalLayout.vue +++ b/contentcuration/contentcuration/frontend/shared/layouts/ImmersiveModalLayout.vue @@ -70,7 +70,7 @@ } .content-wrapper { - margin: 32px; + margin: 28px; } .content { From 4bc57ea46cf782bc4a2d985b1340be1c3da68f17 Mon Sep 17 00:00:00 2001 From: Allan Otodi Opeto <103313919+AllanOXDi@users.noreply.github.com> Date: Sat, 7 Jan 2023 00:29:40 +0300 Subject: [PATCH 4/8] reverted the contactMessage back to it's original form. --- .../contentcuration/frontend/accounts/pages/Create.vue | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/contentcuration/contentcuration/frontend/accounts/pages/Create.vue b/contentcuration/contentcuration/frontend/accounts/pages/Create.vue index 9187f8e552..3785901e9e 100644 --- a/contentcuration/contentcuration/frontend/accounts/pages/Create.vue +++ b/contentcuration/contentcuration/frontend/accounts/pages/Create.vue @@ -161,12 +161,6 @@
{{ $tr('contactMessage') }} - -
@@ -217,7 +211,6 @@ valid: true, registrationFailed: false, emailErrors: [], - email: 'content@learningequality.org', form: { first_name: '', last_name: '', @@ -502,9 +495,8 @@ ToSRequiredMessage: 'Please accept our terms of service', viewPrivacyPolicyLink: 'View Privacy Policy', - contactMessage: 'Questions or concerns? Please email us at ', + contactMessage: 'Questions or concerns? Please email us at content@learningequality.org', finishButton: 'Finish', - mailtolink: 'content@learningequality.org', agreement: 'I have read and agree to terms of service and the privacy policy', }, }; From ba51f6bef374d79d731928568d3f616d40401e21 Mon Sep 17 00:00:00 2001 From: Allan Otodi Opeto <103313919+AllanOXDi@users.noreply.github.com> Date: Fri, 13 Jan 2023 17:30:00 +0300 Subject: [PATCH 5/8] fix PR failed run test --- .../frontend/accounts/pages/Create.vue | 15 +++++++++++++-- .../accounts/pages/__tests__/create.spec.js | 1 - 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/contentcuration/contentcuration/frontend/accounts/pages/Create.vue b/contentcuration/contentcuration/frontend/accounts/pages/Create.vue index 3785901e9e..9a495349b8 100644 --- a/contentcuration/contentcuration/frontend/accounts/pages/Create.vue +++ b/contentcuration/contentcuration/frontend/accounts/pages/Create.vue @@ -132,7 +132,6 @@ -
@@ -241,6 +241,15 @@ tosRules() { return [value => (value ? true : this.$tr('ToSRequiredMessage'))]; }, + acceptedAgreement: { + get() { + return this.form.accepted_tos && this.form.accepted_policy; + }, + set(accepted) { + this.form.accepted_tos = accepted; + this.form.accepted_policy = accepted; + }, + }, usageOptions() { return [ @@ -411,6 +420,9 @@ showOtherField(id) { return id === uses.OTHER && this.form.uses.includes(id); }, + updateAcceptedAgreement() { + this.acceptedAgreement = this.form.accepted_tos && this.form.accepted_policy; + }, submit() { if (this.$refs.form.validate()) { @@ -446,7 +458,6 @@ registrationFailed: 'There was an error registering your account. Please try again', registrationFailedOffline: 'You seem to be offline. Please connect to the internet to create an account.', - // Basic information strings basicInformationHeader: 'Basic information', firstNameLabel: 'First name', diff --git a/contentcuration/contentcuration/frontend/accounts/pages/__tests__/create.spec.js b/contentcuration/contentcuration/frontend/accounts/pages/__tests__/create.spec.js index dc9f24df06..6b2594f8b2 100644 --- a/contentcuration/contentcuration/frontend/accounts/pages/__tests__/create.spec.js +++ b/contentcuration/contentcuration/frontend/accounts/pages/__tests__/create.spec.js @@ -62,7 +62,6 @@ function makeWrapper(formData) { }); return wrapper; } - function makeFailedPromise(statusCode) { return () => { return new Promise((resolve, reject) => { From 471b192dce55d883b09cbd21a7514e81d5c354a5 Mon Sep 17 00:00:00 2001 From: Allan Otodi Opeto <103313919+AllanOXDi@users.noreply.github.com> Date: Fri, 13 Jan 2023 19:04:06 +0300 Subject: [PATCH 6/8] fix PR failed run test --- .../contentcuration/frontend/accounts/pages/Create.vue | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/contentcuration/contentcuration/frontend/accounts/pages/Create.vue b/contentcuration/contentcuration/frontend/accounts/pages/Create.vue index 9a495349b8..2c582fc622 100644 --- a/contentcuration/contentcuration/frontend/accounts/pages/Create.vue +++ b/contentcuration/contentcuration/frontend/accounts/pages/Create.vue @@ -133,13 +133,12 @@
@@ -420,10 +419,6 @@ showOtherField(id) { return id === uses.OTHER && this.form.uses.includes(id); }, - updateAcceptedAgreement() { - this.acceptedAgreement = this.form.accepted_tos && this.form.accepted_policy; - }, - submit() { if (this.$refs.form.validate()) { let cleanedData = this.clean(this.form); From 1fd6b3df03391257ade780112aa381c43e471063 Mon Sep 17 00:00:00 2001 From: Allan Otodi Opeto <103313919+AllanOXDi@users.noreply.github.com> Date: Tue, 17 Jan 2023 22:35:39 +0300 Subject: [PATCH 7/8] minor code cleanup --- .../frontend/accounts/pages/Create.vue | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/contentcuration/contentcuration/frontend/accounts/pages/Create.vue b/contentcuration/contentcuration/frontend/accounts/pages/Create.vue index 2c582fc622..7e7c823efb 100644 --- a/contentcuration/contentcuration/frontend/accounts/pages/Create.vue +++ b/contentcuration/contentcuration/frontend/accounts/pages/Create.vue @@ -131,12 +131,12 @@ /> - + @@ -237,7 +237,7 @@ passwordConfirmRules() { return [value => (this.form.password1 === value ? true : this.$tr('passwordMatchMessage'))]; }, - tosRules() { + tosAndPolicyRules() { return [value => (value ? true : this.$tr('ToSRequiredMessage'))]; }, acceptedAgreement: { @@ -498,7 +498,7 @@ // Privacy policy + terms of service viewToSLink: 'View Terms of Service', - ToSRequiredMessage: 'Please accept our terms of service', + ToSRequiredMessage: 'Please accept our terms of service and policy', viewPrivacyPolicyLink: 'View Privacy Policy', contactMessage: 'Questions or concerns? Please email us at content@learningequality.org', @@ -524,6 +524,10 @@ } } + .policy-checkbox /deep/ .v-messages { + margin-left: 40px; + } + iframe { width: 100%; min-height: 400px; From 70ac9e5a4cd2aafde5ab1b75b201141814797d28 Mon Sep 17 00:00:00 2001 From: Blaine Jester Date: Fri, 27 Jan 2023 12:20:43 -0800 Subject: [PATCH 8/8] Remove min-height from error messages --- .../contentcuration/frontend/accounts/pages/Create.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/contentcuration/contentcuration/frontend/accounts/pages/Create.vue b/contentcuration/contentcuration/frontend/accounts/pages/Create.vue index 7e7c823efb..4521b84337 100644 --- a/contentcuration/contentcuration/frontend/accounts/pages/Create.vue +++ b/contentcuration/contentcuration/frontend/accounts/pages/Create.vue @@ -525,6 +525,7 @@ } .policy-checkbox /deep/ .v-messages { + min-height: 0; margin-left: 40px; }