scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-04 12:51:28 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
2611 commits 216 branches 1 tag 485 MiB
Commit graph

676 commits

Author SHA1 Message Date
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
Matthew Taylor
d69de477a1 Merge branch 'develop' of https://github.com/LLK/scratch-www into feature/conference-schedule 
* 'develop' of https://github.com/LLK/scratch-www: (32 commits)
  Lint
  Bundle all locale data
  Don't bundle polyfills
  Set up Raven within init.js
  Prefix privacyPolicy message string
  Exclude minified javascript from linting
  One space more
  Changes "interfacesto" to "interfaces to"
  Remove tag target
  Filter before mapping to avoid returning undefined
  Fix Pass condition for "static" routes
  Spacing2
  Mangling is the default
  Spacing
  Update for typography fixes
  Cherry pick PR #476 into master
  Add invisible spacer to anchored sections
  For Developers
  Lint JSON, expand and simplify lint step
  Fix banned user redirect
  ...

# Conflicts:
#	src/redux/actions.js
#	src/redux/reducer.js
 2016-05-19 13:25:36 -04:00
Matthew Taylor
cad75217f0 Add schedule/detail components for conference 2016-05-19 11:34:59 -04:00
Matthew Taylor
b969c4e2ed Split reducers into separate files 
Use a model of reducer/action files for each component that has them, and make `reducer.js` be the one that imports and configures all of them. This modeling is based on a few examples I've seen which seemed to work for our current case, but I'm totally fine with splitting actions and reducers into separate directories if we'd like too.
 2016-05-19 11:34:28 -04:00
Ray Schamp
219d144be2 Prefix privacyPolicy message string 
So that it matches the rest, and is localized. Not sure, but I think this was fallout from de-localizing the Privacy Policy page.
 2016-05-17 21:01:49 -04:00
Rachel Thornton
dc42b317e2 Removed rows from grid, changed explore tabs 
Grid component now no longer uses row concept, and changed tabs in the
Explore page to projects/studios, with categories in a new picker above
the tabs. Also compressed svg files.
 2016-05-17 12:40:16 -04:00
Matthew Taylor
829cb6ff0c Merge pull request #478 from mewtaylor/issue/gh-419 
Fix GH-419: Some localization cleanup
 2016-05-17 11:43:27 -04:00
Ray Schamp
b7dd55e7e0 Merge branch 'feature/for-developers' into develop 2016-05-17 08:28:25 -04:00
carljbowman
e885c08ea1 For Developers 
Add landing page for developers
 2016-05-17 07:51:08 -04:00
Matthew Taylor
4abebd8194 Remove duplicate About Scratch entry 
Towards #419 – makes "About Scratch" work on the About page. Additionally, removes `defaultMessages` from the footer since we no longer use those.
 2016-05-16 10:19:52 -04:00
Matthew Taylor
804a65e3d0 Whoops 
That change is coming later with more redux in conference :).
 2016-05-12 18:39:33 -04:00
Matthew Taylor
82dbfabcec Constrain view styles to within view name classes 
So that they don't affect styles declared outside the scope of the view. Thanks @rschamp!
 2016-05-12 18:32:57 -04:00
Matthew Taylor
e1cebe46db Ergonomics – get rid of typography file 
1. Merge typography into main
2. Get rid of use of `#view` in scss
3. Make `render` work with conference pages
 2016-05-12 18:05:26 -04:00
The_Grits
8d294e4d29 Float 2016-05-11 09:53:39 -04:00
Rachel Thornton
4b632e4f5f Removed extraneous image file 2016-05-10 08:26:41 -04:00
Rachel Thornton
4a2a2c8ca2 Whitespace added 2016-05-10 08:22:48 -04:00
Rachel Thornton
9c6475aed5 Support for studios 
Search and Explore now support studios, thought currently the api is
not ready for them.
 2016-05-10 08:16:46 -04:00
Rachel Thornton
d7c9057cbd Refactoring, new grid component 
Significant refactoring of Explore and Search pages, including new grid
component for displaying projects
 2016-05-10 00:54:46 -04:00
The_Grits
75258be4a4 margin-right 
4.4px is the max margin we can put to the right of the button without the "Forgot password?" text wrapping.
 2016-05-09 11:27:22 -04:00
Rachel Thornton
fdd78a5433 Style changes 
Changes to style for lint tests
 2016-04-30 16:38:48 -04:00
Rachel Thornton
eb499c929c Changed path of search page to allow for studio tabs 
Users and Forum tabs removed
 2016-04-30 16:03:11 -04:00
Rachel Thornton
e2a7698cde Changes to path for search results 
No longer uses google_results in url
Also now has correct link to project page from clicking on projects in
explore and search
 2016-04-30 14:50:11 -04:00
Rachel Thornton
bca374b88f Merged changes to routing, separated Tabs into a component 2016-04-30 14:07:11 -04:00
Rachel Thornton
74a6d132bd Search page functions 2016-04-30 11:44:10 -04:00
Matthew Taylor
87009babae Merge pull request #431 from TheGrits/patch-6 
Fix gh-426: Update Project Count
 2016-04-29 16:38:02 -04:00
Matthew Taylor
cf71520875 final content update for conference 
"coming soon" image for schedule, and schedule reference on landing page. Also background image for the landing page.
 2016-04-27 23:23:43 -04:00
Matthew Taylor
7d7fb9797d Cleanup for scratch conference 
1. s/collaborators/sponsors
2. open footer links in new window
3. remove superfluous require statement
4. increase spacing for scratch family links
 2016-04-26 12:24:55 -04:00
The_Grits
e73d3fabcc All other references 2016-04-22 14:16:59 -04:00
Matthew Taylor
2eb62e8ab3 move component convention back to what it was 
formerly presentation components such as `navigation` and `footer` have been nested, and renamed to `container` inside their respective component subdirs
 2016-04-21 18:13:21 -04:00
Matthew Taylor
66113e1c58 Add conference sub-site 2016-04-21 16:22:39 -04:00
Matthew Taylor
017d58fb1b Split out footer container/presentation 2016-04-21 16:22:16 -04:00
Matthew Taylor
f05cb39501 Add flex-row component 
Just a container with some default flexbox formatting.
 2016-04-21 16:21:22 -04:00
Matthew Taylor
eed6f1fc08 Restructure src 
1. Put formatting-specific components into the `presentation` subdir of `components`
2. Put content-specific components into the `container` subdir of `components`
3. Put views that are sub-urls of the site into a subdir of `views` (i.e. `microworlds`, and eventually `conference`)
 2016-04-21 15:46:32 -04:00
Rachel Thornton
405f666109 Merge remote-tracking branch 'LLK/develop' into develop 2016-04-18 16:51:53 -04:00
Rachel Thornton
dfa7b9e582 Starting mock of search page 2016-04-18 16:51:45 -04:00
Rachel Thornton
8e6921cd82 Load button and tabs functioning 
Users can now load more projects by clicking a button at the bottom of
the page, and check out different genres of project using the tabs.
 2016-04-03 16:45:31 -04:00
Ray Schamp
c9157e70b9 Fix reference to session 
Caused by merging an old branch which didn't have conflicts, but did have a different understanding of session.
 2016-03-29 18:38:39 -04:00
Rachel Thornton
bfd3fac6a0 Merge remote-tracking branch 'LLK/develop' into develop 
# Conflicts:
#	src/components/navigation/navigation.jsx
 2016-03-26 21:15:36 -04:00
Ray Schamp
78649b69e2 Merge pull request #353 from morantsur/feature/microworlds 
Moving Microworlds pages to scratch-www & adding arts
 2016-03-25 15:43:10 -04:00
Ray Schamp
ea04658b4a Merge pull request #387 from rschamp/feature/scratchr2#2937-student-nav 
Add "My Class" to student nav
 2016-03-25 14:32:22 -04:00
Rachel Thornton
ff228e022c Merge remote-tracking branch 'LLK/develop' into develop 2016-03-25 11:35:47 -04:00
Ray Schamp
6e0d35efaa Fix incorrect nesting in search styles 2016-03-24 13:12:41 -04:00
Ray Schamp
74d23d05dc Remove inline default messages 2016-03-24 12:29:40 -04:00
Ray Schamp
2d6a38800b Add "My Class" to student nav 2016-03-24 12:28:32 -04:00
Ray Schamp
dce35a4bee Add keys to children where necessary 2016-03-24 11:29:26 -04:00
Rachel Thornton
d4277cabae Early Explore Page 
Added an early prototype of the new Explore page
 2016-03-24 10:16:53 -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
9a2a923b7b Remove projectCount from intro.jsx 
thanks @rschamp!
 2016-03-22 12:09:51 -04:00
Matthew Taylor
4914ba6d85 Use formatNumber to localize project count 
`toLocaleString()` is not supported in Safari, but react-intl has a polyfill, and so it is. This also localized the intro description string, which wasn't previously. This also fixes #366 by doing as @rschamp suggested and checking if the count is the default count before setting the value.
 2016-03-22 11:00:37 -04:00
Ray Schamp
7b72e6cdcd Fix lint errors 2016-03-18 12:40:30 -04:00
Ray Schamp
a5e336a175 Use redux for session handling 2016-03-18 11:51:22 -04:00
Ray Schamp
faabc63e65 Move component structure to one tree 
Instead of inserting `Navigation` and `Footer` into every `render`ed component, just compose them in the views with a new `Page` component.
 2016-03-18 10:54:26 -04:00
morant
99772ca41a * Fix alignment of Editor link in Microworlds. 
* Remove fixed width from most components (replace with relative width).
 2016-03-17 15:58:26 -04:00
morant
2e5a0e1439 Merge remote-tracking branch 'upstream/develop' into feature/microworlds 
* Removed microwords from server/routes for now.

# Conflicts:
#	server/routes.json
#	src/components/thumbnail/thumbnail.jsx
 2016-03-11 21:14:27 -05:00
morant
d735d38d91 * Fix aligning of thumbnails inside a NestedCarousel 
* Remove links from thumbnail image
* Fix vertical aligning when a thumbnail has more than one line of text
 2016-03-11 18:17:34 -05:00
Matthew Taylor
4a40482f74 Add tips to create link for logged out user 
Fixes #374
 2016-03-04 10:27:00 -05:00
morant
c7cc1b626f Revert "Revert "Fix review comments, and organize code a bit."" 
This reverts commit e9cb08d273.
 2016-02-19 15:11:23 -05:00
morant
e9cb08d273 Revert "Fix review comments, and organize code a bit." 
This reverts commit 3d9d280bb9.
 2016-02-19 14:39:43 -05:00
morant
3d9d280bb9 Fix review comments, and organize code a bit. 
The only visible change should be that the tips thumbnails are no longer links.
 2016-02-19 14:30:07 -05:00
Ray Schamp
fd584b1d67 Heed some SCSS warnings 2016-01-29 15:22:06 -05:00
Ray Schamp
f90198d7c3 Fix tall carousel 
I am mystified by how this changed. But this fixes #345.
 2016-01-29 15:22:02 -05:00
morant
7c411845c2 Remove addition to HREF 2016-01-29 12:29:17 -05:00
Matthew Taylor
c46e42e83c fix test 2016-01-25 09:07:55 -05:00
Matthew Taylor
581f071c0e Add missing alt tags 2016-01-25 08:30:10 -05:00
Matthew Taylor
2e79a5aa6b Merge pull request #323 from mewtaylor/bugfix/readme-update 
Added some more documentation
 2016-01-19 16:11:49 -05:00
morant
6e682269fb Align tips slider with the rest of the studios 2016-01-15 12:23:39 -05:00
morant
f7fe1125c8 fix play button positioning 2016-01-15 11:40:21 -05:00
Matthew Taylor
5e055fb6ea Merge pull request #321 from mewtaylor/issue/scratchr2-3245-logout-post 
Change logout to do a POST request
 2016-01-15 11:23:44 -05:00
Matthew Taylor
dddc867c1e Merge pull request #319 from mewtaylor/feature/gh-288-accessibility 
GH-288: accessibility
 2016-01-14 10:27:29 -05:00
Matthew Taylor
112cad14e3 Added some more documentation 2016-01-14 10:25:03 -05:00
Matthew Taylor
9e58efc7e2 Merge pull request #305 from mewtaylor/feature/266-componentize-locale-strings 
GH-266: view-ify locale strings
 2016-01-14 10:10:02 -05:00
Matthew Taylor
98d0f0de6e Updates based on feedback 
1. changes intl filenames to `[view].intl.js`
2. Move nav/footer rendering to `render.jsx`
3. Set locale cookie before submitting language change form

Thanks @thisandagain !
 2016-01-14 08:32:43 -05:00
morant
d002e0c63a Turn microworld to a component, and create paths to all three microworlds 2016-01-13 14:21:59 -05:00
Matthew Taylor
a15842a582 Add back in the session refresh 
Thanks @thisandagain!
 2016-01-13 13:36:36 -05:00
Matthew Taylor
31d4173ef5 Change logout to do a POST request 2016-01-13 11:36:04 -05:00
Matthew Taylor
2ac3e5337f Add alternative labels for input and links 
See https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_text_01
 2016-01-12 13:27:36 -05:00
Matthew Taylor
01975b7e4d Add alt attribute to image tags 
See https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_text_02
 2016-01-12 13:27:09 -05:00
Matthew Taylor
4821383d00 Merge pull request #315 from mewtaylor/issue/gh-289-overlapping-text 
Fix GH-289: Allow white space to wrap in welcome text
 2016-01-12 10:30:02 -05:00
Andrew Sliwinski
3721ecfd14 Fix error in parsing count from updated API route. Re: GH-316 2016-01-11 19:10:38 -05:00
Matthew Taylor
c88fc6f27d Make general nowrap more specific to paragraphs 
And remove the overrides that were already there. ht @rschamp and @carljbowman!
 2016-01-11 14:58:55 -05:00
Andrew Sliwinski
86c93df740 Migrate to new API route for message count. Resolves GH-316 Resolves GH-95 2016-01-11 14:13:34 -05:00
Matthew Taylor
d578d4a800 Allow white space to wrap in welcome text 
It's in an href, so override the default and include wrapping. Fixes #289.
 2016-01-11 09:11:13 -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
Matthew Taylor
398f9cb95a Move component strings into views 
Handle localization and string loading in views only. Components should just of default text, but not the actual text for the page itself – all text handling should be at the view level.
 2016-01-07 10:11:03 -05:00
morant
77a4bd2d10 adding tips to the microworld 2015-12-21 13:30:22 -05:00
Matthew Taylor
1c802f9230 Some translations cleanup 
A couple missing translations
 2015-12-09 14:03:30 -05:00
Andrew Sliwinski
66d9c390fe Change 'View All' link in news component to redirect towards announcements. Resolves GH-280 2015-12-08 14:05:03 -05:00
Ray Schamp
961d97eb67 Use FormattedMessage for My Classes text 
I had matched it to My Stuff, but that's different since the top nav needs the text for a title attribute. h/t @mewtaylor
 2015-11-30 16:25:11 -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
Ray Schamp
9c6cf5f449 Fix GH-237: Show My Classes in nav to educators 2015-11-26 12:08:28 -08: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
Matthew Taylor
1a156cc2a4 Merge pull request #147 from mewtaylor/issue/130-studio-arrow-fix 
Handle arrow display dynamically in carousel component
 2015-10-23 13:28:41 -04:00
Matthew Taylor
317b520220 Handle arrow display dynamically 
And handle specific case for studio homepage row. Fixes #130 and also stuff left over from #105
 2015-10-23 13:28:11 -04:00
carljbowman
3034abc2b4 Update arrow icons on Carousels 
Had to overwrite slick-slider's iconfont with background image for a quick fix.
 2015-10-23 13:05:48 -04:00
Matthew Taylor
438401bde0 display title and extras differently 
So that the creator username appear on the same line as other text, but so that studio titles still get cut off properly
 2015-10-23 09:01:01 -04:00
Andrew Sliwinski
3545ed9382 Merge pull request #135 from carljbowman/Splash-Page-tweaks 
Update spacing on Splash page elements
 2015-10-23 08:48:20 -04:00
Matthew Taylor
237e663794 Add registration component to JOIN SCRATCH 
fixes #122
 2015-10-23 08:33:07 -04:00
Ray Schamp
be6358fba9 Merge pull request #138 from rschamp/feature/welcome-panel 
Add welcome panel component to homepage
 2015-10-22 22:42:47 -04:00
Ray Schamp
cb2f639d07 Localize the welcome panel 2015-10-22 20:55:17 -04:00
Ray Schamp
b6a6b7faad WIP 2015-10-22 18:40:04 -04:00
carljbowman
87b583dc58 Update spacing on Splash page elements 
Added some spacing love to Intro, Video, and Carousel elements.
 2015-10-22 17:44:49 -04:00
Ray Schamp
429aa03507 Add dismissable email confirmation banner 2015-10-22 17:19:31 -04:00
Ray Schamp
58d3ed4ecb Add welcome component and show it conditionally 
Move some of the colors used on the splash page into _colors.scss so they can be reused.
 2015-10-22 12:21:47 -04:00
Matthew Taylor
a40915c60a use ellipsis if text overflows and urlify username 
fixes #103 and #113
 2015-10-21 15:22:59 -04:00
Ray Schamp
41770ad549 Merge pull request #94 from thisandagain/bugfix/messages 
Fix messages XHR request and prop defaults
 2015-10-21 14:54:32 -04:00
Ray Schamp
60a9681f3f Merge pull request #104 from rschamp/bugfix/message-count 
Fix GH-97: Grow message bubble with count
 2015-10-21 14:17:07 -04:00
Matthew Taylor
43ea666141 Get project count from api when logged out 2015-10-21 14:12:34 -04:00
Ray Schamp
849cc30e1a Fix GH-97: Grow message bubble with count 2015-10-21 14:07:18 -04:00
Andrew Sliwinski
9ed814cbda Default admin panel to closed 2015-10-20 21:53:24 -04:00
Andrew Sliwinski
2553c69653 Set 'black' default props for thumbnails and carousel 2015-10-20 21:33:00 -04:00
Andrew Sliwinski
5960f72e81 Remove localhost from api call for message count 2015-10-20 21:22:54 -04:00
Ray Schamp
cad69eb33e Remove mixin import 
ht @thisandagain
 2015-10-20 19:38:43 -04:00
Ray Schamp
715ef7d675 Lint 2015-10-20 19:35:19 -04:00
Ray Schamp
65734a9577 Adapt to upgraded react-modal style handling 2015-10-20 19:28:28 -04:00
Ray Schamp
66105f989c Re-enable join click handler 2015-10-20 17:58:28 -04:00
Matthew Taylor
5d4dbf638c Merge pull request #90 from mewtaylor/issue/update-language-footer 
Use language dropdown form to change language
 2015-10-20 16:52:42 -04:00
Matthew Taylor
7e4555e6b6 Use language dropdown form to change language 
xhr was not updating the session/cookie for some reason. So just force state change, and force form submission to change language
 2015-10-20 16:51:30 -04:00
Ray Schamp
804241a544 Merge pull request #87 from rschamp/bugfix/fix-login 
Use ReactDOM.findDOMNode for login field values
 2015-10-20 15:44:09 -04:00
Ray Schamp
13ee5ad86d Use ReactDOM.findDOMNode for login field values 
The direct reference didn't work as expected I think because we're nesting the `input` within our own `Input` components.
 2015-10-20 15:24:56 -04:00
Ray Schamp
6259cb5b97 Pull homepage rows from the API 
Not localized yet
 2015-10-20 14:49:25 -04:00
Ray Schamp
abfb485560 Merge pull request #83 from mewtaylor/issue/65-splash-activity-hookup 
Get *What's Happening?* box data from api
 2015-10-20 13:59:46 -04:00
Matthew Taylor
22e8ceca5e Activity with current friends-activity format 
This updates `activity.jsx` to handle the current `friends-activity` format (which is a bit hacky atm), and uses `FormattedRelative` to handle relative timestamps
 2015-10-20 13:41:17 -04:00
Andrew Sliwinski
0868a70f00 Remove unused responsive styles from modal.scss 2015-10-20 13:13:08 -04:00
Matthew Taylor
6c34e0bc6a get message count at minute intervals 2015-10-20 10:25:28 -04:00
Ray Schamp
bde208e16b Merge pull request #76 from mewtaylor/refactor/set-language-via-api 
Use api to set language instead of cookie
 2015-10-19 20:39:45 -04:00
Andrew Sliwinski
8647d01e1f Merge pull request #75 from mewtaylor/bugfix/define-format-message 
Define `formatMessage` when used.
 2015-10-19 20:37:24 -04:00
Andrew Sliwinski
dae7288395 Merge pull request #73 from rschamp/feature/login-captcha-redirect 
Redirect to CAPTCHA when too many login attempts fail
 2015-10-19 20:34:10 -04:00
Matthew Taylor
010109a767 Use api to set language instead of cookie 
just to be safe. But i'm leaving in the `set` method of `jar.js` so we can easily move to it in the future.
 2015-10-19 19:49:24 -04:00
Matthew Taylor
e9d24b083a define formateMessage 
I was forgetting to define it, like is done in `activity.jsx`. I was also incorrectly interpreting the documentation
 2015-10-19 19:36:56 -04:00
Ray Schamp
70f06b6be8 Redirect to CAPTCHA when too many attempts fail 2015-10-19 16:36:46 -04:00
Matthew Taylor
43786861c8 Add AdminPanel component 
And include it on the splash page.
 2015-10-19 14:55:38 -04:00
Matthew Taylor
58ef98016a General cleanup 2015-10-16 15:10:27 -04:00
Matthew Taylor
997b94a91c Merge branch 'develop' into feature/react-intl 
* develop:
  Fix 'M' issue in Firefox
  Widen modal to account for tooltip overflow
  Name Registration component
  Refresh session, close popup after registration
  Add standalone legacy registration iframe

# Conflicts:
#	server/proxies.json
#	src/components/navigation/navigation.jsx
 2015-10-16 11:14:45 -04:00
Matthew Taylor
c1de837595 Add formatted messages 
only to components and things that will be going out in the first deploy
 2015-10-16 11:04:01 -04:00
Matthew Taylor
d0b22d0f97 Forgot to include these as part of init restructure 2015-10-16 11:02:41 -04:00
Matthew Taylor
567067ce88 Make LanguageChooser isolated in funcitonality 
and only set cookie client side, rather than using the post request
 2015-10-16 11:01:40 -04:00
Matthew Taylor
be5d8cd3eb use po2icu to get po files as json icu files 2015-10-15 23:02:57 -04:00
carljbowman
694d8a7597 Fix 'M' issue in Firefox 
Set fixed 'text-indent' to push content out of the navigation element.
 2015-10-15 15:26:33 -06:00
Ray Schamp
f44e0b249a Widen modal to account for tooltip overflow 2015-10-15 11:13:31 -06:00
Ray Schamp
8b8aa0ee48 Name Registration component 2015-10-15 11:13:31 -06:00
Ray Schamp
fcec859cbe Refresh session, close popup after registration 2015-10-15 11:13:31 -06:00
Ray Schamp
6b1ce8549e Add standalone legacy registration iframe 2015-10-15 11:13:02 -06:00
Ray Schamp
d3b8c2085e Add the language dropdown, it almost works 2015-10-15 11:48:03 -04:00
Matthew Taylor
54920f5e9f Merge branch 'develop' into feature/upgrade-react-0.14 
* develop:
  Avoid class name conflict on login li
  Update Hover JS fuctions with intative naming
  Remove extra white space on HOC Landing
  Add Collaborators and Logos
  Add CN Logo to Hide & Seek asset
  Remove excess/unused CSS
  Update HOC with Banner Hoverstates & Assets
 2015-10-14 23:03:01 -04:00
Matthew Taylor
c3b62c8f05 Update core react dependencies 2015-10-14 22:59:38 -04:00
Ray Schamp
1696921354 Avoid class name conflict on login li 2015-10-14 15:02:36 -06:00
Andrew Sliwinski
f3d6a273fb Resolve merge conflict 2015-10-13 15:57:55 -04:00
Ray Schamp
79a8d771d6 Merge pull request #52 from rschamp/feature/selenium-entry 
Make app more transparent to Selenium
 2015-10-13 13:32:14 -06:00
Andrew Sliwinski
605e8236d6 Merge pull request #53 from rschamp/feature/identify-things 
Identify all nav items
 2015-10-13 08:55:35 -04:00
Andrew Sliwinski
840a84147a Merge pull request #48 from rschamp/feature/ego-- 
Fix GH-39: use the current user's profile URL
 2015-10-13 08:46:40 -04:00
Ray Schamp
6a967026de Identify all nav items 2015-10-09 14:42:47 -06:00
Ray Schamp
da9174c520 Make app more transparent to Selenium 2015-10-09 14:16:37 -06:00
Ray Schamp
3b51c5cb27 Merge pull request #43 from rschamp/feature/named-exports 
Name all the exports for easier debugging
 2015-10-09 10:44:41 -06:00
Ray Schamp
f613255cc7 Fix GH-39: use the current user's profile URL 2015-10-09 10:43:41 -06:00
Ray Schamp
2affa1b77e Name all the exports for easier debugging 2015-10-08 14:25:18 -06:00
Ray Schamp
347ff4fe71 Fix GH-37: Construct project urls correctly 2015-10-08 13:55:31 -06:00
Ray Schamp
d457897971 Merge pull request #34 from rschamp/bugfix/navigation-quirks 
Fix navigation quirks
 2015-10-08 10:46:49 -06:00
Ray Schamp
0f395255b0 Fix GH-23: link Explore to 30 day view 2015-10-07 22:40:03 -04:00
Ray Schamp
0251932631 /# is for suckers. preventDefault all the things 2015-10-07 22:40:02 -04:00
Ray Schamp
3d7f5ee66b Fix GH-21: toggle dropdown when clicking Sign in 2015-10-07 22:40:02 -04:00
Ray Schamp
4e38c1a050 Fix GH-25: close dropdowns on login/logout 2015-10-07 22:36:11 -04:00
Ray Schamp
60d3c467fe Allow configuring the API host 
Configure host for legacy API calls
 2015-10-07 16:15:10 -04:00
Ray Schamp
6fba6c0a8f Merge pull request #15 from rschamp/feature/session-api 
Share session from scratchr2, add logging in/out
 2015-10-07 15:27:29 -04:00
Ray Schamp
d96294e85b Close login dropdown and clear errors on login 2015-10-07 15:01:34 -04:00
Ray Schamp
7b3874ffd5 Add csrf token handling to api mixin 2015-10-07 15:00:47 -04:00
Ray Schamp
31fb5911ea Don't use boolean coersion 2015-10-07 11:48:55 -04:00
Ray Schamp
621c32a605 Handle API errors by logging them 
Upgrade of bunyan required for use with webpack
 2015-10-07 11:29:17 -04:00
Ray Schamp
06f71a0da6 Update avatar thumbnailUrl per discussion 2015-10-06 13:32:51 -04:00
Ray Schamp
08de438208 Fix thumbnail URL per discussion 2015-10-06 13:07:24 -04:00
Ray Schamp
446543c6c4 Use thumbnail image host from process.env 
Limit built process.env to keys in src/env.json, which serves as a source for defaults.
 2015-10-02 18:24:59 -04:00
Ray Schamp
ef95746df7 Add basic error handling for logins 
No CAPTCHA yet.
 2015-10-02 17:04:30 -04:00
Ray Schamp
4b4482f1fe Allow logging in and out 
On scratchr2, the /session/ endpoint also sets the csrf cookie to allow this.
 2015-10-02 16:58:08 -04:00
Ray Schamp
e0d17005e4 Get session from scratchr2 via proxy 
Cookies aren't shared across ports, so the proxy is necessary to share the session between scratchr2 and www.
 2015-10-02 16:58:08 -04:00
Ray Schamp
f811cf82af Add real content for homepage rows 
Also update the thumbnail and carousel components to account for the new API spec
 2015-10-02 13:08:57 -04: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
carljbowman
127629fc1a Update SCSS Linter for Leading Zeros and 0 Units 2015-09-25 12:47:26 -04:00
carljbowman
5a812ee89c Update HOC Content for Lint CharCount 2015-09-25 11:12:32 -04:00
carljbowman
fbd54998e6 Add HOC Landing page View 
Created a HOC Landing View. Currently all the SCSS lives at the view level and needs to be made into componets. After building out some Global style sheets I will revisit.
 2015-09-25 09:59:56 -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
e16279d305 Merge pull request #8 from rschamp/session 
Add something like session handling
 2015-09-24 18:21:23 -04:00
Ray Schamp
2e57805192 Move session from providers to beside main 2015-09-24 18:13:30 -04:00
carljbowman
1c6720b123 Update User Info and Assets in Navigation 2015-09-23 09:57:20 -04:00
Ray Schamp
d6576409f1 Something like session handling 2015-09-22 10:26:19 -04:00
Ray Schamp
438919ac72 Heed warnings about giving children keys 2015-09-22 10:23:47 -04:00
carljbowman
e93b47285a Merge pull request #10 from carljbowman/navigation 
Navigation
 2015-09-21 13:42:01 -04:00
carljbowman
f5351b651a Removing Extra spaces from Button 2015-09-21 12:25:50 -04:00
Andrew Sliwinski
8c3a3336f4 Remove trailing whitespace 2015-09-21 10:48:47 -04:00
Andrew Sliwinski
ed8ff0cad2 More format module to ./src/lib 2015-09-21 10:48:06 -04:00