Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 350b0c0

Browse filesBrowse files
deploy-code-orgdeploy-code-org
authored
Merge pull request #60576 from code-dot-org/staging
DTT (Staging > Test) [robo-dtt]
2 parents 90a80ef + 7678205 commit 350b0c0
Copy full SHA for 350b0c0

172 files changed

+64-24,091Lines changed: 64 additions & 24091 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎apps/src/signUpFlow/FinishStudentAccount.tsx‎

Copy file name to clipboardExpand all lines: apps/src/signUpFlow/FinishStudentAccount.tsx
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ const FinishStudentAccount: React.FunctionComponent<{
109109
onChange={onParentEmailChange}
110110
/>
111111
<div>
112-
<BodyThreeText className={style.keepMeUpdated}>
112+
<BodyThreeText className={style.parentKeepMeUpdated}>
113113
<strong>{locale.keep_me_updated()}</strong>
114114
</BodyThreeText>
115115
<Checkbox
Collapse file

‎apps/src/signUpFlow/FinishTeacherAccount.tsx‎

Copy file name to clipboardExpand all lines: apps/src/signUpFlow/FinishTeacherAccount.tsx
+23-33Lines changed: 23 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -45,47 +45,37 @@ const FinishTeacherAccount: React.FunctionComponent<{
4545
<Heading2>{locale.finish_creating_teacher_account()}</Heading2>
4646
<BodyTwoText>{locale.tailor_experience()}</BodyTwoText>
4747
</div>
48-
<div className={style.inputContainer}>
49-
<BodyThreeText>
50-
<strong>{locale.what_do_you_want_to_be_called()}</strong>
51-
</BodyThreeText>
52-
<TextField
53-
name="userName"
54-
onChange={onNameChange}
55-
value={name}
56-
className={style.nameInput}
57-
placeholder={locale.msCoder()}
58-
/>
59-
<BodyThreeText>
60-
{locale.this_is_what_your_students_will_see()}
61-
</BodyThreeText>
62-
<SchoolDataInputs usIp={usIp} includeHeaders={false} />
63-
<div className={style.emailOptInContainer}>
48+
<fieldset className={style.inputContainer}>
49+
<div>
50+
<TextField
51+
name="displayName"
52+
label={locale.what_do_you_want_to_be_called()}
53+
className={style.nameInput}
54+
value={name}
55+
placeholder={locale.msCoder()}
56+
onChange={onNameChange}
57+
/>
6458
<BodyThreeText>
59+
{locale.this_is_what_your_students_will_see()}
60+
</BodyThreeText>
61+
</div>
62+
<SchoolDataInputs usIp={usIp} includeHeaders={false} />
63+
<div>
64+
<BodyThreeText className={style.teacherKeepMeUpdated}>
6565
<strong>{locale.keep_me_updated()}</strong>
6666
</BodyThreeText>
67-
<span className={style.emailOptInCheckboxContainer}>
68-
<div className={style.emailOptInCheckbox}>
69-
<Checkbox
70-
label=""
71-
checked={emailOptInChecked}
72-
onChange={onEmailOptInChange}
73-
name="userEmailOptIn"
74-
/>
75-
</div>
76-
<BodyThreeText
77-
className={style.emailOptInLabel}
78-
visualAppearance={'body-two'}
79-
>
80-
{locale.get_informational_emails()}
81-
</BodyThreeText>
82-
</span>
67+
<Checkbox
68+
name="userEmailOptIn"
69+
label={locale.get_informational_emails()}
70+
checked={emailOptInChecked}
71+
onChange={onEmailOptInChange}
72+
/>
8373
<BodyThreeText className={style.emailOptInFootnote}>
8474
<strong>{locale.note()}</strong>{' '}
8575
{locale.after_creating_your_account()}
8676
</BodyThreeText>
8777
</div>
88-
</div>
78+
</fieldset>
8979
<div className={style.finishSignUpButtonContainer}>
9080
<Button
9181
className={style.finishSignUpButton}
Collapse file

‎apps/src/signUpFlow/finishAccount.module.scss‎

Copy file name to clipboardExpand all lines: apps/src/signUpFlow/finishAccount.module.scss
+8-21Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,11 @@ select {
4848

4949
p, label {
5050
margin-bottom: 0 !important;
51+
padding-top: 0 !important;
5152
}
5253

5354
label {
55+
width: 100%;
5456
align-items: start !important;
5557
gap: 0 0.5rem !important;
5658
}
@@ -59,27 +61,12 @@ span {
5961
margin-bottom: 0.125rem !important;
6062
}
6163

62-
.emailOptInContainer {
63-
margin-top: 1.125rem;
64-
65-
.emailOptInCheckboxContainer {
66-
display: flex;
67-
flex-direction: row;
68-
padding: 6px;
69-
70-
.emailOptInCheckbox {
71-
flex: 1;
72-
padding-top: 1px;
73-
}
74-
75-
.emailOptInLabel {
76-
flex: 12;
77-
}
78-
}
64+
.teacherKeepMeUpdated {
65+
margin-bottom: 0.375rem !important;
66+
}
7967

80-
.emailOptInFootnote {
81-
margin-top: 0.125rem;
82-
}
68+
.emailOptInFootnote {
69+
margin-top: 0.5rem;
8370
}
8471

8572
.parentInfoContainer {
@@ -96,7 +83,7 @@ span {
9683
}
9784
}
9885

99-
.keepMeUpdated {
86+
.parentKeepMeUpdated {
10087
margin-bottom: 0.125rem !important;
10188
}
10289

Collapse file

‎apps/src/templates/SchoolDataInputs.jsx‎

Copy file name to clipboardExpand all lines: apps/src/templates/SchoolDataInputs.jsx
+4-12Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@ import PropTypes from 'prop-types';
22
import React, {useState} from 'react';
33

44
import {SimpleDropdown} from '@cdo/apps/componentLibrary/dropdown';
5-
import {
6-
Heading2,
7-
BodyTwoText,
8-
BodyThreeText,
9-
} from '@cdo/apps/componentLibrary/typography';
5+
import {Heading2, BodyTwoText} from '@cdo/apps/componentLibrary/typography';
106
import {COUNTRIES} from '@cdo/apps/geographyConstants';
117
import {EVENTS, PLATFORMS} from '@cdo/apps/lib/util/AnalyticsConstants';
128
import analyticsReporter from '@cdo/apps/lib/util/AnalyticsReporter';
@@ -76,20 +72,16 @@ export default function SchoolDataInputs({
7672
return (
7773
<div className={style.schoolAssociationWrapper}>
7874
{includeHeaders && (
79-
<div>
80-
<Heading2 className={style.topPadding}>
81-
{i18n.censusHeading()}
82-
</Heading2>
75+
<div className={style.headerContainer}>
76+
<Heading2>{i18n.censusHeading()}</Heading2>
8377
<BodyTwoText>{i18n.schoolInfoInterstitialTitle()}</BodyTwoText>
8478
</div>
8579
)}
8680
<div className={style.inputContainer}>
87-
<BodyThreeText className={style.padding}>
88-
<strong>{i18n.whatCountry()}</strong>
89-
</BodyThreeText>
9081
<SimpleDropdown
9182
id="uitest-country-dropdown"
9283
name={fieldNames.country}
84+
labelText={i18n.whatCountry()}
9385
items={COUNTRY_ITEMS}
9486
selectedValue={country}
9587
onChange={onCountryChange}
Collapse file

‎apps/src/templates/SchoolNameInput.jsx‎

Copy file name to clipboardExpand all lines: apps/src/templates/SchoolNameInput.jsx
+9-16Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,24 @@ import PropTypes from 'prop-types';
22
import React, {useState} from 'react';
33

44
import TextField from '@cdo/apps/componentLibrary/textField/TextField';
5-
import {BodyThreeText} from '@cdo/apps/componentLibrary/typography';
65
import i18n from '@cdo/locale';
76

87
import {SCHOOL_NAME_SESSION_KEY} from '../signUpFlow/signUpFlowConstants';
98

10-
import style from './school-association.module.scss';
11-
129
export default function SchoolNameInput({fieldNames}) {
1310
const detectedName = sessionStorage.getItem(SCHOOL_NAME_SESSION_KEY) || '';
1411
const [schoolName, setSchoolName] = useState(detectedName);
1512

1613
return (
17-
<label>
18-
<BodyThreeText className={style.padding}>
19-
<strong>{i18n.schoolOrganizationQuestion()}</strong>
20-
</BodyThreeText>
21-
<TextField
22-
name={fieldNames.schoolName}
23-
onChange={e => {
24-
setSchoolName(e.target.value);
25-
sessionStorage.setItem(SCHOOL_NAME_SESSION_KEY, e.target.value);
26-
}}
27-
value={schoolName}
28-
/>
29-
</label>
14+
<TextField
15+
name={fieldNames.schoolName}
16+
label={i18n.schoolOrganizationQuestion()}
17+
onChange={e => {
18+
setSchoolName(e.target.value);
19+
sessionStorage.setItem(SCHOOL_NAME_SESSION_KEY, e.target.value);
20+
}}
21+
value={schoolName}
22+
/>
3023
);
3124
}
3225

Collapse file

‎apps/src/templates/SchoolZipSearch.jsx‎

Copy file name to clipboardExpand all lines: apps/src/templates/SchoolZipSearch.jsx
+5-11Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import classNames from 'classnames';
21
import PropTypes from 'prop-types';
32
import React, {useState, useEffect} from 'react';
43

@@ -43,9 +42,7 @@ export default function SchoolZipSearch({fieldNames}) {
4342
!detectedZip
4443
);
4544

46-
const labelClassName = isSchoolDropdownDisabled
47-
? classNames(style.padding, style.disabledLabel)
48-
: style.padding;
45+
const labelClassName = isSchoolDropdownDisabled ? style.disabledLabel : '';
4946

5047
useEffect(() => {
5148
const isValidZip = ZIP_REGEX.test(zip);
@@ -121,14 +118,12 @@ export default function SchoolZipSearch({fieldNames}) {
121118
].concat(sortSchoolsByName(dropdownSchools));
122119

123120
return (
124-
<div>
121+
<div className={style.inputContainer}>
125122
<label>
126-
<BodyThreeText className={style.padding}>
127-
<strong>{i18n.enterYourSchoolZip()}</strong>
128-
</BodyThreeText>
129123
<TextField
130124
id="uitest-school-zip"
131125
name={fieldNames.schoolZip}
126+
label={i18n.enterYourSchoolZip()}
132127
onChange={e => {
133128
setZip(e.target.value);
134129
}}
@@ -143,13 +138,12 @@ export default function SchoolZipSearch({fieldNames}) {
143138
</label>
144139
{!inputManually && (
145140
<div>
146-
<BodyThreeText className={labelClassName}>
147-
<strong>{i18n.selectYourSchool()}</strong>
148-
</BodyThreeText>
149141
<SimpleDropdown
150142
id="uitest-school-dropdown"
151143
disabled={isSchoolDropdownDisabled}
152144
name={fieldNames.ncesSchoolId}
145+
className={labelClassName}
146+
labelText={i18n.selectYourSchool()}
153147
itemGroups={[
154148
{
155149
label: i18n.schools(),
Collapse file

‎apps/src/templates/school-association.module.scss‎

Copy file name to clipboardExpand all lines: apps/src/templates/school-association.module.scss
+13-8Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
margin-bottom: 0.25rem;
1010
}
1111

12+
p {
13+
margin-bottom: 0.375rem;
14+
}
15+
1216
label {
1317
width: 100%;
1418
margin-bottom: 0;
@@ -18,7 +22,6 @@
1822
width: 100%;
1923
box-sizing: border-box;
2024
height: 46px !important;
21-
margin-top: 0.37rem !important;
2225
text-indent: 0.25rem;
2326
}
2427

@@ -43,19 +46,21 @@
4346
}
4447
}
4548

49+
.headerContainer {
50+
margin-bottom: 1.75rem;
51+
}
52+
4653
.inputContainer {
4754
justify-self: center;
48-
text-align: left;
55+
text-align: start;
4956
width: 400px;
5057
display: flex;
5158
flex-direction: column;
59+
gap: 1.125rem;
60+
}
5261

53-
.padding {
54-
padding-top: 1.125rem;
55-
margin-bottom: 0;
56-
}
57-
58-
.disabledLabel {
62+
.disabledLabel {
63+
span {
5964
color: $light_gray_300 !important;
6065
}
6166
}
Collapse file

‎i18n/locales/ar-SA/hourofcode/activity-guidelines.md‎

Copy file name to clipboardExpand all lines: i18n/locales/ar-SA/hourofcode/activity-guidelines.md
-3Lines changed: 0 additions & 3 deletions
This file was deleted.
Collapse file

‎i18n/locales/az-AZ/hourofcode/activity-guidelines.md‎

Copy file name to clipboardExpand all lines: i18n/locales/az-AZ/hourofcode/activity-guidelines.md
-3Lines changed: 0 additions & 3 deletions
This file was deleted.
Collapse file

‎i18n/locales/bg-BG/hourofcode/activity-guidelines.md‎

Copy file name to clipboardExpand all lines: i18n/locales/bg-BG/hourofcode/activity-guidelines.md
-3Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.