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

feat: [UEPR-199] Add parent landing page after confirming ToU #9268

Open
wants to merge 88 commits into
base: ux-integration
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
8fbe282
fix(deps): lock file maintenance
renovate[bot] Feb 9, 2025
b45a5a4
Merge pull request #9215 from scratchfoundation/renovate/lock-file-ma…
renovate[bot] Feb 10, 2025
2c0d0ff
fix(deps): update dependency scratch-l10n to v5.0.120
renovate[bot] Feb 10, 2025
1938b3d
Merge pull request #9217 from scratchfoundation/renovate/scratch-l10n…
renovate[bot] Feb 10, 2025
dc7e1dd
fix(deps): lock file maintenance
renovate[bot] Feb 10, 2025
59f427f
fix(deps): update dependency scratch-l10n to v5.0.121
renovate[bot] Feb 11, 2025
ffe73db
Merge pull request #9218 from scratchfoundation/renovate/scratch-l10n…
renovate[bot] Feb 11, 2025
06b83e1
chore(deps): update babel monorepo to v7.26.8
renovate[bot] Feb 11, 2025
a28dd3a
Merge pull request #9219 from scratchfoundation/renovate/babel-monorepo
renovate[bot] Feb 11, 2025
b405dfd
Merge remote-tracking branch 'origin/develop' into release/2025-02-11
cwillisf Feb 11, 2025
758b921
fix(deps): update dependency scratch-l10n to v5.0.122
renovate[bot] Feb 12, 2025
79e21e6
Merge pull request #9222 from scratchfoundation/renovate/scratch-l10n…
renovate[bot] Feb 12, 2025
6e02ed0
fix(deps): update dependency scratch-l10n to v5.0.123
renovate[bot] Feb 12, 2025
d6c5187
Merge pull request #9223 from scratchfoundation/renovate/scratch-l10n…
renovate[bot] Feb 12, 2025
ce07895
fix(deps): update dependency scratch-storage to ^4.0.49
renovate[bot] Feb 12, 2025
7c8e26c
Merge pull request #9224 from scratchfoundation/renovate/scratch-stor…
renovate[bot] Feb 12, 2025
d9da016
chore(deps): update formatjs monorepo
renovate[bot] Feb 12, 2025
2253cd7
Merge pull request #9225 from scratchfoundation/renovate/formatjs-mon…
renovate[bot] Feb 12, 2025
9fc12c0
fix(deps): update dependency scratch-l10n to v5.0.124
renovate[bot] Feb 13, 2025
cd23d05
Merge pull request #9226 from scratchfoundation/renovate/scratch-l10n…
renovate[bot] Feb 13, 2025
a6eb8c9
Merge pull request #9227 from scratchfoundation/renovate/lock-file-ma…
renovate[bot] Feb 13, 2025
61b23aa
Merge pull request #9221 from scratchfoundation/release/2025-02-11
cwillisf Feb 13, 2025
f030ba3
fix(deps): lock file maintenance
renovate[bot] Feb 13, 2025
bb6a14d
chore(deps): update dependency postcss to v8.5.2
renovate[bot] Feb 13, 2025
6f019b4
Merge pull request #9228 from scratchfoundation/renovate/postcss-8.x
renovate[bot] Feb 14, 2025
5884f2c
fix(deps): update dependency scratch-l10n to v5.0.127
renovate[bot] Feb 14, 2025
74dc0b1
Merge pull request #9229 from scratchfoundation/renovate/scratch-l10n…
renovate[bot] Feb 14, 2025
61cfb3a
Merge pull request #9230 from scratchfoundation/renovate/lock-file-ma…
renovate[bot] Feb 15, 2025
6015df0
fix(deps): update dependency scratch-l10n to v5.0.128
renovate[bot] Feb 15, 2025
ce5c661
Merge pull request #9231 from scratchfoundation/renovate/scratch-l10n…
renovate[bot] Feb 15, 2025
40219f2
fix(deps): update dependency scratch-storage to ^4.0.50
renovate[bot] Feb 15, 2025
42149da
Merge pull request #9232 from scratchfoundation/renovate/scratch-stor…
renovate[bot] Feb 15, 2025
4756885
fix(deps): lock file maintenance
renovate[bot] Feb 15, 2025
a4d5374
fix(deps): update dependency scratch-l10n to v5.0.129
renovate[bot] Feb 16, 2025
9496e23
Merge pull request #9233 from scratchfoundation/renovate/scratch-l10n…
renovate[bot] Feb 16, 2025
b51d0a5
chore(deps): update dependency webpack to v5.98.0
renovate[bot] Feb 16, 2025
b9174aa
Merge pull request #9234 from scratchfoundation/renovate/webpack-5.x
renovate[bot] Feb 17, 2025
0df8fbf
fix(deps): update dependency scratch-l10n to v5.0.130
renovate[bot] Feb 17, 2025
6830a4e
Merge pull request #9235 from scratchfoundation/renovate/scratch-l10n…
renovate[bot] Feb 17, 2025
4a5a03d
chore(deps): update dependency sass to v1.85.0
renovate[bot] Feb 17, 2025
7873f8f
Merge pull request #9236 from scratchfoundation/renovate/sass-1.x
renovate[bot] Feb 17, 2025
9c32066
Merge pull request #9240 from scratchfoundation/ux-integration
MiroslavDionisiev Feb 17, 2025
f6939f1
fix(deps): update dependency scratch-storage to ^4.0.52
renovate[bot] Feb 17, 2025
613a045
Merge remote-tracking branch 'origin/develop' into release/2025-02-17
KManolov3 Feb 17, 2025
49ae1aa
Merge pull request #9238 from scratchfoundation/renovate/scratch-stor…
renovate[bot] Feb 17, 2025
dd0c497
chore(deps): update babel monorepo to v7.26.9
renovate[bot] Feb 17, 2025
390c0f5
Merge pull request #9239 from scratchfoundation/renovate/babel-monorepo
renovate[bot] Feb 17, 2025
4686e35
fix: [UEPR-47] change width of text paragraphs
MiroslavDionisiev Feb 18, 2025
1bb1b54
Merge pull request #9243 from scratchfoundation/fix-width-paragraph
MiroslavDionisiev Feb 18, 2025
9109e4b
fix(deps): update dependency scratch-l10n to v5.0.131
renovate[bot] Feb 18, 2025
e6fb2ed
Merge pull request #9244 from scratchfoundation/renovate/scratch-l10n…
renovate[bot] Feb 18, 2025
1bbfb35
fix(deps): update dependency scratch-storage to ^4.0.53
renovate[bot] Feb 18, 2025
5e7a158
Merge pull request #9245 from scratchfoundation/renovate/scratch-stor…
renovate[bot] Feb 18, 2025
d8ba0d3
Merge pull request #9237 from scratchfoundation/renovate/lock-file-ma…
renovate[bot] Feb 19, 2025
499c614
fix: project name typo and changed images resolution
MiroslavDionisiev Feb 19, 2025
217de64
fix: decrease width of carousels and texts and add missing alt text
MiroslavDionisiev Feb 19, 2025
febff37
fix(deps): update dependency scratch-l10n to v5.0.134
renovate[bot] Feb 19, 2025
acb6c83
Merge pull request #9247 from scratchfoundation/fix-typo
MiroslavDionisiev Feb 19, 2025
88beceb
Merge pull request #9246 from scratchfoundation/renovate/scratch-l10n…
renovate[bot] Feb 19, 2025
48029d1
fix(deps): update dependency scratch-storage to ^4.0.54
renovate[bot] Feb 19, 2025
ef812c5
Merge pull request #9249 from scratchfoundation/renovate/scratch-stor…
renovate[bot] Feb 19, 2025
98616c5
fix(deps): update dependency scratch-storage to ^4.0.55
renovate[bot] Feb 20, 2025
c03de82
Merge pull request #9252 from scratchfoundation/renovate/scratch-stor…
renovate[bot] Feb 20, 2025
382aae6
Merge pull request #9220 from scratchfoundation/release/2025-02-11
cwillisf Feb 20, 2025
c2c9f45
Merge pull request #9241 from scratchfoundation/release/2025-02-17
cwillisf Feb 20, 2025
4368952
fix(deps): update dependency scratch-l10n to v5.0.135
renovate[bot] Feb 21, 2025
9fe9c72
Merge pull request #9254 from scratchfoundation/renovate/scratch-l10n…
renovate[bot] Feb 21, 2025
b0ac8db
fix(deps): lock file maintenance
renovate[bot] Feb 22, 2025
78ba912
Merge pull request #9255 from scratchfoundation/renovate/lock-file-ma…
renovate[bot] Feb 22, 2025
8c5e1c6
fix(deps): update dependency scratch-l10n to v5.0.137
renovate[bot] Feb 22, 2025
ba4711e
Merge pull request #9256 from scratchfoundation/renovate/scratch-l10n…
renovate[bot] Feb 22, 2025
de7136e
chore(deps): update dependency postcss to v8.5.3
renovate[bot] Feb 22, 2025
882ee82
Merge pull request #9257 from scratchfoundation/renovate/postcss-8.x
renovate[bot] Feb 22, 2025
42ad680
chore(deps): update node.js to v18.20.7
renovate[bot] Feb 23, 2025
0ee3304
Merge pull request #9259 from scratchfoundation/renovate/node.js
renovate[bot] Feb 23, 2025
3c26b70
fix(deps): update dependency scratch-l10n to v5.0.138
renovate[bot] Feb 23, 2025
70c9fd0
Merge pull request #9260 from scratchfoundation/renovate/scratch-l10n…
renovate[bot] Feb 23, 2025
beebc71
fix(deps): update dependency scratch-storage to ^4.0.56
renovate[bot] Feb 23, 2025
a70af42
Merge pull request #9261 from scratchfoundation/renovate/scratch-stor…
renovate[bot] Feb 23, 2025
e647776
fix(deps): update dependency scratch-l10n to v5.0.139
renovate[bot] Feb 23, 2025
8a02788
Merge pull request #9262 from scratchfoundation/renovate/scratch-l10n…
renovate[bot] Feb 23, 2025
384dbd7
chore(deps): update dependency selenium-webdriver to v4.29.0
renovate[bot] Feb 23, 2025
d27cc3c
Merge pull request #9263 from scratchfoundation/renovate/selenium-web…
renovate[bot] Feb 23, 2025
c7d58a9
fix(deps): update dependency scratch-storage to ^4.0.57
renovate[bot] Feb 24, 2025
c2f09f1
Merge pull request #9264 from scratchfoundation/renovate/scratch-stor…
renovate[bot] Feb 24, 2025
14ddd83
fix(deps): update dependency scratch-l10n to v5.0.140
renovate[bot] Feb 25, 2025
8272bcc
Merge pull request #9265 from scratchfoundation/renovate/scratch-l10n…
renovate[bot] Feb 25, 2025
bd048f9
feat: [UEPR-199] added terms of use confirmation title
Bogomil-Stoyanov Feb 26, 2025
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
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.20.6
18.20.7
567 changes: 305 additions & 262 deletions package-lock.json

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,22 +58,22 @@
"react-twitter-embed": "3.0.3",
"react-use": "17.6.0",
"scratch-parser": "6.0.0",
"scratch-storage": "^4.0.47"
"scratch-storage": "^4.0.57"
},
"devDependencies": {
"@babel/cli": "7.26.4",
"@babel/core": "7.26.7",
"@babel/eslint-parser": "7.26.5",
"@babel/core": "7.26.9",
"@babel/eslint-parser": "7.26.8",
"@babel/plugin-syntax-dynamic-import": "7.8.3",
"@babel/plugin-transform-async-to-generator": "7.25.9",
"@babel/plugin-transform-object-rest-spread": "7.25.9",
"@babel/preset-env": "7.26.7",
"@babel/preset-env": "7.26.9",
"@babel/preset-react": "7.26.3",
"@formatjs/intl-datetimeformat": "6.17.2",
"@formatjs/intl-datetimeformat": "6.17.3",
"@formatjs/intl-locale": "3.4.6",
"@formatjs/intl-numberformat": "8.15.2",
"@formatjs/intl-pluralrules": "5.4.2",
"@formatjs/intl-relativetimeformat": "11.4.9",
"@formatjs/intl-numberformat": "8.15.3",
"@formatjs/intl-pluralrules": "5.4.3",
"@formatjs/intl-relativetimeformat": "11.4.10",
"@scratch/scratch-gui": "^11.0.0-beta.2",
"@types/jest": "29.5.14",
"async": "3.2.6",
Expand Down Expand Up @@ -124,7 +124,7 @@
"minilog": "2.1.0",
"pako": "0.2.8",
"plotly.js": "1.47.4",
"postcss": "8.5.1",
"postcss": "8.5.3",
"postcss-import": "12.0.1",
"postcss-loader": "4.3.0",
"postcss-simple-vars": "5.0.2",
Expand All @@ -145,17 +145,17 @@
"redux-mock-store": "1.5.5",
"redux-thunk": "2.4.2",
"regenerator-runtime": "0.13.9",
"sass": "1.84.0",
"sass": "1.85.0",
"sass-loader": "10.5.2",
"scratch-l10n": "5.0.119",
"selenium-webdriver": "4.28.1",
"scratch-l10n": "5.0.140",
"selenium-webdriver": "4.29.0",
"slick-carousel": "1.8.1",
"stream-browserify": "3.0.0",
"style-loader": "4.0.0",
"tap": "14.11.0",
"url-loader": "3.0.0",
"use-onclickoutside": "0.4.1",
"webpack": "5.97.1",
"webpack": "5.98.0",
"webpack-bundle-analyzer": "4.10.2",
"webpack-cli": "5.1.4",
"webpack-dev-middleware": "5.3.4",
Expand Down
3 changes: 2 additions & 1 deletion src/views/parents/l10n.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,6 @@
"parents.faqOfflineBody" : "Yes, the Scratch app allows you to create Scratch projects without an internet connection. You can download the {scratchApp} from the Scratch website or the app store on your device.",
"parents.faqScratchApp": "Scratch app",
"parents.faqOffline2LinkText": "Scratch 2.0 offline editor",
"parents.faqOffline14LinkText": "Scratch 1.4 offline editor"
"parents.faqOffline14LinkText": "Scratch 1.4 offline editor",
"parents.agreedNewTermsOfUse": "You have agreed to the new Terms of Use!"
}
21 changes: 16 additions & 5 deletions src/views/parents/parents.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,27 @@ const Landing = () => {
return query.indexOf('from_confirmation=true') >= 0;
}, [window.location.search]);

const isParentAcceptingTermsOfUse = React.useMemo(() => {
const query = window.location.search;

return query.indexOf('from_terms_of_use_confirmation=true') >= 0;
}, [window.location.search]);

let titleId;
if (isParentConfirmingChildEmail) {
titleId = 'parents.emailConfirmedTitle';
} else if (isParentAcceptingTermsOfUse) {
titleId = 'parents.agreedNewTermsOfUse';
} else {
titleId = 'parents.title';
}

return (<div className="parents">
<TitleBanner className="masthead">
<div className="inner">
<h1 className="title-banner-h1">
<FormattedMessage
id={
isParentConfirmingChildEmail ?
'parents.emailConfirmedTitle' :
'parents.title'
}
id={titleId}
/>
</h1>
<FlexRow className="masthead-info">
Expand Down
1 change: 1 addition & 0 deletions src/views/starter-projects/l10n.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@
"starterProjects.surpriseMe": "Surprise me",
"starterProjects.gettingStarted": "Getting Started",
"starterProjects.newToScratch": "New to Scratch? Try the Getting Started tutorial.",
"starterProjects.gettingStartedImageDescription": "An illustrated boy plants his flag on top of a freshly painted mountaintop.",
"starterProjects.tryIt": "Try it!"
}
82 changes: 41 additions & 41 deletions src/views/starter-projects/starter-projects.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/views/starter-projects/starter-projects.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const StarterProjects = () => {
<section className="getting-started">
<img
alt={intl.formatMessage({
id: 'ideas.gettingStartedImageDescription'
id: 'starterProjects.gettingStartedImageDescription'
})}
src="/images/ideas/getting-started-illustration.svg"
/>
Expand Down