Commit 06bb5a95 authored by Chi Kei Chan's avatar Chi Kei Chan

Add transition to route changes

parent c524f613
import React, { Component } from 'react'; import React, { Component } from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { BrowserRouter, Switch, Route } from 'react-router-dom'; import { BrowserRouter, Switch, Route } from 'react-router-dom';
import { AnimatedSwitch } from 'react-router-transition';
import { initialize } from '../ducks/web3' import { initialize } from '../ducks/web3'
import Swap from './Swap'; import Swap from './Swap';
import Send from './Send'; import Send from './Send';
...@@ -16,11 +17,16 @@ class App extends Component { ...@@ -16,11 +17,16 @@ class App extends Component {
render() { render() {
return ( return (
<BrowserRouter> <BrowserRouter>
<Switch> <AnimatedSwitch
atEnter={{ opacity: 0 }}
atLeave={{ opacity: 0 }}
atActive={{ opacity: 1 }}
className="app__switch-wrapper"
>
<Route exact path="/swap" component={Swap} /> <Route exact path="/swap" component={Swap} />
<Route exact path="/send" component={Send} /> <Route exact path="/send" component={Send} />
<Route exact path="/pool" component={Pool} /> <Route exact path="/pool" component={Pool} />
</Switch> </AnimatedSwitch>
</BrowserRouter> </BrowserRouter>
); );
} }
......
@import "../variables.scss"; @import "../variables.scss";
.app { .app {
&__switch-wrapper {
height: 100%;
position: relative;
& > div {
position: absolute;
width: 100%;
height: 100%;
top: 0;
bottom: 0;
}
}
} }
\ No newline at end of file
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
.pool { .pool {
@extend %col-nowrap; @extend %col-nowrap;
height: 100%; height: 100%;
background-color: $white;
&__liquidity-container { &__liquidity-container {
@extend %row-nowrap; @extend %row-nowrap;
......
...@@ -3,4 +3,5 @@ ...@@ -3,4 +3,5 @@
.send { .send {
@extend %col-nowrap; @extend %col-nowrap;
height: 100%; height: 100%;
background-color: $white;
} }
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
.swap { .swap {
@extend %col-nowrap; @extend %col-nowrap;
height: 100%; height: 100%;
background-color: $white;
&--inactive { &--inactive {
opacity: .5; opacity: .5;
......
...@@ -7987,6 +7987,10 @@ pend@~1.2.0: ...@@ -7987,6 +7987,10 @@ pend@~1.2.0:
version "1.2.0" version "1.2.0"
resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
performance-now@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
performance-now@^2.1.0: performance-now@^2.1.0:
version "2.1.0" version "2.1.0"
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
...@@ -8705,18 +8709,18 @@ promzard@^0.3.0: ...@@ -8705,18 +8709,18 @@ promzard@^0.3.0:
dependencies: dependencies:
read "1" read "1"
prop-types@^15.5.4, prop-types@^15.5.8, prop-types@^15.6.0: prop-types@^15.5.10, prop-types@^15.5.6, prop-types@^15.6.1, prop-types@^15.6.2:
version "15.6.0" version "15.6.2"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102"
dependencies: dependencies:
fbjs "^0.8.16"
loose-envify "^1.3.1" loose-envify "^1.3.1"
object-assign "^4.1.1" object-assign "^4.1.1"
prop-types@^15.5.6, prop-types@^15.6.1, prop-types@^15.6.2: prop-types@^15.5.4, prop-types@^15.5.8, prop-types@^15.6.0:
version "15.6.2" version "15.6.0"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
dependencies: dependencies:
fbjs "^0.8.16"
loose-envify "^1.3.1" loose-envify "^1.3.1"
object-assign "^4.1.1" object-assign "^4.1.1"
...@@ -8853,7 +8857,7 @@ qw@~1.0.1: ...@@ -8853,7 +8857,7 @@ qw@~1.0.1:
version "1.0.1" version "1.0.1"
resolved "https://registry.yarnpkg.com/qw/-/qw-1.0.1.tgz#efbfdc740f9ad054304426acb183412cc8b996d4" resolved "https://registry.yarnpkg.com/qw/-/qw-1.0.1.tgz#efbfdc740f9ad054304426acb183412cc8b996d4"
raf@3.4.0: raf@3.4.0, raf@^3.1.0:
version "3.4.0" version "3.4.0"
resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.0.tgz#a28876881b4bc2ca9117d4138163ddb80f781575" resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.0.tgz#a28876881b4bc2ca9117d4138163ddb80f781575"
dependencies: dependencies:
...@@ -8992,6 +8996,14 @@ react-input-autosize@^2.1.2: ...@@ -8992,6 +8996,14 @@ react-input-autosize@^2.1.2:
dependencies: dependencies:
prop-types "^15.5.8" prop-types "^15.5.8"
react-motion@^0.5.0:
version "0.5.2"
resolved "https://registry.yarnpkg.com/react-motion/-/react-motion-0.5.2.tgz#0dd3a69e411316567927917c6626551ba0607316"
dependencies:
performance-now "^0.2.0"
prop-types "^15.5.8"
raf "^3.1.0"
react-redux@^5.0.7: react-redux@^5.0.7:
version "5.0.7" version "5.0.7"
resolved "http://registry.npmjs.org/react-redux/-/react-redux-5.0.7.tgz#0dc1076d9afb4670f993ffaef44b8f8c1155a4c8" resolved "http://registry.npmjs.org/react-redux/-/react-redux-5.0.7.tgz#0dc1076d9afb4670f993ffaef44b8f8c1155a4c8"
...@@ -9003,7 +9015,7 @@ react-redux@^5.0.7: ...@@ -9003,7 +9015,7 @@ react-redux@^5.0.7:
loose-envify "^1.1.0" loose-envify "^1.1.0"
prop-types "^15.6.0" prop-types "^15.6.0"
react-router-dom@^4.3.1: react-router-dom@^4.1.1, react-router-dom@^4.3.1:
version "4.3.1" version "4.3.1"
resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.3.1.tgz#4c2619fc24c4fa87c9fd18f4fb4a43fe63fbd5c6" resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.3.1.tgz#4c2619fc24c4fa87c9fd18f4fb4a43fe63fbd5c6"
dependencies: dependencies:
...@@ -9014,6 +9026,14 @@ react-router-dom@^4.3.1: ...@@ -9014,6 +9026,14 @@ react-router-dom@^4.3.1:
react-router "^4.3.1" react-router "^4.3.1"
warning "^4.0.1" warning "^4.0.1"
react-router-transition@^1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/react-router-transition/-/react-router-transition-1.2.1.tgz#167702d122ca6de339cdd005b95d74707e1c7e77"
dependencies:
prop-types "^15.5.10"
react-motion "^0.5.0"
react-router-dom "^4.1.1"
react-router@^4.3.1: react-router@^4.3.1:
version "4.3.1" version "4.3.1"
resolved "https://registry.yarnpkg.com/react-router/-/react-router-4.3.1.tgz#aada4aef14c809cb2e686b05cee4742234506c4e" resolved "https://registry.yarnpkg.com/react-router/-/react-router-4.3.1.tgz#aada4aef14c809cb2e686b05cee4742234506c4e"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment