Matthew Taylor
27b55082f0
Merge pull request #407 from mewtaylor/issue/gh-406-counselor-link
...
GH-406: Add community counselor job
2016-04-04 14:55:36 -04:00
Rachel Thornton
f545d8acf7
Fixed problem with loading
2016-04-04 14:11:35 -04:00
Rachel Thornton
ce8849e4aa
Merge remote-tracking branch 'LLK/develop' into develop
...
# Conflicts:
# src/components/navigation/navigation.jsx
2016-04-03 16:46:23 -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
53e508dd24
Merge pull request #411 from sayamindu/develop
...
Add view for community blocks interview recruitment
2016-04-01 16:34:57 -04:00
Sayamindu Dasgupta
bd81438800
Add view for community blocks interview recruitment
...
We are recruiting Scratchers for interviews on the Scratch Community
blocks feature; this is a part of my PhD disseration. This commit has
the PDF forms and the views that are needed for the recruitment.
2016-04-01 13:23:48 -04:00
Matthew Taylor
7734ee8931
Add community counselor job
...
Fixes #406
2016-04-01 10:29:13 -04:00
Matthew Taylor
1adb8ecf5b
Add page component to jobs view
...
Fixes #398
2016-03-28 14:18:44 -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
Rachel Thornton
ff228e022c
Merge remote-tracking branch 'LLK/develop' into develop
2016-03-25 11:35:47 -04:00
Ray Schamp
042ef65070
Merge pull request #393 from rschamp/feature/silence
...
Upgrade sass-lint, quiet various warnings
2016-03-24 12:02:40 -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
56787ee09c
Add spot check for cards, use new Page
paradigm
2016-03-23 16:47:55 -04:00
Matthew Taylor
b903067658
Update the cards with new grouped structure
2016-03-23 16:37:15 -04:00
Matthew Taylor
f95b62bf67
Change name to cards
to prevent interaction fx
...
thanks @rschamp !
2016-03-23 16:37:15 -04:00
Matthew Taylor
5d693ed53d
Add /info/cards/
route
...
Also implements a method for handling translation of static files as described in https://github.com/LLK/scratch-www/issues/372#issuecomment-193350144
2016-03-23 16:37:15 -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
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
Matthew Taylor
cb81ae550a
Merge pull request #382 from mewtaylor/hotfix/wedo-appstore-link
...
[Develop] Hotfix: wedo appstore link
2016-03-10 15:28:50 -05:00
Matthew Taylor
c514d814c9
Update device manager app store link
2016-03-10 15:14:08 -05:00
Matthew Taylor
b484480e1e
Merge branch 'wedo-landing' into develop
...
* wedo-landing:
Update with links, fix linter issues, center setup
[WIP] Add WeDo Landing page
# Conflicts:
# server/routes.json
2016-03-10 09:05:51 -05:00
Matthew Taylor
aeaa02aae8
Update with links, fix linter issues, center setup
2016-03-09 23:04:25 -05:00
carljbowman
3220fd1b9d
[WIP] Add WeDo Landing page
...
Adding LEGO WeDO landing page. This also includes the initial pass on Global Typographic Standards.
Needs Work
-Add URLs to all links on the page (still being generated)
-Ater URLs have been added, update translation JSON to include messages that include links
2016-03-09 14:33:17 -05:00
Andrew Sliwinski
47ab0a0ae0
Update jobs to match Media Lab listings
2016-03-02 09:42:51 -05:00
Andrew Sliwinski
7511121972
Merge branch 'develop' into feature/jobs
2016-03-01 10:19:34 -05:00
Matthew Taylor
0ac9f5edc5
Merge pull request #359 from TheGrits/patch-2
...
Fix gh-357: Splash - Initial value of project count is arbitrary
2016-02-23 11:43:26 -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
The_Grits
8d05ed84b4
singlequotes
...
Apparently double quotes don't work
2016-02-18 14:34:02 -05:00
The_Grits
9f2325bd83
"over 13 million"
...
Changed as per @mewtaylor's suggestion
2016-02-18 14:29:58 -05:00
The_Grits
7992c43b87
Update credits.jsx
...
Travis was complaining that link 188 had over 120 characters, this should fix it.
2016-02-12 07:37:25 -05:00
Matthew Taylor
212a2d2c41
Merge pull request #352 from technoboy10/gh333-creditspage
...
Fix gh-333: Add/Remove Moderators on Credits Page
2016-02-10 22:51:54 -05:00
The_Grits
91f3de0682
link formatting in paragraphs
2016-02-08 14:50:56 -05:00
The_Grits
53cf85a4c2
Update project count
...
Updated the number with a more recent number, I wasn't sure if using a string like "Loading..." would damage anything.
2016-02-08 10:04:38 -05:00
The_Grits
3939dde44e
Update credits.scss
2016-02-08 08:10:41 -05:00
The_Grits
2a6f30cdb7
word-wrap for p elements
...
Should fix #354 , I'll test on a local machine.
2016-02-05 07:59:09 -05:00
Technoboy10
e1b9cf5716
Removed Megan Haddadi, added Linda and Lily
2016-02-03 08:36:05 -07:00
Andrew Sliwinski
6204b52479
WIP
2016-01-31 13:02:10 -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
Matthew Taylor
7303b7963b
import main.scss
in render.jsx
...
Fallout from #305 , fixes #324
2016-01-14 14:55:24 -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
morant
793b8c025d
remove unneeded imports, and show design studio without a propmpt project as a carousel
2016-01-13 12:32:53 -05:00
Matthew Taylor
f00d07b0bf
edit all indentation
...
ht @thisandagain!
2016-01-13 11:52:38 -05:00
Matthew Taylor
592f66c9a8
Fix credits link
...
Fixes #297
2016-01-13 10:35:26 -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
morant
2cf6befeaf
add hip hop and fashion JSONs, and minor fixes to microworlds.jsx
2016-01-11 18:38:15 -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
morant
6aa93b1711
Error Handling - when a component isn't declared, don't show it.
2016-01-08 18:35:17 -05:00
morant
2593d7aaf5
Generic version of the Microworlds.
...
No arts specific features anymore.
Still fails when a component is missing
2016-01-08 16:18:51 -05:00
morant
cca175154c
First version of generic microworlds.
...
Reads videos information from JSON, other parts still not generic.
2016-01-08 14:43:39 -05:00
morant
5c919506cf
Add tips
2016-01-08 14:42:35 -05:00
Matthew Taylor
ceec694b2a
Revert "Migrate to using a loader method"
...
This reverts commit 214430b0c4
.
2016-01-08 13:50:58 -05:00
Matthew Taylor
214430b0c4
Migrate to using a loader method
...
This moves all locale/translation building to a dependency, `scratch-www-intl-loader`, as well as tests associated with it. Also gets rid of the `make translations` step.
2016-01-07 17:01:57 -05:00
Matthew Taylor
d5ffd9fcc0
Flatten messages for components into one object
...
thanks @rschamp!
2016-01-07 11:02:14 -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
Matthew Taylor
448ca0b103
Remove main bundle
...
Render footer and nav on each view directly instead of globally in a separate bundle
2016-01-06 14:23:47 -05:00
Matthew Taylor
8ae98d703f
Make localizations view-based
...
1. Load locale strings into `window._messages` in a separate file added to `template.html`, which contains view-specific and general strings
2. Update build-locales to compile separate files
2016-01-06 14:09:32 -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
fc59793aff
Merge pull request #244 from thisandagain/feature/about
...
Migrate - About View
2015-12-08 13:52:27 -05:00
Andrew Sliwinski
64546a2410
Merge pull request #245 from thisandagain/feature/credits
...
Migrate - Credits View
2015-12-08 13:52:18 -05:00
Andrew Sliwinski
2fdc6458e0
Address feedback from review
2015-12-08 10:53:12 -05:00
Andrew Sliwinski
aa7efc7e4f
Merge branch 'develop' of github.com:llk/scratch-www into feature/about
2015-12-08 10:31:48 -05:00
Andrew Sliwinski
30f4feff48
Hotfix for HOC legal notices
2015-12-04 10:41:25 -05:00
Hannah Cole
92dc1727e2
fixed tests, formatting
2015-12-01 16:14:37 -05:00
Hannah Cole
97877b1fbd
jobs page styling changes
2015-12-01 16:00:52 -05:00
Hannah Cole
1eadc19d5e
localized jobs page
2015-12-01 15:50:29 -05:00
Hannah Cole
6ec9f7da11
created jobs page
2015-11-29 13:53:03 -05:00
Hannah Cole
c82aecf1f7
created jobs page
2015-11-29 13:42:26 -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
morant
9f0d36624a
Fresh version of arts microworld
2015-11-22 21:40:08 -05:00
carljbowman
ba2902f979
Add Made with Code Logo
2015-11-20 09:56:10 -05:00
Andrew Sliwinski
167353c68d
Migrate credits page. Resolves GH-30. Resolves GH-174. Resolves GH-215
2015-11-18 21:14:54 -05:00
Andrew Sliwinski
82eedaaf13
Resolve merge conflicts
2015-11-18 20:06:54 -05:00
Andrew Sliwinski
8a2ac5f24e
Resolve lint errors
2015-11-18 20:06:05 -05:00
Andrew Sliwinski
f2561fbc03
Migrate about view. Resolves GH-63
2015-11-18 19:57:07 -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
carljbowman
96b1dba277
Update HOC tutorials and linking
...
- Swapped Pong Game with B-Ball Hoops
- Changed Bearstack Story's thumbnail to clear up confusion around similar thumbnails
- Added 'B-Ball Hoops' to localization JSON
- Added anchor link to resource section for easy acess.
2015-11-10 10:58:08 -08: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
b1694c1adc
Fix GH-128 again: use table layout for IE 9
2015-11-05 19:33:02 -05:00
Matthew Taylor
21e1e73c95
Fix HOC links
...
bearstack, dance studio
2015-11-04 10:33:26 -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
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
Matthew Taylor
46742459bf
Add empty host for clear-cache
proxy request
...
So that it actually goes to scratchr2, not scratch-api
2015-10-30 09:14:49 -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
399d91fea5
Use shouldShowWelcome method to show welcome panel
...
Fixes GH-153. Again...
2015-10-25 16:34:32 -04:00
Ray Schamp
2eb63e604d
Scope message handler to confirmation iframe
2015-10-25 12:13:48 -04:00
Ray Schamp
3b729fcb0a
Move "should show banner" test to one function
2015-10-25 12:13:48 -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
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
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
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
5865b6d619
Add some padding to the empty message
2015-10-24 12:38: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
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
Ray Schamp
39550d805a
Fix #152 : Don't output activity without a message
2015-10-23 17:41:50 -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
carljbowman
dc13d63d2e
Update entire Tutorial cards to be clickable
...
Wrapped the Tutorial cards in link tags, rather than just the button.
2015-10-22 10:34:18 -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
carljbowman
c7367967ba
Update Hover JS fuctions with intative naming
2015-10-14 14:53:40 -06:00
carljbowman
5a8ab315b5
Remove extra white space on HOC Landing
2015-10-14 14:46:13 -06:00
carljbowman
4424fe2f0b
Add Collaborators and Logos
2015-10-14 14:45:00 -06:00
carljbowman
144d30ad09
Remove excess/unused CSS
2015-10-14 10:33:56 -06:00
carljbowman
2d745dd1ea
Update HOC with Banner Hoverstates & Assets
...
- Added hover states on the tutorial cards that changes the banner background.
- Included new web optimized image assets.
2015-10-14 10:30:52 -06:00
Andrew Sliwinski
3bf13df8fe
More copy changes for HOC
2015-10-13 18:18:15 -04:00
Andrew Sliwinski
2a881fccb5
Quick HOC copy changes from Natalie & Mitch
2015-10-13 17:20:05 -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
Andrew Sliwinski
bb3870c43d
Merge pull request #20 from carljbowman/hoc-landing-updates
...
Hoc landing updates
2015-10-06 17:32:40 -04:00
carljbowman
c26378f53d
Update as many links as possible with live content
...
Links still to be added
- Hide & Seek Tips Window
- Hide & Seek Tips Cards Download
- Compose a Dance Tips Cards Download
- Animate Your Name Tips Cards Download
2015-10-06 16:14:01 -04:00
carljbowman
4a51ffeb59
Remove Red Outline on "href='''
2015-10-06 15:49:10 -04:00
Andrew Sliwinski
3a648a20cb
Merge pull request #17 from rschamp/feature/better-featured-json
...
Add real content for homepage rows
2015-10-06 15:47:38 -04:00
Ray Schamp
08de438208
Fix thumbnail URL per discussion
2015-10-06 13:07:24 -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
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
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
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
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
carljbowman
e93b47285a
Merge pull request #10 from carljbowman/navigation
...
Navigation
2015-09-21 13:42:01 -04:00
carljbowman
d3ebcd6744
Replacing Tabs with Spaces
2015-09-21 11:32:17 -04:00
Andrew Sliwinski
a85db60610
Resolve merge conflicts
2015-09-21 10:44:58 -04:00
carljbowman
9a67d3fb98
Navigation WIP
2015-09-21 09:18:00 -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
f76374b24e
Add an "intro" component to the homepage
2015-09-09 22:26:07 -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
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
41176aaee1
Extend build process to support multiple views
2015-09-03 22:26:56 -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