From fe3b983347ecfe7f146b812c30380065b3871fd4 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Sun, 19 Jul 2015 13:36:35 -0700 Subject: [PATCH] remove react-stampit --- common/app/routes/Hikes/components/Hikes.jsx | 3 +-- common/app/routes/Hikes/components/Lecture.jsx | 6 +++--- common/app/routes/Hikes/components/Map.jsx | 3 +-- common/app/routes/Hikes/components/Question.jsx | 13 +++++++------ package.json | 1 - 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/common/app/routes/Hikes/components/Hikes.jsx b/common/app/routes/Hikes/components/Hikes.jsx index 87b2b5c63e..ca891a9f99 100644 --- a/common/app/routes/Hikes/components/Hikes.jsx +++ b/common/app/routes/Hikes/components/Hikes.jsx @@ -1,5 +1,4 @@ import React, { PropTypes } from 'react'; -import stampit from 'react-stampit'; import { Row } from 'react-bootstrap'; import { contain } from 'thundercats-react'; // import debugFactory from 'debug'; @@ -20,7 +19,7 @@ export default contain( return props.params.dashedName !== nextProps.params.dashedName; } }, - stampit(React, { + React.createClass({ displayName: 'Hikes', propTypes: { diff --git a/common/app/routes/Hikes/components/Lecture.jsx b/common/app/routes/Hikes/components/Lecture.jsx index d2174e5bf3..26ebca087f 100644 --- a/common/app/routes/Hikes/components/Lecture.jsx +++ b/common/app/routes/Hikes/components/Lecture.jsx @@ -1,14 +1,14 @@ import React, { PropTypes } from 'react'; import { Button, Col, Row, Panel } from 'react-bootstrap'; import { Navigation } from 'react-router'; -import stampit from 'react-stampit'; import Vimeo from 'react-vimeo'; import debugFactory from 'debug'; const debug = debugFactory('freecc:hikes'); -export default stampit(React, { +export default React.createClass({ displayName: 'Lecture', + mixin: [Navigation], propTypes: { currentHike: PropTypes.object, @@ -68,4 +68,4 @@ export default stampit(React, { ); } -}).compose(Navigation); +}); diff --git a/common/app/routes/Hikes/components/Map.jsx b/common/app/routes/Hikes/components/Map.jsx index a5acbe2032..830f74a7ef 100644 --- a/common/app/routes/Hikes/components/Map.jsx +++ b/common/app/routes/Hikes/components/Map.jsx @@ -1,9 +1,8 @@ import React, { PropTypes } from 'react'; -import stampit from 'react-stampit'; import { Link } from 'react-router'; import { ListGroup, ListGroupItem, Panel } from 'react-bootstrap'; -export default stampit(React, { +export default React.createClass({ displayName: 'HikesMap', propTypes: { diff --git a/common/app/routes/Hikes/components/Question.jsx b/common/app/routes/Hikes/components/Question.jsx index f54cec2f7f..42918687a6 100644 --- a/common/app/routes/Hikes/components/Question.jsx +++ b/common/app/routes/Hikes/components/Question.jsx @@ -1,6 +1,5 @@ import React, { PropTypes } from 'react'; import { Navigation, TransitionHook } from 'react-router'; -import stampit from 'react-stampit'; import debugFactory from 'debug'; import { Button, @@ -12,9 +11,13 @@ import { const debug = debugFactory('freecc:hikes'); -export default stampit(React, { - state: { showInfo: false }, +export default React.createClass({ + getInitialState: () => ({ showInfo: false }), displayName: 'Question', + mixins: [ + Navigation, + TransitionHook + ], propTypes: { currentHike: PropTypes.object, @@ -127,6 +130,4 @@ export default stampit(React, { ); } -}) - .compose(Navigation) - .compose(TransitionHook); +}); diff --git a/package.json b/package.json index c96f9ca36a..630bdc068c 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,6 @@ "react": "^0.13.3", "react-bootstrap": "^0.23.7", "react-router": "https://github.com/BerkeleyTrue/react-router#freecodecamp", - "react-stampit": "git+https://github.com/BerkeleyTrue/react-stampit.git#fcc", "react-vimeo": "^0.0.3", "request": "~2.53.0", "rx": "^2.5.3",