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.

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

Adds a photo to the initial sign up page #1826

Merged
merged 1 commit into from
Oct 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file added app/assets/images/nyc-workshop.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 14 additions & 9 deletions app/views/members/new.html.haml
Original file line number Diff line number Diff line change
@@ -1,26 +1,31 @@
.container.py-4.py-lg-5
.row.justify-content-md-center
.col-md-10.col-lg-8
.col
%h1= @page_title

.py-4.py-lg-5.bg-light
.container
.row.justify-content-md-center
matyikriszta marked this conversation as resolved.
Show resolved Hide resolved
.col-md-10.col-lg-8
%p.lead
.col-12.col-lg-6
%p
= t('members.new.intro')
= link_to t('members.code_of_conduct'), code_of_conduct_path
\.
%p.lead
%p
= t('members.new.students.intro')
= link_to t('members.new.students.criteria_link'), 'http://codebar.io/student-guide#eligibility'
= link_to t('members.new.students.criteria_link'), student_guide_path(anchor: 'eligibility')
= t('members.new.students.criteria_brief')
%p.lead
%p.mb-4
= t('members.new.students.github')
.d-flex.flex-column.align-items-start
= link_to registration_path(member_type: 'student'), class: 'btn btn-lg btn-primary mb-4 text-decoration-none' do
.d-grid.d-lg-block
= link_to registration_path(member_type: 'student'), class: 'btn btn-primary btn-lg text-decoration-none' do
= t('members.sign_up_as_student')
%i.fab.fa-github
= link_to registration_path(member_type: 'coach'), class: 'btn btn-lg btn-primary text-decoration-none' do
%p
%small.fw-bold
= t('members.sign_up_as_student_disclaimer')
= link_to registration_path(member_type: 'coach'), class: 'btn btn-primary btn-lg text-decoration-none' do
= t('members.sign_up_as_coach')
%i.fab.fa-github
.col-12.col-lg-6.mt-4.mt-lg-0
= image_tag("nyc-workshop.jpg", alt: "A photo of three people sat with their laptops, taken at a codebar NYC workshop", class: "mw-100")
3 changes: 2 additions & 1 deletion config/locales/de.yml
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,8 @@ de:
members:
sign_up: "Anmelden"
sign_in_with_github: "Anmelden mit GitHub"
sign_up_as_student: "Ich verstehe und erfülle die Teilnahmebedingungen. Meldet mich als Student an"
sign_up_as_student: "Meldet mich als Student an *"
sign_up_as_student_disclaimer: "* Ich verstehe und erfülle die Teilnahmebedingungen."
sign_up_as_coach: "Melde dich als Trainer an"
code_of_conduct: "Verhaltenskodex"
new:
Expand Down
3 changes: 2 additions & 1 deletion config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,8 @@ en:
members:
sign_up: "Sign up"
sign_in_with_github: "Sign in with GitHub"
sign_up_as_student: "I understand and meet the eligibility criteria. Sign me up as a student"
sign_up_as_student: "Sign up as a student*"
sign_up_as_student_disclaimer: "* I understand and meet the eligibility criteria."
sign_up_as_coach: "Sign up as a coach"
code_of_conduct: "code of conduct"
new:
Expand Down
3 changes: 2 additions & 1 deletion config/locales/en_AU.yml
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,8 @@ en-AU:
members:
sign_up: "Sign up"
sign_in_with_github: "Sign in with GitHub"
sign_up_as_student: "I understand and meet the eligibility criteria. Sign me up as a student"
sign_up_as_student: "Sign up as a student"
sign_up_as_student_disclaimer: "* I understand and meet the eligibility criteria."
sign_up_as_coach: "Sign up as a coach"
code_of_conduct: "code of conduct"
new:
Expand Down
3 changes: 2 additions & 1 deletion config/locales/en_GB.yml
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,8 @@ en-GB:
members:
sign_up: "Sign up"
sign_in_with_github: "Sign in with GitHub"
sign_up_as_student: "I understand and meet the eligibility criteria. Sign me up as a student"
sign_up_as_student: "Sign up as a student"
sign_up_as_student_disclaimer: "* I understand and meet the eligibility criteria."
sign_up_as_coach: "Sign up as a coach"
code_of_conduct: "code of conduct"
new:
Expand Down
3 changes: 2 additions & 1 deletion config/locales/en_US.yml
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,8 @@ en-US:
members:
sign_up: "Sign up"
sign_in_with_github: "Sign in with GitHub"
sign_up_as_student: "I understand and meet the eligibility criteria. Sign me up as a student"
sign_up_as_student: "Sign up as a student"
sign_up_as_student_disclaimer: "* I understand and meet the eligibility criteria."
sign_up_as_coach: "Sign up as a coach"
code_of_conduct: "code of conduct"
new:
Expand Down
3 changes: 2 additions & 1 deletion config/locales/es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,8 @@ es:
members:
sign_up: "Inscribirse"
sign_in_with_github: "Iniciar sesión con Github"
sign_up_as_student: "Entiendo y cumplo con los criterios de elegibilidad. Inscribirme como estudiante"
sign_up_as_student: "Inscribirme como estudiante *"
sign_up_as_student_disclaimer: "* Entiendo y cumplo con los criterios de elegibilidad."
sign_up_as_coach: "Regístrate como Entrenador"
code_of_conduct: "código de conducta"
new:
Expand Down
3 changes: 2 additions & 1 deletion config/locales/fi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,8 @@ fi:
members:
sign_up: "Sign up"
sign_in_with_github: "Sign in with GitHub"
sign_up_as_student: "I understand and meet the eligibility criteria. Sign me up as a student"
sign_up_as_student: "Sign up as a student"
sign_up_as_student_disclaimer: "* I understand and meet the eligibility criteria."
sign_up_as_coach: "Sign up as a coach"
code_of_conduct: "code of conduct"
new:
Expand Down
3 changes: 2 additions & 1 deletion config/locales/fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,8 @@ fr:
members:
sign_up: "S'inscrire"
sign_in_with_github: "Se connecter via GitHub"
sign_up_as_student: "Je comprends et j'accept les critères d'éligibilité. Je souhaite m'inscrire en tant qu'étudiant"
sign_up_as_student: "Je souhaite m'inscrire en tant qu'étudiant *"
sign_up_as_student_disclaimer: "* Je comprends et j'accept les critères d'éligibilité."
sign_up_as_coach: "S'inscrire en tant qu'enseignant"
code_of_conduct: "code de conduite"
new:
Expand Down
3 changes: 2 additions & 1 deletion config/locales/no.yml
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,8 @@
members:
sign_up: "Sign up"
sign_in_with_github: "Sign in with GitHub"
sign_up_as_student: "I understand and meet the eligibility criteria. Sign me up as a student"
sign_up_as_student: "Sign up as a student"
sign_up_as_student_disclaimer: "* I understand and meet the eligibility criteria."
sign_up_as_coach: "Sign up as a coach"
code_of_conduct: "code of conduct"
new:
Expand Down
6 changes: 3 additions & 3 deletions spec/features/accepting_terms_and_conditions_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
scenario 'they can''t proceed unless they accept the ToCs' do
visit root_path
click_on 'Sign up as a student'
click_on 'I understand and meet the eligibility criteria. Sign me up as a student'
click_on 'Sign up as a student'

expect(page).to have_current_path(terms_and_conditions_path)

Expand All @@ -21,7 +21,7 @@
scenario 'they can read the Code of Conduct before accepting the ToCs', js: true do
visit root_path
click_on 'Sign up as a student'
click_on 'I understand and meet the eligibility criteria. Sign me up as a student'
click_on 'Sign up as a student'

expect(page).to have_current_path(terms_and_conditions_path)

Expand All @@ -36,7 +36,7 @@
scenario 'they can fill in their details after they accept the ToCs' do
visit root_path
click_on 'Sign up as a student'
click_on 'I understand and meet the eligibility criteria. Sign me up as a student'
click_on 'Sign up as a student'

expect(page).to have_current_path(terms_and_conditions_path)

Expand Down
2 changes: 1 addition & 1 deletion spec/features/member_joining_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
scenario 'A visitor can access signups through the landing page' do
visit root_path
click_on 'Sign up as a student'
click_on 'I understand and meet the eligibility criteria. Sign me up as a student'
click_on 'Sign up as a student'

accept_toc

Expand Down
Loading