Commit graph

698 commits

Author SHA1 Message Date
Sean Hickey
f54379e0d7 Cleaned up linter errors 2018-05-29 11:07:08 -04:00
Sean Hickey
fd24fbacef Updated asset paths 2018-05-29 11:07:08 -04:00
Sean Hickey
9ef187aada Updated conference pages for 2018 2018-05-29 11:07:07 -04:00
Andrew Sliwinski
244a76149b Resolve lint issues 2018-05-23 09:55:36 -04:00
Andrew Sliwinski
f6a11e1c43 Update default 'opt-in' state for teacher registration 2018-05-23 09:55:27 -04:00
Andrew Sliwinski
585a2e6686
Merge pull request #1891 from thisandagain/hotfix/privacy
[Develop] Hotfix - Update Privacy Policy
2018-05-21 17:15:21 -04:00
Andrew Sliwinski
88e99e655b Resolve lint issues 2018-05-21 17:04:50 -04:00
Andrew Sliwinski
d78d78e1fa Update default 'opt-in' state for teacher registration 2018-05-21 15:55:42 -04:00
Andrew Sliwinski
a302d37eef Remove references to Linux for the Scratch 2.0 offline editor. Resolves GH-1880 2018-05-15 10:19:12 -04:00
chrisgarrity
65e7657680
Merge pull request #1868 from LLK/hotfix/close-conf-reg
[DEVELOP] Close registration when full
2018-04-26 15:00:22 -04:00
chrisgarrity
b8326a3d57
Feature/preview project2 (#1856)
* Add user-session awareness
  - only show remix button if user is logged in (TBD: probably will want to hide if project creator == user)
* decorate text with @mentions and #hashtags
* Add studios, loves, favs
* In-place editing of title and description if current user is author and project shared (with validation)
2018-04-24 11:00:47 -04:00
Ray Schamp
2f8017bb89 Lint 2018-04-02 17:04:54 -04:00
Ray Schamp
a01cb1962e Use empty string for placeholder value
Fixes React warning about using `selected` prop on `select` component options
2018-04-02 15:16:19 -04:00
chrisgarrity
19039a4905 Catch empty phone number 2018-04-02 13:49:45 -04:00
chrisgarrity
730835c4be Fix validation and lint errors
* checkbox needed a default value
* general-error is passed a ref by formsy - cannot be stateless function
* add missing `label` prop to input field
* add missing proptypes to phoneinput.
2018-04-02 12:26:12 -04:00
Ray Schamp
191a95eb76 Resurrect phone input validation 2018-03-30 13:45:42 -04:00
Ray Schamp
41780fb7cb Finish updating react-telephone-input 2018-03-30 12:11:21 -04:00
Ray Schamp
ad81dba61b Finish linting 2018-03-30 11:28:59 -04:00
Ray Schamp
9001e6ba5c Lint 2018-03-30 11:21:41 -04:00
chrisgarrity
7c46f6957a Fix up student registration 2018-03-30 10:51:23 -04:00
chrisgarrity
67f292037a Correcting teacher registration for react16 2018-03-30 10:51:22 -04:00
Ray Schamp
55a45349da WIP - update phone input 2018-03-30 10:51:22 -04:00
chrisgarrity
53ca763646 Add Error Boundary and Crash message
Added all the strings to general l10n as error boundary/crash message applies to all pages.
2018-03-30 10:51:22 -04:00
Ray Schamp
f375130190 Remove unrecognized props from Input
In the process, make Input into a stateless component, since apparently this state isn't ever changed.
2018-03-30 10:49:58 -04:00
Ray Schamp
34f39b1c0b Update to React 16, and dependent packages
The Splash page renders with this commit.
2018-03-30 10:49:58 -04:00
Ray Schamp
61c2bb148a Use country data from an NPM package
To prepare to upgrade react-telephone-input which removed this module
2018-03-30 10:49:58 -04:00
chrisgarrity
b7900aca05
Merge pull request #1833 from chrisgarrity/feature/preview-project
Feature/preview project  - part 1 (elements 'above the fold')
2018-03-21 10:29:01 -04:00
chrisgarrity
1b2050c58a cleanup 2018-03-20 20:19:48 -04:00
Joel Gritter
316a36f1ed Fix gh-1824: Add note about real names (#1830)
* Add note about real names as a new string

Fixes gh-1824
2018-03-16 16:18:17 -04:00
chrisgarrity
1c6b0dd64c Cleanup
Fixing lint problems and removing (most) unused code. I left user and session as they will get used soon even though they aren’t currently.
2018-03-15 17:40:16 -04:00
chrisgarrity
9545e53c98 Close registration when full
Hotfix ready to deploy when conference registration has filled up.
2018-03-15 09:00:49 -04:00
chrisgarrity
f836c6e3a8 Adding in remix metadata
- Moved preview state into redux
- Gets remix credit if the project is a remix
- Shows up to 5 remixes (direct children?)
- handles empty remixes result (it’s not an array)
- Added Column component - based on Grid, but doesn’t use frameless to set width.
- allows trailing ‘/‘ on the URL
- cleaned up conditional content
2018-03-14 15:50:27 -04:00
chrisgarrity
79199d6d32 Placeholders for everything ‘above the fold’ 2018-03-08 15:57:19 -05:00
Kerr Travers
2d98faf160
Update footer.jsx 2018-02-14 16:32:24 +00:00
chrisgarrity
aff3c33817
Merge pull request #1796 from chrisgarrity/hotfix/conf2018-feb5
[DEVELOP] Hotfix Conference page to close session proposals
2018-02-05 08:41:27 -05:00
Linda
358ac9a5b9 fixes #1764/reduce string duplication in teaacher registration (#1791) 2018-02-01 17:25:55 -05:00
Ray Schamp
25a1280cca
Merge pull request #1759 from towerofnix/fix-firefox-focusring
Hide Firefox focus ring on <select> elements (language selector)
2018-02-01 09:29:09 -05:00
chrisgarrity
2989857dbe Update Conference page to close session proposals
Fixes #1782, needs to be hotfixed on Feb 5
2018-01-31 17:14:42 -05:00
Ray Schamp
590f505a61 Revert "Merge pull request #1788 from LLK/revert-1775-hotfix/es6-upgrade"
This reverts commit 1b1b396e92, reversing
changes made to a144bab0e6.
2018-01-30 11:53:12 -05:00
Ray Schamp
46511e1253
Revert "[Develop] Upgrade to ES6" 2018-01-30 09:54:45 -05:00
Ray Schamp
99c1f3f0b8 Avoid adding click event properties to formData
Setting onClick to onNextStep directly caused click event data to be passed in handleAdvanceStep, which then merged it with the formData state in student registration. This caused issues.
2018-01-29 14:00:29 -05:00
Ray Schamp
2df911259d Disable no-multi-comp completely for steps.jsx 2018-01-29 14:00:29 -05:00
chrisgarrity
404dc4b04c Ensure dropdown links are always white
Add state pseudo classes to make the style more ‘specific’
2018-01-29 10:54:32 -05:00
chrisgarrity
4633086bf3 Remove blue outline around modals 2018-01-29 08:56:03 -05:00
Ray Schamp
2a64d61fed Fix registration modal close behavior 2018-01-25 15:01:42 -05:00
Ray Schamp
6036fa79bc Fix homepage row links 2018-01-25 14:48:09 -05:00
Ray Schamp
d5411ca20b Fix dropdown opening 2018-01-23 13:58:09 -05:00
Matthew Taylor
6d1f2fbccd initial es6 commit 2018-01-19 14:06:26 -05:00
Florrie
9e487c8527 Fix CSS rule order 2018-01-12 11:51:11 -04:00
Florrie
ab107f865c Hide Firefox focus ring
See this StackOverflow answer: https://stackoverflow.com/a/18853002/4633828

This isn't a perfect fix - we have to set `color` explicitly, rather
than use `inherit`, because we want the text color to be the same when
the select element is focused. That means both `color` and
`text-shadow`'s color have to be explicitly set to the same thing
(otherwise they might not match). Yay, hacks!
2018-01-05 13:37:06 -04:00
Florrie
870b916db3 Only transition border property
..since it's the only property which actually animates. (The background
image also changes on hover/focus, but that isn't visually effected by
transition, so we ignore it.)

This is for the next commit. Without this, the focus ring slowly
disappears, and the text slowly becomes the color it's meant to be;
neither of those are good.
2018-01-05 13:34:57 -04:00
Matthew Taylor
53acea2112
Merge pull request #1670 from mewtaylor/issue/whats-happening
Implement GH-1628: Use new activity endpoint
2017-12-18 14:59:10 -05:00
chrisgarrity
ec507b73c5
Merge pull request #1654 from chrisgarrity/feature/hoc-2017
Top and middle banners for HoC 2017
2017-12-01 13:22:31 -05:00
Matthew Taylor
bfff01f024 Merge branch 'hotfix/avatar-endpoint' into develop
* hotfix/avatar-endpoint:
  fall back to default image if thumb not found
2017-11-29 08:04:17 -05:00
Matthew Taylor
02da6f62a6 fall back to default image if thumb not found
This incorporates a fallback image into the thumbnail component for all of project, studio and avatar thumbnails using the `onerror` property of img elements (which is supported across all browsers).

/cc @thisandagain @rschamp
2017-11-29 08:03:48 -05:00
Matthew Taylor
ea90dc9309
Merge pull request #1699 from mewtaylor/hotfix/avatar-endpoint
[Develop] Hotfix: Change avatar to use `uploads` endpoint
2017-11-28 15:33:14 -05:00
Matthew Taylor
be7e83db78 Change avatar to use uploads endpoint 2017-11-28 14:01:55 -05:00
Sheshank Shankar
3e52bc7fc5
Make Conference logo button link to homepage. 2017-11-21 16:51:11 -08:00
Sheshank Shankar
4f14dfcbe3 Fixes #1633 - Scratch Conference 2018 Website Phase 1 (#1673)
* add 2018 conference page (new subdirectory and index page)

* Redirect /conference route to 2018, and add new route for /conference/2017 for last year's conferences.

* Update mailto link in the footer
2017-11-21 09:19:37 -05:00
Sheshank Shankar
2ba03708c3 Fixes #1633 - Scratch Conference 2018 Website Phase 1 (#1673)
* add 2018 conference page (new subdirectory and index page)

* Redirect /conference route to 2018, and add new route for /conference/2017 for last year's conferences.

* Update mailto link in the footer
2017-11-20 09:12:12 -05:00
Matthew Taylor
91a0e865ad Use new activity endpoint
This also moves homepage row retrieval into redux to further move towards using redux to handle functionality. This implements #1628.
2017-11-15 12:49:23 -05:00
chrisgarrity
60a2a51bb5 minor formatting changes for consistency 2017-11-08 09:04:33 -05:00
chrisgarrity
4fe3997df4 Top and middle banners for HoC 2017
Css animated top banner

Middle banner of activities - responsive

https://github.com/LLK/scratchr2/issues/4869

Also updated ttt see-more/open- modal link to be consistent with the new icon from Carl.
2017-11-03 16:50:26 -04:00
The_Grits
cfa55d98e8 Fix gh-1588: Localize "it's free!" String (#1594)
* Add it's free string
* Add it's free string into page
* Update presentation.jsx
2017-10-23 11:11:33 -04:00
Matthew Taylor
a1675cbb7d hide overflow on comment component (#1611)
fixes #1568 by imposing a hidden state on overflow text.
2017-10-11 10:09:02 -04:00
Matthew Taylor
426259fbe8 Merge pull request #1542 from mewtaylor/issue/manager-thumbnail-activity
[Develop] Hotfix: use recipient thumbnail, not actor for manager activity
2017-09-13 14:11:50 -04:00
Matthew Taylor
d4b0207bb0 clean up stuff 2017-09-13 13:51:17 -04:00
Matthew Taylor
98cbfd638f use recipient thumbnail, not actor for manager activity
Fixes an issue where the thumbnail mismatches the username presented
2017-09-13 13:47:27 -04:00
Matthew Taylor
16a5208624 Merge pull request #1477 from Petroochio/IS-1195-radio-button-tabbing
Fix issue 1195 registration gender tabbing
2017-09-13 08:26:37 -04:00
Matthew Taylor
057f741f89 highlight unread message row in light blue
This addresses issues with seeing unread notifications by highlighting them as light blue, along with more opaque icons
2017-09-11 09:59:24 -04:00
Matthew Taylor
a90dd6e296 remove debug message 2017-09-09 16:59:39 -04:00
Matthew Taylor
ffa6b7d376 call as anonymous method 2017-09-09 16:55:43 -04:00
Matthew Taylor
7917f15874 fix parentheses around interval 2017-09-09 15:56:01 -04:00
Matthew Taylor
d18fd0064b change width to min-width on icon
fixes #1521 but no idea why **shrug**
2017-09-08 18:09:55 -04:00
Matthew Taylor
9e3823e6e7 add icons to social message notifications 2017-09-08 14:10:46 -04:00
Matthew Taylor
7a3290a2ca show recipient for owner notification 2017-09-07 14:55:48 -04:00
Matthew Taylor
ce88466ee4 tweak formatting for message content
helps with comment formatting
2017-09-06 11:41:26 -04:00
Matthew Taylor
b77e278927 handle logout on messages page (#1503)
Go back to redirecting to splash on logout, and empty messages page too.
2017-09-05 14:31:10 -04:00
Matthew Taylor
e9f54b3fd3 use border-bottom, not top
this fixes an issue with comment bubble displays in firefox
2017-09-05 10:06:27 -04:00
Matthew Taylor
3dd768f2f6 GH-1361: Implement Notifications Page (#1487)
* start work on www page
committing out of paranoia.
including changing splash page endpoints

* updates from feedback

thanks @rschamp! This includes:

1. splitting out messages list into a separate component (for clarity)
2. some comment/formatting adjustments for the api calls
3. removal of an extraneous property in emoji-text

* remove duplicate string declaration

* use object.assign instead of defaults deep

we don’t need deep defaults

* fix react warnings
2017-08-31 17:05:22 -04:00
Peter Gyory
69effaac79 Fix issue 1195 registration gender tabbing
Add focus highlight scss for radio buttons
on demographic registration step
2017-08-21 15:13:49 -06:00
Matthew Taylor
8561385324 Update name for legacy carousel 2017-07-20 13:56:11 -04:00
Matthew Taylor
cb4ca51061 Add new carousel component
1. Moves carousel to `LegacyCarousel` since it currently is designed to handle JSON from proxy endpoints
2. Add separate `Carousel` endpoint to handle data from project models in scratch’s new api, the standard moving forward.
2017-07-20 13:47:14 -04:00
Ray Schamp
84a37a671f Remove SmartyStreets API
We are so lax with this that it's not actually helping us, and we don't have a plan with them anymore.
2017-07-13 10:44:50 -04:00
Matthew Taylor
b22aaa8465 Add /store to footer 2017-06-26 10:35:29 -04:00
Matthew Taylor
c1e5c7cb03 Change help to tips in footer
Fixes #1364
2017-06-23 11:55:43 -04:00
Andrew Sliwinski
124c8e36d7 Update navigation. Resolves GH-1262 (#1285) 2017-06-22 09:40:34 -04:00
chrisgarrity
74e315dc71 Add new Tips page (#1357)
New of tips page, uses cards from new resources server (s3)

* added get-localized-urls script to get the generated json from the s3 bucket
* added /tips route
* correct localized-urls for other pages
* remove thingstotry
* redirect /go
* fix up /info/cards view to use resources (s3).
* redirect /go to /tips
* change /hoc redirect from /go to /tips
* Add full set of cards pdf download to tips localization
* removed cards and guides from static PDFs, they are all coming from resources.scratch.mit.edu now.
* removed things to try view

Corrections for reviews:
* decided to pretty print the localized URLs
* replaced console.errors with process.stdout and fail with exit(1)
* formatted localized-urls to make it easier to read
* moved link outside  `<Button…` makes whole button clickable instead of just text
* fixed up css styles, removed unnecessary classes
* corrected “unused” resource links
2017-06-21 16:20:18 -04:00
Matthew Taylor
cf863fb3d3 point links at /download 2017-06-16 10:14:01 -04:00
The_Grits
f589ed0f4d Update dropdown.scss 2017-05-08 10:10:24 -04:00
The_Grits
8ae401e861 Move mobile rule 2017-05-03 15:58:14 -04:00
The_Grits
83baa2ada6 import frameless 2017-04-26 23:14:50 -04:00
The_Grits
8f827d812a Re-add min-width for mobile 2017-04-26 23:13:24 -04:00
Matthew Taylor
aed3093bc0 Change invalidation to year 2017-04-21 07:51:03 -04:00
Matthew Taylor
f61fe17353 use birthOffset for age validation
Fixes #1278
2017-04-20 16:47:35 -04:00
Matthew Taylor
76c46be17b Merge pull request #1269 from mewtaylor/issue/r2-4470
Fix R2-4470: Only allows birthdays >= 13 yrs old for teacher reg
2017-04-19 16:41:09 -04:00
Matthew Taylor
cd3fb9245a Only apply offset to teachers
thanks @chrisgarrity!
2017-04-14 14:18:32 -04:00
The_Grits
7c9f6f4fad Fix gh-728
Fixes mis-aligned nav-bar dropdown
2017-04-14 06:46:50 -04:00
Matthew Taylor
2c472b607a Only allows birthdays > 13 yrs old for teacher reg
Helps fix https://github.com/LLK/scratchr2/issues/4470 from the UX side of things
2017-04-12 17:41:43 -04:00
The_Grits
bc43e89d36 Remove localization of Scratch Day 2017-03-20 11:05:52 -04:00