scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-03 20:31:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
2839 commits 216 branches 1 tag 484 MiB
Commit graph

717 commits

Author SHA1 Message Date
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
Andrew Sliwinski
a85db60610 Resolve merge conflicts 2015-09-21 10:44:58 -04:00
carljbowman
e8bfa13a4f Updates based on PR Feedback 
- Removed Commented SCSS in Main
- Doubled checked Spaces over Tabs
 2015-09-21 09:52:53 -04:00
carljbowman
9a67d3fb98 Navigation WIP 2015-09-21 09:18:00 -04:00
Ray Schamp
271dfa2fd9 Use classnames package to manage classnames 
https://facebook.github.io/react/docs/class-name-manipulation.html
 2015-09-16 10:14:00 -04:00
Ray Schamp
93d4638a04 Fix intro link spacing 2015-09-14 16:14:41 -04:00
Ray Schamp
ab85004e4e Add logged in state and dropdown 2015-09-14 16:14:40 -04:00
Ray Schamp
e1d3396019 Add login component 2015-09-14 16:14:40 -04:00
Ray Schamp
a4a96c9cc0 Add a dropdown component to the nav 2015-09-14 16:14:40 -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
c4d7cdbdb2 Enforce no trailing spaces 2015-09-14 16:14:40 -04:00
Ray Schamp
52c91e2c2e Format the project count 2015-09-09 22:30:53 -04:00
Ray Schamp
f76374b24e Add an "intro" component to the homepage 2015-09-09 22:26:07 -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
Ray Schamp
b4147a8d53 Resolve feedback from PR, fix stylistic issues 2015-09-09 10:01:10 -04:00
Andrew Sliwinski
826ed270e5 Add stub for 'Activity' component 2015-09-08 19:54:55 -07:00
Ray Schamp
730e440ee6 Add example feature content to splash 2015-09-08 18:15:02 -04:00
Ray Schamp
d53a84925d Fix carousel styling for box container 2015-09-08 15:10:25 -04:00
Ray Schamp
a02c73ddf2 Add carousel component 2015-09-08 14:56:54 -04:00
Andrew Sliwinski
d780e43ae3 Clean-up 'more' section in box component as per R 2015-09-08 09:05:27 -07:00
Andrew Sliwinski
67d95554cb Resolve lint error 2015-09-08 07:58:27 -07:00
Andrew Sliwinski
02d38c513a Resolve feedback from review. 2015-09-08 07:54:15 -07:00
Andrew Sliwinski
4e7cd53e5c Adds basic 'box' and 'news' component 2015-09-06 16:18:53 -07:00
Andrew Sliwinski
3716d0462c Merge and resolve feedback from review 2015-09-04 08:26:18 -07:00
Andrew Sliwinski
79dce3f711 Clean-up travis config and demo code 2015-09-02 13:33:31 -07:00
Andrew Sliwinski
fa4fce1b1c Initial commit 2015-09-02 12:08:58 -07:00