diff --git a/front-api/controllers/cart.rb b/front-api/controllers/cart.rb index 24fcda9..2bb0207 100644 --- a/front-api/controllers/cart.rb +++ b/front-api/controllers/cart.rb @@ -103,23 +103,42 @@ post '/cart/confirmation' do end post '/payment/confirmation' do - data = param[:custom] - anonymus = data[:anonymous_id_string] - user = data[:user_id] + data = JSON.parse params[:custom] - cart = Cart.just_find(anonymus, user) - allowed_keys = ["name", "address", "place", "postal_code", "phone", "email", "note"] - params = data.reject { |key,_| !allowed_keys.include?(key) } - cart.delivery_destination.update_attributes(params) - cart.delivery_destination.save! + puts "Data #{data.inspect}" + anonymous = data["anonymous_id_string"] + user = data["user_id"] + user ||= -1 + user = user.to_i + + cart = Cart.just_find(anonymous, user) if cart.item_in_carts.length > 0 cart.ordered = true cart.save! end - Cart.find_or_create(anonymous, logged_in_user_id) + Cart.find_or_create(anonymous, user) report_to_trello(cart) send_order_email(cart) "OK".to_json end + +get '/pikpay/confirmation' do + anonymous = params["anonymous_id_string"] + user = params["user_id"] + user ||= -1 + user = user.to_i + + cart = Cart.just_find(anonymous, user) + if cart.item_in_carts.length > 0 + cart.ordered = true + cart.save! + end + + Cart.find_or_create(anonymous, user) + report_to_trello(cart) + send_order_email(cart) + + redirect "http://localhost:3001/hvala" +end diff --git a/front-api/db/migrate/20160111024541_add_payment_method_to_delivery_destination.rb b/front-api/db/migrate/20160111024541_add_payment_method_to_delivery_destination.rb new file mode 100644 index 0000000..436f912 --- /dev/null +++ b/front-api/db/migrate/20160111024541_add_payment_method_to_delivery_destination.rb @@ -0,0 +1,5 @@ +class AddPaymentMethodToDeliveryDestination < ActiveRecord::Migration + def change + add_column :delivery_destinations, :payment_method, :string + end +end diff --git a/front-api/db/schema.rb b/front-api/db/schema.rb index 4339239..f5633fb 100644 --- a/front-api/db/schema.rb +++ b/front-api/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20160108081208) do +ActiveRecord::Schema.define(version: 20160111024541) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -67,7 +67,7 @@ ActiveRecord::Schema.define(version: 20160108081208) do t.integer "user_id" t.string "anonymous_id_string" t.boolean "instant_delivery", default: false - t.string "payment_method", default: "cash_on_delivery" + t.string "payment_method" end create_table "delivery_time_estimations", force: :cascade do |t| diff --git a/front-ui/app/components/cart/checkoutPage.js b/front-ui/app/components/cart/checkoutPage.js index 5198444..6f7dddf 100644 --- a/front-ui/app/components/cart/checkoutPage.js +++ b/front-ui/app/components/cart/checkoutPage.js @@ -19,7 +19,12 @@ var CheckoutPage = React.createClass({ render: function() { var choosePayment = (
- +
); @@ -97,25 +102,21 @@ var CheckoutPage = React.createClass({ -
- -
-
Roba:
- - Dostava:
- Ukupno: +
+ +
+
Roba:
+ + Dostava:
+ Ukupno:
-
-
-
- Plaćanje:

-
- {choosePayment} -
-
+
+
- +
+ {choosePayment} +
diff --git a/front-ui/app/components/payment/cashOnDeliveryButton.js b/front-ui/app/components/payment/cashOnDeliveryButton.js new file mode 100644 index 0000000..3febebe --- /dev/null +++ b/front-ui/app/components/payment/cashOnDeliveryButton.js @@ -0,0 +1,17 @@ +var React = require('react'); +var ItemActions = require('../../actions/itemActions'); +var NavigationActions = require('../../actions/navigationActions'); +var NavigationStore = require('../../stores/navigationStore'); + +var Globals = require('../../globals'); +var Router = require('react-router'); + +var CashOnDeliveryButton = React.createClass({ + render: function() { + return ( + + ); + } +}); + +module.exports = CashOnDeliveryButton; diff --git a/front-ui/app/components/payment/paymentSelect.js b/front-ui/app/components/payment/paymentSelect.js index a71765c..d12c978 100644 --- a/front-ui/app/components/payment/paymentSelect.js +++ b/front-ui/app/components/payment/paymentSelect.js @@ -6,13 +6,29 @@ var NavigationStore = require('../../stores/navigationStore'); var Globals = require('../../globals'); var Router = require('react-router'); var PaypalButton = require('./paypalButton'); +var PikpaylButton = require('./pikpayButton'); +var CashOnDeliveryButton = require('./cashOnDeliveryButton'); var PaymentSelect = React.createClass({ render: function() { + var cashOnDeliveryBtn = ( ); + var pikpayBtn = ( ); + var paypalBtn = ( ); + return ( -
- -
); +
+
+ {cashOnDeliveryBtn} + {pikpayBtn} + {paypalBtn} +
+ +
+ {cashOnDeliveryBtn} + {pikpayBtn} + {paypalBtn} +
+
); } }); diff --git a/front-ui/app/components/payment/paypalButton.js b/front-ui/app/components/payment/paypalButton.js index 5d40447..41c401e 100644 --- a/front-ui/app/components/payment/paypalButton.js +++ b/front-ui/app/components/payment/paypalButton.js @@ -2,27 +2,38 @@ var React = require('react'); var ItemActions = require('../../actions/itemActions'); var NavigationActions = require('../../actions/navigationActions'); var NavigationStore = require('../../stores/navigationStore'); +var CartStore = require('../../stores/cartStore'); +var CartActions = require('../../actions/cartActions'); var Globals = require('../../globals'); var Router = require('react-router'); var PaypalButton = React.createClass({ render: function() { - var deliveryDestination = JSON.stringify(this.props.deliveryDestination); + var deliveryDestination = JSON.stringify( + { + 'anonymous_id_string': this.props.deliveryDestination.get('anonymous_id_string'), + 'user_id': this.props.deliveryDestination.get('user_id') + }); var amount = Globals.ConvertToEuro(this.props.amount); var deliveryCost = Globals.ConvertToEuro(this.props.deliveryCost); var notifyUrl = Globals.ApiUrl + "/payment/confirmation"; var root = location.protocol + '//' + location.host; - var return_url = root + "/hvala_paypal"; - var cancel_return_url = root + "/odgodjeno"; + var return_url = root + "/hvala"; + var cancel_return_url = root + "/dostava"; return ( +<<<<<<< HEAD
+======= +
+ ); + }, + _onPaypalClick: function(e) { + CartActions.changeDeliveryDestinationProperty('payment_method', 'paypal'); + CartStore.saveDeliveryDestinationAnd(function() { + $("#paypal_form").submit(); + }); } }); diff --git a/front-ui/app/components/payment/pikpayButton.js b/front-ui/app/components/payment/pikpayButton.js new file mode 100644 index 0000000..033ce64 --- /dev/null +++ b/front-ui/app/components/payment/pikpayButton.js @@ -0,0 +1,64 @@ +var React = require('react'); +var ItemActions = require('../../actions/itemActions'); +var NavigationActions = require('../../actions/navigationActions'); +var NavigationStore = require('../../stores/navigationStore'); +var CartStore = require('../../stores/cartStore'); +var CartActions = require('../../actions/cartActions'); + +var Globals = require('../../globals'); +var Router = require('react-router'); +var sha1 = require('sha1'); + +var PikpayButton = React.createClass({ + render: function() { + var total = this.props.amount + this.props.deliveryCost; + total = total * 100; + var order_info = "Info"; + var order_number = "4678678678229"; + var key = "Ribica" + var authenticity_token = Globals.PikpayAuthenticityToken; + var digest = sha1(key + order_number + total + "BAM"); + var rebate_digest = sha1(key + order_number + total + total + "BAM"); + var deliveryDestination = this.props.deliveryDestination; + var city = CartStore.getNameOfThePlace(deliveryDestination.get('place')); + var custom = JSON.stringify( + { + 'anonymous_id_string': deliveryDestination.get('anonymous_id_string'), + 'user_id': deliveryDestination.get('user_id') + }); + + return ( + + ); + }, + _onPikpayClick: function(e) { + CartActions.changeDeliveryDestinationProperty('payment_method', 'pikpay'); + CartStore.saveDeliveryDestinationAnd(function() { + $("#pikpay_form").submit(); + }); + } +}); + +module.exports = PikpayButton; diff --git a/front-ui/app/css/checkout.css b/front-ui/app/css/checkout.css index 71886a0..b8e9e90 100644 --- a/front-ui/app/css/checkout.css +++ b/front-ui/app/css/checkout.css @@ -1,10 +1,16 @@ .checkout_form_margin { margin-right: 10px !important; margin-left: 10px !important; - } -.payment-btn { - float: left; - margin-left: 12px; +.payment-select-container { + text-align: center; +} + +.payment-select-desktop .payment-btn { + margin-right: 10px !important;; +} + +.payment-select-mobile .payment-btn { + margin-bottom: 6px !important; } diff --git a/front-ui/app/globals.js b/front-ui/app/globals.js index 22c2d4e..4d677ae 100644 --- a/front-ui/app/globals.js +++ b/front-ui/app/globals.js @@ -20,6 +20,8 @@ module.exports = { }, MaxNumberOfItemsToBeAdded: 1000, PaypalId: "W7GKS2Q9ZGLGY", + PikpayFormUrl: "https://ipgtest.pikpay.ba/form", + PikpayAuthenticityToken: "1bb1eea16bd6492c01262636897c0c2e3291a1ab", Slugify: function(text) { return text.toString().toLowerCase() diff --git a/front-ui/app/router.js b/front-ui/app/router.js index 1535f93..8946f9e 100644 --- a/front-ui/app/router.js +++ b/front-ui/app/router.js @@ -48,8 +48,8 @@ var router = Router.create({ location: Router.HistoryLocation }); -router.run(function (Handler, state) { - +router.run(function (Handler, state) { + }); diff --git a/front-ui/app/stores/cartStore.js b/front-ui/app/stores/cartStore.js index 3e7a356..6d231cf 100644 --- a/front-ui/app/stores/cartStore.js +++ b/front-ui/app/stores/cartStore.js @@ -2694,10 +2694,14 @@ var addNItems = function(item, count) { var changeDeliveryDestinationProperty = function(property, value) { _deliveryDestination.set(property, value); + console.log(_deliveryDestination); + if (property === 'place') { fetchPlace(); } validateDeliveryDestinationForm(); + + console.log(_deliveryDestination); }; @@ -2717,6 +2721,13 @@ var confirmOrder = function() { }); }; +var saveDeliveryDestinationAnd = function(successCallback) { + _deliveryDestination.save(null, { + success: function() { + successCallback(); + } + }) +}; var saveDeliveryDestination = function() { _deliveryDestination.save(null, { @@ -2809,8 +2820,8 @@ var CartStore = _.extend({}, EventEmitter.prototype, { }, getDeliveryCost: function(instantDelivery) { - return instantDelivery ? _deliveryCosts.get('instant_delivery_price') - : _deliveryCosts.get('delivery_price'); + return instantDelivery ? Number(_deliveryCosts.get('instant_delivery_price')) + : Number(_deliveryCosts.get('delivery_price')); }, getWholeCartState: function() { @@ -2871,6 +2882,14 @@ var CartStore = _.extend({}, EventEmitter.prototype, { address.push(_deliveryDestination.get('email')) return address; + }, + + getNameOfThePlace: function(code) { + return nameOfThePlace(code); + }, + + saveDeliveryDestinationAnd: function(successCallback) { + saveDeliveryDestinationAnd(successCallback); } }); diff --git a/node_modules/ga-react-router/README.md b/node_modules/ga-react-router/README.md deleted file mode 100644 index 041ef81..0000000 --- a/node_modules/ga-react-router/README.md +++ /dev/null @@ -1,23 +0,0 @@ -# Google analytics for react-router - -## How to use - -1. `npm install ga-react-router` -2. In your `webpack.config.js` add `new webpack.DefinePlugin({GA_TRACKING_CODE: JSON.stringify('XXXXXXXX')})` -3. Use analytics in your `Router.run` code. - -## Example - -```js -'use strict'; -var React = require('react'); -var Router = require('react-router'); -var analytics = require('ga-react-router'); - -var routes = require('./routes'); - -Router.run(routes, Router.HistoryLocation, function(Handler, state) { - React.render(, document.getElementById('content')); - analytics(state); -}); -``` diff --git a/node_modules/ga-react-router/package.json b/node_modules/ga-react-router/package.json deleted file mode 100644 index 3687066..0000000 --- a/node_modules/ga-react-router/package.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "name": "ga-react-router", - "version": "1.3.0", - "description": "Google analytics component for react-router", - "main": "src/index.js", - "peerDependencies": { - "react-router": "0.11.x - 0.13.x" - }, - "author": { - "name": "Thomas Coopman @tcoopman" - }, - "repository": { - "type": "git", - "url": "git+ssh://git@github.com/tcoopman/ga-react-router.git" - }, - "licenses": [ - { - "type": "MIT", - "url": "http://www.opensource.org/licenses/mit-license.php" - } - ], - "gitHead": "bd1a0c6d97aef76c38690de4278dec63da13fe9c", - "bugs": { - "url": "https://github.com/tcoopman/ga-react-router/issues" - }, - "homepage": "https://github.com/tcoopman/ga-react-router#readme", - "_id": "ga-react-router@1.3.0", - "scripts": {}, - "_shasum": "28f51f27d5b0339db55499adf82265033cedc939", - "_from": "ga-react-router@*", - "_npmVersion": "2.8.3", - "_nodeVersion": "1.8.1", - "_npmUser": { - "name": "tcoopman", - "email": "thomas.coopman@gmail.com" - }, - "maintainers": [ - { - "name": "tcoopman", - "email": "thomas.coopman@gmail.com" - } - ], - "dist": { - "shasum": "28f51f27d5b0339db55499adf82265033cedc939", - "tarball": "http://registry.npmjs.org/ga-react-router/-/ga-react-router-1.3.0.tgz" - }, - "directories": {}, - "_resolved": "https://registry.npmjs.org/ga-react-router/-/ga-react-router-1.3.0.tgz", - "readme": "ERROR: No README data found!" -} diff --git a/node_modules/ga-react-router/src/ga.js b/node_modules/ga-react-router/src/ga.js deleted file mode 100644 index 1d02120..0000000 --- a/node_modules/ga-react-router/src/ga.js +++ /dev/null @@ -1,31 +0,0 @@ -'use strict'; -if(typeof window !== 'undefined' && typeof GA_TRACKING_CODE !== 'undefined') { - (function(window, document, script, url, r, tag, firstScriptTag) { - window['GoogleAnalyticsObject']=r; - window[r] = window[r] || function() { - (window[r].q = window[r].q || []).push(arguments) - }; - window[r].l = 1*new Date(); - tag = document.createElement(script), - firstScriptTag = document.getElementsByTagName(script)[0]; - tag.async = 1; - tag.src = url; - firstScriptTag.parentNode.insertBefore(tag, firstScriptTag); - })( - window, - document, - 'script', - '//www.google-analytics.com/analytics.js', - 'ga' - ); - - var ga = window.ga; - - ga('create', GA_TRACKING_CODE, 'auto'); - - module.exports = function() { - return window.ga.apply(window.ga, arguments); - }; -} else { - module.exports = function() {console.log(arguments)}; -} diff --git a/node_modules/ga-react-router/src/index.js b/node_modules/ga-react-router/src/index.js deleted file mode 100644 index 08c2da4..0000000 --- a/node_modules/ga-react-router/src/index.js +++ /dev/null @@ -1,12 +0,0 @@ -'use strict'; -var ga = require('./ga'); - - -function analytics(state) { - ga('send', 'pageview', { - 'page': state.path - }); -} - - -module.exports = analytics; diff --git a/node_modules/react-router/README.md b/node_modules/react-router/README.md deleted file mode 100644 index 985c291..0000000 --- a/node_modules/react-router/README.md +++ /dev/null @@ -1,140 +0,0 @@ -[![npm package](https://img.shields.io/npm/v/react-router.svg?style=flat-square)](https://www.npmjs.org/package/react-router) -[![build status](https://img.shields.io/travis/rackt/react-router/master.svg?style=flat-square)](https://travis-ci.org/rackt/react-router) -[![dependency status](https://img.shields.io/david/rackt/react-router.svg?style=flat-square)](https://david-dm.org/rackt/react-router) -[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/rackt/react-router?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) - -React Router -============ - -A complete routing library for React. - -Docs ----- - -- [Guide: Overview](/docs/guides/overview.md) -- [API](/docs/api/) - -Important Notes ---------------- - -### SemVer - -Before our `1.0` release, breaking API changes will cause a bump to -`0.x`. For example, `0.4.1` and `0.4.8` will have the same API, but -`0.5.0` will have breaking changes. - -Please refer to the [upgrade guide](/UPGRADE_GUIDE.md) and -[changelog](/CHANGELOG.md) when upgrading. - -Installation ------------- - -```sh -npm install react-router -# or -bower install react-router -``` - -This library is written with CommonJS modules. If you are using -browserify, webpack, or similar, you can consume it like anything else -installed from npm. - -There is also a global build available on bower, find the library on -`window.ReactRouter`. - -The library is also available on the popular CDN [cdnjs](https://cdnjs.com/libraries/react-router). - -Features --------- - -- Nested views mapped to nested routes -- Modular construction of route hierarchy -- Sync and async transition hooks -- Transition abort / redirect / retry -- Dynamic segments -- Query parameters -- Links with automatic `.active` class when their route is active -- Multiple root routes -- Hash or HTML5 history (with fallback) URLs -- Declarative Redirect routes -- Declarative NotFound routes -- Browser scroll behavior with transitions - -Check out the `examples` directory to see how simple previously complex UI -and workflows are to create. - -What's it look like? --------------------- - -```js -var routes = ( - - - - - - - - - - - -); - -Router.run(routes, function (Handler) { - React.render(, document.body); -}); - -// Or, if you'd like to use the HTML5 history API for cleaner URLs: - -Router.run(routes, Router.HistoryLocation, function (Handler) { - React.render(, document.body); -}); -``` - -See more in the [overview guide](/docs/guides/overview.md). - -Benefits of this Approach -------------------------- - -1. **Incredible screen-creation productivity** - There is only one - use-case when a user visits a route: render something. Every user - interface has layers (or nesting) whether it's a simple navbar or - multiple levels of master-detail. Coupling nested routes to these - nested views gets rid of a ton of work for the developer to wire all - of it together when the user switches routes. Adding new screens - could not get faster. - -2. **Immediate understanding of application structure** - When routes - are declared in one place, developers can easily construct a mental - image of the application. It's essentially a sitemap. There's not a - better way to get so much information about your app this quickly. - -3. **Code tractability** - When a developer gets a ticket to fix a bug - at as specific url they simply 1) look at the route config, then 2) - go find the handler for that route. Every entry point into your - application is represented by these routes. - -4. **URLs are your first thought, not an after-thought** - With React - Router, you don't get UI on the page without configuring a url first. - Fortunately, it's wildly productive this way, too. - -Related Modules ---------------- - -- [rnr-constrained-route](https://github.com/bjyoungblood/rnr-constrained-route) - validate paths - and parameters on route handlers. -- [react-router-bootstrap](https://github.com/mtscout6/react-router-bootstrap) - Integration with [react-bootstrap](https://github.com/react-bootstrap/react-bootstrap) components. -- [react-router-proxy-loader](https://github.com/odysseyscience/react-router-proxy-loader) - A Webpack loader to dynamically load react-router components on-demand - -Contributing ------------- - -Please see [CONTRIBUTING](CONTRIBUTING.md) - -Thanks, Ember -------------- - -This library is highly inspired by the Ember.js routing API. In general, -it's a translation of the Ember router api to React. Huge thanks to the -Ember team for solving the hardest part already. diff --git a/node_modules/react-router/lib/Cancellation.js b/node_modules/react-router/lib/Cancellation.js deleted file mode 100644 index bcce202..0000000 --- a/node_modules/react-router/lib/Cancellation.js +++ /dev/null @@ -1,9 +0,0 @@ -/** - * Represents a cancellation caused by navigating away - * before the previous transition has fully resolved. - */ -"use strict"; - -function Cancellation() {} - -module.exports = Cancellation; \ No newline at end of file diff --git a/node_modules/react-router/lib/History.js b/node_modules/react-router/lib/History.js deleted file mode 100644 index f6194ad..0000000 --- a/node_modules/react-router/lib/History.js +++ /dev/null @@ -1,30 +0,0 @@ -'use strict'; - -var invariant = require('react/lib/invariant'); -var canUseDOM = require('react/lib/ExecutionEnvironment').canUseDOM; - -var History = { - - /** - * The current number of entries in the history. - * - * Note: This property is read-only. - */ - length: 1, - - /** - * Sends the browser back one entry in the history. - */ - back: function back() { - invariant(canUseDOM, 'Cannot use History.back without a DOM'); - - // Do this first so that History.length will - // be accurate in location change listeners. - History.length -= 1; - - window.history.back(); - } - -}; - -module.exports = History; \ No newline at end of file diff --git a/node_modules/react-router/lib/Match.js b/node_modules/react-router/lib/Match.js deleted file mode 100644 index ec5f8bc..0000000 --- a/node_modules/react-router/lib/Match.js +++ /dev/null @@ -1,75 +0,0 @@ -'use strict'; - -var _classCallCheck = function (instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }; - -var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })(); - -/* jshint -W084 */ -var PathUtils = require('./PathUtils'); - -function deepSearch(route, pathname, query) { - // Check the subtree first to find the most deeply-nested match. - var childRoutes = route.childRoutes; - if (childRoutes) { - var match, childRoute; - for (var i = 0, len = childRoutes.length; i < len; ++i) { - childRoute = childRoutes[i]; - - if (childRoute.isDefault || childRoute.isNotFound) continue; // Check these in order later. - - if (match = deepSearch(childRoute, pathname, query)) { - // A route in the subtree matched! Add this route and we're done. - match.routes.unshift(route); - return match; - } - } - } - - // No child routes matched; try the default route. - var defaultRoute = route.defaultRoute; - if (defaultRoute && (params = PathUtils.extractParams(defaultRoute.path, pathname))) { - return new Match(pathname, params, query, [route, defaultRoute]); - } // Does the "not found" route match? - var notFoundRoute = route.notFoundRoute; - if (notFoundRoute && (params = PathUtils.extractParams(notFoundRoute.path, pathname))) { - return new Match(pathname, params, query, [route, notFoundRoute]); - } // Last attempt: check this route. - var params = PathUtils.extractParams(route.path, pathname); - if (params) { - return new Match(pathname, params, query, [route]); - }return null; -} - -var Match = (function () { - function Match(pathname, params, query, routes) { - _classCallCheck(this, Match); - - this.pathname = pathname; - this.params = params; - this.query = query; - this.routes = routes; - } - - _createClass(Match, null, [{ - key: 'findMatch', - - /** - * Attempts to match depth-first a route in the given route's - * subtree against the given path and returns the match if it - * succeeds, null if no match can be made. - */ - value: function findMatch(routes, path) { - var pathname = PathUtils.withoutQuery(path); - var query = PathUtils.extractQuery(path); - var match = null; - - for (var i = 0, len = routes.length; match == null && i < len; ++i) match = deepSearch(routes[i], pathname, query); - - return match; - } - }]); - - return Match; -})(); - -module.exports = Match; \ No newline at end of file diff --git a/node_modules/react-router/lib/Navigation.js b/node_modules/react-router/lib/Navigation.js deleted file mode 100644 index 023720c..0000000 --- a/node_modules/react-router/lib/Navigation.js +++ /dev/null @@ -1,70 +0,0 @@ -'use strict'; - -var PropTypes = require('./PropTypes'); - -/** - * A mixin for components that modify the URL. - * - * Example: - * - * var MyLink = React.createClass({ - * mixins: [ Router.Navigation ], - * handleClick(event) { - * event.preventDefault(); - * this.transitionTo('aRoute', { the: 'params' }, { the: 'query' }); - * }, - * render() { - * return ( - * Click me! - * ); - * } - * }); - */ -var Navigation = { - - contextTypes: { - router: PropTypes.router.isRequired - }, - - /** - * Returns an absolute URL path created from the given route - * name, URL parameters, and query values. - */ - makePath: function makePath(to, params, query) { - return this.context.router.makePath(to, params, query); - }, - - /** - * Returns a string that may safely be used as the href of a - * link to the route with the given name. - */ - makeHref: function makeHref(to, params, query) { - return this.context.router.makeHref(to, params, query); - }, - - /** - * Transitions to the URL specified in the arguments by pushing - * a new URL onto the history stack. - */ - transitionTo: function transitionTo(to, params, query) { - this.context.router.transitionTo(to, params, query); - }, - - /** - * Transitions to the URL specified in the arguments by replacing - * the current URL in the history stack. - */ - replaceWith: function replaceWith(to, params, query) { - this.context.router.replaceWith(to, params, query); - }, - - /** - * Transitions to the previous URL. - */ - goBack: function goBack() { - return this.context.router.goBack(); - } - -}; - -module.exports = Navigation; \ No newline at end of file diff --git a/node_modules/react-router/lib/PathUtils.js b/node_modules/react-router/lib/PathUtils.js deleted file mode 100644 index c39d210..0000000 --- a/node_modules/react-router/lib/PathUtils.js +++ /dev/null @@ -1,153 +0,0 @@ -'use strict'; - -var invariant = require('react/lib/invariant'); -var assign = require('object-assign'); -var qs = require('qs'); - -var paramCompileMatcher = /:([a-zA-Z_$][a-zA-Z0-9_$]*)|[*.()\[\]\\+|{}^$]/g; -var paramInjectMatcher = /:([a-zA-Z_$][a-zA-Z0-9_$?]*[?]?)|[*]/g; -var paramInjectTrailingSlashMatcher = /\/\/\?|\/\?\/|\/\?/g; -var queryMatcher = /\?(.*)$/; - -var _compiledPatterns = {}; - -function compilePattern(pattern) { - if (!(pattern in _compiledPatterns)) { - var paramNames = []; - var source = pattern.replace(paramCompileMatcher, function (match, paramName) { - if (paramName) { - paramNames.push(paramName); - return '([^/?#]+)'; - } else if (match === '*') { - paramNames.push('splat'); - return '(.*?)'; - } else { - return '\\' + match; - } - }); - - _compiledPatterns[pattern] = { - matcher: new RegExp('^' + source + '$', 'i'), - paramNames: paramNames - }; - } - - return _compiledPatterns[pattern]; -} - -var PathUtils = { - - /** - * Returns true if the given path is absolute. - */ - isAbsolute: function isAbsolute(path) { - return path.charAt(0) === '/'; - }, - - /** - * Joins two URL paths together. - */ - join: function join(a, b) { - return a.replace(/\/*$/, '/') + b; - }, - - /** - * Returns an array of the names of all parameters in the given pattern. - */ - extractParamNames: function extractParamNames(pattern) { - return compilePattern(pattern).paramNames; - }, - - /** - * Extracts the portions of the given URL path that match the given pattern - * and returns an object of param name => value pairs. Returns null if the - * pattern does not match the given path. - */ - extractParams: function extractParams(pattern, path) { - var _compilePattern = compilePattern(pattern); - - var matcher = _compilePattern.matcher; - var paramNames = _compilePattern.paramNames; - - var match = path.match(matcher); - - if (!match) { - return null; - }var params = {}; - - paramNames.forEach(function (paramName, index) { - params[paramName] = match[index + 1]; - }); - - return params; - }, - - /** - * Returns a version of the given route path with params interpolated. Throws - * if there is a dynamic segment of the route path for which there is no param. - */ - injectParams: function injectParams(pattern, params) { - params = params || {}; - - var splatIndex = 0; - - return pattern.replace(paramInjectMatcher, function (match, paramName) { - paramName = paramName || 'splat'; - - // If param is optional don't check for existence - if (paramName.slice(-1) === '?') { - paramName = paramName.slice(0, -1); - - if (params[paramName] == null) return ''; - } else { - invariant(params[paramName] != null, 'Missing "%s" parameter for path "%s"', paramName, pattern); - } - - var segment; - if (paramName === 'splat' && Array.isArray(params[paramName])) { - segment = params[paramName][splatIndex++]; - - invariant(segment != null, 'Missing splat # %s for path "%s"', splatIndex, pattern); - } else { - segment = params[paramName]; - } - - return segment; - }).replace(paramInjectTrailingSlashMatcher, '/'); - }, - - /** - * Returns an object that is the result of parsing any query string contained - * in the given path, null if the path contains no query string. - */ - extractQuery: function extractQuery(path) { - var match = path.match(queryMatcher); - return match && qs.parse(match[1]); - }, - - /** - * Returns a version of the given path without the query string. - */ - withoutQuery: function withoutQuery(path) { - return path.replace(queryMatcher, ''); - }, - - /** - * Returns a version of the given path with the parameters in the given - * query merged into the query string. - */ - withQuery: function withQuery(path, query) { - var existingQuery = PathUtils.extractQuery(path); - - if (existingQuery) query = query ? assign(existingQuery, query) : existingQuery; - - var queryString = qs.stringify(query, { arrayFormat: 'brackets' }); - - if (queryString) { - return PathUtils.withoutQuery(path) + '?' + queryString; - }return PathUtils.withoutQuery(path); - } - -}; - -module.exports = PathUtils; \ No newline at end of file diff --git a/node_modules/react-router/lib/PropTypes.js b/node_modules/react-router/lib/PropTypes.js deleted file mode 100644 index fdee9be..0000000 --- a/node_modules/react-router/lib/PropTypes.js +++ /dev/null @@ -1,31 +0,0 @@ -'use strict'; - -var assign = require('react/lib/Object.assign'); -var ReactPropTypes = require('react').PropTypes; -var Route = require('./Route'); - -var PropTypes = assign({}, ReactPropTypes, { - - /** - * Indicates that a prop should be falsy. - */ - falsy: function falsy(props, propName, componentName) { - if (props[propName]) { - return new Error('<' + componentName + '> should not have a "' + propName + '" prop'); - } - }, - - /** - * Indicates that a prop should be a Route object. - */ - route: ReactPropTypes.instanceOf(Route), - - /** - * Indicates that a prop should be a Router object. - */ - //router: ReactPropTypes.instanceOf(Router) // TODO - router: ReactPropTypes.func - -}); - -module.exports = PropTypes; \ No newline at end of file diff --git a/node_modules/react-router/lib/Redirect.js b/node_modules/react-router/lib/Redirect.js deleted file mode 100644 index 7cbf688..0000000 --- a/node_modules/react-router/lib/Redirect.js +++ /dev/null @@ -1,12 +0,0 @@ -/** - * Encapsulates a redirect to the given route. - */ -"use strict"; - -function Redirect(to, params, query) { - this.to = to; - this.params = params; - this.query = query; -} - -module.exports = Redirect; \ No newline at end of file diff --git a/node_modules/react-router/lib/Route.js b/node_modules/react-router/lib/Route.js deleted file mode 100644 index b2d4ac1..0000000 --- a/node_modules/react-router/lib/Route.js +++ /dev/null @@ -1,200 +0,0 @@ -'use strict'; - -var _classCallCheck = function (instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }; - -var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })(); - -var assign = require('react/lib/Object.assign'); -var invariant = require('react/lib/invariant'); -var warning = require('react/lib/warning'); -var PathUtils = require('./PathUtils'); - -var _currentRoute; - -var Route = (function () { - function Route(name, path, ignoreScrollBehavior, isDefault, isNotFound, onEnter, onLeave, handler) { - _classCallCheck(this, Route); - - this.name = name; - this.path = path; - this.paramNames = PathUtils.extractParamNames(this.path); - this.ignoreScrollBehavior = !!ignoreScrollBehavior; - this.isDefault = !!isDefault; - this.isNotFound = !!isNotFound; - this.onEnter = onEnter; - this.onLeave = onLeave; - this.handler = handler; - } - - _createClass(Route, [{ - key: 'appendChild', - - /** - * Appends the given route to this route's child routes. - */ - value: function appendChild(route) { - invariant(route instanceof Route, 'route.appendChild must use a valid Route'); - - if (!this.childRoutes) this.childRoutes = []; - - this.childRoutes.push(route); - } - }, { - key: 'toString', - value: function toString() { - var string = ''; - - return string; - } - }], [{ - key: 'createRoute', - - /** - * Creates and returns a new route. Options may be a URL pathname string - * with placeholders for named params or an object with any of the following - * properties: - * - * - name The name of the route. This is used to lookup a - * route relative to its parent route and should be - * unique among all child routes of the same parent - * - path A URL pathname string with optional placeholders - * that specify the names of params to extract from - * the URL when the path matches. Defaults to `/${name}` - * when there is a name given, or the path of the parent - * route, or / - * - ignoreScrollBehavior True to make this route (and all descendants) ignore - * the scroll behavior of the router - * - isDefault True to make this route the default route among all - * its siblings - * - isNotFound True to make this route the "not found" route among - * all its siblings - * - onEnter A transition hook that will be called when the - * router is going to enter this route - * - onLeave A transition hook that will be called when the - * router is going to leave this route - * - handler A React component that will be rendered when - * this route is active - * - parentRoute The parent route to use for this route. This option - * is automatically supplied when creating routes inside - * the callback to another invocation of createRoute. You - * only ever need to use this when declaring routes - * independently of one another to manually piece together - * the route hierarchy - * - * The callback may be used to structure your route hierarchy. Any call to - * createRoute, createDefaultRoute, createNotFoundRoute, or createRedirect - * inside the callback automatically uses this route as its parent. - */ - value: function createRoute(options, callback) { - options = options || {}; - - if (typeof options === 'string') options = { path: options }; - - var parentRoute = _currentRoute; - - if (parentRoute) { - warning(options.parentRoute == null || options.parentRoute === parentRoute, 'You should not use parentRoute with createRoute inside another route\'s child callback; it is ignored'); - } else { - parentRoute = options.parentRoute; - } - - var name = options.name; - var path = options.path || name; - - if (path && !(options.isDefault || options.isNotFound)) { - if (PathUtils.isAbsolute(path)) { - if (parentRoute) { - invariant(path === parentRoute.path || parentRoute.paramNames.length === 0, 'You cannot nest path "%s" inside "%s"; the parent requires URL parameters', path, parentRoute.path); - } - } else if (parentRoute) { - // Relative paths extend their parent. - path = PathUtils.join(parentRoute.path, path); - } else { - path = '/' + path; - } - } else { - path = parentRoute ? parentRoute.path : '/'; - } - - if (options.isNotFound && !/\*$/.test(path)) path += '*'; // Auto-append * to the path of not found routes. - - var route = new Route(name, path, options.ignoreScrollBehavior, options.isDefault, options.isNotFound, options.onEnter, options.onLeave, options.handler); - - if (parentRoute) { - if (route.isDefault) { - invariant(parentRoute.defaultRoute == null, '%s may not have more than one default route', parentRoute); - - parentRoute.defaultRoute = route; - } else if (route.isNotFound) { - invariant(parentRoute.notFoundRoute == null, '%s may not have more than one not found route', parentRoute); - - parentRoute.notFoundRoute = route; - } - - parentRoute.appendChild(route); - } - - // Any routes created in the callback - // use this route as their parent. - if (typeof callback === 'function') { - var currentRoute = _currentRoute; - _currentRoute = route; - callback.call(route, route); - _currentRoute = currentRoute; - } - - return route; - } - }, { - key: 'createDefaultRoute', - - /** - * Creates and returns a route that is rendered when its parent matches - * the current URL. - */ - value: function createDefaultRoute(options) { - return Route.createRoute(assign({}, options, { isDefault: true })); - } - }, { - key: 'createNotFoundRoute', - - /** - * Creates and returns a route that is rendered when its parent matches - * the current URL but none of its siblings do. - */ - value: function createNotFoundRoute(options) { - return Route.createRoute(assign({}, options, { isNotFound: true })); - } - }, { - key: 'createRedirect', - - /** - * Creates and returns a route that automatically redirects the transition - * to another route. In addition to the normal options to createRoute, this - * function accepts the following options: - * - * - from An alias for the `path` option. Defaults to * - * - to The path/route/route name to redirect to - * - params The params to use in the redirect URL. Defaults - * to using the current params - * - query The query to use in the redirect URL. Defaults - * to using the current query - */ - value: function createRedirect(options) { - return Route.createRoute(assign({}, options, { - path: options.path || options.from || '*', - onEnter: function onEnter(transition, params, query) { - transition.redirect(options.to, options.params || params, options.query || query); - } - })); - } - }]); - - return Route; -})(); - -module.exports = Route; \ No newline at end of file diff --git a/node_modules/react-router/lib/ScrollHistory.js b/node_modules/react-router/lib/ScrollHistory.js deleted file mode 100644 index 52a585f..0000000 --- a/node_modules/react-router/lib/ScrollHistory.js +++ /dev/null @@ -1,75 +0,0 @@ -'use strict'; - -var invariant = require('react/lib/invariant'); -var canUseDOM = require('react/lib/ExecutionEnvironment').canUseDOM; -var getWindowScrollPosition = require('./getWindowScrollPosition'); - -function shouldUpdateScroll(state, prevState) { - if (!prevState) { - return true; - } // Don't update scroll position when only the query has changed. - if (state.pathname === prevState.pathname) { - return false; - }var routes = state.routes; - var prevRoutes = prevState.routes; - - var sharedAncestorRoutes = routes.filter(function (route) { - return prevRoutes.indexOf(route) !== -1; - }); - - return !sharedAncestorRoutes.some(function (route) { - return route.ignoreScrollBehavior; - }); -} - -/** - * Provides the router with the ability to manage window scroll position - * according to its scroll behavior. - */ -var ScrollHistory = { - - statics: { - - /** - * Records curent scroll position as the last known position for the given URL path. - */ - recordScrollPosition: function recordScrollPosition(path) { - if (!this.scrollHistory) this.scrollHistory = {}; - - this.scrollHistory[path] = getWindowScrollPosition(); - }, - - /** - * Returns the last known scroll position for the given URL path. - */ - getScrollPosition: function getScrollPosition(path) { - if (!this.scrollHistory) this.scrollHistory = {}; - - return this.scrollHistory[path] || null; - } - - }, - - componentWillMount: function componentWillMount() { - invariant(this.constructor.getScrollBehavior() == null || canUseDOM, 'Cannot use scroll behavior without a DOM'); - }, - - componentDidMount: function componentDidMount() { - this._updateScroll(); - }, - - componentDidUpdate: function componentDidUpdate(prevProps, prevState) { - this._updateScroll(prevState); - }, - - _updateScroll: function _updateScroll(prevState) { - if (!shouldUpdateScroll(this.state, prevState)) { - return; - }var scrollBehavior = this.constructor.getScrollBehavior(); - - if (scrollBehavior) scrollBehavior.updateScrollPosition(this.constructor.getScrollPosition(this.state.path), this.state.action); - } - -}; - -module.exports = ScrollHistory; \ No newline at end of file diff --git a/node_modules/react-router/lib/State.js b/node_modules/react-router/lib/State.js deleted file mode 100644 index 8cad99e..0000000 --- a/node_modules/react-router/lib/State.js +++ /dev/null @@ -1,74 +0,0 @@ -'use strict'; - -var PropTypes = require('./PropTypes'); - -/** - * A mixin for components that need to know the path, routes, URL - * params and query that are currently active. - * - * Example: - * - * var AboutLink = React.createClass({ - * mixins: [ Router.State ], - * render() { - * var className = this.props.className; - * - * if (this.isActive('about')) - * className += ' is-active'; - * - * return React.DOM.a({ className: className }, this.props.children); - * } - * }); - */ -var State = { - - contextTypes: { - router: PropTypes.router.isRequired - }, - - /** - * Returns the current URL path. - */ - getPath: function getPath() { - return this.context.router.getCurrentPath(); - }, - - /** - * Returns the current URL path without the query string. - */ - getPathname: function getPathname() { - return this.context.router.getCurrentPathname(); - }, - - /** - * Returns an object of the URL params that are currently active. - */ - getParams: function getParams() { - return this.context.router.getCurrentParams(); - }, - - /** - * Returns an object of the query params that are currently active. - */ - getQuery: function getQuery() { - return this.context.router.getCurrentQuery(); - }, - - /** - * Returns an array of the routes that are currently active. - */ - getRoutes: function getRoutes() { - return this.context.router.getCurrentRoutes(); - }, - - /** - * A helper method to determine if a given route, params, and query - * are active. - */ - isActive: function isActive(to, params, query) { - return this.context.router.isActive(to, params, query); - } - -}; - -module.exports = State; \ No newline at end of file diff --git a/node_modules/react-router/lib/TestUtils.js b/node_modules/react-router/lib/TestUtils.js deleted file mode 100644 index 60b706b..0000000 --- a/node_modules/react-router/lib/TestUtils.js +++ /dev/null @@ -1,171 +0,0 @@ -'use strict'; - -var React = require('react'); -var RouteHandler = require('./components/RouteHandler'); -var PropTypes = require('./PropTypes'); - -exports.Nested = React.createClass({ - displayName: 'Nested', - - render: function render() { - return React.createElement( - 'div', - null, - React.createElement( - 'h1', - { className: 'Nested' }, - 'Nested' - ), - React.createElement(RouteHandler, null) - ); - } -}); - -exports.Foo = React.createClass({ - displayName: 'Foo', - - render: function render() { - return React.createElement( - 'div', - { className: 'Foo' }, - 'Foo' - ); - } -}); - -exports.Bar = React.createClass({ - displayName: 'Bar', - - render: function render() { - return React.createElement( - 'div', - { className: 'Bar' }, - 'Bar' - ); - } -}); - -exports.Baz = React.createClass({ - displayName: 'Baz', - - render: function render() { - return React.createElement( - 'div', - { className: 'Baz' }, - 'Baz' - ); - } -}); - -exports.Async = React.createClass({ - displayName: 'Async', - - statics: { - delay: 10, - - willTransitionTo: function willTransitionTo(transition, params, query, callback) { - setTimeout(callback, exports.Async.delay); - } - }, - - render: function render() { - return React.createElement( - 'div', - { className: 'Async' }, - 'Async' - ); - } -}); - -exports.RedirectToFoo = React.createClass({ - displayName: 'RedirectToFoo', - - statics: { - willTransitionTo: function willTransitionTo(transition) { - transition.redirect('/foo'); - } - }, - - render: function render() { - return null; - } -}); - -exports.RedirectToFooAsync = React.createClass({ - displayName: 'RedirectToFooAsync', - - statics: { - delay: 10, - - willTransitionTo: function willTransitionTo(transition, params, query, callback) { - setTimeout(function () { - transition.redirect('/foo'); - callback(); - }, exports.RedirectToFooAsync.delay); - } - }, - - render: function render() { - return null; - } -}); - -exports.Abort = React.createClass({ - displayName: 'Abort', - - statics: { - willTransitionTo: function willTransitionTo(transition) { - transition.abort(); - } - }, - - render: function render() { - return null; - } -}); - -exports.AbortAsync = React.createClass({ - displayName: 'AbortAsync', - - statics: { - delay: 10, - - willTransitionTo: function willTransitionTo(transition, params, query, callback) { - setTimeout(function () { - transition.abort(); - callback(); - }, exports.AbortAsync.delay); - } - }, - - render: function render() { - return null; - } -}); - -exports.EchoFooProp = React.createClass({ - displayName: 'EchoFooProp', - - render: function render() { - return React.createElement( - 'div', - null, - this.props.foo - ); - } -}); - -exports.EchoBarParam = React.createClass({ - displayName: 'EchoBarParam', - - contextTypes: { - router: PropTypes.router.isRequired - }, - render: function render() { - return React.createElement( - 'div', - { className: 'EchoBarParam' }, - this.context.router.getCurrentParams().bar - ); - } -}); \ No newline at end of file diff --git a/node_modules/react-router/lib/Transition.js b/node_modules/react-router/lib/Transition.js deleted file mode 100644 index d58c311..0000000 --- a/node_modules/react-router/lib/Transition.js +++ /dev/null @@ -1,75 +0,0 @@ -/* jshint -W058 */ - -'use strict'; - -var Cancellation = require('./Cancellation'); -var Redirect = require('./Redirect'); - -/** - * Encapsulates a transition to a given path. - * - * The willTransitionTo and willTransitionFrom handlers receive - * an instance of this class as their first argument. - */ -function Transition(path, retry) { - this.path = path; - this.abortReason = null; - // TODO: Change this to router.retryTransition(transition) - this.retry = retry.bind(this); -} - -Transition.prototype.abort = function (reason) { - if (this.abortReason == null) this.abortReason = reason || 'ABORT'; -}; - -Transition.prototype.redirect = function (to, params, query) { - this.abort(new Redirect(to, params, query)); -}; - -Transition.prototype.cancel = function () { - this.abort(new Cancellation()); -}; - -Transition.from = function (transition, routes, components, callback) { - routes.reduce(function (callback, route, index) { - return function (error) { - if (error || transition.abortReason) { - callback(error); - } else if (route.onLeave) { - try { - route.onLeave(transition, components[index], callback); - - // If there is no callback in the argument list, call it automatically. - if (route.onLeave.length < 3) callback(); - } catch (e) { - callback(e); - } - } else { - callback(); - } - }; - }, callback)(); -}; - -Transition.to = function (transition, routes, params, query, callback) { - routes.reduceRight(function (callback, route) { - return function (error) { - if (error || transition.abortReason) { - callback(error); - } else if (route.onEnter) { - try { - route.onEnter(transition, params, query, callback); - - // If there is no callback in the argument list, call it automatically. - if (route.onEnter.length < 4) callback(); - } catch (e) { - callback(e); - } - } else { - callback(); - } - }; - }, callback)(); -}; - -module.exports = Transition; \ No newline at end of file diff --git a/node_modules/react-router/lib/actions/LocationActions.js b/node_modules/react-router/lib/actions/LocationActions.js deleted file mode 100644 index 8970c10..0000000 --- a/node_modules/react-router/lib/actions/LocationActions.js +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Actions that modify the URL. - */ -'use strict'; - -var LocationActions = { - - /** - * Indicates a new location is being pushed to the history stack. - */ - PUSH: 'push', - - /** - * Indicates the current location should be replaced. - */ - REPLACE: 'replace', - - /** - * Indicates the most recent entry should be removed from the history stack. - */ - POP: 'pop' - -}; - -module.exports = LocationActions; \ No newline at end of file diff --git a/node_modules/react-router/lib/behaviors/ImitateBrowserBehavior.js b/node_modules/react-router/lib/behaviors/ImitateBrowserBehavior.js deleted file mode 100644 index e7782f9..0000000 --- a/node_modules/react-router/lib/behaviors/ImitateBrowserBehavior.js +++ /dev/null @@ -1,29 +0,0 @@ -'use strict'; - -var LocationActions = require('../actions/LocationActions'); - -/** - * A scroll behavior that attempts to imitate the default behavior - * of modern browsers. - */ -var ImitateBrowserBehavior = { - - updateScrollPosition: function updateScrollPosition(position, actionType) { - switch (actionType) { - case LocationActions.PUSH: - case LocationActions.REPLACE: - window.scrollTo(0, 0); - break; - case LocationActions.POP: - if (position) { - window.scrollTo(position.x, position.y); - } else { - window.scrollTo(0, 0); - } - break; - } - } - -}; - -module.exports = ImitateBrowserBehavior; \ No newline at end of file diff --git a/node_modules/react-router/lib/behaviors/ScrollToTopBehavior.js b/node_modules/react-router/lib/behaviors/ScrollToTopBehavior.js deleted file mode 100644 index 92c81e9..0000000 --- a/node_modules/react-router/lib/behaviors/ScrollToTopBehavior.js +++ /dev/null @@ -1,15 +0,0 @@ -/** - * A scroll behavior that always scrolls to the top of the page - * after a transition. - */ -"use strict"; - -var ScrollToTopBehavior = { - - updateScrollPosition: function updateScrollPosition() { - window.scrollTo(0, 0); - } - -}; - -module.exports = ScrollToTopBehavior; \ No newline at end of file diff --git a/node_modules/react-router/lib/components/ActiveHandler.js b/node_modules/react-router/lib/components/ActiveHandler.js deleted file mode 100644 index 13844be..0000000 --- a/node_modules/react-router/lib/components/ActiveHandler.js +++ /dev/null @@ -1,108 +0,0 @@ -'use strict'; - -var _classCallCheck = function (instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }; - -var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })(); - -var _inherits = function (subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) subClass.__proto__ = superClass; }; - -var React = require('react'); -var ContextWrapper = require('./ContextWrapper'); -var assign = require('react/lib/Object.assign'); -var PropTypes = require('../PropTypes'); - -var REF_NAME = '__routeHandler__'; - -/** - * A component renders the active child route handler - * when routes are nested. - */ - -var RouteHandler = (function (_React$Component) { - function RouteHandler() { - _classCallCheck(this, RouteHandler); - - if (_React$Component != null) { - _React$Component.apply(this, arguments); - } - } - - _inherits(RouteHandler, _React$Component); - - _createClass(RouteHandler, [{ - key: 'getChildContext', - value: function getChildContext() { - return { - routeDepth: this.context.routeDepth + 1 - }; - } - }, { - key: 'componentDidMount', - value: function componentDidMount() { - this._updateRouteComponent(this.refs[REF_NAME]); - } - }, { - key: 'componentDidUpdate', - value: function componentDidUpdate() { - this._updateRouteComponent(this.refs[REF_NAME]); - } - }, { - key: 'componentWillUnmount', - value: function componentWillUnmount() { - this._updateRouteComponent(null); - } - }, { - key: '_updateRouteComponent', - value: function _updateRouteComponent(component) { - this.context.router.setRouteComponentAtDepth(this.getRouteDepth(), component); - } - }, { - key: 'getRouteDepth', - value: function getRouteDepth() { - return this.context.routeDepth; - } - }, { - key: 'createChildRouteHandler', - value: function createChildRouteHandler(props) { - var route = this.context.router.getRouteAtDepth(this.getRouteDepth()); - - if (route == null) { - return null; - }var childProps = assign({}, props || this.props, { - ref: REF_NAME, - params: this.context.router.getCurrentParams(), - query: this.context.router.getCurrentQuery() - }); - - return React.createElement(route.handler, childProps); - } - }, { - key: 'render', - value: function render() { - var handler = this.createChildRouteHandler(); - //