Commit graph

200 commits

Author SHA1 Message Date
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
f4887008a5 Extract strings for localizing the preview page 2018-10-23 11:38:34 -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
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
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
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
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
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
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
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
56d9ac2af9 resolve travis errors caused by wrong ordering of css stuff 2018-08-22 16:48:07 -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
Ben Wheeler
2c8990ae7e report project POSTs to scratchr2, displays modal reactively 2018-08-09 12:41:38 -04:00
Ben Wheeler
7aa81199ce modal halo 2018-08-01 15:53:53 -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
097fb66955 currentStudioIds now an array; reverted a few changes 2018-07-31 15:00:56 -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
ffe5e8cb43 adding distinct object to redux/preview.js state to track studio membership 2018-07-24 09:12:13 -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
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
Ben Wheeler
9cac70ab18 small steps towards addtostudio modal's container-presentation refactor 2018-07-07 14:09:43 -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
Ben Wheeler
6989fd4ecf Added SVGs for add to studio modal 2018-06-27 11:38:32 -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
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
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
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
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
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
Matthew Taylor
6d1f2fbccd initial es6 commit 2018-01-19 14:06:26 -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
morant
012321721c Remove isRequired from description and onGuideClick, and fix naming on l10n strings. 2016-12-20 12:58:16 -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
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
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
19f469db48 Upgrade and quiet sass-linter
These warnings were annoying me because the noise makes it easy to miss real issues.

The `no-mergeable-selectors` rule is one that we do want to have, but right now it asks that you merge selectors in different `@media` blocks.  When the next release happens we should put that back.

https://github.com/sasstools/sass-lint/issues/307

Similarly, we want `force-element-nesting` but there is a problem with that because there's no easy way to have a nested selector in a list of selectors.
https://github.com/sasstools/sass-lint/issues/575

Finally, until they implement per-line overrides, we have to silence `class-name-format` because we don't have control over the ReactModal class names.  It's a useful rule to keep class names consistent though.  Per-line ignores should be coming soon: https://github.com/sasstools/sass-lint/issues/70
2016-03-23 18:34:54 -04:00
Matthew Taylor
112cad14e3 Added some more documentation 2016-01-14 10:25:03 -05:00
Ray Schamp
14fd4c5860 Fix GH-168: Rehabilitate the Modal props.style
This makes it more sane, and consistent with the way the react-modal `Modal` works.  The old way made multiple modals on the page have the same `style` prop.
2015-10-24 17:15:03 -04:00
Ray Schamp
65734a9577 Adapt to upgraded react-modal style handling 2015-10-20 19:28:28 -04:00
Andrew Sliwinski
0868a70f00 Remove unused responsive styles from modal.scss 2015-10-20 13:13:08 -04:00
Ray Schamp
da9174c520 Make app more transparent to Selenium 2015-10-09 14:16:37 -06:00
Ray Schamp
2affa1b77e Name all the exports for easier debugging 2015-10-08 14:25:18 -06:00
carljbowman
41e4b3b990 Add Global Colors and Updated SCSS / Linter
Created a new global style sheet to manage colors and converted all the current SCSS to match the new color scheme.
2015-09-29 11:22:48 -04:00
Ray Schamp
fd546296c2 Lint everything but color literals 2015-09-24 19:27:50 -04:00
Ray Schamp
c3bc59fee2 Add a Sass linter 2015-09-24 18:32:21 -04:00
Ray Schamp
e36bef3bce Use consistent quote style 2015-09-14 16:14:40 -04:00
Ray Schamp
a2ffa76b1d Enforce consistent function style 2015-09-14 16:14:40 -04:00
Ray Schamp
27fc9ff012 Add a modal component, extending react-modal
Also fix some z-index quirks
2015-09-09 22:26:06 -04:00