1608 commits

Author	SHA1	Message	Date
Ben Wheeler	7a4925ddba	add join flow country step	2019-08-08 00:29:04 -04:00
Ray Schamp	6275b516fc	Merge pull request #3199 from benjiwheeler/join-flow-country-data ... Consolidate country lists, fix country field in teacher account registration	2019-08-07 15:00:50 -04:00
Ben Wheeler	564baf2ebc	handle error when teacher country selection fails to resolve to country name	2019-08-06 15:00:18 -04:00
Ben Wheeler	51aa38fb34	consolidated country-data and contry-list	2019-08-06 00:00:37 -04:00
Ben Wheeler	aca45d4032	replaced id with name in formik-radio-button	2019-08-03 00:08:18 -04:00
Ben Wheeler	c4d7ba0350	changed naming of user-provided radio input from other to custom	2019-08-03 00:08:18 -04:00
Ben Wheeler	8725cee6a1	replaced gender l10n strings with existing ones	2019-08-03 00:08:18 -04:00
Ben Wheeler	a2b96e9bac	fixed linting errors	2019-08-03 00:08:18 -04:00
Ben Wheeler	0be2f463c3	removed unnecessary validation code	2019-08-03 00:08:18 -04:00
Ben Wheeler	29ea00ab3c	correct proptype	2019-08-03 00:08:18 -04:00
Ben Wheeler	150201f8d0	add padding to top of gender step	2019-08-03 00:08:18 -04:00
Ben Wheeler	b7b65ec3ee	remove formik input inline prop	2019-08-03 00:08:18 -04:00
Ben Wheeler	40c90e2d2e	formik input can be made to appear inline	2019-08-03 00:08:18 -04:00
Ben Wheeler	bd83a282c5	gender step handles other option	2019-08-03 00:08:18 -04:00
Ben Wheeler	cf42b8b3a1	formik input accepts classname from radio option other	2019-08-03 00:08:17 -04:00
Ben Wheeler	26ab2b1366	validate gender step by defaulting to prefer not to say	2019-08-03 00:08:17 -04:00
Ben Wheeler	e22a848350	add GenderOption component to handle most gender radio options	2019-08-03 00:08:17 -04:00
Ben Wheeler	5de681fd68	remove header image and set height of overall gender step	2019-08-03 00:08:17 -04:00
Ben Wheeler	d70df3c91a	add gender step to join flow sequence	2019-08-03 00:07:11 -04:00
Ben Wheeler	9e2a3eb3e3	add gender step draft, formik radio button draft	2019-08-03 00:07:11 -04:00
Benjamin Wheeler	56ce60fe86	Merge pull request #3207 from benjiwheeler/join-flow-welcome-text ... add instructions text to join flow welcome step	2019-08-03 00:06:00 -04:00
Ben Wheeler	16dd9e0b76	format next button, use correct strings	2019-08-01 22:27:47 -04:00
Ben Wheeler	bef6063373	add instructions text to join flow welcome step	2019-08-01 16:27:54 -04:00
Ray Schamp	1da17e4035	Merge pull request #3192 from LLK/hotfix/registration-recaptcha ... [Develop] Adjust height when displaying reCAPTCHA challenge	2019-07-31 09:03:25 -04:00
Ben Wheeler	db3c73c267	removed errant birth_month and birth_year variables	2019-07-30 14:21:19 -04:00
Ben Wheeler	a435626ae1	added stubs for email step, welcome step	2019-07-29 22:29:04 -04:00
Ben Wheeler	651807438a	better validation positioning on birthdate step	2019-07-29 16:32:20 -04:00
Benjamin Wheeler	4d5232bec5	Merge pull request #3179 from benjiwheeler/join-flow-missing-strings ... added missing strings to join flow	2019-07-29 16:25:34 -04:00
Ray Schamp	fe15a89486	Adjust height when displaying reCAPTCHA challenge	2019-07-29 12:03:59 -04:00
Benjamin Wheeler	986707ccf8	Merge pull request #3180 from benjiwheeler/join-flow-design-tweaks ... Join flow design tweaks	2019-07-29 10:09:09 -04:00
Ben Wheeler	1cd0713bb9	added missing strings to join flow	2019-07-26 22:10:21 -04:00
Ben Wheeler	e5b80bb8c3	better line spacing for join flow descriptions	2019-07-26 13:39:33 -04:00
Benjamin Wheeler	0ac7cc7ab0	Merge pull request #3136 from benjiwheeler/fix-add-to-studio-height ... fix add-to-studio modal height, gradient interference	2019-07-23 12:14:27 -04:00
Ben Wheeler	1e9b9a537d	correct select padding	2019-07-23 12:09:10 -04:00
Ben Wheeler	77780bd94c	whitespace fixes for linting	2019-07-22 21:24:37 -04:00
Ben Wheeler	1757f28a5e	add missing props declarations	2019-07-22 21:24:37 -04:00
Ben Wheeler	87c1bc5858	add noopener noreferrer to fix lint errors	2019-07-22 21:24:37 -04:00
Ben Wheeler	740f1fb466	split join-flow-steps into separate files; simplify birth year options	2019-07-18 21:18:34 -04:00
Ben Wheeler	e33d7dd0ee	Simplify birth month option generation	2019-07-18 21:18:34 -04:00
Ben Wheeler	55e7ada760	validate birthdate	2019-07-18 21:18:34 -04:00
Ben Wheeler	9539afd0e2	add birthdate header image	2019-07-18 21:18:33 -04:00
Ben Wheeler	d6c34f83ae	add birthdate month and year header labels, initial vals	2019-07-18 21:18:33 -04:00
Ben Wheeler	71baf3e802	birthdate month and year layout	2019-07-18 21:18:33 -04:00
Ben Wheeler	39fd6b07ea	added draft of birth date step; localize birth month string	2019-07-18 21:18:33 -04:00
Ben Wheeler	c8800d8663	After rebasing on develop, reintroduce changes	2019-07-17 12:58:50 -04:00
Ben Wheeler	faa37ae270	rename row-relative to row-with-tooltip	2019-07-17 12:52:42 -04:00
Ben Wheeler	911ecc8516	Format validation; redo of PR 3116	2019-07-17 12:52:42 -04:00
Benjamin Wheeler	62f30c7a8b	Merge pull request #3138 from benjiwheeler/join-flow-improve-css ... Improve formatting of join flow title, description, next step button	2019-07-17 00:02:05 -04:00
Ben Wheeler	681e7d9a74	move next step font size to next-step-button.scss	2019-07-17 00:00:31 -04:00
Ben Wheeler	a85ad87028	Improve formatting of join flow title, description, next step button	2019-07-15 17:29:09 -04:00
Ben Wheeler	27cb6199b5	use padding rather than margin to avoid margin collapse; drop overflow clear approach	2019-07-15 16:07:39 -04:00
Ben Wheeler	2773495878	Format join flow using ModalTitle, ModalInnerContent, NextStepButton components	2019-07-15 09:58:41 -04:00
Ben Wheeler	862bc8000f	fix add-to-studio modal height, gradient interference	2019-07-15 06:27:13 -04:00
Ben Wheeler	9084fb8bfd	use existing select css	2019-07-12 14:43:22 -04:00
Ben Wheeler	658cb1d61e	specify PropTypes format of formik-select options	2019-07-12 13:32:21 -04:00
Ben Wheeler	3d0da891a9	introduce formik select component	2019-07-12 12:47:02 -04:00
Benjamin Wheeler	07419526cd	Merge pull request #3119 from benjiwheeler/join-flow-advance-step ... handle join flow state for tracking, advancing current step	2019-07-12 11:42:57 -04:00
Ben Wheeler	a1ed49084f	add ModalInnerContent component, use it in modals	2019-07-11 16:10:33 -04:00
Benjamin Wheeler	86261ec1ef	Revert "add ModalInnerContent component, use it in modals"	2019-07-11 11:06:02 -04:00
Benjamin Wheeler	5214eeda6e	Revert "Format and position validation error messages in join flow"	2019-07-11 10:54:17 -04:00
Ben Wheeler	dd7a57d866	handle join flow state for tracking, advancing current step	2019-07-10 21:49:04 -04:00
Ben Wheeler	d4c59522bd	comment explaining row relative style for validations	2019-07-10 13:57:52 -04:00
Ben Wheeler	c85214815b	position/format validations in join flow	2019-07-10 13:56:04 -04:00
Ben Wheeler	ed5ff981c1	Support for formatting and positioning validation error messages	2019-07-10 13:48:31 -04:00
Ben Wheeler	171d5854ff	prevent modal-inner-content margins from unexpectedly collapsing with parent	2019-07-09 23:50:11 -04:00
Ben Wheeler	3a685e38fb	add ModalInnerContent component, use it in modals	2019-07-09 22:20:59 -04:00
Ben Wheeler	57d9ab6511	Add classname prop to modal title	2019-07-09 19:42:16 -04:00
Ben Wheeler	f02d41f8b5	created ModalTitle component	2019-07-08 17:42:05 -04:00
Benjamin Wheeler	30a17719c6	Merge pull request #3086 from benjiwheeler/simplify-join-flow-step ... use html form instead of formik form	2019-07-08 11:49:05 -04:00
Ben Wheeler	a0618b5b4c	removed unused css classname, added TODO re: 'hide username' text	2019-07-08 11:47:14 -04:00
Ben Wheeler	b044e973ac	simplified export of join flow step	2019-07-02 17:53:10 -04:00
Ben Wheeler	585340d289	removed commented out code from join flow steps	2019-07-02 17:37:56 -04:00
Ben Wheeler	f6d1ba3194	WIP moving join flow validation functions to library	2019-07-02 17:27:44 -04:00
Ben Wheeler	7ecbe905f5	cleared up props passed in and out of username step	2019-06-26 14:44:20 -04:00
Ben Wheeler	15ddd0e86c	working username step of join flow	2019-06-26 14:44:20 -04:00
Ben Wheeler	469e9a2626	use html form instead of formik form	2019-06-26 13:50:01 -04:00
Benjamin Wheeler	a445c0ccc1	Merge pull request #3081 from benjiwheeler/fix-formik-validation-message ... fix passing text to validation message	2019-06-26 11:36:25 -04:00
Ben Wheeler	42721a3d6f	fix passing text to validation message	2019-06-25 18:14:09 -04:00
Ben Wheeler	2fbaf4af8e	moved join-flow-steps to join flow dir	2019-06-25 17:41:12 -04:00
Benjamin Wheeler	b12694fc12	Merge pull request #3077 from benjiwheeler/join-flow-step ... introduce join-flow-step, next-step-button	2019-06-25 17:15:03 -04:00
Benjamin Wheeler	249d2b2525	Merge pull request #3076 from benjiwheeler/join-flow-formik-input ... added initial formik input component, form validation message component	2019-06-25 17:13:51 -04:00
Ben Wheeler	c6fc3621d4	added initial formik input component, form validation message component	2019-06-25 17:06:57 -04:00
Ben Wheeler	3ecefebeb4	introduce join-flow-step, next-step-button	2019-06-25 17:03:35 -04:00
Ben Wheeler	a5bb0bddc3	Rename ExampleStep as UsernameStep, clean up props	2019-06-25 09:40:35 -04:00
Ben Wheeler	69164a5f53	added formik dependency, join flow steps using it	2019-06-24 13:35:01 -04:00
Benjamin Wheeler	c09fd1d5bc	Merge pull request #3074 from benjiwheeler/add-join-flow-component ... stub for join-flow component within modal	2019-06-24 13:23:31 -04:00
Ben Wheeler	0b69eef56d	removed unnecessary redux connect	2019-06-24 11:36:18 -04:00
Ben Wheeler	0468c19665	stub for join-flow component within modal	2019-06-24 11:31:16 -04:00
Ben Wheeler	037f1c66d7	Moved validation message css from card to own file	2019-06-24 11:23:32 -04:00
Ben Wheeler	3375d6d3d5	introduced stub components for new scratch3 join modal	2019-06-18 16:50:27 -04:00
Ben Wheeler	f6cb3d5078	make search urls consistent ... in search urls: * use %20 for spaces everywhere * encode search term strings * hide ‘q’ key if it has no value	2019-05-10 22:58:33 -04:00
Benjamin Wheeler	d97f5b9d7a	Merge pull request #2924 from benjiwheeler/embed-modal ... Embed/social sharing modal	2019-05-08 14:53:19 -04:00
Ben Wheeler	4ef73525c4	Revised modal title to Copy Link, use orig icon	2019-05-08 14:36:00 -04:00
Ben Wheeler	73944a34e4	removed unused css for embed modal	2019-05-07 10:54:21 -04:00
Ben Wheeler	4ae4d4232a	removed social images and links	2019-05-07 10:54:01 -04:00
Ben Wheeler	6a3110e24e	moved and renamed linkUrl to keep url generation in one place	2019-05-06 18:49:57 -04:00
Ben Wheeler	d5e2ed69ad	refined colors	2019-05-06 16:22:41 -04:00
Ben Wheeler	08f8e1c546	simplified embed modal to remove social links	2019-05-02 17:18:13 -04:00
Eric Rosenbaum	513bbb43cd	Fix headline icon size and position	2019-04-30 15:56:20 -04:00
Ben Wheeler	433aabc1c2	cleaned up comments	2019-04-26 14:03:55 -04:00
Ben Wheeler	2289584bbf	got copied result text working, closing in on final design	2019-04-24 15:09:39 -04:00
Ben Wheeler	67e7a54413	renamed externalShare to social	2019-04-24 12:09:44 -04:00
Ben Wheeler	63baada567	added social icons and links	2019-04-23 17:11:27 -04:00
Ben Wheeler	5d12f0f781	put social links section, copy project link button inside social share modal	2019-04-22 22:36:26 -04:00
Ben Wheeler	1e63b51565	first take on embed modal	2019-04-22 14:50:49 -04:00
Ben Wheeler	9587de480c	first attempt at external share modal	2019-04-18 11:29:00 -04:00
Benjamin Wheeler	32484656ba	Merge pull request #2805 from apple502j/patch-12 ... Add SiP Link	2019-03-26 16:16:41 -04:00
Ben Wheeler	dd3b777763	moved educators SiP from 3-icon section to standalone sub-banner	2019-03-21 09:23:59 -04:00
Ben Wheeler	2a4e076339	corrected mail list form; links use _blank; redirect conference url; logo links to main site	2019-02-28 10:44:30 -05:00
Ben Wheeler	42844a8927	made more conferences 2019 related strings translatable	2019-02-27 16:58:13 -05:00
Ben Wheeler	6668e6d840	updated text and icons per feedback from scratch foundation	2019-02-25 17:22:30 -05:00
Ben Wheeler	42f2486e1c	improved 2019 conference responsiveness, improved calendar icon	2019-02-25 13:49:08 -05:00
Ben Wheeler	f33b96d6bf	new title image for conference page, new calendar icon	2019-02-20 18:13:07 -05:00
Ben Wheeler	3179f7e59d	use solid icons, not outlines ones, on 2019 conference page	2019-02-19 16:26:30 -05:00
Ben Wheeler	9509e698cb	initial conference 2019 changes	2019-02-15 12:11:14 -05:00
Benjamin Wheeler	16ca2d7319	Merge pull request #2739 from chrisgarrity/issue/2309-wide-translations ... Wrap ‘need help?’ link when translation is too long	2019-02-05 09:43:15 -05:00
chrisgarrity	56d2a90bf2	Wrap ‘need help’ link when translation is too long ... Refactored the submit row of the login component to use Flex Row instead of `float: right` for the `need help` link. The bulk of the changes are white space, so remember to ignore whitespace for review.	2019-02-05 13:00:41 +01:00
Ben Wheeler	7aa1ba6c42	use slider toggle for turning comments on and off	2019-02-01 17:03:43 -05:00
chrisgarrity	3c661660c8	Make www modal z-index consitent with gui ... The gui uses z-indices up to 500 for things that should be covered by a modal and sets the modal to 510. www should match gui.	2019-01-30 11:50:07 +01:00
Ben Wheeler	a8d4184b3f	renamed frameless.js tablet var to mobileIntermediate, use tabletPortrait for breaks	2019-01-29 10:35:19 -05:00
Ben Wheeler	be975cba26	using tabletPortrait instead of changing value of tablet var, per chrisg's suggestion	2019-01-28 22:36:39 -05:00
Benjamin Wheeler	4d3e46e40b	Revert "Revert "Add to studio modal should only show studios user can actually change""	2019-01-22 17:07:52 -05:00
Benjamin Wheeler	5ddb7660f6	Revert "Add to studio modal should only show studios user can actually change"	2019-01-17 11:22:00 -05:00
Ben Wheeler	ab82d37720	only show studios user can manipulate in add to studio modal ... Refactored studio list consolidation code for add to studio; set canAdd, canRemove flags directly on each studio. pass flag userOwnsProject through to add to studio modal and its buttons. pass flag isAdmin through to add to studio and its buttons. set flags in add to studio buttons for whether user has permission to add project to studio, remove project from studio. Set user ability/inability to click add to studio buttons using permissions flags and css	2019-01-16 13:49:54 -05:00
apple502j	d8a0a90e92	Change Credits URL - Footer	2019-01-15 14:49:45 +09:00
apple502j	8e4124f093	Wear helmet on 404 to set title	2019-01-08 13:51:18 +09:00
kyleplo	7cfad7b075	switch to more common options	2019-01-03 09:23:06 -05:00
kyleplo	c7f3ac00e9	Fix font in add to studio modal	2019-01-03 08:30:46 -05:00
Paul Kaplan	0f4b20d5f6	Merge pull request #2530 from colbygk/integrate-sentry-webpack ... Use sentry webpack instead of Raven	2018-12-20 15:36:46 -05:00
Paul Kaplan	95658d06b8	Fix indentation for linting	2018-12-20 13:38:22 -05:00
chrisgarrity	54ae001e72	Merge pull request #2480 from chrisgarrity/issue/consistent-languages ... Make list of languages on www consistent with gui	2018-12-20 13:28:19 -05:00
Colby Gutierrez-Kraybill	6a946b99fc	Update to new sentry API pattern ... Use current Sentry browser package and forward errorId into eventId Fix up errorInfo reference Put Sentry on the window object for GUI to use Remove unneeded reference to old style Raven and raven-js Move Sentry webpack config into production only Add GA tracker ID to window Allows scratch-gui to use same GA id	2018-12-20 12:56:33 -05:00
Benjamin Wheeler	3c8cf1a6fc	Merge pull request #2526 from chrisgarrity/feature/2319-masthead ... Implement new Intro masthead	2018-12-20 11:35:39 -05:00
chrisgarrity	496fdad8be	New 3.0 Masthead ... * intro component was changed for new banner masthead layout * added new video component for embedding wistia (based on extension video, we should probably figure out consolidating the two) * new and updated strings in splash/l10n.json * updated splash presentation to move Intro above `inner` to allow it to be full width (like banners) * new assets	2018-12-20 07:32:03 -05:00
Paul Kaplan	8af12ec0e1	Show error ID and report React errors to Sentry	2018-12-19 13:47:17 -05:00
chrisgarrity	94a8396713	Make list of languages on www consistent with gui ... start to depend on `scratch-l10n` So far only the supported locales is used. There is one small difference between scratch-l10n and the `languages.json` that was removed. languages was: `{locale: ‘languagename’, …}` key value pairs. l10n exports: `{locale: {name: ‘languagename’},…} That required an additional change to the language chooser.	2018-12-13 16:00:41 -05:00
Eric Rosenbaum	e170a9cd4a	Merge pull request #2455 from ericrosenbaum/feature/ideas-page ... Ideas page	2018-12-13 13:58:55 -05:00
Paul Kaplan	cac7c2ff49	Merge pull request #2457 from paulkaplan/scroll-studios ... Fix scrollbars for add-to-studio modal	2018-12-13 11:41:59 -05:00
Eric Rosenbaum	7aecb1185d	Fix tile layout	2018-12-13 11:13:15 -05:00
Eric Rosenbaum	646624a07f	Clicking modal img also opens tutorial	2018-12-13 10:22:47 -05:00
Eric Rosenbaum	600830acc5	Fixing links	2018-12-12 15:57:27 -05:00
Paul Kaplan	1aafd28b0c	Fix scrollbars for add-to-studio modal	2018-12-12 15:14:13 -05:00
Eric Rosenbaum	43e7ec6ebf	css lint and cleanup	2018-12-12 15:05:36 -05:00
Eric Rosenbaum	8a06137284	Remove unused require	2018-12-12 14:25:25 -05:00
Eric Rosenbaum	20e3812380	First pass at complete layout	2018-12-12 14:17:39 -05:00
Paul Kaplan	bc99c52ebe	Fix hard-coded /preview/id url for remix list.	2018-12-11 14:46:05 -05:00
Eric Rosenbaum	7212436f3b	Update nav from “tips” to “ideas”	2018-12-10 18:17:05 -05:00
Eric Rosenbaum	8e6af59635	Initial draft of ideas page	2018-12-10 18:06:07 -05:00
Ray Schamp	1979675ebf	Don't occlude page content with the admin panel ... /ht @paulkaplan for the idea to move it below the nav bar.	2018-12-07 13:15:38 -05:00
Ray Schamp	af32c08971	Merge pull request #2413 from rschamp/mod-panel-phase-3 ... Match scratchr2 admin panel behavior more closely	2018-12-06 15:47:48 -05:00
Ray Schamp	b7ffa34eec	Open and close admin panel from parent component	2018-12-06 15:05:20 -05:00
Eric Rosenbaum	b49854300b	Merge pull request #2405 from ericrosenbaum/feature/landing-pg-vids ... Add videos to WeDo and EV3 landing pages	2018-12-06 10:38:19 -05:00
Eric Rosenbaum	c371a3757f	Maybe this is the correct order for CSS properties	2018-12-06 09:43:30 -05:00
Ray Schamp	8e75b8c6cf	Merge pull request #2404 from rschamp/mod-panel-phase-1 ... Admin panel for the project page	2018-12-06 09:33:02 -05:00
Eric Rosenbaum	8c6013b243	Add extension video component to wedo and ev3 pages	2018-12-05 17:25:07 -05:00
Ray Schamp	096aeb02a0	Lint	2018-12-05 16:09:04 -05:00
Ray Schamp	726a2005bb	Basic project admin panel support ... Just in case we don't do anything else, this "proxies" the old admin panel to the new project page. Requires https://github.com/LLK/scratchr2/pull/5219 to work.	2018-12-05 15:40:18 -05:00
Eric Rosenbaum	d206b44abe	Add video player to wedo page	2018-12-05 10:48:46 -05:00
Eric Rosenbaum	3c24bf236b	Adjust header layout	2018-12-04 14:58:16 -05:00
Eric Rosenbaum	e9c2e8f13f	Lint	2018-12-03 17:58:51 -05:00
Eric Rosenbaum	421aabadc1	Update version requirements	2018-12-03 15:29:25 -05:00
Ray Schamp	df3d18e649	Revert "Revert "use cdn.scratch.ly in staging""	2018-11-21 10:27:13 -05:00
Ray Schamp	45415944c1	Revert "use cdn.scratch.ly in staging"	2018-11-21 10:07:57 -05:00
Eric Rosenbaum	bfc36e25f9	Merge pull request #2329 from ericrosenbaum/feature/get-link-from-app-stores ... App store badges for Link download	2018-11-20 13:17:18 -05:00
Ben Wheeler	7ee463509c	use cdn.scratch.ly in staging	2018-11-19 17:07:48 -05:00
Eric Rosenbaum	f77357daf2	Update mac and windows app store links	2018-11-19 15:59:37 -05:00
Eric Rosenbaum	8efb6045ee	Lint	2018-11-19 15:22:18 -05:00
Eric Rosenbaum	9ee3c9eb6c	App store badges for Link download	2018-11-19 13:51:29 -05:00
chrisgarrity	13b3e57381	open getting started tutorial for logged out users ... - `create` on the navbar opens the getting started tutorial if the user is not logged in - replaced any other use of `tip_bar=getStarted` with `tutorial=getStarted` (with the exception of Tips page) - did not replace other uses of `tip_bar=home` as those should probably go to the new tips/ideas page.	2018-11-12 12:58:59 -05:00
MasterOfTheTiger	12aeba90ed	Use https for ScratchJR links	2018-11-09 09:17:04 -08:00
Paul Kaplan	315c8b78fc	Add "project not available" view for when project body cannot be loaded ... This happens when the project id does not exist, or is not visible to the given user.	2018-11-07 16:32:12 -05:00
Paul Kaplan	f4887008a5	Extract strings for localizing the preview page	2018-10-23 11:38:34 -04:00
Paul Kaplan	8acbf05b1a	Merge pull request #2211 from paulkaplan/fix-studio-modal ... Connect the consolidated studio data directly	2018-10-19 10:44:32 -04:00
chrisgarrity	b0a5f7feff	Merge pull request #2183 from sehgalvibhor/character-fix ... Japanese Character Fix	2018-10-19 09:12:53 -04:00
Paul Kaplan	35abd285df	Connect the consolidated studio data directly ... To the modal to prevent constantly updating. Also only render the modals if they are visible	2018-10-18 16:45:24 -04:00
sjgllghr	6d8235c7e8	Fix gh-2156: Use variables for media queries for consistency (#2182) ... * use variables for media queries * add medium-and-intermediate media query variable	2018-10-16 13:28:41 -04:00
Benjamin Wheeler	9106a14340	made account menu have min-width, changed max-width to rem from px (#2181)	2018-10-15 16:00:47 -04:00
Vibhor Sehgal	1ae8180aa4	Fix Select Menu in Messages Section (#2179) ... * Fix width for Select in Message Section * Removed extra CSS property * Removed Margin property; Not required * Fix for the CI test	2018-10-15 06:48:29 -04:00
Vibhor Sehgal	d9018185e7	Japanese Character Fix	2018-10-14 13:28:48 +05:30
Benjamin Wheeler	d5343dfb01	fix ReactModal bodyOpenClassName error so that it is entirely omitted, rather than passing null value (#2176)	2018-10-11 16:58:30 -04:00
Paul Kaplan	1f8342b987	Merge pull request #2164 from paulkaplan/comment-report-delete ... Comment report action and modal flow for deleting	2018-10-11 11:08:07 -04:00
Benjamin Wheeler	8b222f0466	fix base modal prop passed to ReactModal (#2165)	2018-10-10 14:08:59 -04:00
Paul Kaplan	bdde34ba26	Implement report action with modal flow	2018-10-09 11:38:24 -04:00
chrisgarrity	32aa3e66d4	Merge pull request #2153 from LiFaytheGoblin/2133/move-media-queries-to-frameless ... Move media queries used in responsive project page to frameless	2018-10-09 10:56:11 -04:00
Paul Kaplan	744c90501e	Add comments to projects and replies to comments	2018-10-09 09:36:41 -04:00
Linda	d358c45482	media queries used in responsive project page have been moved to frameless.css	2018-10-05 10:25:56 -04:00
Linda	437334b872	resolve merging conflicts	2018-10-03 10:54:53 -04:00
Linda	8009978c06	fixed linting errors	2018-10-03 10:09:44 -04:00
Linda	6f5b5c3278	extract css for new components and make some fixes to validation in report modal	2018-10-03 10:09:44 -04:00
Linda	06bb9c60c4	fixed problem where sometimes there would be two scrollbars	2018-10-02 15:33:15 -04:00
Linda	b03bd51f79	fixed linting error	2018-10-02 13:57:41 -04:00
Linda	7c8fdbfcc3	fixed height of studio buttons scrolling container to fill all modal	2018-10-02 13:49:56 -04:00
Linda	3010db684d	Merge pull request #2116 from LiFaytheGoblin/responsive-project-page/thumbnailcolumns ... Thumbnailcolumns appear at bottom on mobile	2018-09-28 13:57:24 -04:00
Ray Schamp	5278e77e0c	Merge pull request #2098 from chen-robert/gh1930-teacher-register-year ... Fix gh-1930: Teacher registration dates	2018-09-28 10:58:26 -04:00
Linda	4299afaec5	fixes to warning and thumbnailcolumns for mobile WIP	2018-09-26 14:35:36 -04:00
Linda	35194803b4	fixed linting errors	2018-09-25 16:06:46 -04:00
Linda	a5d2ee18ef	fixed validation message for modals	2018-09-25 15:58:10 -04:00
Linda	d061e2afe9	improve responsiveness for project page modals and also clean up the modals a bit	2018-09-25 15:40:27 -04:00
Linda	55cdeea04d	wip refactored and responsive project page modals	2018-09-25 15:37:52 -04:00
Benjamin Wheeler	935eb0b15f	move login/registration functions and view state to session reducer, pass to gui (#2078) ... * move login/registration functions and view state to session reducer, pass to gui * navigation reducer handles login; gui passed renderLogin function * put back in join class to make smoke tests keep working	2018-09-24 11:04:30 -04:00
Robert Chen	86551baa94	Fixed Issue 1930	2018-09-20 22:15:24 -07:00
Linda	42f0ed16e5	Merge pull request #2073 from LiFaytheGoblin/2005/animate-add-to-studio-buttons ... Animate add-to-studio-buttons on preview project page	2018-09-14 12:28:44 -04:00
Linda	497aae2a3c	convention fixes	2018-09-13 11:04:14 -04:00
Linda	c54b7413bc	replaced old spinner with new svg to work everywhere where spinner is used	2018-09-12 14:54:15 -04:00
Linda	1cee3c68fc	removed some leftovers	2018-09-11 17:18:09 -04:00
Linda	a8ebdb7d32	Merge pull request #2046 from LiFaytheGoblin/2045/project-page/studio-thumbnails ... Fix appearance of studio thumbnails on preview project page	2018-09-11 10:10:21 -04:00
Linda	7313f26530	fixed linting errors	2018-09-07 16:45:17 -04:00
Linda	b582b31491	added comments and improved spin animation a little	2018-09-07 16:19:49 -04:00
Linda	ab4f8a09ce	the animation now works	2018-09-07 16:11:37 -04:00
Linda	ed604a21d4	add studio buttons animation on preview page, need fixing	2018-09-07 09:26:11 -04:00
Ben Wheeler	4bf0964bf2	moved dispatched navigation function calls to mapDispatchToProps	2018-09-05 17:52:03 -04:00
Benjamin Wheeler	3c6530fe85	Merge pull request #2022 from benjiwheeler/account-nav-component ... split account nav into its own component, pass logout callback to GUI	2018-09-05 13:32:45 -04:00
Ben Wheeler	f9003077a3	use account-nav class, not account-nav id	2018-09-04 17:15:52 -04:00
Linda	3863e9c5bf	remove unnecessary comments	2018-08-28 16:50:34 -04:00
Linda	a1721abc46	Merge pull request #2042 from LiFaytheGoblin/2038/add-to-studio-dialog-entries-cursor ... 2038/add to studio dialog entries cursor	2018-08-28 17:41:44 -03:00
Linda	c52eb610b4	Merge pull request #2041 from LiFaytheGoblin/1991/accessibility-extension-landing ... 1991/accessibility extension landing	2018-08-28 17:37:51 -03:00
Ray Schamp	e6ea1e301d	Merge pull request #2037 from LiFaytheGoblin/2016/add-to-studio-dialog-clip-studio-name ... 2016/add to studio dialog clip studio name	2018-08-28 16:08:29 -04:00
Ben Wheeler	733134c421	pass through logout callback to GUI	2018-08-27 18:56:27 -04:00
Linda	10aa57e4a2	fixed ordering and so in css	2018-08-24 09:25:04 -04:00
Linda	d95ee37c04	now you can see the full title of something when hovering over the title which might be cut off	2018-08-24 09:09:17 -04:00
Linda	79e80aea54	improved remix and studio row	2018-08-24 09:05:08 -04:00
Linda	ba919062f3	changed look of studio thumbnails	2018-08-24 08:41:37 -04:00
Ben Wheeler	796ad7b152	split account nav into its own component	2018-08-23 14:10:55 -04:00
Linda	50242a3bb1	added pointer cursor style to the buttons that add or remove a project to or from a studio	2018-08-23 11:32:18 -04:00
Linda	f934b9bc7e	fixed some intendation	2018-08-23 11:18:12 -04:00
Linda	641e9895f6	updated from develop with new extension landing pages	2018-08-22 18:05:57 -04:00
Linda	56d9ac2af9	resolve travis errors caused by wrong ordering of css stuff	2018-08-22 16:48:07 -04:00
Eric Rosenbaum	78b32597c5	Merge branch 'develop' into hotfix/extension-landing-pages	2018-08-22 16:28:52 -04:00
Linda	68c7616a25	remove now obsolete truncate library	2018-08-22 15:10:19 -04:00
Linda	a7c279fab5	cut of studio name on studio adding dialog using css and not using the library for that anymore, also displays full title as a title of the div	2018-08-22 15:05:21 -04:00
Linda	253d6ac279	style fix	2018-08-22 13:32:23 -04:00
Linda	9a91fa9b0a	h2 in header is now h1, including overwritten styles	2018-08-22 10:45:19 -04:00
Linda	c26dc79b8d	add alt tags to remaining images and correct some	2018-08-22 10:21:28 -04:00
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
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
Matthew Taylor	0bb60700ba	Merge pull request #1244 from mewtaylor/issue/opt-in ... [Develop] Hotfix: re-add checkbox to opt-in to email list for teacher	2017-03-15 10:15:16 -04:00
Matthew Taylor	63c6bf59f2	Merge pull request #1149 from mewtaylor/issue/r2-4092 ... For R2-4092: Add checkbox to opt-in to teacher emails	2017-03-15 10:08:35 -04:00
The_Grits	86b5e462c6	Between, not Around	2017-03-06 16:34:21 -05:00
Matthew Taylor	8d2a43530e	Merge pull request #1205 from TheGrits/patch-2 ... Fix gh-1183: Remove slashes	2017-03-06 10:11:43 -05:00
The_Grits	82af7786a0	Put back some slashes	2017-02-28 09:38:43 -05:00
Matthew Taylor	eb56b27a88	Update otherDisabled check ... Fall out from #1217. We should likely change the way this is set up, it seems not ideal. But not sure the best way atm.	2017-02-23 10:57:27 -05:00
Matthew Taylor	f59774bd0d	Don’t localize an empty string	2017-02-23 09:52:33 -05:00
Matthew Taylor	7a2e7cc949	Some additional tweaks for conference 2017 ... 1. Updates svgs for formatting 2. Makes the font size of the title smaller Fixes #1211, 5-6 in #1206	2017-02-23 09:39:57 -05:00
The_Grits	b75fb7debe	Remove slashes	2017-02-22 11:14:12 -05:00
Matthew Taylor	dd940235cd	Add language chooser to conf footer ... thanks @jwzimmer!	2017-02-22 10:31:40 -05:00
Matthew Taylor	1b0de13d63	Merge pull request #1192 from mewtaylor/issue/conference-fixes ... Bugfix: Some copy fixes for new conference page	2017-02-22 09:25:56 -05:00
Matthew Taylor	b139f0a606	Additional conference fixes ... 1. border on flags 2. `Conferences` in nav 3. mailto for costa rica	2017-02-22 08:03:16 -05:00
Ray Schamp	d6093f19b0	Fix React key warnings ... The number of warnings was locking up my browser, making it hard to test things out.	2017-02-20 11:04:41 -05:00
Matthew Taylor	06ebc88287	Change footer for 2017 ... Take out sponsors	2017-02-17 13:13:03 -05:00
Matthew Taylor	4e65e34275	Merge pull request #1184 from mewtaylor/issue/gh-1086 ... Conference 2017: add new landing page, and archive old site	2017-02-16 07:56:21 -05:00
Matthew Taylor	8b772737a3	Add 2017 conference site	2017-02-15 08:35:10 -05:00
Matthew Taylor	67a39e4870	Archive 2016 site ... move to a subfolder, do some css shuffling and add some trello style guide stylings to help scope for also adding 2017	2017-02-15 08:34:46 -05:00
Ray Schamp	05adcde88d	URI-encode search string on form submit ... This prevents the search form from setting an invalid URL. Resolves #1153	2017-02-10 18:51:42 -05:00
Ray Schamp	22802f87e8	Merge pull request #1160 from TheGrits/patch-3 ... Fix gh-1159: Add 2017 to Teacher Registration	2017-02-01 12:44:23 -05:00
Matthew Taylor	ca0985571e	Revert "Merge pull request #1149 from mewtaylor/issue/r2-4092" ... This reverts commit 8e82398255, reversing changes made to e1a0e9fece.	2017-01-31 11:38:50 -05:00
Matthew Taylor	6363a16b47	Merge pull request #1151 from mewtaylor/issue/r2-4219 ... For r2-4451: Change password reset anchor text	2017-01-20 07:49:34 -05:00
Matthew Taylor	b2c32c465a	Merge pull request #1138 from mewtaylor/issue/gh-1097 ... Fix GH-1097: Don’t validate username server side unless it passes client-side checks	2017-01-20 07:48:49 -05:00
Matthew Taylor	8e82398255	Merge pull request #1149 from mewtaylor/issue/r2-4092 ... For R2-4092: Add checkbox to opt-in to teacher emails	2017-01-19 18:37:11 -05:00
chrisgarrity	e1a0e9fece	Fix GH 1102: Don’t allow duplicate strings in a single l10n file (#1150) ... * Don’t allow duplicate strings in a single l10n file Added check_duplicate_strings to test for duplicates in a single file. removed duplicates - tried to keep the more generic ‘key’ * revised test case for safer file reads	2017-01-19 18:23:56 -05:00
Matthew Taylor	e1665c2b34	Change password reset anchor text ... This is part of https://github.com/LLK/scratchr2/pull/4451	2017-01-19 11:12:54 -05:00
Matthew Taylor	313f267cfe	Add checkbox to opt-in to teacher emails	2017-01-17 15:57:15 -05:00
Matthew Taylor	6c589e1dc7	remove test ref ... whoopsie :)	2016-12-28 10:03:11 -05:00
Matthew Taylor	5da9514f4d	Don’t validate username server side if error ... Fixes #1097 by not making the server-side username validation call if the client side validations have failed. This is not the ideal way to do this, since it’s getting the input from an array. However, to make this different would require significant refactor.	2016-12-28 09:54:46 -05:00
morantsur	e95caef368	Merge branch 'develop' into microworlds_projects	2016-12-20 13:02:46 -05:00
morant	012321721c	Remove isRequired from description and onGuideClick, and fix naming on l10n strings.	2016-12-20 12:58:16 -05:00
morant	485d3903e0	- Fix routes ... - move functions to inline rendering in ttt-tile and mw homepage	2016-12-20 12:06:58 -05:00
Matthew Taylor	ccd6713ef1	get formatMessage from props ... Fixes #1125. I had fixed this last iteration, not sure how it got re-introduced.	2016-12-18 22:08:17 -05:00
morant	7bbb498a4f	- Stop using ttt cscc files, and remove all references to ttt that are not needed. ... - Update translation strings that are specific to microworlds to have microworlds as prefix. - Address other comments	2016-12-16 12:18:16 -05:00
morant	e3025ea3e9	Added a microworlds homepage, based on the ttt page, at /microworlds/go. ... Changed ttt-tile to only show “see guides…” if they exist.	2016-12-15 16:59:48 -05:00
Matthew Taylor	0111278fa5	Update id string for general error message strings ... Fixes #1112, which was created by moving the error message into `general`	2016-12-15 15:32:40 -05:00
Matthew Taylor	ba50840809	only apply right margin to radio input ... fixes #1101. I wanted to apply a custom class to the input, however that is unfortunately obscured and unreachable with our current implementation of `formsy-react-components`	2016-12-13 12:11:24 -05:00
Matthew Taylor	cbd983baf8	Merge pull request #932 from TheGrits/patch-3 ... Fix gh-678: Retain Search Term	2016-12-12 22:52:38 -05:00
The_Grits	0b2c1fff1a	Squish	2016-12-12 16:01:06 -05:00
Matthew Taylor	11828d2d44	Merge pull request #1099 from mewtaylor/issue/gh-966 ... Fix GH-966: Localize default “required” message	2016-12-08 09:35:57 -05:00
Matthew Taylor	9ae4e5a963	Move validationRequired into general ... thanks @rschamp!	2016-12-07 17:24:48 -05:00
Matthew Taylor	6be9fc1084	Localize default “required” message ... Fixes #966. I was trying, if possible, to not introduce localization at the component level in order to keep it in the views – but that seemed a bit too involved given that the fix in this way is only a few lines long.	2016-12-06 11:36:24 -05:00
Matthew Taylor	afa25dc1c2	Move other input to be the label for the button ... thanks @rschamp! Never would’ve thought label would accept html.	2016-12-05 14:05:27 -05:00
Matthew Taylor	cc0496619d	use width for radio buttons, not margin ... This fixes #962 – the margin was causing flex to overflow the radio buttons when the text was long, causing the male and other options to render on top of each other. This fixes that by giving the radio buttons a fixed with relative to the parent container, and by ensuring that languages with long localizations will still be visible in overflow text.	2016-12-05 12:53:04 -05:00
Matthew Taylor	2e7336ff55	Merge branch 'feature/gh-981' into release/hoc-nov-21 ... * feature/gh-981: Add hoc banner Move padding to splash element trello-ize title banner h1,p styling # Conflicts: # src/components/title-banner/title-banner.scss # src/views/hoc/hoc.jsx	2016-11-23 11:17:47 -05:00
Matthew Taylor	0c9f2561f9	Merge branch 'release/hoc-2016-1' into release/2.2.15 ... * release/hoc-2016-1: Merge pull request #1027 from TheGrits/patch-7 Additional content changes Fix TTT content Redirect hoc page to `/go` Merge pull request #1037 from chrisgarrity/patch-column-count update ttt content Update ttt content Merge pull request #1006 from chrisgarrity/feature/gh979-tttpage Merge pull request #1018 from mewtaylor/issue/gh-995 Merge pull request #1008 from mewtaylor/issue/gh-980 Update pattern so rewrite accepts querystring too # Conflicts: # src/components/modal/ttt/modal.jsx # src/views/jobs/jobs.jsx # src/views/thingstotry/l10n.json	2016-11-21 15:01:53 -05:00
chrisgarrity	58656aea17	Additional content changes ... - new FlyCards.pdf (fixes shortcut url on title page) - changes ‘download’ to ‘open’ for PDFs	2016-11-21 11:06:12 -05:00
chrisgarrity	bb777baf4c	Fix TTT content ... ttt.subtitle: - ‘try theTutorial’ instead of ‘try a Tutorial’ - Hide and Seek instead of Hide-and-Seek Game - change <b> to <strong> title-banner.scss - add explicit rule to bold <strong> within title-banner for windows browsers	2016-11-21 11:06:02 -05:00
chrisgarrity	b58163c420	Merge pull request #1037 from chrisgarrity/patch-column-count ... fix column count for IE and Edge	2016-11-18 17:42:20 -05:00
Matthew Taylor	b7bfaec438	Merge pull request #1006 from chrisgarrity/feature/gh979-tttpage ... Fix gh-979: TTT page	2016-11-18 17:41:58 -05:00
Matthew Taylor	9ca54e83ce	Merge pull request #1008 from mewtaylor/issue/gh-980 ... Implement GH-980: add new TTT modal component	2016-11-18 17:41:26 -05:00
chrisgarrity	0ab62689ce	fix column count for IE and Edge ... Set column-count for all widths since it’s needed for Firefox, IE and Edge browsers	2016-11-18 17:08:23 -05:00
Matthew Taylor	c4f42b3673	Add hoc banner	2016-11-16 08:52:18 -05:00
Matthew Taylor	e65ba61e7a	Move padding to splash element ... Having it in the nav was causing issues with positioning the banner, as evidenced by the teacher banner’s `-20px` setting	2016-11-16 08:51:57 -05:00
Matthew Taylor	fe70dd0f9e	trello-ize title banner h1,p styling ... we need it to be different for the hoc banner, so make it need a class name in order to be styled correctly	2016-11-16 08:50:00 -05:00
chrisgarrity	a27fea51e6	Integrated ttt-modal ... integrated modal and added guide pdfs. Catch and Pet Guides are still missing. We may need to remove them from the TTT list. Wanted to get this committed in any case to start review.	2016-11-14 14:34:45 -05:00
chrisgarrity	5854e9ccc9	Adding data for tutorials/guides/cards	2016-11-14 10:31:40 -05:00
Matthew Taylor	1b95e643a9	fix for linting	2016-11-14 10:31:40 -05:00
Matthew Taylor	d72a605e69	Last tweaks ... thanks @rschamp!	2016-11-14 10:31:40 -05:00
Matthew Taylor	688ab935d1	Some last tweaks ... based on feedback from @rschamp, thanks! 1. make `ref` into method 2. remove accidental inclusion of prototype modal 3. use `omit` for props so that we don’t need a separate object for wrapped component properties	2016-11-14 10:31:40 -05:00
Matthew Taylor	438dbb21e1	Edits based on feedback ... thanks @rschamp !	2016-11-14 10:31:40 -05:00
Matthew Taylor	fa380a7148	edit copy/paste error ... Thanks @chrisgarrity !	2016-11-14 10:31:40 -05:00
Matthew Taylor	95b6d6bd5c	Update microworld iframe modal	2016-11-14 10:31:40 -05:00
Matthew Taylor	484e3d2544	Add ttt modal component ... This assumes that the parent view that renders it will contain the strings that are specific to the ttt element.	2016-11-14 10:31:40 -05:00
Matthew Taylor	b1e37360f3	Refactor modal components ... 1. Split out base modal stylings from iframe modal stylings 2. Move iframe-specific stylings into a separate copmonent 3. Move width/height iframe stylings to scss 4. Change global stylings for modals to match #980 5. Update styles to use trello style guide	2016-11-14 10:31:40 -05:00
chrisgarrity	145da5f872	Styling and formatting clean up pass ... Went over styles with Carl. Some notes: renamed tutorial button tutorial tag as it’s not really a button and is unique to ttt. Found out why cols4 wasn’t working - if your browser default font isn’t 16px, rem isn’t 16px. Opening a separate issue and using cols4 where it should be.	2016-11-09 21:25:35 -05:00
chrisgarrity	ca7d0cf30e	Next draft ... Includes new SVGs for banner and resources link MasonryGrid does the reordering of items Using react-responsive MediaQuery to change columns Brought in ../forms/button.scss for button styling, and then modified for TTT Still needs Modal Final styling pass with Carl	2016-11-09 09:28:59 -05:00
chrisgarrity	c6f2fa68a7	First version of TTT page	2016-11-07 15:07:19 -05:00
The_Grits	21941ecf86	Phone Number 'Required' Validation	2016-11-04 11:51:48 -04:00
The_Grits	8be3e11486	Travis and Other Stuffs	2016-10-31 10:19:35 -04:00
The_Grits	10e49d87b3	Empty Phone Number Validation ... Separated the null check from the area code check so that when the field is null the 'required' popup will be displayed.	2016-10-26 14:15:54 -04:00
chrisgarrity	29b104741f	Added tests for duplicate strings in build-locales merge ... Also took out default messages for strings that are in the l10n json files.	2016-10-12 09:41:06 -04:00
Matthew Taylor	99cedec978	Put label for “Not Required” above input ... Fixes #933	2016-09-30 15:02:05 -04:00
Matthew Taylor	bd911c52d1	Merge pull request #867 from morantsur/feature/microworlds ... Adding routes to microworlds	2016-09-12 12:06:27 -04:00
Matthew Taylor	2e3aee25d9	cover undefined case as well ... thanks @rschamp!	2016-09-01 16:22:45 -04:00
Matthew Taylor	ffa249c3c5	Check for username before sending ... the `//` for an empty username that gets sent to the backend causes a 500 error. This is an edge case in formsy, as it has not detected a change value yet, so handle it in the username validation method. Fixes #872	2016-09-01 14:59:02 -04:00
Matthew Taylor	e7b0415a6b	Only require zip code for US addresses ... Since we only check for the US, only require for that country. Other countries have zip codes, but it seems better to do it this way than codify which countries do/do not have zip codes (in case local practices are not the same as international information). Fixes #825	2016-08-26 11:14:26 -04:00
Matthew Taylor	5dd80c1020	additional reformatting	2016-08-24 10:55:13 -04:00
Matthew Taylor	fb5d9788f8	Re-structure grid styling a bit ... combine stylings where possible, re-name some of the variables to be used more often	2016-08-24 10:24:01 -04:00
Matthew Taylor	28f96a1d0d	Align grid items on the left ... use `flex-start` with margins to ensure proper spacing between, while still starting at the left of each row.	2016-08-24 10:23:26 -04:00
Technoboy10	f0703b9f46	fix styling error	2016-08-23 09:26:22 -06:00
Technoboy10	55f95bb2a8	remove inactive class on tabs	2016-08-23 09:26:22 -06:00
Technoboy10	f27e99f1a4	move card styling to grid.scss, use card as default grid style	2016-08-23 09:26:22 -06:00
Technoboy10	017df9da20	redo tabs component	2016-08-23 09:26:21 -06:00
Technoboy10	3fa6fa95fd	add card display to grid and thumbnail components	2016-08-23 09:26:21 -06:00
Technoboy10	55163d2c86	more work on user avatar in thumbnail	2016-08-23 09:26:21 -06:00
Technoboy10	432b621079	wip	2016-08-23 09:24:44 -06:00
Technoboy10	f883ecfbae	commit changes	2016-08-23 09:24:44 -06:00
morant	28aa4f0b2c	Fixing microword pages and adding routes to them. ... - Remove temp "open in Scratch" button, now that we have a permanent one. - Fix microworld pages to work with new changes to environment. - Fix alignment issues. - Connect routes to microworld pages. - Add soccer microworld. - Comment out videos and tips from arts microworls, so it can be shown publicly.	2016-08-22 13:31:44 -04:00
Matthew Taylor	70eb82f7cb	remove .card-specific stylings	2016-08-19 15:16:35 -04:00
Matthew Taylor	baf0676f99	move .validation-message out` ... It doesn’t need to be specifically styled, as we have no use for it inside `.card` but outside `.row` yet. Thanks @rschamp!	2016-08-19 15:06:12 -04:00
Matthew Taylor	bc0263531b	align gender/org input msg with others ... Because the `input` field is already to the right, they were being transformed too far over. This overrides the transform to be correct, and also scopes some css in more detail	2016-08-19 14:11:24 -04:00
Matthew Taylor	41a0ef73ba	Add missing strings for translation ... 1. Explore page header 2. “by” in the project thumbnail	2016-08-16 08:55:32 -04:00
Matthew Taylor	b893c5c657	Merge pull request #845 from mewtaylor/issue/new-languages ... Add fur, sq and te to language list	2016-08-16 08:45:28 -04:00
Matthew Taylor	54e9980808	Merge pull request #847 from mewtaylor/issue/gh-835 ... For GH-835: eliminate max height of validation messsage	2016-08-16 08:14:09 -04:00
Matthew Taylor	bb37d4be57	eliminate max height of validation messsage ... now that it’s not centered but rather top/down, we don’t need this anymore	2016-08-16 08:08:48 -04:00
Matthew Taylor	f3de2d1d28	re-order languages ... and also get language for dropdown from `IntlProvider` rather than the window, so that we have one point of truth	2016-08-15 14:53:31 -04:00
Matthew Taylor	59d558116e	Merge pull request #836 from mewtaylor/issue/gh-760 ... Fix GH-760: Add username `not equals` to password validation	2016-08-15 13:29:46 -04:00
Matthew Taylor	e791c0a8ff	Merge branch 'issue/gh-835' of https://github.com/mewtaylor/scratch-www-1 into develop ... * 'issue/gh-835' of https://github.com/mewtaylor/scratch-www-1: Switch ordering Remove `option` warning in console Add `maxLength` validations where needed # Conflicts: # src/components/registration/steps.jsx	2016-08-12 17:23:32 -04:00
Matthew Taylor	61ef3c2c69	Switch ordering ... so `intl` comes first	2016-08-12 16:43:56 -04:00
Matthew Taylor	0d9493de12	Remove option warning in console ... `option` throws an error in React if it’s not a string. `FormattedMessage` returns a `span` around strings, so any time this function was loaded/called, it was throwing >100 warnings in the console. use `intl` to return a string instead.	2016-08-12 15:47:44 -04:00
Matthew Taylor	6d5bb4f850	Add maxLength validations where needed ... fixes #835	2016-08-12 15:39:39 -04:00
Matthew Taylor	f8de61f067	Update from feedback ... use props for username rather than constructed form data, and `studentUsername -> username`. Thanks @rschamp!	2016-08-12 10:11:14 -04:00
Matthew Taylor	cbf76ec636	Clean up a few lint warnings	2016-08-12 08:10:42 -04:00
Matthew Taylor	537104c56b	Add username validation to student complete registration ... Fixes #760	2016-08-12 08:10:20 -04:00
Matthew Taylor	6e3a18a574	only look for empty phone on submit ... thanks @rschamp!	2016-08-10 09:45:21 -04:00
Matthew Taylor	56e88685b5	Check for empty phone number on submit ... Thanks @rschamp!	2016-08-10 09:38:43 -04:00
Matthew Taylor	30945bc078	Remove phoneLength validation	2016-08-10 07:53:49 -04:00
Matthew Taylor	56481c797e	Remove phoneLength validation ... It appears that some valid phone numbers in some countries differ in length from what is specified in the util’s phone number format. Fixes #816.	2016-08-10 07:47:12 -04:00
Connor Hudson	f49d6e6a83	Merge pull request #767 from technoboy10/mobile-nav-footer ... Fix GH-217: Implement responsive nav and footer (woohoo!)	2016-08-09 15:09:01 -04:00
Technoboy10	c009497b6b	use scss in navbar instead of react-responsive	2016-08-09 09:55:20 -04:00
Matthew Taylor	f3c4276d0f	Merge pull request #814 from St19Galla/patch-1 ... Fix GH-812 / Enhance Checkbox Display	2016-08-08 10:20:09 -04:00
Matthew Taylor	606e3600ba	Merge pull request #803 from mewtaylor/issue/gh-683 ... Fix GH-[683,705,712,797]: Updates to registration UX for teachers	2016-08-08 08:10:24 -04:00
St19_Galla	a7ea6d7fd9	whoops, don't need that anymore	2016-08-05 15:51:48 -04:00
St19_Galla	ef55f20ff3	now i finally understand scss variables	2016-08-05 15:50:51 -04:00
St19_Galla	3ff81296a7	test	2016-08-05 15:43:15 -04:00
St19_Galla	dd85de22e6	Enhance Checkbox Display	2016-08-05 15:24:33 -04:00
Matthew Taylor	73fbc36ff9	declare callback if undefined	2016-08-03 16:24:51 -04:00
Matthew Taylor	86662e13d6	Consolidate and remove onValidSubmit	2016-08-03 15:20:58 -04:00
Matthew Taylor	4e568f7c06	use minLength instead ... it’s the same thing :). Thanks @rschamp!	2016-08-03 14:34:07 -04:00
Matthew Taylor	cec3214def	some updates from feedback ... thanks @rschamp! 1. moved org type validation to a custom validation 2. added a callback to the username validation call	2016-08-03 12:11:55 -04:00
Technoboy10	fdfbf57e28	fix file location	2016-08-02 16:50:40 -04:00
Technoboy10	c19c32ded3	fix merge conflicts from upstream/develop	2016-08-02 16:50:23 -04:00
Technoboy10	ed924e3b2c	add space back in	2016-08-02 15:30:01 -04:00
Matthew Taylor	f0c2280fde	Updates to registration UX for teachers ... 1. Phone too long validation occurs before submit now. 2. Organization “other” type is now being required 3. Organization type required now shows up at the same time as other organization validation errors 4. Username check now occurs earlier, on blur rather than on submit	2016-08-02 15:23:09 -04:00
Ray Schamp	0e6a7e6fdc	Merge pull request #794 from rschamp/hotfix/activate-teacher-registration ... [Develop] Add "Request Account" button to Educators landing page	2016-08-02 10:55:43 -04:00
Technoboy10	63c67a1d2d	use frameless.js for carousel breakpoints	2016-08-02 09:17:13 -04:00
Ray Schamp	025958fc24	Add align prop to SubNavigation component	2016-08-01 12:18:25 -04:00
Matthew Taylor	4909d509d2	remove ie fallback to mobile styling ... it looks like @rschamp’s wodnerful `top` alignment fix for Chrome and Edge also helps here, from a test I did in IE11.	2016-07-28 15:46:56 -04:00
Matthew Taylor	d97bc193df	Remove unnecessary redefinitions ... These are already defined in the base, and are not overridden anywhere. Only redefine the things that were overridden.	2016-07-28 15:11:14 -04:00
Matthew Taylor	2c9df3237e	Fix gender input error alignment in IE11 ... Also re-apply the arrow styling on the organization checkbox group, since it appears to be aligned correctly.	2016-07-28 14:10:36 -04:00
Ray Schamp	e218cc5169	Move "select country" to general strings ... It's reused in the other registration views so doesn't belong in teacherregistration/l10n.json Fixes #783	2016-07-28 12:26:56 -04:00
Matthew Taylor	9e9ffc96e9	Merge pull request #779 from mewtaylor/issue/gh-773 ... Fix GH-[772,773]: Fix “afterschool” typo, default country and margin for username	2016-07-28 10:52:55 -04:00
Ray Schamp	7e8fddef18	Don't use a static width for inputs ... Fixes #769	2016-07-28 10:39:18 -04:00
Matthew Taylor	40fb433d7d	Make country choice a function that’s called ... And also default the country in address to the country in demographics. Thanks @rschamp @carljbowman!	2016-07-28 09:56:01 -04:00
Matthew Taylor	2650e6e148	Move countryOptions to the global scope ... thanks @rschamp!	2016-07-28 08:30:29 -04:00
Matthew Taylor	cf4a057278	Fix “afterschool” typo ... Also make default country selectable in the user demographic step, and fix the spacing with `Create a Username`	2016-07-27 23:33:45 -04:00
Ray Schamp	668f141457	Merge pull request #778 from rschamp/bugfix/chrome-52 ... Set common y-origin for validation bubbles	2016-07-27 20:17:32 -04:00
Ray Schamp	ecbbeb5612	Set common y-origin for validation bubbles ... I believe this will keep the misalignment from happening across browsers. Sets the top left corner to the top left corner of the input block. Resolves #770	2016-07-27 20:15:53 -04:00
Ray Schamp	19d67dc0b4	Resurrect old invite step design for new users	2016-07-27 19:32:08 -04:00
Technoboy10	2da07923ca	revert verbiage change as per IRL discussion with Carl	2016-07-27 15:49:48 -04:00
Ray Schamp	89071b10d0	Lint	2016-07-27 14:12:55 -04:00
Ray Schamp	d1f73c3ef4	Redesign invite step, add option to log out ... Resolves #752	2016-07-27 10:24:37 -04:00
Technoboy10	5e7bf85733	remove redundant media query from footer.scss	2016-07-27 09:48:07 -04:00
Matthew Taylor	806fd25e46	Move to the view ... thanks @rschamp!	2016-07-26 17:03:41 -04:00
Matthew Taylor	60a62bb374	Redirect to /educators/classes if a confirmed teacher ... Fixes #757. Note: Because we are getting this info from the session, the redirect may not happen until the page is rendered first in cases where the connection is slow, or the db is slow.	2016-07-26 15:24:51 -04:00
Matthew Taylor	e87a2bce76	remove trailing whitespace	2016-07-26 11:24:51 -04:00
Technoboy10	a8b26b1a1c	experiment with removing content display from scss	2016-07-26 11:06:21 -04:00
Matthew Taylor	69ac5b60bd	make .no-label an auto assignment ... thanks @rschamp!	2016-07-26 10:44:19 -04:00
Matthew Taylor	b510d154df	remove ‘noformsy` option on inputs	2016-07-26 10:20:06 -04:00
Matthew Taylor	6787ae03ce	Apply classes to row, not textarea ... And move help rendering into the phone input row.	2016-07-26 08:06:38 -04:00
Matthew Taylor	d8e07ee7f6	use rowClassName instead ... so that it can include `label`. Also add some default styling to `label` in `.row`. Thanks @rschamp!	2016-07-25 15:43:44 -04:00
Matthew Taylor	263d292b3c	Fix formatting for a few form elements ... and make use of the FRC `elementWrapperClassName`, since they way we did it before – custom `className` strings on the element – was not working. Fixes #749.	2016-07-25 13:21:28 -04:00
Technoboy10	daf803d4a3	experiment with the react-responsive library	2016-07-25 10:53:57 -04:00
Technoboy10	808922b50d	pass layout to navbar and footer	2016-07-22 14:57:05 -04:00
Technoboy10	391344489d	footer mobile	2016-07-22 14:56:14 -04:00
Technoboy10	5b9cef8dd6	navbar mobile	2016-07-22 14:55:56 -04:00
Ray Schamp	7455807591	Provide RegistrationError content as children ... This allows us to do more inline formatting, so we don't have any of that outside of `render`. Thanks @mewtaylor	2016-07-22 09:38:37 -04:00
Ray Schamp	be41d004ad	Show password by default	2016-07-21 21:08:07 -04:00
Ray Schamp	3335207c54	Update copy for password step	2016-07-21 21:08:07 -04:00
Ray Schamp	a4dd1611d1	Add student registration update view	2016-07-21 21:08:06 -04:00
Ray Schamp	7a6e5c3eb4	Fix student registration localization ... Add missing strings, actually translate the content of the steps	2016-07-21 21:08:06 -04:00
Ray Schamp	8dae646ff3	Style tweaks	2016-07-21 20:44:51 -04:00
Ray Schamp	b06a9e49d0	Fix wording on student username step	2016-07-21 20:44:51 -04:00
Ray Schamp	9aa7e828b7	Remove "blank" classroom, show spinner instead ... It was broken due to a key error on `classroom.images` anyway	2016-07-21 20:44:51 -04:00
Technoboy10	b88b8c83b1	redo responsive nav	2016-07-21 10:12:16 -04:00
Technoboy10	3bbc17bb35	moved ie targeting to steps.scss	2016-07-20 17:29:34 -04:00
Technoboy10	22dc55c030	change verbiage, begin work on responsive nav/footer	2016-07-20 16:53:50 -04:00
Ray Schamp	754859f35f	Update image format for API change ... Removed default `image` field convention	2016-07-20 13:47:43 -04:00
Ray Schamp	a3b56dcbf1	Fix lint errors, l10n issues	2016-07-20 12:07:19 -04:00
Technoboy10	4e6efae667	Remove IE weird input additions, fallback to mobile error style on IE, fix some mobile error issues	2016-07-20 09:46:51 -04:00
Ray Schamp	6d5b7d3c02	Update description of demographics step	2016-07-19 22:58:50 -04:00
Ray Schamp	1c5940cc05	Add student registration flow	2016-07-19 16:51:28 -04:00
Ray Schamp	67ecb60f48	Make registration styles reusable	2016-07-19 16:49:12 -04:00
Technoboy10	db049b871f	fix IE11 select background, indent issues	2016-07-18 10:17:22 -04:00
Matthew Taylor	845ddb2966	only show username in search and explore ... fixes #710	2016-07-11 16:35:03 -04:00
Matthew Taylor	075f1481a2	Add custom validation for organization and phone ... It appears that the `required` field is not applied in the way we'd like it to be for the custom checkbox group and custom phone input fields, so do a `required` check on form submission. Additionally, this adds in a few style fixes. Fixes #695, #694, #693, #691	2016-07-07 16:56:51 -04:00
Ray Schamp	b7c46f483e	Don't error on null children ... Was throwing a `TypeError` when child was null/undefined.	2016-07-05 15:48:21 -04:00
Ray Schamp	c50ac03a48	Merge pull request #671 from rschamp/bugfix/669 ... Disable default style for select elements in IE	2016-07-05 14:39:58 -04:00
Ray Schamp	edf0c1e475	Disable default style for select elements in IE ... Fixes #669	2016-07-05 14:39:08 -04:00
Ray Schamp	6f9c16a7a5	Merge pull request #667 from rschamp/bugfix/647 ... Add style to general error messages	2016-07-05 14:18:49 -04:00
Ray Schamp	d990dee755	Move location of the general error message ... From review of the style with @carljbowman Requires a bit of magic, where the Form component manually adds the "all" value. But without a major overhaul of the validation system, I don't see how else to put the general error among the other fields.	2016-07-05 12:06:10 -04:00
Ray Schamp	b15b5b8614	Add style to general error messages ... Resolves #647	2016-07-05 12:03:27 -04:00
Matthew Taylor	2cd8019ef6	Add box shadow for focus state on checkboxes ... Fixes #628 by applying the same outline for focus as is currently applied to checked boxes.	2016-07-05 11:39:06 -04:00
Ray Schamp	7fe82c11be	Get rid of most splash warnings in development	2016-07-03 14:49:01 -04:00
Ray Schamp	c25852b3c6	Merge pull request #657 from rschamp/bugfix/645 ... Revalidate address step after invalid submissions	2016-07-01 13:48:13 -04:00
Ray Schamp	a56f994886	Revalidate address step after invalid submissions ... I don't like that the state is being set to a calculation of existing props. When I did that calculation in `render`, it didn't update when fields were changed. Fixes #645	2016-07-01 11:43:18 -04:00
Technoboy10	2206cb97f6	message icon tweak	2016-06-30 19:17:53 -04:00
Technoboy10	42c000d14f	orangify this	2016-06-30 18:06:17 -04:00
Matthew Taylor	6db426a586	Use empty default object ... Looks as if the having one of these objects as the default causes overwriting in some way, as opposed to augmentation. Have the source object be an empty one, so that it gets the attributes of both defaults and props. Fixes #642.	2016-06-30 16:52:46 -04:00
Ray Schamp	5b288e4d3e	Merge pull request #648 from rschamp/feature/username-clarity ... Clarify username field is not for logging in	2016-06-30 16:17:14 -04:00
Ray Schamp	0816b0ec0f	Clarify username field is not for logging in	2016-06-30 16:16:31 -04:00
Ray Schamp	554e21cd15	Fix localization of address validation message ... Fixes #608	2016-06-30 15:54:32 -04:00
Matthew Taylor	f2b8e9025d	switch ordering in defaults ... This was assigning `props` to defaults, rather than the other way around. Fixes #618.	2016-06-30 08:00:40 -04:00
Matthew Taylor	b874d05bda	Override devault input style for login ... so that it looks like it used to, and not to tall. Fixes #618.	2016-06-29 14:54:00 -04:00
Connor Hudson	9bafdf6067	Merge pull request #619 from technoboy10/darken-dropdown ... Darken Account Nav Link when Menu Open	2016-06-29 13:31:27 -04:00
Technoboy10	41d9b1f526	use classNames before return	2016-06-29 13:24:37 -04:00
Matthew Taylor	8f60b020cb	fix educator faq link ... `info` is not in there anymore	2016-06-29 12:35:53 -04:00
Matthew Taylor	19bbd5ae7b	Link icon to splash page ... fixes #623	2016-06-29 10:53:55 -04:00
Connor Hudson	221170a9ff	Merge pull request #616 from technoboy10/gh537-dropdown-gap ... Fix GH-537: Logged-in user dropdown gap	2016-06-29 08:58:16 -04:00
Technoboy10	52d834c3fa	darken account nav link when menu open	2016-06-28 21:10:33 -04:00
Matthew Taylor	7bb52c25fe	move permissions checks to mirror session more ... thanks @rschamp!	2016-06-28 14:25:11 -04:00
Technoboy10	c4a98c5571	close gap, use border-box for box-sizing	2016-06-28 13:50:58 -04:00
Matthew Taylor	91de6f7912	Merge pull request #614 from mewtaylor/issue/gh-611-teacher-banner ... Fix GH-611: Connect `TeacherBanner` to redux	2016-06-27 22:40:13 -04:00
Technoboy10	5f62e5ffaf	scoping tweak	2016-06-24 11:42:35 -04:00
Matthew Taylor	c4a365a0e8	Connect TeacherBanner to redux ... whoops! Thanks @rschamp. Fixes #611	2016-06-24 11:40:50 -04:00
Technoboy10	172dd3cd62	set the size of the language chooser	2016-06-24 11:34:11 -04:00
Matthew Taylor	ef881a07f9	Merge pull request #610 from mewtaylor/cleanup/teacher-styling ... styling cleanup for teacher registration	2016-06-24 11:25:25 -04:00
Matthew Taylor	97516b1e1d	styling cleanup for teacher registration ... some scoping, as well as class labeling	2016-06-24 11:19:41 -04:00
Technoboy10	93054cf393	change from defaultValue to value because of formsy	2016-06-24 11:13:05 -04:00
Matthew Taylor	92883d3cbe	swap logos in conference footer	2016-06-23 22:46:11 -04:00
Matthew Taylor	e71aff5df1	Merge pull request #594 from St19Galla/develop ... Navbar issues; :hover	2016-06-23 17:20:44 -04:00
St19_Galla	49f6a6bee2	Update navigation.scss ... Changed padding rather than height	2016-06-23 17:06:40 -04:00
Matthew Taylor	0c1abada3a	Small tweaks ... 1. left-align form elements even in mobile 2. Bolden input labels, except for checkboxes and radio elements /cc @carljbowman	2016-06-23 15:44:14 -04:00
Matthew Taylor	86a8f94919	some code formatting tweaks	2016-06-23 15:10:51 -04:00
Matthew Taylor	f00aedd17e	linter error	2016-06-23 14:27:42 -04:00
Matthew Taylor	1a08e7ae49	Finalize styling for registration flow ... /cc @carljbowman One issue we ran into is that our `frameless` configuration is in `em` rather than `rem`, making it difficult to have an aboslute grid applied uniformly at all hierarchies. For now, we're using straight `rem` calculations instead of `$cols{1,8}` in the styling until we can refactor `frameless` to use `em`.	2016-06-23 14:06:36 -04:00
Matthew Taylor	1910d38bc6	Merge branch 'feature/teacher-registration-flow' of https://github.com/rschamp/scratch-www into feature/teacher-registration-flow ... * 'feature/teacher-registration-flow' of https://github.com/rschamp/scratch-www: Add teacher waiting room view Only pass necessary props to steps # Conflicts: # src/components/registration/steps.jsx # src/views/teacherregistration/teacherregistration.jsx	2016-06-23 07:35:06 -04:00
Matthew Taylor	8fb16bf397	Add formatting for teacher reg flow	2016-06-23 07:27:43 -04:00
Ray Schamp	93ed60cd0d	Add teacher waiting room view	2016-06-22 13:35:38 -04:00
St19_Galla	ab2dc47921	Update navigation.scss	2016-06-22 11:22:30 -04:00
Matthew Taylor	9d6fb63d18	Merge branch 'feature/teacher-registration-flow' of https://github.com/rschamp/scratch-www into feature/teacher-registration-flow ... * 'feature/teacher-registration-flow' of https://github.com/rschamp/scratch-www: (46 commits) Add serverside email validation Clean up Move registration step to main component Submit the rest of the fields when registering This help text is redundant now Fix organization "other" field enablement Get the form creating regular accounts Add method to api for submitting forms Update language chooser for formsy Add missing string Add progress indicators Style pass Remove unused label component Remove unused mixin factory Fixup api refactor Add serverside username validation L10n pass Explain the GeneralError component Add help text when a field is not required L10n WIP ... # Conflicts: # src/l10n.json # src/views/splash/splash.jsx	2016-06-17 15:32:49 -04:00
Matthew Taylor	32e9b089c5	updates to the conference site ... 1. new collaborators 2. new sold out language 3. some copy edits	2016-06-16 17:07:22 -04:00
Ray Schamp	d27b0a2433	Update language chooser for formsy	2016-06-16 16:31:13 -04:00
Ray Schamp	e062096445	Add progress indicators	2016-06-16 10:54:36 -04:00
Matthew Taylor	8ef3acd5d9	Merge pull request #560 from mewtaylor/issue/gh-556-footer ... Fix GH-556: Add "For Developers" to the footer	2016-06-16 10:28:19 -04:00
Matthew Taylor	098bc8618a	Merge pull request #577 from mewtaylor/issue/gh-573-grid-align ... Fix GH-573: center align grid while left aligning projects	2016-06-16 10:24:53 -04:00
Ray Schamp	1fba322d01	Style pass	2016-06-15 15:08:56 -04:00
Matthew Taylor	626b3f008e	Merge branch 'develop' of https://github.com/LLK/scratch-www into issue/gh-543-teacher-banner ... * 'develop' of https://github.com/LLK/scratch-www: (29 commits) Add explore redirects Allow access to 2014 and 2015 pages use route aliases for generalizable route patterns remove `/components` from `routes.json` Remove Make it Fly banner Fix issues in FAQ of /developers page. move shuffle to utility module fix error with shuffleArray function add shuffleArray function, shuffle most loved and most remixed use `image` to get studio thumbnail quick formatting fix for box header on search Fix merge issue Add localizations, minor style changes Removed rows from grid, changed explore tabs Removed extraneous image file Whitespace added Small fix Support for studios Refactoring, new grid component Style changes ... # Conflicts: # src/views/splash/splash.jsx # src/views/splash/splash.scss	2016-06-15 09:45:05 -04:00
Matthew Taylor	2193914650	center align grid while left aligning projects ... Fixes #573	2016-06-15 09:34:15 -04:00
Ray Schamp	fb57c25afd	Remove unused label component	2016-06-14 17:47:56 -04:00
Ray Schamp	97c4e9beb9	Explain the GeneralError component	2016-06-14 17:29:31 -04:00
Ray Schamp	f74a078afb	Add help text when a field is not required ... Most of our fields are required, so it makes more sense to display help when they are optional than to asterisk every required field	2016-06-14 17:29:31 -04:00
Ray Schamp	4e0d54df98	Split up concerns of form progression and display ... Still thinking of a good name for the form "card" component...	2016-06-14 17:29:30 -04:00
Ray Schamp	da2a4ce48c	Add bot honeypot	2016-06-14 17:29:30 -04:00
Ray Schamp	cfa85427b1	Add address validation	2016-06-14 17:29:30 -04:00
Ray Schamp	d7df1e980f	Move api mixin to lib, remove mixin ... The mixin doesn't gain us anything except complexity	2016-06-14 17:29:30 -04:00
Ray Schamp	0206a4da9d	Lint	2016-06-14 17:29:29 -04:00
Ray Schamp	9da2bb29a8	Base phone and address country on user country	2016-06-14 17:29:29 -04:00
Ray Schamp	fe74208f32	Add international phone validation	2016-06-14 17:29:29 -04:00
Ray Schamp	bcda082014	Add validation to the rest of the form	2016-06-14 17:29:29 -04:00
Ray Schamp	175a71711d	Update existing forms on the site to use formsy ... Or not in the case of the search form	2016-06-14 17:29:29 -04:00
Ray Schamp	b5c615b1fa	Use formsy-react for validation ... Complete validation for username/password form (except for checking if a username exists).	2016-06-14 17:27:53 -04:00
Ray Schamp	de3151924c	Lint	2016-06-14 17:27:53 -04:00
Ray Schamp	1eaf6effcc	Tiny bit of style	2016-06-14 17:27:53 -04:00
Ray Schamp	04c8650512	Allow other types other than form in FormStep	2016-06-14 17:27:53 -04:00
Ray Schamp	2ca846f826	Use Scratch components for the form and clean up	2016-06-14 17:27:52 -04:00
Ray Schamp	350a573fc5	Move formset into forms	2016-06-14 17:27:52 -04:00
Ray Schamp	68d49a84dc	Update FormSet to advance steps onSubmit	2016-06-14 17:27:52 -04:00
Ray Schamp	144d6e3754	wip	2016-06-14 17:27:52 -04:00
Ray Schamp	a080b2b64f	wip	2016-06-14 17:27:52 -04:00
Ray Schamp	01b662f77f	Merge pull request #567 from rschamp/hotfix/remove-banner ... [Develop] Remove Make it Fly banner	2016-06-13 14:43:37 -04:00
Ray Schamp	e2dcd6c647	Remove Make it Fly banner ... This reverts commit 7cf3846231, reversing changes made to afe14ebe88.	2016-06-13 14:35:08 -04:00
Matthew Taylor	e04b314656	remove dashes ... Thanks @rschamp!	2016-06-13 10:07:00 -04:00
Matthew Taylor	0c2a73a910	Don't use dash in name ... It's used for grouping in `build-locales`.	2016-06-13 09:41:12 -04:00
Matthew Taylor	e5f274933b	Add final copy for teacher account banner	2016-06-13 07:47:43 -04:00
Matthew Taylor	e5467e5f45	Add "For Developers" to the footer ... Fixes #556	2016-06-09 11:54:14 -04:00
Matthew Taylor	ef0037942e	use image to get studio thumbnail ... same as with `project`	2016-06-09 09:44:09 -04:00
Matthew Taylor	b065ed5254	quick formatting fix for box header on search	2016-06-09 07:57:41 -04:00
Matthew Taylor	365c3d0bad	Fix merge issue	2016-06-09 07:44:28 -04:00
Matthew Taylor	9fad938eb8	Add localizations, minor style changes	2016-06-09 07:32:25 -04:00
Matthew Taylor	ac17850491	Add teacher banner to splash page ... This only shows if the logged in user is a teacher, and persists for teachers.	2016-06-08 13:47:11 -04:00
Matthew Taylor	0894724dfd	Merge branch 'develop' of https://github.com/rthorn/scratch-www into feature/explore-from-rthorn ... * 'develop' of https://github.com/rthorn/scratch-www: Removed rows from grid, changed explore tabs Removed extraneous image file Whitespace added Small fix Support for studios Refactoring, new grid component Style changes Changed path of search page to allow for studio tabs Changes to path for search results Removed unnecessary files Search page functions Starting mock of search page Fixed problem with loading Load button and tabs functioning Merge remote-tracking branch 'LLK/develop' into develop Early Explore Page # Conflicts: # src/components/navigation/www/navigation.jsx	2016-06-07 09:06:01 -04:00
Matthew Taylor	bf1fa2934d	Merge pull request #552 from mewtaylor/bugfix/mobile-nav-conference ... [Develop] hotfix: mobile nav conference	2016-06-06 11:01:12 -04:00
Matthew Taylor	fce41dc32e	use row wrap instead of columns ... apparently mobile doesn't like columns as much as row wrap for flexbox.	2016-06-06 08:29:51 -04:00
Connor Hudson	245c9cbe4f	Merge pull request #542 from technoboy10/gh307-newstatic ... Fix GH-307: Restyle FAQ and legal pages	2016-06-03 14:31:08 -04:00
Technoboy10	acea4f4df1	move imports into .information-page	2016-06-03 14:16:17 -04:00
Technoboy10	fea1fc611f	restrict styles to only informationpage element	2016-06-03 14:14:45 -04:00
Technoboy10	9853f5ba5a	Move all styling into the InformationPage component	2016-06-03 14:02:29 -04:00
Connor Hudson	f280d1d8df	Remove quotes around keys, results -> session	2016-06-01 17:22:11 -04:00
Connor Hudson	fd1401fe1b	used stricter comparison	2016-06-01 16:14:58 -04:00
Connor Hudson	4d65d478ed	change to more extensible session	2016-06-01 15:28:18 -04:00
Connor Hudson	1178a50beb	restyle all the things	2016-06-01 11:57:50 -04:00
Connor Hudson	e402363576	initial pass	2016-05-31 16:37:42 -04:00
Ray Schamp	7fb512f4a8	Merge pull request #531 from rschamp/feature/cn-banner ... [Develop] Homepage module	2016-05-31 12:25:16 -04:00
Ray Schamp	3632f3dc1d	Merge branch 'release/2.2.9' into develop	2016-05-31 12:24:21 -04:00
Ray Schamp	7cf3846231	Merge pull request #530 from rschamp/feature/cn-banner ... [Master] Homepage module	2016-05-31 10:18:20 -04:00
Ray Schamp	89bdeff631	Don't break up navigation on mobile	2016-05-31 09:32:04 -04:00
Matthew Taylor	932dab40c7	Some additional mobile changes	2016-05-29 11:59:53 -04:00
Matthew Taylor	6eeebe05c3	Merge pull request #525 from mewtaylor/issue/conference-tweaks ... For GH-497: conference tweaks for fallout from schedule/typography	2016-05-27 16:40:39 -04:00
Matthew Taylor	c351d54e9b	fix lint warning ... thanks @rschamp!	2016-05-27 16:02:38 -04:00
Matthew Taylor	74ac6e52bb	conference formatting tweaks for mobile ... thanks @carljbowman!	2016-05-27 15:55:27 -04:00
Ray Schamp	992f6d7481	Update footer and nav styles per @carljbowman	2016-05-27 12:02:22 -04:00
Ray Schamp	986341341b	Fix line height and wrapping on splash components	2016-05-27 11:46:35 -04:00
Ray Schamp	2a01ebee84	Fix search button display ... Update search form submit button from an input[type=submit] to a button. React 15 omits the value prop if it's blank, so the `<input type="submit" value="">` was rendered as `<input type="submit">`. This caused the input to display the default value of "Submit". The button element is more appropriate for this behavior and doesn't have the missing value issue.	2016-05-26 16:00:28 -04:00
Ray Schamp	c966f8a0ba	Fix modal layout ... The styles in the upgraded react-modal broke our centering. The auto-focusing on the modal made an annoying blue border around it in Chrome.	2016-05-26 16:00:28 -04:00
Ray Schamp	fe08f8c18f	Update final graphic	2016-05-26 14:38:56 -04:00
Ray Schamp	18bb2357c6	Update final copy and links	2016-05-26 14:10:59 -04:00
Ray Schamp	d1f675374b	Localize banner	2016-05-24 17:30:48 -04:00
Ray Schamp	448bb8aa3f	Add Power Puff Girls banner	2016-05-24 17:14:12 -04:00
Matthew Taylor	a860b27941	Some updates to the redux structure ... 1. split `auth.js` up so it's 1 reducer per file 2. consolidate the conference schedule reducers 3. make conference reducer names more descriptive 4. add error handling for `body === 'undefined'` Thanks @rschamp for all the help!	2016-05-19 16:55:25 -04:00