diff options
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | package.json | 21 | ||||
| -rw-r--r-- | src/components/home/ContactSection.js | 5 | ||||
| -rw-r--r-- | src/components/navigation/AppNavbar.js | 8 | ||||
| -rw-r--r-- | src/containers/auth/Login.js | 4 |
5 files changed, 19 insertions, 20 deletions
@@ -10,6 +10,7 @@ Collaborative Datacenter Simulation and Exploration for Everybody [](https://travis-ci.org/atlarge-research/opendc-frontend) [](https://opensource.org/licenses/MIT) [](https://github.com/prettier/prettier) +[](https://www.bithound.io/github/atlarge-research/opendc-frontend) The user-facing component of the OpenDC stack, allowing users to build and interact with their own (virtual) datacenters. Built in *React.js* and *Redux*, with the help of `create-react-app`. diff --git a/package.json b/package.json index c6c0994a..0d96e935 100644 --- a/package.json +++ b/package.json @@ -22,31 +22,30 @@ "classnames": "^2.2.5", "husky": "^0.14.3", "isomorphic-fetch": "^2.2.1", - "konva": "^1.6.8", - "lint-staged": "^4.2.3", + "konva": "^1.7.2", + "lint-staged": "^4.3.0", "node-sass-chokidar": "^0.0.3", "npm-run-all": "^4.1.1", "prettier": "^1.7.4", - "prop-types": "^15.5.10", - "react": "^15.6.1", + "prop-types": "^15.6.0", + "react": "^16.0.0", "react-document-title": "^2.0.3", - "react-dom": "^15.6.1", + "react-dom": "^16.0.0", "react-fontawesome": "^1.6.1", "react-google-login": "^2.9.3", - "react-konva": "^1.1.4", - "react-mailto": "^0.4.0", + "react-konva": "^1.1.5", "react-redux": "^5.0.5", "react-router-dom": "^4.2.2", - "react-scripts": "^1.0.13", - "react-shortcuts": "^1.6.1", + "react-scripts": "^1.0.14", + "react-shortcuts": "^2.0.0", "redux": "^3.7.2", "redux-localstorage": "^0.4.1", "redux-logger": "^3.0.6", - "redux-saga": "^0.15.6", + "redux-saga": "^0.16.0", "redux-thunk": "^2.2.0", "socket.io-client": "^2.0.3", "svgsaver": "^0.9.0", - "victory": "^0.22.2" + "victory": "^0.23.1" }, "lint-staged": { "src/**/*.{js,jsx,json}": [ diff --git a/src/components/home/ContactSection.js b/src/components/home/ContactSection.js index d957297a..4e640924 100644 --- a/src/components/home/ContactSection.js +++ b/src/components/home/ContactSection.js @@ -1,6 +1,5 @@ import React from "react"; import FontAwesome from "react-fontawesome"; -import Mailto from "react-mailto"; import "./ContactSection.css"; import ContentSection from "./ContentSection"; @@ -15,11 +14,11 @@ const ContactSection = () => ( </a> </div> <div className="col-4"> - <Mailto title="Contact us" email="opendc@atlarge-research.com"> + <a href="mailto:opendc@atlarge-research.com"> <FontAwesome name="envelope" size="3x" className="mb-2" /> <div className="w-100" /> opendc@atlarge-research.com - </Mailto> + </a> </div> </div> <div className="row"> diff --git a/src/components/navigation/AppNavbar.js b/src/components/navigation/AppNavbar.js index ab4b8412..1a35f85d 100644 --- a/src/components/navigation/AppNavbar.js +++ b/src/components/navigation/AppNavbar.js @@ -1,6 +1,5 @@ import React from "react"; import FontAwesome from "react-fontawesome"; -import Mailto from "react-mailto"; import { Link } from "react-router-dom"; import Navbar, { NavItem } from "./Navbar"; import "./Navbar.css"; @@ -42,15 +41,14 @@ const AppNavbar = ({ simulationId, inSimulation, fullWidth }) => ( </Link> </NavItem> <NavItem route="email"> - <Mailto + <a className="nav-link" title="Support" - email="opendc@atlarge-research.com" - headers={{ subject: "[support]" }} + href="mailto:opendc@atlarge-research.com" > <FontAwesome name="envelope" className="mr-2" /> Support - </Mailto> + </a> </NavItem> </Navbar> ); diff --git a/src/containers/auth/Login.js b/src/containers/auth/Login.js index de12f815..28e95963 100644 --- a/src/containers/auth/Login.js +++ b/src/containers/auth/Login.js @@ -33,7 +33,9 @@ class LoginContainer extends React.Component { onFailure={this.onAuthResponse.bind(this)} className="login btn btn-primary" > - <span className="fa fa-google" /> <span>Login with Google</span> + <span> + <span className="fa fa-google" /> Login with Google + </span> </GoogleLogin> ); } |