Commit graph

125 commits

Author SHA1 Message Date
Matthew Taylor
d0e7c29b5f key api calls on username check
`this.props.user` will now return `true` because there is a default user object that’s empty. So, instead, wait for an actual user object
2017-07-20 15:01:36 -04:00
Matthew Taylor
36dc8283b8 move projects loved by following to new api endpoint 2017-07-19 11:25:39 -04:00
Matthew Taylor
753a3e1eed Split splash into container/presentation component
This does a bit of upkeep based on recs from @rschamp that:

1. Splits splash into container/presentation components
2. Updates the default project count to 20 million
3. makes the api calls that get info from the api take in arguments rather than use the session
4. Updates `MapStateToProps` to be more specific in what it uses beyond just `session` and `permissions`

Thanks @rschamp!
2017-07-17 12:19:49 -04:00
Matthew Taylor
8c94a04e77 Move custom homepage row to new api endpoints
This goes along with https://github.com/LLK/scratch-api/pull/292. This can be updated if we choose to migrate the `lovedByFollowing` endpoint off of proxy as well.
2017-07-13 15:35:18 -04:00
Matthew Taylor
ae53dcd746 Remove 10th banner 2017-05-15 11:08:15 -04:00
Matthew Taylor
00b80b40f3 Merge pull request #1295 from mewtaylor/issue/r2-4586
Implement r2-4586: Add anniversary banner
2017-05-01 07:35:31 -04:00
Matthew Taylor
fc075aedaf Add anniversary banner 2017-04-28 08:51:40 -04:00
Matthew Taylor
f2e4858868 Revert "[Master] Temp Hotfix: remove custom rows" 2017-04-18 06:36:39 -04:00
Matthew Taylor
5ca5c149f3 temporarily remove custom homepage rows
redis emptied when mc1 restarted, so this is all going to mysql at the moment
2017-04-11 09:27:19 -04:00
Matthew Taylor
9affc8441c Revert "Merge pull request #1255 from LLK/release/branch"
This reverts commit c36bde2c30, reversing
changes made to becae19f6f.
2017-04-03 14:32:38 -04:00
Matthew Taylor
d8ef3110e2 don’t apply to top banners 2017-03-31 10:26:56 -04:00
Matthew Taylor
0e645ce954 Reset banner on new login 2017-03-31 10:00:40 -04:00
Matthew Taylor
d66e11fced Banner updates 2017-03-31 09:02:54 -04:00
Matthew Taylor
3c3f1c2f8f Remove HOC Banner
Reverts #1073
2016-12-15 15:58:29 -05:00
Matthew Taylor
2daa882331 Add hoc event row
still missing the video for content, otherwise should be good to go
2016-11-29 11:13:00 -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
24aa9be30d fix for linting 2016-11-14 09:58:42 -05:00
Matthew Taylor
402efd8046 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-10 17:13:44 -05:00
Matthew Taylor
d2474c87a5 Edits based on feedback
thanks @rschamp !
2016-11-10 15:00:33 -05:00
Matthew Taylor
c9de1d73d9 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-08 14:44:03 -05:00
St19_Galla
bb20fa3375 single quotes whoops! 2016-10-13 17:31:57 -04:00
St19_Galla
5775cedc7a add space 2016-10-13 17:26:46 -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
chrisgarrity
5b2ff1a4ca Update md5map fixtures for tests
Also cleaned up comments from @mewtaylor
2016-10-11 19:28:13 -04:00
chrisgarrity
1339683a73 Fix #940
Most problems were due to strings being duplicated and overwriting each other. Updated the build-locales script to keep track of duplicates.
Project Curated by on the splash page was just missing the formatMessage call.
2016-10-11 12:33:31 -04:00
Ray Schamp
c0eb1608bd Don't set state to undefined API response bodies
This resolves the "Cannot read property 'x' of undefined" errors that occur when the API returns non-JSON responses. For instance if the proxy endpoints return 500 error responses from scratchr2.
2016-09-08 17:23:49 -04:00
Matthew Taylor
4a0442695a generalize “Educator Resources”
It was getting overwritten since it was defined in multiple places. fixes #840.
2016-08-16 11:33:07 -04:00
Matthew Taylor
43add1ad35 Clean up some intl formatting
remove `defaultMessage` from inline, which we don’t use right now
2016-08-16 08:56:01 -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
Matthew Taylor
7cb14c17b9 Bind the api method to the splash page
otherwise, `this` is undefined. Fixes #673.
2016-08-08 16:31:03 -04:00
Technoboy10
2a5f330884 hide intro if not desktop width 2016-07-26 11:29:45 -04:00
Technoboy10
daf803d4a3 experiment with the react-responsive library 2016-07-25 10:53:57 -04:00
Technoboy10
a9def9c1ae tweak splash to not be terrible on mobile 2016-07-22 14:53:39 -04:00
Technoboy10
22dc55c030 change verbiage, begin work on responsive nav/footer 2016-07-20 16:53:50 -04:00
Ray Schamp
7fe82c11be Get rid of most splash warnings in development 2016-07-03 14:49:01 -04:00
Matthew Taylor
7bb52c25fe move permissions checks to mirror session more
thanks @rschamp!
2016-06-28 14:25:11 -04:00
Matthew Taylor
f2310170b2 Add permissions dispatch for WillReceiveProps
We still need `componentWillMount` to handle the initial render for a logged in teacher first visting the page. Fixes issue in which a teacher would not see the banner immediately after dynamic login.
2016-06-28 13:30:36 -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
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
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
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
0c2a73a910 Don't use dash in name
It's used for grouping in `build-locales`.
2016-06-13 09:41:12 -04:00
Connor Hudson
fde193ca06 move shuffle to utility module 2016-06-13 09:40:32 -04:00
Matthew Taylor
e5f274933b Add final copy for teacher account banner 2016-06-13 07:47:43 -04:00
Connor Hudson
3d6a95e84b fix error with shuffleArray function 2016-06-09 17:33:49 -04:00
Connor Hudson
04166ab423 add shuffleArray function, shuffle most loved and most remixed 2016-06-09 17:22:31 -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
Connor Hudson
f280d1d8df Remove quotes around keys, results -> session 2016-06-01 17:22:11 -04:00