Merge pull request #2 from mosaicnetworks/dev

Dev

README.md

@@ -1,15 +1,7 @@
-<img width="75px" height="75px" align="right" alt="Monet Logo" src="./src/assets/monet_logo.png" title="Monet Logo"/>
-
 # Monet Wallet
 
 A user interface to interact with Monet.
 
-## Preview
-
-<img  alt="Monet Logo" src="./assets/accounts.png" title="Accounts Page"/>
-
-<img  alt="Monet Logo" src="./assets/config.png" title="Accounts Page"/>
-
 ## Development
 
 To build and run Monet Wallet, download / clone this repository, then simply follow the instructions below.
@@ -20,10 +12,10 @@ You will need to install `yarn` to proceed to development.
 curl -o- -L https://yarnpkg.com/install.sh | bash
 ```
 
-To install dependencies
+To install dependencies and build files
 
 ```bash
-yarn install
+yarn install && yarn build
 ```
 
 This should also transpile all `ts` and `tsx` files.

package.json

@@ -1,76 +1,82 @@
 {
 	"name": "monet-wallet",
-	"version": "1.0.0",
+	"version": "0.1.0",
 	"private": true,
 	"dependencies": {
-		"js-scrypt": "^0.2.0",
-		"random-hash": "^4.0.1",
-		"react": "^16.9.0",
-		"react-dom": "^16.9.0",
+		"@fortawesome/fontawesome-svg-core": "^1.2.25",
+		"@fortawesome/free-solid-svg-icons": "^5.11.2",
+		"@fortawesome/react-fontawesome": "^0.1.7",
+		"bootstrap": "^4.3.1",
+		"evm-lite-client": "^1.3.7",
+		"evm-lite-consensus": "^1.3.7",
+		"evm-lite-core": "^1.3.7",
+		"evm-lite-datadir": "^1.3.7",
+		"evm-lite-keystore": "^1.3.7",
+		"evm-lite-utils": "^1.3.7",
+		"react": "^16.10.2",
+		"react-bootstrap": "^1.0.0-beta.14",
+		"react-dom": "^16.10.2",
 		"react-redux": "^7.1.1",
-		"react-spring": "^8.0.27",
-		"react-toastify": "^5.3.2",
+		"react-reveal": "^1.2.2",
+		"react-tooltip": "^3.11.1",
 		"redux": "^4.0.4",
 		"redux-persist": "^6.0.0",
 		"redux-thunk": "^2.3.0",
-		"styled-components": "^4.3.2"
+		"styled-components": "^4.4.0",
+		"react-router-dom": "^5.1.2"
 	},
 	"scripts": {
-		"prepublish": "yarn run build",
 		"dev": "concurrently --kill-others \"yarn run start:server\" \"yarn run start:electron\"",
 		"start:server": "webpack-dev-server --config config/webpack.config.js --hot --inline",
 		"start:electron": "electron ./dist",
 		"build": "rm -rf dist/ && webpack --config config/webpack.config.js && cp ./package.json ./dist/",
 		"clean": "rm -rf node_modules dist pkg",
-		"pkg:mac": "electron-packager ./dist \"Monet Wallet\" --platform=darwin --target=zip --arch=x64 --out ./pkg --overwrite --icon src/assets/monet_logo.icns",
+		"pkg:mac": "electron-packager dist \"Monet Wallet\" --platform=darwin --target=zip --arch=x64 --out=pkg --overwrite --icon=src/assets/icons/monet_logo.icns",
 		"pkg:linux": "electron-packager ./dist \"Monet Wallet\" --target=zip --platform=linux --arch=x64 --out ./pkg --overwrite --icon src/assets/monet_logo.png",
 		"pkg:win": "electron-packager ./dist \"Monet Wallet\" --platform=win32 --arch=x64 --out ./pkg --overwrite --icon src/assets/monet_logo.ico",
-		"linkalldev": "yarn link evm-lite-core evm-lite-consensus evm-lite-keystore evm-lite-datadir evm-lite-client evm-lite-utils"
+		"linkalldev": "yarn link evm-lite-core evm-lite-consensus evm-lite-keystore evm-lite-datadir evm-lite-client evm-lite-utils",
+		"addalldev": "yarn add evm-lite-core evm-lite-consensus evm-lite-keystore evm-lite-datadir evm-lite-client evm-lite-utils"
 	},
 	"devDependencies": {
-		"@babel/core": "^7.6.0",
-		"@types/mkdirp": "^0.5.2",
-		"@types/node": "^12.7.5",
-		"@types/react": "^16.9.2",
-		"@types/react-alert": "^5.2.0",
-		"@types/react-dom": "^16.9.0",
-		"@types/react-redux": "^7.1.2",
-		"@types/react-router-dom": "^4.3.5",
+		"@types/react-tooltip": "^3.11.0",
+		"@babel/core": "^7.6.2",
+		"@types/node": "^12.7.8",
+		"@types/react": "^16.9.3",
+		"@types/react-dom": "^16.9.1",
+		"@types/react-redux": "^7.1.4",
+		"@types/react-router-dom": "^5.1.2",
 		"@types/redux-logger": "^3.0.7",
 		"@types/styled-components": "^4.1.19",
-		"@types/webpack": "^4.39.1",
+		"@types/webpack": "^4.39.2",
 		"autoprefixer": "^9.6.1",
 		"babel-loader": "^8.0.6",
 		"babel-preset-es2015-node": "^6.1.1",
 		"babel-preset-react": "^6.24.1",
 		"concurrently": "^4.1.2",
 		"css-loader": "^3.2.0",
-		"electron": "^6.0.9",
+		"electron": "^6.0.10",
 		"electron-devtools-installer": "^2.2.4",
-		"electron-packager": "^14.0.5",
+		"electron-packager": "^14.0.6",
 		"file-loader": "^4.2.0",
 		"fork-ts-checker-webpack-plugin": "^1.5.0",
 		"html-webpack-plugin": "^3.2.0",
 		"postcss-flexbugs-fixes": "^4.1.0",
 		"postcss-loader": "^3.0.0",
-		"react-dev-utils": "^9.0.3",
-		"react-router-dom": "^5.0.1",
+		"react-dev-utils": "^9.0.4",
 		"redux-logger": "latest",
-		"semantic-ui-css": "^2.4.1",
-		"semantic-ui-react": "^0.88.1",
 		"source-map-loader": "^0.2.4",
 		"standard-loader": "^7.0.0",
 		"style-loader": "^1.0.0",
-		"ts-loader": "^6.1.0",
+		"ts-loader": "^6.2.0",
 		"ts-node": "^8.4.1",
 		"tslint": "^5.20.0",
 		"tslint-config-prettier": "^1.18.0",
 		"tslint-loader": "^3.5.4",
-		"tslint-react": "^4.0.0",
+		"tslint-react": "^4.1.0",
 		"typescript": "^3.6.3",
 		"url-loader": "^2.1.0",
-		"webpack": "^4.40.2",
-		"webpack-cli": "^3.3.8",
-		"webpack-dev-server": "^3.8.0"
+		"webpack": "^4.41.0",
+		"webpack-cli": "^3.3.9",
+		"webpack-dev-server": "^3.8.1"
 	}
 }

src/app/App.tsx

@@ -1,44 +1,44 @@
 import React, { useEffect } from 'react';
 
+import ReactTooltip from 'react-tooltip';
+
 import { useDispatch } from 'react-redux';
 import { HashRouter, Route } from 'react-router-dom';
-import { ToastContainer } from 'react-toastify';
 
-import { initialize } from '../modules/configuration';
+import { initSettings } from '../modules/settings';
 
-import AccountDetail from '../containers/AccountDetail';
+import Account from '../containers/Account';
 import Accounts from '../containers/Accounts';
-import Configuration from '../containers/Configuration';
-import POA from '../containers/POA';
-import Wrapper from '../containers/Wrapper';
+import Settings from '../containers/Settings';
+
+import Wrapper from '../components/Wrapper';
 
 const App: React.FunctionComponent<{}> = () => {
 	const dispatch = useDispatch();
 
-	const init = () => dispatch(initialize());
+	const initConf = () => dispatch(initSettings());
+
+	const initApp = async () => {
+		await initConf();
+	};
 
 	useEffect(() => {
-		init();
+		initApp();
 	}, []);
 
 	return (
 		<HashRouter>
+			<ReactTooltip type="dark" />
 			<React.Fragment>
 				<Wrapper>
 					<Route exact={true} path="/" component={Accounts} />
-					<Route path="/config" component={Configuration} />
-					<Route path="/poa" component={POA} />
 					<Route
 						exact={true}
-						path="/account/:address"
-						component={AccountDetail}
+						path="/account/:moniker"
+						component={Account}
 					/>
+					<Route exact={true} path="/settings" component={Settings} />
 				</Wrapper>
-				<ToastContainer
-					autoClose={2000}
-					position={'bottom-left'}
-					toastClassName="toast-custom"
-				/>
 			</React.Fragment>
 		</HashRouter>
 	);

src/app/index.tsx

@@ -8,15 +8,23 @@ import { PersistGate } from 'redux-persist/integration/react';
 import getStores from '../store';
 import App from './App';
 
-import 'react-toastify/dist/ReactToastify.css';
-import 'semantic-ui-css/semantic.min.css';
-
+import 'bootstrap/dist/css/bootstrap.min.css';
 import '../index.css';
+
 const stores = getStores();
 
+const reset = () => {
+	stores.persistor.purge();
+	stores.persistor.flush();
+};
+
 ReactDOM.render(
 	<Provider store={stores.store}>
-		<PersistGate loading={null} persistor={stores.persistor}>
+		<PersistGate
+			loading={null}
+			onBeforeLift={reset}
+			persistor={stores.persistor}
+		>
 			<App />
 		</PersistGate>
 	</Provider>,