diff --git a/src/components/tipsslider/tipsslider.json b/src/components/tipsslider/tipsslider.json
new file mode 100644
index 000000000..5c16ec508
--- /dev/null
+++ b/src/components/tipsslider/tipsslider.json
@@ -0,0 +1,50 @@
+[
+ {
+ "id": 1,
+ "type": "project",
+ "title": "Project1",
+ "thumbnailUrl": "/images/microworlds/hiphop/add-repeat.gif",
+ "creator": "",
+ "href": "/images/microworlds/hiphop/add-repeat.gif"
+ },
+ {
+ "id": 2,
+ "type": "project",
+ "title": "Project2",
+ "thumbnailUrl": "/images/microworlds/hiphop/add-wait.gif",
+ "creator": "",
+ "href": "/images/microworlds/hiphop/add-wait.gif"
+ },
+ {
+ "id": 3,
+ "type": "project",
+ "title": "Project",
+ "thumbnailUrl": "",
+ "creator": "",
+ "href": "#"
+ },
+ {
+ "id": 4,
+ "type": "project",
+ "title": "Project",
+ "thumbnailUrl": "",
+ "creator": "",
+ "href": "#"
+ },
+ {
+ "id": 5,
+ "type": "project",
+ "title": "Project",
+ "thumbnailUrl": "",
+ "creator": "",
+ "href": "#"
+ },
+ {
+ "id": 6,
+ "type": "project",
+ "title": "Project",
+ "thumbnailUrl": "",
+ "creator": "",
+ "href": "#"
+ }
+]
diff --git a/src/components/tipsslider/tipsslider.jsx b/src/components/tipsslider/tipsslider.jsx
new file mode 100644
index 000000000..8b46cd3f6
--- /dev/null
+++ b/src/components/tipsslider/tipsslider.jsx
@@ -0,0 +1,75 @@
+var classNames = require('classnames');
+var defaults = require('lodash.defaults');
+var React = require('react');
+var Slider = require('react-slick');
+
+var Thumbnail = require('../thumbnail/thumbnail.jsx');
+
+require('slick-carousel/slick/slick.scss');
+require('slick-carousel/slick/slick-theme.scss');
+require('./tipsslider.scss');
+
+var TipsSlider = React.createClass({
+ type: 'TipsSlider',
+ propTypes: {
+ items: React.PropTypes.array
+ },
+ getDefaultProps: function () {
+ return {
+ items: require('./tipsslider.json'),
+ showRemixes: false,
+ showLoves: false
+ };
+ },
+ render: function () {
+ console.error("ITEMS:");
+ console.error(this.props.items);
+ var settings = this.props.settings || {};
+ defaults(settings, {
+ dots: false,
+ infinite: false,
+ lazyLoad: true,
+ slidesToShow: 5,
+ slidesToScroll: 5,
+ variableWidth: true
+ });
+
+ var arrows = this.props.items.length > settings.slidesToShow;
+
+ var classes = classNames(
+ 'tipsslider',
+ this.props.className
+ );
+
+ var slides = [];
+ console.error("before");
+ console.error(this.props.items.length);
+ for (var i=0; i < this.props.items.length; i++) {
+ var items = this.props.items[i].tips;
+ console.error("bla");
+ console.error(items);
+ var thumbnails = [];
+ for (var j=0; j < items.length; j++) {
+ var item = items[j];
+ thumbnails.push()
+ }
+ console.error(thumbnails)
+ slides.push(
+
+
{this.props.items[i].title}
+ {thumbnails}
+ )
+ }
+ console.error("slides")
+ console.error(slides[0]);
+ return (
+
+ {slides}
+
+ );
+ }
+});
+
+module.exports = TipsSlider;
diff --git a/src/components/tipsslider/tipsslider.scss b/src/components/tipsslider/tipsslider.scss
new file mode 100644
index 000000000..c530a2764
--- /dev/null
+++ b/src/components/tipsslider/tipsslider.scss
@@ -0,0 +1,75 @@
+@import "../../colors";
+
+.tipsslider {
+ $icon-size: 40px;
+ $button-offset: $icon-size + 5px;
+ $box-content-offset: 20px;
+
+ padding: 12px $button-offset;
+
+ .box-content & {
+ padding: 12px $button-offset - 20px;
+ }
+
+ .slick-next,
+ .slick-prev {
+ margin-top: -$icon-size/2;
+ width: $icon-size;
+ height: $icon-size;
+
+ &:before {
+ display: block;
+ background-repeat: no-repeat;
+ background-position: center center;
+ background-size: 70%;
+ width: $icon-size;
+ height: $icon-size;
+ font-size: $icon-size;
+ content: "";
+ }
+
+ &.slick-disabled:before {
+ opacity: 1;
+ }
+ }
+
+ .slick-prev {
+ left: 0;
+
+ &:before {
+ background-image: url("/svgs/carousel/prev_ui-dark-gray.svg");
+ }
+
+ &:hover:before {
+ background-image: url("/svgs/carousel/prev_ui-blue.svg");
+ background-size: 90%;
+ }
+
+
+ .box-content & {
+ left: -$box-content-offset;
+ }
+ }
+
+ .slick-next {
+ right: 0;
+
+ &:before {
+ background-image: url("/svgs/carousel/next_ui-dark-gray.svg");
+ }
+
+ &:hover:before {
+ background-image: url("/svgs/carousel/next_ui-blue.svg");
+ background-size: 90%;
+ }
+
+ .box-content & {
+ right: -$box-content-offset;
+ }
+ }
+
+ .slick-slide {
+ padding-right: 30px;
+ }
+
+}
diff --git a/src/views/microworlds_art/microworlds_art.jsx b/src/views/microworlds_art/microworlds_art.jsx
index f17a330f7..029298f84 100644
--- a/src/views/microworlds_art/microworlds_art.jsx
+++ b/src/views/microworlds_art/microworlds_art.jsx
@@ -12,6 +12,7 @@ var Box = require('../../components/box/box.jsx');
require('./microworlds_art.scss');
var Carousel = require('../../components/carousel/carousel.jsx');
var Modal = require('../../components/modal/modal.jsx');
+var TipsSlider = require('../../components/tipsslider/tipsslider.jsx');
var Microworld = React.createClass({
type: 'Microworld',
@@ -119,31 +120,46 @@ var Microworld = React.createClass({
- {this.renderTips()}
+
+
+
Start Painting
+
+
+ {this.createSlider()}
+
+
)
},
+ createSlider: function() {
+ var tips = require("./microworlds_art_tips.json");
+ console.error("in here!");
+ console.error(tips);
+ return (
+
+ )
+ },
renderTips: function() {
return (
- {/*
+
-
Start to Dance
-
![](images/pathways/dancer-sprite.png)
+
First, select a sprite
-
![](images/pathways/switch-wait.gif)
+
Then, try this script
-
![](images/pathways/green-flag.gif)
+
Start it!
@@ -153,16 +169,16 @@ var Microworld = React.createClass({
Repeat the Dance
-
![](images/pathways/add-wait.gif)
+
Add another "wait"
-
![](images/pathways/add-repeat.gif)
+
Drag this block over
-
![](images/pathways/green-flag.gif)
+
Start it
@@ -172,12 +188,12 @@ var Microworld = React.createClass({
Play Music
-
![](images/pathways/add-play-sound.gif)
+
Add music that repeats
-
![](images/pathways/green-flag.gif)
+
Start it
@@ -187,17 +203,17 @@ var Microworld = React.createClass({
Shadow Dance
-
![](images/pathways/shadow-dance.gif)
+
Add this block
-
![](images/pathways/green-flag.gif)
+
Start it
-
![](images/pathways/stop.gif)
+
Click the stop sign to reset
@@ -207,16 +223,16 @@ var Microworld = React.createClass({
More things to try
-
![](images/pathways/change-dance-moves.gif)
+
Try different dance moves
-
![](images/pathways/long-dance-script.png)
+
Add more moves
-
![](images/pathways/change-dance-timing.png)
+
Change the timing
@@ -225,7 +241,7 @@ var Microworld = React.createClass({
-
*/}
+
);
diff --git a/src/views/microworlds_art/microworlds_art.scss b/src/views/microworlds_art/microworlds_art.scss
index 2fe384e05..cd4905a73 100644
--- a/src/views/microworlds_art/microworlds_art.scss
+++ b/src/views/microworlds_art/microworlds_art.scss
@@ -169,6 +169,15 @@ $base-bg: $ui-white;
}
}
+ .tipsslider {
+ text-align: center;
+
+ .thumbnail {
+ display: inline-block;
+ margin: 0px 50px;
+ }
+ }
+
.pathways .box-content {padding:20px;}
diff --git a/src/views/microworlds_art/microworlds_art_tips.json b/src/views/microworlds_art/microworlds_art_tips.json
new file mode 100644
index 000000000..f1a8247c3
--- /dev/null
+++ b/src/views/microworlds_art/microworlds_art_tips.json
@@ -0,0 +1,66 @@
+[
+{
+ "title": "Start Dancing",
+ "tips": [
+ {
+ "id": 1,
+ "type": "tip",
+ "title": "First, select a sprite",
+ "thumbnailUrl": "/images/microworlds/hiphop/dancer-sprite.png"
+ },
+ {
+ "id": 2,
+ "type": "tip",
+ "title": "Then, try this script",
+ "thumbnailUrl": "/images/microworlds/hiphop/switch-wait.gif"
+ },
+ {
+ "id": 3,
+ "type": "tip",
+ "title": "Start it!",
+ "thumbnailUrl": "/images/microworlds/hiphop/green-flag.gif"
+ }
+ ]
+ },
+ {
+ "title": "Repeat the Dance",
+ "tips": [
+ {
+ "id": 4,
+ "type": "tip",
+ "title": "Add another \"wait\"",
+ "thumbnailUrl": "/images/microworlds/hiphop/add-wait.gif"
+ },
+ {
+ "id": 5,
+ "type": "tip",
+ "title": "Drag this block over",
+ "thumbnailUrl": "/images/microworlds/hiphop/add-repeat.gif"
+ },
+ {
+ "id": 6,
+ "type": "tip",
+ "title": "Start it",
+ "thumbnailUrl": "/images/microworlds/hiphop/green-flag.gif"
+ }
+ ]
+ },
+ {
+ "title": "Play Music",
+ "tips": [
+
+ {
+ "id": 7,
+ "type": "tip",
+ "title": "Add music that repeats",
+ "thumbnailUrl": "/images/microworlds/hiphop/add-play-sound.gif"
+ },
+ {
+ "id": 8,
+ "type": "tip",
+ "title": "Start it",
+ "thumbnailUrl": "/images/microworlds/hiphop/green-flag.gif"
+ }
+ ]
+ }
+]
diff --git a/static/images/microworlds/fashion/accessories-sprite.png b/static/images/microworlds/fashion/accessories-sprite.png
new file mode 100755
index 000000000..4ec0cf1e3
Binary files /dev/null and b/static/images/microworlds/fashion/accessories-sprite.png differ
diff --git a/static/images/microworlds/fashion/click-block-color.gif b/static/images/microworlds/fashion/click-block-color.gif
new file mode 100755
index 000000000..9c231cd5d
Binary files /dev/null and b/static/images/microworlds/fashion/click-block-color.gif differ
diff --git a/static/images/microworlds/fashion/click-block-costume.gif b/static/images/microworlds/fashion/click-block-costume.gif
new file mode 100755
index 000000000..ff96ca7a6
Binary files /dev/null and b/static/images/microworlds/fashion/click-block-costume.gif differ
diff --git a/static/images/microworlds/fashion/click-hat.gif b/static/images/microworlds/fashion/click-hat.gif
new file mode 100755
index 000000000..ca03d8125
Binary files /dev/null and b/static/images/microworlds/fashion/click-hat.gif differ
diff --git a/static/images/microworlds/fashion/click-shirt.gif b/static/images/microworlds/fashion/click-shirt.gif
new file mode 100755
index 000000000..d8cf5124b
Binary files /dev/null and b/static/images/microworlds/fashion/click-shirt.gif differ
diff --git a/static/images/microworlds/fashion/green-flag.gif b/static/images/microworlds/fashion/green-flag.gif
new file mode 100755
index 000000000..f33668197
Binary files /dev/null and b/static/images/microworlds/fashion/green-flag.gif differ
diff --git a/static/images/microworlds/fashion/hats-sprite.png b/static/images/microworlds/fashion/hats-sprite.png
new file mode 100755
index 000000000..f77ce2fb1
Binary files /dev/null and b/static/images/microworlds/fashion/hats-sprite.png differ
diff --git a/static/images/microworlds/fashion/next-costume.png b/static/images/microworlds/fashion/next-costume.png
new file mode 100755
index 000000000..fb49d8ecd
Binary files /dev/null and b/static/images/microworlds/fashion/next-costume.png differ
diff --git a/static/images/microworlds/fashion/person-sprite.png b/static/images/microworlds/fashion/person-sprite.png
new file mode 100755
index 000000000..7da721ab9
Binary files /dev/null and b/static/images/microworlds/fashion/person-sprite.png differ
diff --git a/static/images/microworlds/fashion/say-something.gif b/static/images/microworlds/fashion/say-something.gif
new file mode 100755
index 000000000..a58acfd10
Binary files /dev/null and b/static/images/microworlds/fashion/say-something.gif differ
diff --git a/static/images/microworlds/fashion/shirts-sprite.png b/static/images/microworlds/fashion/shirts-sprite.png
new file mode 100755
index 000000000..fadf6d485
Binary files /dev/null and b/static/images/microworlds/fashion/shirts-sprite.png differ
diff --git a/static/images/microworlds/fashion/switch-wait.gif b/static/images/microworlds/fashion/switch-wait.gif
new file mode 100755
index 000000000..d92d6bd1f
Binary files /dev/null and b/static/images/microworlds/fashion/switch-wait.gif differ
diff --git a/static/images/microworlds/fashion/when-clicked-color.gif b/static/images/microworlds/fashion/when-clicked-color.gif
new file mode 100755
index 000000000..8fe85709c
Binary files /dev/null and b/static/images/microworlds/fashion/when-clicked-color.gif differ
diff --git a/static/images/microworlds/fashion/when-clicked-costume.gif b/static/images/microworlds/fashion/when-clicked-costume.gif
new file mode 100755
index 000000000..89b1ff73b
Binary files /dev/null and b/static/images/microworlds/fashion/when-clicked-costume.gif differ
diff --git a/static/images/microworlds/fashion/when-clicked-goto.gif b/static/images/microworlds/fashion/when-clicked-goto.gif
new file mode 100755
index 000000000..1479691fd
Binary files /dev/null and b/static/images/microworlds/fashion/when-clicked-goto.gif differ
diff --git a/static/images/microworlds/fashion/when-clicked-say.gif b/static/images/microworlds/fashion/when-clicked-say.gif
new file mode 100755
index 000000000..db9950853
Binary files /dev/null and b/static/images/microworlds/fashion/when-clicked-say.gif differ
diff --git a/static/images/microworlds/hiphop/add-play-sound.gif b/static/images/microworlds/hiphop/add-play-sound.gif
new file mode 100755
index 000000000..a83aa9ce9
Binary files /dev/null and b/static/images/microworlds/hiphop/add-play-sound.gif differ
diff --git a/static/images/microworlds/hiphop/add-repeat.gif b/static/images/microworlds/hiphop/add-repeat.gif
new file mode 100755
index 000000000..b1390b376
Binary files /dev/null and b/static/images/microworlds/hiphop/add-repeat.gif differ
diff --git a/static/images/microworlds/hiphop/add-wait.gif b/static/images/microworlds/hiphop/add-wait.gif
new file mode 100755
index 000000000..a8b8c9ff0
Binary files /dev/null and b/static/images/microworlds/hiphop/add-wait.gif differ
diff --git a/static/images/microworlds/hiphop/block-stack.png b/static/images/microworlds/hiphop/block-stack.png
new file mode 100755
index 000000000..3735e7d03
Binary files /dev/null and b/static/images/microworlds/hiphop/block-stack.png differ
diff --git a/static/images/microworlds/hiphop/change-dance-moves.gif b/static/images/microworlds/hiphop/change-dance-moves.gif
new file mode 100755
index 000000000..e776b3942
Binary files /dev/null and b/static/images/microworlds/hiphop/change-dance-moves.gif differ
diff --git a/static/images/microworlds/hiphop/change-dance-timing.png b/static/images/microworlds/hiphop/change-dance-timing.png
new file mode 100755
index 000000000..e08f787cf
Binary files /dev/null and b/static/images/microworlds/hiphop/change-dance-timing.png differ
diff --git a/static/images/microworlds/hiphop/clear-effects.gif b/static/images/microworlds/hiphop/clear-effects.gif
new file mode 100755
index 000000000..a00dd50c9
Binary files /dev/null and b/static/images/microworlds/hiphop/clear-effects.gif differ
diff --git a/static/images/microworlds/hiphop/dancer-sprite.png b/static/images/microworlds/hiphop/dancer-sprite.png
new file mode 100755
index 000000000..94d165049
Binary files /dev/null and b/static/images/microworlds/hiphop/dancer-sprite.png differ
diff --git a/static/images/microworlds/hiphop/dancer-test.gif b/static/images/microworlds/hiphop/dancer-test.gif
new file mode 100755
index 000000000..691c2ea73
Binary files /dev/null and b/static/images/microworlds/hiphop/dancer-test.gif differ
diff --git a/static/images/microworlds/hiphop/green-flag.gif b/static/images/microworlds/hiphop/green-flag.gif
new file mode 100644
index 000000000..f33668197
Binary files /dev/null and b/static/images/microworlds/hiphop/green-flag.gif differ
diff --git a/static/images/microworlds/hiphop/long-dance-script.png b/static/images/microworlds/hiphop/long-dance-script.png
new file mode 100755
index 000000000..7fd159864
Binary files /dev/null and b/static/images/microworlds/hiphop/long-dance-script.png differ
diff --git a/static/images/microworlds/hiphop/play-drum.png b/static/images/microworlds/hiphop/play-drum.png
new file mode 100755
index 000000000..3a6eeba46
Binary files /dev/null and b/static/images/microworlds/hiphop/play-drum.png differ
diff --git a/static/images/microworlds/hiphop/shadow-dance.gif b/static/images/microworlds/hiphop/shadow-dance.gif
new file mode 100755
index 000000000..c8eb798f3
Binary files /dev/null and b/static/images/microworlds/hiphop/shadow-dance.gif differ
diff --git a/static/images/microworlds/hiphop/stop.gif b/static/images/microworlds/hiphop/stop.gif
new file mode 100755
index 000000000..db6e1b1eb
Binary files /dev/null and b/static/images/microworlds/hiphop/stop.gif differ
diff --git a/static/images/microworlds/hiphop/switch-wait.gif b/static/images/microworlds/hiphop/switch-wait.gif
new file mode 100644
index 000000000..d92d6bd1f
Binary files /dev/null and b/static/images/microworlds/hiphop/switch-wait.gif differ