Commit graph

5289 commits

Author SHA1 Message Date
Ray Schamp
8d574399e5 Use environment for proxy settings
Also use default local scratchr2 port, 8080.
2015-10-02 16:58:08 -04:00
Ray Schamp
69820aed6e Add newline for OCD reasons 2015-10-02 16:58:08 -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
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
carljbowman
090ffad317 Merge pull request #16 from carljbowman/hoc-landing-updates
Update HOC Landing Page
2015-10-02 12:39:07 -04:00
carljbowman
d36c020b8f Update IMG tags to self close & 'mbs' to 'MBS' 2015-10-01 15:01:24 -04:00
carljbowman
823609f1a7 Update HOC Landing Page
- Added folder of SVGS (includes on for the landing page)
- Swapped out images assets (removed links to Dropbox)
- Added resource styling
2015-10-01 14:30:30 -04:00
carljbowman
9c18f0c30c Merge pull request #14 from carljbowman/global-colors
Add Global Colors and Updated SCSS / Linter
2015-09-29 13:55:13 -04:00
carljbowman
fc460015ea Update Global Colors SCSS to include Underscore
Change 'colors.scss' to '_colors.scss'
2015-09-29 13:51:46 -04:00
carljbowman
1afd94ded1 Make that background color pop
HTML & Body take on a dark-blue

Light-gray background got moved over to #view
2015-09-29 12:08:15 -04:00
carljbowman
855b328040 Quick update to Global Color SCSS 2015-09-29 11:27:16 -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
Ray Schamp
ab40dd8aa3 Merge pull request #13 from carljbowman/hoc-landing
Add HOC Landing page View
2015-09-28 09:22:55 -04:00
carljbowman
c2371d2a9f Add a (link) style for empty links 2015-09-25 12:51:06 -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
b8b65f5bcc Merge pull request #11 from rschamp/sass-lint
Add a Sass linter
2015-09-24 19:29:44 -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
a315371f02 Initialize with logged out state 2015-09-24 18:20:41 -04:00
Ray Schamp
2e57805192 Move session from providers to beside main 2015-09-24 18:13:30 -04:00
Andrew Sliwinski
38216adce2 Merge pull request #12 from carljbowman/navigation-user-info
Update User Info and Assets in Navigation
2015-09-24 09:30:41 -04:00
carljbowman
1c6720b123 Update User Info and Assets in Navigation 2015-09-23 09:57:20 -04:00
Ray Schamp
f429140b07 Fix indentation 2015-09-22 10:26:20 -04:00
Ray Schamp
54cca4ef96 Don't lint json in providers 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
Ray Schamp
89d64fa743 Use the right local port for www 2015-09-22 10:22:18 -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
carljbowman
d3ebcd6744 Replacing Tabs with Spaces 2015-09-21 11:32:17 -04:00
Andrew Sliwinski
5906e828b6 Merge pull request #5 from thisandagain/activity
Add stub for 'Activity' component
2015-09-21 11:08:29 -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
Andrew Sliwinski
fc7f9bb300 Merge pull request #9 from thisandagain/develop
Add deployment configuration
2015-09-19 19:53:14 -04:00
Andrew Sliwinski
5eca8d03ae Add deployment configuration 2015-09-19 19:25:54 -04:00
Colby Gutierrez-Kraybill
56178f2b6c No console.log, how about a process.stdout.write instead. 2015-09-16 15:14:54 -04:00
Colby Gutierrez-Kraybill
95c6cd2a06 okay eslint. 2015-09-16 15:11:48 -04:00
Colby Gutierrez-Kraybill
1cf6cedaee Initial nginx config generation, can use environment variabes PORT and SERVER_NAME. Dynamically figures out static regex based on build directory 2015-09-16 15:09:15 -04:00
Ray Schamp
df1c214a01 Merge pull request #7 from rschamp/login
Add log in component and basic functionality for logging in
2015-09-16 10:33:25 -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