Commit graph

775 commits

Author SHA1 Message Date
kyleplo
46e24ac3ef
Fix spacing in message title 2018-08-22 08:15:22 -04:00
Linda
bf5a890a87 added alt attributes to img tags in starter projects component and when using this component on ev3 page 2018-08-21 16:07:27 -04:00
Eric Rosenbaum
7be5857120 Add todo comment 2018-08-21 15:16:07 -04:00
Eric Rosenbaum
0c5de6cea1 Detect mac vs windows 2018-08-21 15:16:07 -04:00
Eric Rosenbaum
287bc8405a Use project id links for starter projects instead of downloads 2018-08-21 15:16:07 -04:00
Eric Rosenbaum
43ee8a6631 Lint 2018-08-21 15:16:07 -04:00
Eric Rosenbaum
83232212ab css for outline around screenshot images 2018-08-21 15:16:07 -04:00
Connor Hudson
b604b19641 Refactor Extension Landing Pages (#2006)
* Add extension-landing generalized styles, install scratch link component

* Make EV3 page use generalized stuff

* Use OS_ENUM file instead of class variable

* use extension-landing/os-enum in os chooser

* Use extension-landing class in extension-landing.scss

* Use extension-landing styles and components on microbit page

* Add view-specific styles

* Move install scratch link l10n strings to src/l10n.json

* Start moving steps display to its own components

* Finish initial pass at Step, Steps components for extension landing pages

* Create ProjectCard component

* Use new components on InstallScratchLInk component

* Use new components on EV3 page

* allow className prop in Steps component

* Use new components on micro:bit landing page

* imageUrl -> imageSrc in ProjectCard

* Create ExtensionHeader component and use it on micro:bit and EV3 pages

* Fix a spacing issue in the InstallScratchLink component

* Add ExtensionRequirements component

* Use ExtensionRequirements component on landing pages

* Remove requirements l10n string for ev3 page

* Move project card styles out of things-to-try section

* Don't render the number row in a step if compact and number props are not set

* Add ExtensionSection component

* Use ExtensionSection on ev3 and microbit pages

* Move state configuration to ExtensionLanding class

* Move tip box, screenshot styles outside of specific section

* Add TipBox component and use it on the EV3 page

* Use hr element instead of section-separator div

* Remove refactor TODO comments :)
2018-08-21 15:13:49 -04:00
Ben Wheeler
2c8990ae7e report project POSTs to scratchr2, displays modal reactively 2018-08-09 12:41:38 -04:00
Benjamin Wheeler
f76ca8b891
Merge pull request #1985 from benjiwheeler/studio-modal-benwheeler
Add To Studio modal on project page. Sorry for merge commit, merges from develop made these un-squashable :(
2018-08-02 17:53:53 -04:00
Connor Hudson
de2691762e
Refactor Extension Landing Pages (#2006)
* Add extension-landing generalized styles, install scratch link component

* Make EV3 page use generalized stuff

* Use OS_ENUM file instead of class variable

* use extension-landing/os-enum in os chooser

* Use extension-landing class in extension-landing.scss

* Use extension-landing styles and components on microbit page

* Add view-specific styles

* Move install scratch link l10n strings to src/l10n.json

* Start moving steps display to its own components

* Finish initial pass at Step, Steps components for extension landing pages

* Create ProjectCard component

* Use new components on InstallScratchLInk component

* Use new components on EV3 page

* allow className prop in Steps component

* Use new components on micro:bit landing page

* imageUrl -> imageSrc in ProjectCard

* Create ExtensionHeader component and use it on micro:bit and EV3 pages

* Fix a spacing issue in the InstallScratchLink component

* Add ExtensionRequirements component

* Use ExtensionRequirements component on landing pages

* Remove requirements l10n string for ev3 page

* Move project card styles out of things-to-try section

* Don't render the number row in a step if compact and number props are not set

* Add ExtensionSection component

* Use ExtensionSection on ev3 and microbit pages

* Move state configuration to ExtensionLanding class

* Move tip box, screenshot styles outside of specific section

* Add TipBox component and use it on the EV3 page

* Use hr element instead of section-separator div

* Remove refactor TODO comments :)
2018-08-02 13:09:55 -04:00
Ben Wheeler
7aa81199ce modal halo 2018-08-01 15:53:53 -04:00
Benjamin Wheeler
08453f9f7c
Merge branch 'develop' into studio-modal-benwheeler 2018-08-01 14:46:33 -04:00
Ben Wheeler
4ce72ce61f consolidated colors per consult with Carl 2018-08-01 14:42:15 -04:00
Ben Wheeler
38f4c6a5c3 rearranged colors; longer studio button names 2018-08-01 11:01:37 -04:00
Ben Wheeler
5fab657fad Merge remote-tracking branch 'origin/develop' into studio-modal-benwheeler 2018-08-01 10:14:09 -04:00
carljbowman
3352f8a7f0 Add missing semicolon 2018-07-31 15:33:34 -04:00
Ben Wheeler
097fb66955 currentStudioIds now an array; reverted a few changes 2018-07-31 15:00:56 -04:00
carljbowman
6a8676ea35 Remove Darken and Ligthen SCSS
Updated all the places in the SCSS where we use Darken and Lighten properties.

These properties have been problematic in the past and caused some state issues, e.g. New message(s) hightlight (which was fixed seperately from this issue)
2018-07-31 14:37:49 -04:00
chrisgarrity
4b3d6b9e9d
Merge pull request #1964 from JoelGritter/JoelGritter-patch-1
Fix gh-1962: Update footer wiki link
2018-07-31 08:08:55 -04:00
Ben Wheeler
7cc2f61a2b compressed svgs; small modal scss reversion 2018-07-25 16:30:50 -04:00
Ben Wheeler
1a4922a262 addtostudio buttons in own component; currentStudioIds redux object; lint fixes 2018-07-25 15:08:12 -04:00
Ben Wheeler
0c6b8607da better approach to tracking which studios the project current belongs to 2018-07-24 11:50:03 -04:00
Ben Wheeler
66c21d8b33 merged docker-compose 2018-07-24 09:29:07 -04:00
Ben Wheeler
ffe5e8cb43 adding distinct object to redux/preview.js state to track studio membership 2018-07-24 09:12:13 -04:00
carljbowman
7de1cb80d6 Fix new message highlight
New messages should now have a blue backgroud (like they did previously).
2018-07-21 09:55:08 -04:00
Ben Wheeler
d1d42f4245 resolved spinner conflict 2018-07-20 21:14:41 -04:00
Ben Wheeler
fc5912526e addtostudio modal interfaces with api add/remove endpoints; waits to close; handles open studios that user does not curate.
addtostudio modal interfaces with api add/remove endpoints; waits to close; handles open studios that user does not curate.
2018-07-20 20:37:36 -04:00
Connor Hudson
5f0016f385
Add landing pages for the micro:bit and EV3 extensions (#1981)
* start building ev3 landing page structure

* Inject translations, add more content and structure to ev3 landing page

* Add ev3 route

* add active styles for os chooser buttons

* Add ev3 assets

* Add content and intial styles for everything down to "Sample Projects"

* Add correct padding to all sections on ev3 page

* Add more margins to match the mockup

* Create os chooser component for reuse on other landing pages

* Make EV3 page stateful, add OS logic, change step styles, fix images on Chrome

* Add sample project cards and styles

* Add fixed ev3 icon svg

* Add app store badges (no href on links yet)

* Add section separator, fix sample project card margins

* Add border to project cards, make project cards clickable links

* Add FAQ boilerplate and styling from InformationPage component

* Add indented ol style, example

* Add link style with underline

* Add EV3 retail link

* Content updates

* Fix some z-index issues with os chooser

* micro:bit page mega-commit

* os chooser should not have a higher z-index than nav

* Update starter projects

* Localize OS chooser

* Add localization configuration for EV3 page

* Localize section titles on ev3 page

* Add starter project images and descriptions

* Add link to microbit.org

* Fix tip box width on microbit and ev3 pages

* add l10n strings up to things to try on ev3 page

* Fix lint error in ev3.scss

* Add download link style to ev3

* microbit getting started text and images

* Remove tip about microbit name

* Hex file and starter project download links

* microbit wording updates

* update images

* Fix issues with download link style

* text fix

* Add ev3 starter project downloads

* Add microbit l10n file and config

* Add l10n strings for microbit header and scratch link sections

* Add l10n strings for microbit page up to faq

* content updates

* Fix some page overflow issues

* microbit faq content and style

* Use zipped version of microbit hex file

* Add platform name to scratch link download button

* Add EV3 faq to l10n.json

* Add final strings from micro:bit and EV3 pages to l10n.json files

* Add white download asset

* Tweak styles for ev3 and microbit

* Add some final tweaks to the EV3 page styles

* Add TODO comments about refactoring duplicate code
2018-07-19 18:08:44 -04:00
carljbowman
ef9b726f63 Replace last remaining HEX colors in _colors.scss
There were a few colors used in the logged-out Welcome message. Replaced them with new 3.0 colors.
2018-07-17 09:26:46 -04:00
carljbowman
201517a32d Remove shadows on buttons
GET OUT OF HERE BOX SHADOWS.
2018-07-16 18:05:10 -04:00
carljbowman
ebd41b169e Update colors to match 3.0 palette
Updates maintain WWW color variable naming conventions, but replaces values with 3.0 colors.

Colors have the commented HEX and GUI variable name.

More work to do auditing but it’s a start.
2018-07-16 18:02:12 -04:00
Ben Wheeler
a59d533a1c merged changes in report modal and add to studio handling 2018-07-16 13:39:29 -04:00
Ben Wheeler
bc7b31e924 finished draft of intermediary refactor of addtostudio modal redux code, container-presentation code simplified 2018-07-13 09:50:17 -04:00
Ben Wheeler
6a32edb2fe addtostudiomodal: incomplete progress on 1. container-presentation refactor, 2. redux handling of add and leave studio requests 2018-07-11 15:08:01 -04:00
Joel Gritter
90ab0f75d0
Update wiki link 2018-07-10 17:29:25 -04:00
Ray Schamp
5844fed2e0 Merge branch 'hotfix/update-conference-2018-3' into develop 2018-07-09 16:34:23 -04:00
Ben Wheeler
9cac70ab18 small steps towards addtostudio modal's container-presentation refactor 2018-07-07 14:09:43 -04:00
Sean Hickey
377eaf0e61 Conference updates - schedule, logos, room locations 2018-07-06 10:17:57 -04:00
Ben Wheeler
d9543314cc small comment 2018-07-05 13:34:41 -04:00
Ben Wheeler
af25e44fc6 refactoring add to studio modal into container and presentation; added getCuratedStudios functionality to preview 2018-07-04 18:01:11 -04:00
Colby Gutierrez-Kraybill
02c45300d6
Merge pull request #1940 from LLK/hotfix/update-conference-2018-2
[DEVELOP] Conference site updates
2018-06-27 12:37:03 -04:00
Ben Wheeler
6989fd4ecf Added SVGs for add to studio modal 2018-06-27 11:38:32 -04:00
Sean Hickey
05fd133f27 Updated LEGO Foundation logo to LEGO Education logo. Removed Thursday dinner from expect page. 2018-06-26 15:04:55 -04:00
Ben Wheeler
ab0ec0f10e simplified addtostudio modal code 2018-06-22 09:19:44 -04:00
Ben Wheeler
6e4cd63e95 spinner logic works, at least with mocked situation and no request or response from server 2018-06-20 23:12:54 -04:00
Ben Wheeler
0a6ec304d3 starting to change addtostudios modal to make changes on the fly 2018-06-20 20:25:46 -04:00
Ben Wheeler
c25bfab7bb improved addtostudio modal variable names 2018-06-20 08:38:16 -04:00
Ben Wheeler
0f819f6a49 addtostudio formatting much closer to design spec 2018-06-20 00:19:52 -04:00
Ben Wheeler
e44b21a712 fixed elusive setState bug in addToStudio modal, by calling setState only when content is confirmed to have changed 2018-06-19 22:43:50 -04:00
Ben Wheeler
b44c8ab60b debugger statements back in, some tiny fixes 2018-06-19 15:43:07 -04:00
Ben Wheeler
e89325889b got gradient overlay working on addtostudio modal 2018-06-19 13:46:17 -04:00
Ben Wheeler
db4e64e4c7 cleaned up debug code, formatting of addtostudio buttons 2018-06-19 12:59:27 -04:00
Ben Wheeler
1b874b748c further debugging addtostudio modal 2018-06-19 11:26:02 -04:00
Ben Wheeler
61dda43b8f further debugging addtostudio modal 2018-06-19 11:07:25 -04:00
Ray Schamp
5740fe8bf8
Merge pull request #1912 from chrisgarrity/feature/preview-restructure
Feature/preview restructure
2018-06-19 10:47:40 -04:00
Ben Wheeler
b18ddeedaf better handling of addtostudio modal scrollbar; attempting to debug its setstate calls 2018-06-19 10:47:17 -04:00
Ben Wheeler
16190f1147 got addtostudio modal state changes to work, though not updating to server yet 2018-06-19 10:13:40 -04:00
Ben Wheeler
bc0a5f64f7 add to studio modal: notes on next steps 2018-06-19 00:14:32 -04:00
Ben Wheeler
e05079a28c mocked my permissioned studios 2018-06-19 00:00:37 -04:00
Ben Wheeler
4c657a1e80 showing actual studio membership, though not unadded studios yet 2018-06-18 23:36:20 -04:00
Ben Wheeler
847e204efc add to studio modal scrollbar formatting works 2018-06-18 19:47:43 -04:00
Ray Schamp
9e02798f7b Lint 2018-06-18 17:19:12 -04:00
Ben Wheeler
f8df3c0146 added royal blue color, button styles, small jsx fixes to Add to Studio modal 2018-06-18 15:17:19 -04:00
Ben Wheeler
9d9226f4a4 got rid of bug keeping page from displaying 2018-06-16 19:28:28 -04:00
Ben Wheeler
f0fbc0a57f add to studio modal appears from project page, looks horrendous 2018-06-16 19:13:50 -04:00
Ray Schamp
4ce05622bc Move report options from state
These never change so don't belong there.
2018-06-14 09:22:00 -04:00
Sean Hickey
8f0b12c2a6 Updated sponsor logos and keynote descriptions 2018-06-13 15:12:50 -04:00
chrisgarrity
74c76fb1cf Refactor report-modal
* addresses comments for https://github.com/LLK/scratch-www/pull/1900
* renames report fields to match scratchr2 expectations
* restyle modal to allow display of validation messages
* removed cruft
2018-06-01 15:25:28 -04:00
chrisgarrity
6872cfc51f FIxing PR #1900 comments
addresses most comments except modal refactor, and error response from sumitting report.
* restore gui as a dev dependency
* better separation of view container/presentation
* replace absolute heights for textareas with making all sub components `display: flex`
* start to make presentation more modular added subcomponents to the view folder:
  * share-banner (moved from components)
  * remix-credit
  * remix-list
  * studio-list
2018-05-31 21:04:11 -04:00
chrisgarrity
285b2dbcff Updated styles 2018-05-31 15:02:45 -04:00
chrisgarrity
db3120091d Fix lint and don’t duplicate the ‘other’ string 2018-05-31 15:02:45 -04:00
chrisgarrity
71dfe690be First pass at correcting project input styles
* Add placeholders to description input text-areas
* fix styling to show box shadow highlight on focus
* adjust height for non-remix project
* fix lint errors
2018-05-31 15:02:45 -04:00
chrisgarrity
08cf4f4f3d Refactor report modal
* move all the report modal presentation into the component
* add strings to general l10n file because we don’t handle l10n files in components
* Add current project id and username to the data before submitting
2018-05-31 15:02:44 -04:00
chrisgarrity
34042c9e8e Report first pass
Report button opens a modal with the report project form. All the content is currently in `preview/presentation` because components cannot have their own l10n files.
2018-05-31 15:02:44 -04:00
chrisgarrity
bd391b422a presentation first pass
First pass at project page design using actual assets from Carl, and matching styles with current design.

Includes a (negative margin) hack to line up the stage. see https://github.com/LLK/scratch-gui/issues/2132
2018-05-31 14:58:23 -04:00
chrisgarrity
81ac8eeef2
Merge pull request #1907 from LLK/hotfix/conference-2018
[DEVELOP]: Hotfix/conference 2018
2018-05-31 14:49:54 -04:00
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