Commit graph

174 commits

Author SHA1 Message Date
morant
f7fe1125c8 fix play button positioning 2016-01-15 11:40:21 -05:00
morant
d002e0c63a Turn microworld to a component, and create paths to all three microworlds 2016-01-13 14:21:59 -05:00
morant
6aa93b1711 Error Handling - when a component isn't declared, don't show it. 2016-01-08 18:35:17 -05:00
morant
5c919506cf Add tips 2016-01-08 14:42:35 -05:00
morant
77a4bd2d10 adding tips to the microworld 2015-12-21 13:30:22 -05:00
morant
bd1319edff Add interactive design studio, and make studios show arts projects.
Also many design changes.
2015-11-29 09:32:01 -05:00
Matthew Taylor
15641ee244 scratch foundation, not code to learn 2015-11-13 10:07:28 -05:00
Ray Schamp
7ed45cb5dd Stop spinner and display XHR errors if they occur
Resolves GH-232
2015-11-12 12:49:40 -05:00
Ray Schamp
7c0363e99b Merge pull request #211 from rschamp/bugfix/GH-195
Fix GH-195: Use a spinner component to convey activity while logging in
2015-11-11 11:11:02 -05:00
Ray Schamp
a8a05c4fdc Merge pull request #220 from rschamp/bugfix/activity-key-warnings
Quiet warnings about keys in Activity component
2015-11-10 14:55:02 -05:00
Ray Schamp
5dc6cd220d Quiet warnings about keys in Activity component 2015-11-06 11:36:35 -05:00
Andrew Sliwinski
35a3e4c192 Merge pull request #216 from rschamp/bugfix/GH-128
Fix GH-128: Use table layout in IE 9 for navigation and homepage
2015-11-06 10:14:22 -05:00
Ray Schamp
bfaccaaed4 Fix navigation for IE9 2015-11-05 18:42:16 -05:00
Ray Schamp
0420457bdc Use blue for the spinner color. H/t @carljbowman 2015-11-04 14:30:58 -05:00
Matthew Taylor
a5e6ea4a61 Merge pull request #189 from mewtaylor/feature/hoc
Update hoc page formatting
2015-11-04 06:22:45 -05:00
Matthew Taylor
ad8d32474f Update HOC page with new mobile, styling & content
Mobile styling is from the frameless framework from #198 (ht @rthorn!). Localization also in as well.

Use `white-space: normal` instead of `inline-block`

Prep for componetizing Sub-Nav

- Fixed top banner extra margin
- Updated HTML containers and SCSS

Add subnavigation component

Added more content

- More projects (still need photos)
- Added section about Studios (need to create links to studios)

WIP: adding frameless to HOC page

Remove Grid elements on Sections

Made the implmentation more granular with breakpoints in mind.

More formatting adjustments

Cards in box now working.

Update responsive behavior and spacing

Updated all elements to respond to new grid system breakpoints.

Update content and organize HOC assets

- Added studios section with studio elements
- Reorganized the image assets for HOC 2015

Fix SCSS linting errors

Update addtional activities photo assets

Generalize `info` class on subnav

Move onto one line

left-align single-column studio links

Add strings for localization

Some rebase conflicts

Code review feedback

ht @thisandagain!

Fix alignment of studios

Keep `inline-block` for mobile
2015-11-03 23:50:51 -05:00
Ray Schamp
6f50282fc3 Lint 2015-11-03 19:02:28 -05:00
Ray Schamp
1304f9e7ba Use a Spinner to convey activity when logging in
Resolves GH-195
2015-11-03 18:47:10 -05:00
Ray Schamp
f97e3f51ee Add Spinner component
Using one found on http://tobiasahlin.com/spinkit/ for now. @carljbowman please help
2015-11-03 18:45:38 -05:00
Ray Schamp
40b5727613 Fix GH-128: Make video float right of the intro 2015-11-03 15:20:05 -05:00
Matthew Taylor
a44894be6d Merge pull request #191 from mewtaylor/issue/95-message-notification-persists
WIP #95 – Reset `unreadMessageCount` state
2015-11-03 09:48:57 -05:00
Matthew Taylor
b2d05a996f Reset unreadMessageCount state
1. When the component is unmounted
2. When the user's state changes to logged out

I think this should fix any state-side issues with the persistence for #95.
2015-11-02 22:31:27 -05:00
Matthew Taylor
311c156947 Add missing translations to en.json
Also add `Search` to translatable strings
2015-10-30 10:05:08 -04:00
Andrew Sliwinski
18cd13701f Merge pull request #186 from mewtaylor/issue/180-clear-homepage-cache
#180 – Use xhr to clear cache instead of form
2015-10-29 18:36:00 -04:00
Matthew Taylor
d897d4387d Use xhr to clear cache instead of form
because csrf. also, since we don't have a definite message/banner system in place yet, use the button itself for feedback rather than messages. The button will disable if it has been successfully used, or turn pink if there was an error (and it will not be disabled in that case).
2015-10-29 10:28:32 -04:00
Ray Schamp
ac3fcd0096 Fix GH-177: Lower z-index for banners to 9
The navigation is at 10, so we want the banners to be underneath that.
2015-10-26 13:29:07 -04:00
Ray Schamp
b7f795f2d9 Merge pull request #139 from rschamp/feature/email-confirmation-banner
Add email confirmation banner to homepage
2015-10-25 12:19:42 -04:00
Ray Schamp
8cde05fdc8 Fix remaining Modal styles 2015-10-25 12:13:47 -04:00
Ray Schamp
7e74c4a105 Use classNames everywhere with dynamic classNames
Fixes GH-141, and keeps it from being introduced on Banner
2015-10-25 12:13:23 -04:00
Matthew Taylor
8014925cce Merge branch 'develop' of https://github.com/LLK/scratch-www into bugfix/GH-148
# By Ray Schamp
# Via Andrew Sliwinski (2) and Ray Schamp (2)
* 'develop' of https://github.com/LLK/scratch-www:
  Fix GH-168: Rehabilitate the `Modal` props.style
  Fix GH-162: Show "user deletion canceled" modal
  Clean up activity item rendering logic
  Add some padding to the empty message
  Make sure boxes aren't transparent
  Add empty state for What's Happening box

# Conflicts:
#	src/components/registration/registration.jsx
2015-10-25 09:11:43 -04:00
Matthew Taylor
ccd048893f Merge branch 'develop' into feature/email-confirmation-banner
* develop:
  Fix GH-168: Rehabilitate the `Modal` props.style
  Fix GH-162: Show "user deletion canceled" modal
  Set empty states on sign out
  Clean up activity item rendering logic
  Add some padding to the empty message
  Make sure boxes aren't transparent
  Add empty state for What's Happening box
  Fix GH-124: Fix studio thumbnail URLs
  Only show "Welcome" panel if user is < 2 weeks old
  Fix #152: Don't output activity without a message
  Fix #102: Add remix and love icons
  Update arrow icons on Carousels

# Conflicts:
#	src/components/modal/modal.jsx
#	src/views/splash/splash.jsx
2015-10-25 09:05:35 -04:00
Andrew Sliwinski
b09d191dd5 Merge pull request #167 from rschamp/bugfix/GH-162
Fix GH-162: Show "user deletion canceled" modal
2015-10-25 05:26:06 -04:00
Andrew Sliwinski
790b765fc8 Merge pull request #169 from rschamp/bugfix/GH-168
Fix GH-168: Rehabilitate the `Modal` props.style
2015-10-25 05:25:59 -04:00
Ray Schamp
3963a15caa Merge pull request #143 from rschamp/feature/empty-activity
Add empty state for What's Happening box
2015-10-24 18:58:53 -04:00
Ray Schamp
a2327632a5 Handle relaunch requests from the iframe
Only attach the message listener when the modal is displaying. This prevents multiple listeners being set up by multiple registration components on the page.

Also, scope the `onMessage` handler to that component's iframe, so that we don't respond to other component's messages.
2015-10-24 18:41:13 -04: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
02cf7d0bcb Fix GH-162: Show "user deletion canceled" modal
The look of the modals is all messed up. Will fix that separately.
2015-10-24 16:06:00 -04:00
Matthew Taylor
07bd1f215f Move to using iframe in modal
like registration
2015-10-24 14:33:34 -04:00
Matthew Taylor
ade0959d94 Merge pull request #165 from rschamp/bugfix/GH-124
Fix GH-124: Fix studio thumbnail URLs
2015-10-24 14:03:09 -04:00
Ray Schamp
d6de9ffe37 Clean up activity item rendering logic 2015-10-24 12:44:20 -04:00
Ray Schamp
0b26be7036 Make sure boxes aren't transparent 2015-10-24 12:33:23 -04:00
Ray Schamp
c8834ed251 Add empty state for What's Happening box 2015-10-24 12:33:23 -04:00
Ray Schamp
21b7386270 Merge pull request #157 from rschamp/bugfix/GH-152
Fix #152: Don't output activity without a message
2015-10-24 12:25:55 -04:00
Ray Schamp
99d7055a48 Fix GH-124: Fix studio thumbnail URLs 2015-10-24 12:20:59 -04:00
Ray Schamp
39550d805a Fix #152: Don't output activity without a message 2015-10-23 17:41:50 -04:00
Ray Schamp
717ede8afd Fix #102: Add remix and love icons 2015-10-23 17:07:40 -04:00
Matthew Taylor
cfb7fa0307 Merge branch 'develop' into feature/email-confirmation-banner
* develop:
  separate out arrows var from settings object
  Handle arrow display dynamically
  Deploy from Travis
  Adjust nitpicks, remove whitespace in (), add around +
  display title and extras differently
  Add registration component to `JOIN SCRATCH`
  Explicitly set `Accept-Language` to cookie lang
  Remove the session listener on unmount
  Localize the welcome panel
  Update spacing on Splash page elements
  Handle sentry config and express routing/page handling errors, to do: handle uncaughtExceptions
  Handle sentry config and express routing/page handling errors, to do: handle uncaughtExceptions
  Update entire Tutorial cards to be clickable
  Add window.Intl polyfill. Resolves GH-96
  Override `Slider`'s `arrows` setting by row length
  use ellipsis if text overflows and urlify username
  Test the build when we test our build
  Default admin panel to closed
  Set 'black' default props for thumbnails and carousel
  Remove localhost from api call for message count
2015-10-23 15:30:13 -04:00
Ray Schamp
0b47ac87c4 Merge pull request #150 from carljbowman/Splash-Page-tweaks
Update arrow icons on Carousels
2015-10-23 15:18:46 -04:00
Matthew Taylor
c6095d6425 separate out arrows var from settings object
seems to be returning false when it shouldn't. When I was testing before it appears I was getting a cached js, so it didn't actually work.
2015-10-23 14:47:49 -04:00
Matthew Taylor
fd8515668f Merge pull request #144 from mewtaylor/issue/122-register-from-gobo
Add registration component to `JOIN SCRATCH`
2015-10-23 13:38:19 -04:00