From a6bd62fabf05f97d461cfcb55d9c494286834f6c Mon Sep 17 00:00:00 2001 From: apanizo Date: Tue, 25 Sep 2018 16:44:26 +0200 Subject: [PATCH] Adding opening components & styles --- src/routes/index.js | 8 ++++- src/routes/open/container/Open.jsx | 8 ++++- src/routes/opening/assets/vault.svg | 12 ++++++++ src/routes/opening/index.jsx | 46 +++++++++++++++++++++++++++++ src/theme/variables.js | 3 +- 5 files changed, 74 insertions(+), 3 deletions(-) create mode 100644 src/routes/opening/assets/vault.svg create mode 100644 src/routes/opening/index.jsx diff --git a/src/routes/index.js b/src/routes/index.js index 42b6f74c..677e39db 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -4,7 +4,7 @@ import Loadable from 'react-loadable' import { Switch, Redirect, Route } from 'react-router-dom' import Loader from '~/components/Loader' import Welcome from './welcome/container' -import { SAFELIST_ADDRESS, OPEN_ADDRESS, SAFE_PARAM_ADDRESS, WELCOME_ADDRESS, SETTINS_ADDRESS } from './routes' +import { SAFELIST_ADDRESS, OPEN_ADDRESS, SAFE_PARAM_ADDRESS, WELCOME_ADDRESS, SETTINS_ADDRESS, OPENING_ADDRESS } from './routes' const Safe = Loadable({ loader: () => import('./safe/container'), @@ -26,6 +26,11 @@ const Open = Loadable({ loading: Loader, }) +const Opening = Loadable({ + loader: () => import('./opening'), + loading: Loader, +}) + const SAFE_ADDRESS = `${SAFELIST_ADDRESS}/:${SAFE_PARAM_ADDRESS}` const SAFE_SETTINGS = `${SAFE_ADDRESS}${SETTINS_ADDRESS}` @@ -39,6 +44,7 @@ const Routes = () => ( + ) diff --git a/src/routes/open/container/Open.jsx b/src/routes/open/container/Open.jsx index 6dc8b149..b5ac2604 100644 --- a/src/routes/open/container/Open.jsx +++ b/src/routes/open/container/Open.jsx @@ -42,7 +42,13 @@ export const createSafe = async (values: Object, userAccount: string, addSafe: A addSafe(name, safeContract.address, numConfirmations, dailyLimit, owners, accounts) if (stillInOpeningView()) { - const url = `${SAFELIST_ADDRESS}/${safeContract.address}` + const url = { + pathname: `${SAFELIST_ADDRESS}/${safeContract.address}`, + state: { + name, + }, + } + history.push(url) } diff --git a/src/routes/opening/assets/vault.svg b/src/routes/opening/assets/vault.svg new file mode 100644 index 00000000..cc83c30b --- /dev/null +++ b/src/routes/opening/assets/vault.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/routes/opening/index.jsx b/src/routes/opening/index.jsx new file mode 100644 index 00000000..be840d82 --- /dev/null +++ b/src/routes/opening/index.jsx @@ -0,0 +1,46 @@ +// @flow +import * as React from 'react' +import Block from '~/components/layout/Block' +import Paragraph from '~/components/layout/Paragraph' +import LinearProgress from '@material-ui/core/LinearProgress' +import { withStyles } from '@material-ui/core/styles' +import Img from '~/components/layout/Img' +import Page from '~/components/layout/Page' + +type Props = { + name: string, + classes: Object, +} + +const vault = require('./assets/vault.svg') + +const styles = { + page: { + letterSpacing: '-1px', + }, +} + +const Opening = ({ classes, name = 'Safe creation process' }: Props) => ( + + + {name} + + + Vault + + + + + + Transaction submitted + + + Deploying your new Safe... + + + This process should take a couple of minutes.
+
+
+) + +export default withStyles(styles)(Opening) diff --git a/src/theme/variables.js b/src/theme/variables.js index ff8780a9..b8bcdb42 100644 --- a/src/theme/variables.js +++ b/src/theme/variables.js @@ -42,7 +42,8 @@ module.exports = Object.assign({}, { smallFontSize: '11px', mediumFontSize: '13px', largeFontSize: '15px', - extraLargeFontSize: '24px', + extraLargeFontSize: '18px', + xxlFontSize: '32px', screenXs: 480, screenXsMax: 767, screenSm: 768,