merged with dev

Author: joshua0308

src/app/containers/MainContainer.jsx

@@ -81,18 +81,11 @@ class MainContainer extends Component {
     }
   }
 
-<<<<<<< HEAD
   play(speed = 1000) {
     globalPlaying = !globalPlaying;
     this.setState({ playing: globalPlaying }, () => {
       const { playing } = this.state;
       if (playing) {
-=======
-  play() {
-    globalPlaying = !globalPlaying;
-    this.setState({ playing: globalPlaying }, () => {
-      if (this.state.playing) {
->>>>>>> dev
         intervalId = setInterval(() => {
           const { snapshots, snapshotIndex } = this.state;
           if (snapshotIndex < snapshots.length - 1) {
@@ -102,15 +95,9 @@ class MainContainer extends Component {
             // clear interval when play reaches the end
             globalPlaying = false;
             clearInterval(intervalId);
-<<<<<<< HEAD
             this.setState({ playing: false });
           }
         }, speed);
-=======
-            this.setState({ playing: false })
-          }
-        }, 1000);
->>>>>>> dev
       } else {
         clearInterval(intervalId);
       }
@@ -189,14 +176,9 @@ class MainContainer extends Component {
             moveBackward={this.moveBackward}
             moveForward={this.moveForward}
             play={this.play}
-<<<<<<< HEAD
             pause={this.pause}
             playing={playing}
             playSpeed={playSpeed}
-=======
-            playing={playing}
-            pause={this.pause}
->>>>>>> dev
           />
           <ButtonsContainer mode={mode} toggleMode={this.toggleMode} />
         </div>

src/app/containers/TravelContainer.jsx

@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
 import MainSlider from '../components/MainSlider';
 import Dropdown from '../components/Dropdown';
 
-<<<<<<< HEAD
 const options = [
   { value: 2000, label: '0.5x' },
   { value: 1000, label: '1.0x' },
@@ -63,38 +62,6 @@ class TravelContainer extends Component {
     );
   }
 }
-=======
-const TravelContainer = ({
-  moveBackward,
-  moveForward,
-  snapshotsLength,
-  handleChangeSnapshot,
-  handleJumpSnapshot,
-  snapshotIndex,
-  play,
-  playing,
-  pause,
-}) => (
-  <div className="travel-container">
-    <div className="play-button" onClick={play}>
-      {playing ? 'Pause' : 'Play'}
-    </div>
-    <MainSlider
-      snapshotLength={snapshotsLength}
-      handleChangeSnapshot={handleChangeSnapshot}
-      snapshotIndex={snapshotIndex}
-      handleJumpSnapshot={handleJumpSnapshot}
-      pause={pause}
-    />
-    <div className="backward-button" onClick={moveBackward}>
-      {'<'}
-    </div>
-    <div className="forward-button" onClick={moveForward}>
-      {'>'}
-    </div>
-  </div>
-);
->>>>>>> dev
 
 TravelContainer.propTypes = {
   pause: PropTypes.func.isRequired,