Yet again more pages added to the story and more images

thepont · Feb 13, 2016 · ed285a9 · ed285a9
1 parent 1e5fccd
commit ed285a9
Show file tree

Hide file tree

Showing 33 changed files with 28 additions and 38,108 deletions.
diff --git a/images/bg1.png b/images/bg1.png
diff --git a/images/car.png b/images/car.png
diff --git a/images/clouds1.png b/images/clouds1.png
diff --git a/images/clouds1.xcf b/images/clouds1.xcf
diff --git a/images/clouds2.png b/images/clouds2.png
diff --git a/images/duck.xcf b/images/duck.xcf
diff --git a/images/duck1.png b/images/duck1.png
diff --git a/images/duck1.xcf b/images/duck1.xcf
diff --git a/images/duck1small.xcf b/images/duck1small.xcf
diff --git a/images/duck2-small.xcf b/images/duck2-small.xcf
diff --git a/images/duck2.png b/images/duck2.png
diff --git a/images/duck2.xcf b/images/duck2.xcf
diff --git a/images/fedsq.png b/images/fedsq.png
diff --git a/images/fg1.png b/images/fg1.png
diff --git a/images/fg2.png b/images/fg2.png
diff --git a/images/flinders.png b/images/flinders.png
diff --git a/images/marie1.xcf b/images/marie1.xcf
diff --git a/images/melbounesky.png b/images/melbounesky.png
diff --git a/images/mountain.png b/images/mountain.png
diff --git a/images/rail.png b/images/rail.png
diff --git a/images/terrible-small.xcf b/images/terrible-small.xcf
diff --git a/images/terrible.xcf b/images/terrible.xcf
diff --git a/images/trees1.png b/images/trees1.png
diff --git a/images/trees2.png b/images/trees2.png
diff --git a/src/scroller/client/components/Story.jsx b/src/scroller/client/components/Story.jsx
@@ -42,10 +42,15 @@ const PageDetails = {
         locationX: 12000,
         previous: '/story/duck1',
         next: '/story/melbourne'
-    }
+    },
     melbourne: {
         locationX: 12001,
         previous: '/story/duck2',
+        next: '/story/outback'
+    },
+    outback: {
+        locationX: 14500,
+        previous: '/story/melbourne',
         next: '/story/tallouse'
     }
 }
@@ -68,7 +73,9 @@ export class Story extends React.Component {
       window.addEventListener('scroll', this.handleScroll);
   }
   render() {
-    var id = this.props.params.id;
+    if(this.props.params){
+        var {id} = this.props.params;
+    }
     var style = {
         height: this.props.height,
         backgroundColor: 'black'
@@ -82,7 +89,7 @@ export class Story extends React.Component {
     var centerStyle = {
         position: 'absolute',
 
-    },
+    }
     var skyBlue = {
          backgroundColor: '#7EC0EE',
          height: '100%',
@@ -91,9 +98,6 @@ export class Story extends React.Component {
 
     var pageDetails = PageDetails[id] || PageDetails['tallouse'];
 
-
-    console.log('ID', id, pageDetails);
-
     return <div style={style} >
                 <div style={fixedStyle}>
                     <div style={skyBlue}>
@@ -105,15 +109,17 @@ export class Story extends React.Component {
                         <ScrollLayer zIndex={4} step={-0.228} currentScroll={pageDetails.locationX} width={3228} image={'/images/fg2.png'} startX={0} stopX={PageDetails.grenoble.locationX}/>
 
 
-                        <ScrollLayer zIndex={1} step={-0.1} currentScroll={pageDetails.locationX} width={667} image={'/images/duck1.png'} startX={10000} stopX={10300}/>
                         <ScrollLayer zIndex={0} step={-0.5} currentScroll={pageDetails.locationX} width={3000} image={'/images/clouds1.png'} startX={9601} stopX={12000}/>
+                        <ScrollLayer zIndex={1} step={-0.1} currentScroll={pageDetails.locationX} width={667} image={'/images/duck1.png'} startX={10000} stopX={10300}/>
                         <ScrollLayer zIndex={3} step={-1.2} currentScroll={pageDetails.locationX} width={3000} image={'/images/clouds2.png'} startX={9601} stopX={12000}/>
-                        <ScrollLayer zIndex={1} step={-0.01} currentScroll={pageDetails.locationX} width={7313} image={'/images/duck2.png'} startX={10301} stopX={12000}/>
-
-                        <ScrollLayer zIndex={0} step={-1.2} currentScroll={pageDetails.locationX} width={900} image={'/images/melbounesky.png'} startX={12001} stopX={14000}/>
-                        <ScrollLayer zIndex={1} step={-0.5} currentScroll={pageDetails.locationX} width={900} image={'/images/fedsq.png'} startX={12001} stopX={14000}/>
-                        <ScrollLayer zIndex={2} step={-0.1} currentScroll={pageDetails.locationX} width={900} image={'/images/flinders.png'} startX={12001} stopX={14000}/>
+                        <ScrollLayer zIndex={1} step={-0.01} currentScroll={pageDetails.locationX} width={731} image={'/images/duck2.png'} startX={10301} stopX={12000}/>
 
+                        <ScrollLayer zIndex={0} step={-0.3} currentScroll={pageDetails.locationX} width={900} image={'/images/melbounesky.png'} startX={12001} stopX={14500}/>
+                        <ScrollLayer zIndex={1} step={-0.41} currentScroll={pageDetails.locationX} width={3400} image={'/images/trees2.png'} startX={12001} stopX={14500}/>
+                        <ScrollLayer zIndex={2} step={-0.45} currentScroll={pageDetails.locationX} width={3400} image={'/images/trees1.png'} startX={12001} stopX={14500}/>
+                        <ScrollLayer zIndex={3} step={-0.5} currentScroll={pageDetails.locationX} width={3400} image={'/images/fedsq.png'} startX={12001} stopX={14500}/>
+                        <ScrollLayer zIndex={4} step={-0.54} currentScroll={pageDetails.locationX} width={900} image={'/images/flinders.png'} startX={12001} stopX={14500}/>
+                        <ScrollLayer zIndex={5} step={0.02} currentScroll={pageDetails.locationX} width={3400} image={'/images/car.png'} startX={12001} stopX={14500}/>
 
                     </div>
 

diff --git a/src/scroller/client/components/StoryPage.jsx b/src/scroller/client/components/StoryPage.jsx
@@ -0,0 +1,6 @@
+import React from 'react';
+import {Story} from './Story';
+
+export default (props) => {
+    return <Story height={3000} {...props}/>
+}
diff --git a/src/scroller/public/images/car.png b/src/scroller/public/images/car.png
diff --git a/src/scroller/public/images/fedsq.png b/src/scroller/public/images/fedsq.png
diff --git a/src/scroller/public/images/melbounesky.png b/src/scroller/public/images/melbounesky.png
diff --git a/src/scroller/public/images/trees1.png b/src/scroller/public/images/trees1.png
diff --git a/src/scroller/public/images/trees2.png b/src/scroller/public/images/trees2.png
diff --git a/src/scroller/public/scroller.css b/src/scroller/public/scroller.css