Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

💻 Guest teacher connect option in teacher signup #5467

Merged
merged 11 commits into from
Apr 30, 2024
Merged

💻 Guest teacher connect option in teacher signup #5467

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d64fd83
input field for phone number if connect guess teacher is ticked
Annelein Apr 24, 2024
c6b46ec
translations
Annelein Apr 24, 2024
5f9098f
ids
Annelein Apr 24, 2024
8271f82
test
Annelein Apr 24, 2024
b7aa0ff
backend
Annelein Apr 24, 2024
1f8d239
solve account submit without phone number
Annelein Apr 24, 2024
e44839a
Update templates/signup.html
Annelein Apr 29, 2024
f1e5419
Update templates/signup.html
Annelein Apr 29, 2024
4a5be45
Merge branch 'main' into guest-teacher-connect
Annelein Apr 29, 2024
7e0cee0
Merge branch 'main' into guest-teacher-connect
mergify[bot] Apr 30, 2024
1ad23f2
🤖 Automatically update generated files
mergify[bot] Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions messages.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,9 @@ msgstr ""
msgid "congrats_message"
msgstr ""

msgid "connect_guest_teacher"
msgstr ""

msgid "content_invalid"
msgstr ""

Expand Down Expand Up @@ -866,6 +869,9 @@ msgstr ""
msgid "keyword_language_invalid"
msgstr ""

msgid "landcode_phone_number"
msgstr ""

msgid "language"
msgstr ""

Expand Down Expand Up @@ -1241,6 +1247,9 @@ msgstr ""
msgid "personal_text_invalid"
msgstr ""

msgid "phone_number"
msgstr ""

msgid "postfix_classname"
msgstr ""

Expand Down
12 changes: 12 additions & 0 deletions templates/signup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@ <h4 class="text-blue-500 mt-0 mb-0 text-center">{{_('create_student_account_expl
<label class="signup-label" for="email">{{_('email')}}</label>
<input class="signup-input" id="email" name="email" type="email" required>
</div>
<div class="signup-container">
<div class="hidden" id="phone_number">
<label class="signup-label" for="phone">{{_('phone_number')}}</label>
<input class="signup-input" id="phone" name="phone" type="number" placeholder="{{_('landcode_phone_number')}}">
</div>
</div>
<div class="signup-container">
<label class="signup-label" for="password">{{_('password')}}</label>
<div class="flex ml-auto items-center justify-end">
Expand Down Expand Up @@ -203,6 +209,12 @@ <h4 class="text-blue-500 mt-0 mb-0 text-center">{{_('create_student_account_expl
<label for="pair_with_teacher">{{_('pair_with_teacher')}}</label>
<input type="checkbox" id="pair_with_teacher" name="pair_with_teacher">
</div>
<div class="flex justify-between items-center">
<label for="connect_guest_teacher">{{_('connect_guest_teacher')}}</label>
<input type="checkbox" id="connect_guest_teacher" name="connect_guest_teacher"
_="on click toggle [@required='true'] on #phone
toggle .hidden on #phone_number">
</div>
{% endif %}
<div class="flex justify-between items-center">
<label for="agree_terms">{{_('agree_with')}} <a href="/privacy" target="_blank">{{_('privacy_terms')}}</a></label>
Expand Down
14 changes: 14 additions & 0 deletions tests/cypress/e2e/signup_page/connect_guest_teacher_create_account.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import {goToRegisterTeacher} from '../tools/navigation/nav.js'

describe('Check connect with guest teacher', () => {
it('passes', () => {

goToRegisterTeacher();

cy.get('#connect_guest_teacher').check()
.should('be.visible')

cy.get('#phone_number')
.should('be.visible')
})
})
9 changes: 9 additions & 0 deletions translations/ar/LC_MESSAGES/messages.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,9 @@ msgstr "Common errors"
msgid "congrats_message"
msgstr "Congratulations, {username}, you have completed Hedy!"

msgid "connect_guest_teacher"
msgstr ""

msgid "content_invalid"
msgstr "هذه المغامرة غير صالحة"

Expand Down Expand Up @@ -1002,6 +1005,9 @@ msgstr "Waiting for a button press..."
msgid "keyword_language_invalid"
msgstr "الرجاء اختيار لغة صحيحة للكلمات المفتاحية (الأوامر البرمجية). اختر اللغة الإنجليزية أو لغتك الخاصة."

msgid "landcode_phone_number"
msgstr ""

#, fuzzy
msgid "language"
msgstr "Language"
Expand Down Expand Up @@ -1435,6 +1441,9 @@ msgstr "النص الشخصي"
msgid "personal_text_invalid"
msgstr "النص الشخصي غير صالح."

msgid "phone_number"
msgstr ""

#, fuzzy
msgid "postfix_classname"
msgstr "Postfix classname"
Expand Down
9 changes: 9 additions & 0 deletions translations/bg/LC_MESSAGES/messages.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,9 @@ msgstr "Common errors"
msgid "congrats_message"
msgstr "Congratulations, {username}, you have completed Hedy!"

msgid "connect_guest_teacher"
msgstr ""

#, fuzzy
msgid "content_invalid"
msgstr "This adventure is invalid."
Expand Down Expand Up @@ -1115,6 +1118,9 @@ msgstr "Waiting for a button press..."
msgid "keyword_language_invalid"
msgstr "Please select a valid keyword language (select English or your own language)."

msgid "landcode_phone_number"
msgstr ""

#, fuzzy
msgid "language"
msgstr "Language"
Expand Down Expand Up @@ -1600,6 +1606,9 @@ msgstr "Personal text"
msgid "personal_text_invalid"
msgstr "Your personal text is invalid."

msgid "phone_number"
msgstr ""

#, fuzzy
msgid "postfix_classname"
msgstr "Postfix classname"
Expand Down
9 changes: 9 additions & 0 deletions translations/bn/LC_MESSAGES/messages.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,9 @@ msgstr "Common errors"
msgid "congrats_message"
msgstr "Congratulations, {username}, you have completed Hedy!"

msgid "connect_guest_teacher"
msgstr ""

#, fuzzy
msgid "content_invalid"
msgstr "This adventure is invalid."
Expand Down Expand Up @@ -1149,6 +1152,9 @@ msgstr "Waiting for a button press..."
msgid "keyword_language_invalid"
msgstr "Please select a valid keyword language (select English or your own language)."

msgid "landcode_phone_number"
msgstr ""

#, fuzzy
msgid "language"
msgstr "Language"
Expand Down Expand Up @@ -1663,6 +1669,9 @@ msgstr "Personal text"
msgid "personal_text_invalid"
msgstr "Your personal text is invalid."

msgid "phone_number"
msgstr ""

#, fuzzy
msgid "postfix_classname"
msgstr "Postfix classname"
Expand Down
9 changes: 9 additions & 0 deletions translations/ca/LC_MESSAGES/messages.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,9 @@ msgstr "Errors freqüents"
msgid "congrats_message"
msgstr "Felicitats, {username}, has completat Hedy!"

msgid "connect_guest_teacher"
msgstr ""

msgid "content_invalid"
msgstr "Aquesta aventura no és vàlida."

Expand Down Expand Up @@ -944,6 +947,9 @@ msgstr "Waiting for a button press..."
msgid "keyword_language_invalid"
msgstr "Please select a valid keyword language (select English or your own language)."

msgid "landcode_phone_number"
msgstr ""

#, fuzzy
msgid "language"
msgstr "Language"
Expand Down Expand Up @@ -1455,6 +1461,9 @@ msgstr "Personal text"
msgid "personal_text_invalid"
msgstr "Your personal text is invalid."

msgid "phone_number"
msgstr ""

msgid "postfix_classname"
msgstr "Afegir sufix classe"

Expand Down
9 changes: 9 additions & 0 deletions translations/cs/LC_MESSAGES/messages.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,9 @@ msgstr "Common errors"
msgid "congrats_message"
msgstr "Congratulations, {username}, you have completed Hedy!"

msgid "connect_guest_teacher"
msgstr ""

#, fuzzy
msgid "content_invalid"
msgstr "This adventure is invalid."
Expand Down Expand Up @@ -1115,6 +1118,9 @@ msgstr "Waiting for a button press..."
msgid "keyword_language_invalid"
msgstr "Please select a valid keyword language (select English or your own language)."

msgid "landcode_phone_number"
msgstr ""

#, fuzzy
msgid "language"
msgstr "Language"
Expand Down Expand Up @@ -1596,6 +1602,9 @@ msgstr "Personal text"
msgid "personal_text_invalid"
msgstr "Your personal text is invalid."

msgid "phone_number"
msgstr ""

#, fuzzy
msgid "postfix_classname"
msgstr "Postfix classname"
Expand Down
9 changes: 9 additions & 0 deletions translations/cy/LC_MESSAGES/messages.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,9 @@ msgstr "Common errors"
msgid "congrats_message"
msgstr "Congratulations, {username}, you have completed Hedy!"

msgid "connect_guest_teacher"
msgstr ""

#, fuzzy
msgid "content_invalid"
msgstr "This adventure is invalid."
Expand Down Expand Up @@ -1149,6 +1152,9 @@ msgstr "Waiting for a button press..."
msgid "keyword_language_invalid"
msgstr "Please select a valid keyword language (select English or your own language)."

msgid "landcode_phone_number"
msgstr ""

#, fuzzy
msgid "language"
msgstr "Language"
Expand Down Expand Up @@ -1676,6 +1682,9 @@ msgstr "Personal text"
msgid "personal_text_invalid"
msgstr "Your personal text is invalid."

msgid "phone_number"
msgstr ""

#, fuzzy
msgid "postfix_classname"
msgstr "Postfix classname"
Expand Down
9 changes: 9 additions & 0 deletions translations/da/LC_MESSAGES/messages.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,9 @@ msgstr "Common errors"
msgid "congrats_message"
msgstr "Congratulations, {username}, you have completed Hedy!"

msgid "connect_guest_teacher"
msgstr ""

#, fuzzy
msgid "content_invalid"
msgstr "This adventure is invalid."
Expand Down Expand Up @@ -1149,6 +1152,9 @@ msgstr "Waiting for a button press..."
msgid "keyword_language_invalid"
msgstr "Please select a valid keyword language (select English or your own language)."

msgid "landcode_phone_number"
msgstr ""

#, fuzzy
msgid "language"
msgstr "Language"
Expand Down Expand Up @@ -1676,6 +1682,9 @@ msgstr "Personal text"
msgid "personal_text_invalid"
msgstr "Your personal text is invalid."

msgid "phone_number"
msgstr ""

#, fuzzy
msgid "postfix_classname"
msgstr "Postfix classname"
Expand Down
9 changes: 9 additions & 0 deletions translations/de/LC_MESSAGES/messages.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,9 @@ msgstr "Häufige Fehler"
msgid "congrats_message"
msgstr "Herzlichen Glückwunsch, {username}, Du hast Hedy abgeschlossen!"

msgid "connect_guest_teacher"
msgstr ""

msgid "content_invalid"
msgstr "Dieses Abenteuer ist ungültig."

Expand Down Expand Up @@ -928,6 +931,9 @@ msgstr "Warte auf Knopfdruck..."
msgid "keyword_language_invalid"
msgstr "Bitte wähle eine gültige Schlüsselwortsprache (wähle Englisch oder deine eigene Sprache)."

msgid "landcode_phone_number"
msgstr ""

msgid "language"
msgstr "Sprache"

Expand Down Expand Up @@ -1341,6 +1347,9 @@ msgstr "Persönlicher Text"
msgid "personal_text_invalid"
msgstr "Dein persönlicher Text ist ungültig."

msgid "phone_number"
msgstr ""

msgid "postfix_classname"
msgstr "Postfix Klassenname"

Expand Down
9 changes: 9 additions & 0 deletions translations/el/LC_MESSAGES/messages.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,9 @@ msgstr "Common errors"
msgid "congrats_message"
msgstr "Congratulations, {username}, you have completed Hedy!"

msgid "connect_guest_teacher"
msgstr ""

msgid "content_invalid"
msgstr "Αυτή η περιπέτεια δεν είναι έγκυρη"

Expand Down Expand Up @@ -1033,6 +1036,9 @@ msgstr "Waiting for a button press..."
msgid "keyword_language_invalid"
msgstr "Επίλεξε μια έγκυρη γλώσσα λέξεων-κλειδιών (επιλέξτε Αγγλικά ή τη δική σας γλώσσα)"

msgid "landcode_phone_number"
msgstr ""

#, fuzzy
msgid "language"
msgstr "Language"
Expand Down Expand Up @@ -1476,6 +1482,9 @@ msgstr "Προσωπικό κείμενο"
msgid "personal_text_invalid"
msgstr "Το προσωπικό σου κείμενο δεν είναι έγκυρο"

msgid "phone_number"
msgstr ""

#, fuzzy
msgid "postfix_classname"
msgstr "Postfix classname"
Expand Down
9 changes: 9 additions & 0 deletions translations/en/LC_MESSAGES/messages.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,9 @@ msgstr "Common errors"
msgid "congrats_message"
msgstr "Congratulations, {username}, you have reached the following results with Hedy!"

msgid "connect_guest_teacher"
msgstr "I would like to be connected with a guest teacher who can give a few lessons"

msgid "content_invalid"
msgstr "This adventure is invalid."

Expand Down Expand Up @@ -867,6 +870,9 @@ msgstr "Waiting for a button press..."
msgid "keyword_language_invalid"
msgstr "Please select a valid keyword language (select English or your own language)."

msgid "landcode_phone_number"
msgstr "Please also add your country's landcode"

msgid "language"
msgstr "Language"

Expand Down Expand Up @@ -1270,6 +1276,9 @@ msgstr "Personal text"
msgid "personal_text_invalid"
msgstr "Your personal text is invalid."

msgid "phone_number"
msgstr "Phone number"

msgid "postfix_classname"
msgstr "Postfix classname"

Expand Down
Loading
Loading