Commit graph

42 commits

Author SHA1 Message Date
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
Matthew Taylor
eb38951f06 Set empty states on sign out
also make state setting a bit more uniform
2015-10-24 14:52:11 -04:00
Matthew Taylor
07bd1f215f Move to using iframe in modal
like registration
2015-10-24 14:33:34 -04:00
Ray Schamp
616e99c631 Only show "Welcome" panel if user is < 2 weeks old
Or if they've dismissed it. Fixes GH-153.
2015-10-24 12:06:16 -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
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
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
b6a6b7faad WIP 2015-10-22 18:40:04 -04:00
Ray Schamp
429aa03507 Add dismissable email confirmation banner 2015-10-22 17:19:31 -04:00
Ray Schamp
af415e1bf3 Set template cue to dismiss welcome panel 2015-10-22 17:17:27 -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
fe96c6fa71 Override Slider's arrows setting by row length
If the row length is less than `slidesToShow`, don't show the arrows.
2015-10-21 16:49:50 -04:00
Ray Schamp
345540aa20 Organize view methods
Proposing this ordering: attributes, lifecycle, getters, handlers, rendering
2015-10-21 15:12:41 -04:00
Ray Schamp
b847777d09 Merge pull request #111 from rschamp/feature/hide-empty-rows
Only display custom rows that exist and have items
2015-10-21 14:34:37 -04:00
Ray Schamp
8df5e41991 Only display custom rows that exist and have items 2015-10-21 14:27:29 -04:00
Matthew Taylor
43ea666141 Get project count from api when logged out 2015-10-21 14:12:34 -04:00
Matthew Taylor
23558f583f change max to limit for new api 2015-10-20 17:07:16 -04:00
Ray Schamp
50646b6c3c Localize homepage row content 2015-10-20 14:49:25 -04:00
Ray Schamp
6259cb5b97 Pull homepage rows from the API
Not localized yet
2015-10-20 14:49:25 -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
Matthew Taylor
43786861c8 Add AdminPanel component
And include it on the splash page.
2015-10-19 14:55:38 -04:00
Matthew Taylor
7b704e878f Give name to the exported module 2015-10-16 15:10:17 -04:00
Matthew Taylor
0577860f3a Rename renderer to render
and make it a method that returns a component, rather than an object with a render method
2015-10-15 23:11:09 -04:00
Ray Schamp
07be335a42 Consolidate rendering to helper function 2015-10-13 11:45:23 -06:00
Ray Schamp
da9174c520 Make app more transparent to Selenium 2015-10-09 14:16:37 -06:00
Ray Schamp
37f0eb3348 Fetch news from api if the user is logged in 2015-10-07 16:23:08 -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
31fb5911ea Don't use boolean coersion 2015-10-07 11:48:55 -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
d73b7508bc Add missing key, heed React warning 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
Ray Schamp
f429140b07 Fix indentation 2015-09-22 10:26: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
Andrew Sliwinski
a85db60610 Resolve merge conflicts 2015-09-21 10:44:58 -04:00
Ray Schamp
a2ffa76b1d Enforce consistent function style 2015-09-14 16:14:40 -04:00
Ray Schamp
f76374b24e Add an "intro" component to the homepage 2015-09-09 22:26:07 -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
Andrew Sliwinski
baa5e158b9 Add navigation and footer components 2015-09-03 19:41:27 -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