Merge branch 'v0.10.0' into ee-v0.10.0

Author: YourTechBud

mission-control/package-lock.json

@@ -4,10 +4,11 @@
   "private": true,
   "dependencies": {
     "antd": "^3.19.2",
-    "automate-redux": "^1.0.1",
+    "automate-redux": "^1.1.0",
     "babel-plugin-import": "^1.12.0",
     "codemirror": "^5.47.0",
     "customize-cra": "^0.2.13",
+    "firebase": "^6.3.0",
     "less": "^3.9.0",
     "less-loader": "^5.0.0",
     "lodash": "^4.17.11",
@@ -19,7 +20,8 @@
     "react-redux": "^7.0.3",
     "react-router-dom": "^5.0.0",
     "react-scripts": "3.0.1",
-    "redux": "^4.0.1"
+    "redux": "^4.0.1",
+    "space-api": "^0.9.2"
   },
   "homepage": "https://spaceuptech.com/mission-control",
   "scripts": {

mission-control/package.json

@@ -8,6 +8,7 @@
   <meta name="theme-color" content="#000000" />
   <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
   <link href="https://fonts.googleapis.com/css?family=Raleway&display=swap" rel="stylesheet">
+  <script id="bolt" src="https://sboxcheckout-static.citruspay.com/bolt/run/bolt.min.js" bolt-color="0063FF" bolt-logo="https://spaceuptech.com/images/kit/logo-white.svg"></script>
   <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/

mission-control/public/index.html

@@ -8,18 +8,21 @@ import DBRules from './pages/database/rules/Rules'
 import FunctionRules from './pages/functions/rules/Rules'
 import FileStorageRules from './pages/file-storage/rules/Rules'
 import Configure from './pages/configure/configure'
-import Overview from  './pages/overview/Overview'
+import Overview from './pages/overview/Overview'
 import Welcome from "./pages/welcome/Welcome"
 import CreateProject from "./pages/create-project/CreateProject"
 import Billing from "./pages/billing/Billing"
+import Deploy from "./pages/deploy/Deploy"
+import Plans from "./pages/plans/Plans"
+import SigninModal from "./components/signin-modal/SigninModal"
 
 export default () => {
   return (
     <Router history={history}>
       <Route exact path="/mission-control" component={Login} />
       <Route exact path="/mission-control/welcome" component={Welcome} />
       <Route exact path="/mission-control/create-project" component={CreateProject} />
-      <Route exact path="/mission-control/projects/:projectId" component={(props) => <Redirect to={`/mission-control/projects/${props.match.params.projectId}/overview`}/>} />
+      <Route exact path="/mission-control/projects/:projectId" component={(props) => <Redirect to={`/mission-control/projects/${props.match.params.projectId}/overview`} />} />
       <Route exact path="/mission-control/projects/:projectId/overview" component={Overview} />
       <Route exact path="/mission-control/projects/:projectId/user-management" component={UserManagement} />
       <Route exact path="/mission-control/projects/:projectId/database" component={Database} />
@@ -29,7 +32,10 @@ export default () => {
       <Route exact path="/mission-control/projects/:projectId/file-storage" component={(props) => <Redirect to={`/mission-control/projects/${props.match.params.projectId}/file-storage/rules`} />} />
       <Route exact path="/mission-control/projects/:projectId/file-storage/rules" component={FileStorageRules} />
       <Route exact path="/mission-control/projects/:projectId/configure" component={Configure} />
+      <Route exact path="/mission-control/projects/:projectId/deploy" component={Deploy} />
+      <Route exact path="/mission-control/projects/:projectId/plans" component={Plans} />
       <Route exact path="/mission-control/projects/:projectId/billing" component={Billing} />
+      <SigninModal />
     </Router>
   )
 }

mission-control/src/Routes.js

@@ -14,24 +14,21 @@ function BillingTable(props) {
 				{props.data.map((value) => {
 					return (
 						<Row>
-							<Col xs={{ span: 4, offset: 2 }}>
-								<div className="table-col">{value.project}</div>
-							</Col>
-							<Col xs={{ span: 6, offset: 0 }}>
+							<Col xs={{ span: 12 }}>
 								<div className="table-col">{value.item}</div>
 							</Col>
-							<Col xs={{ span: 4, offset: 2 }}>
+							<Col xs={{ span: 8 }}>
 								<div className="table-col">{value.usage}</div>
 							</Col>
-							<Col xs={{ span: 4, offset: 2 }}>
+							<Col xs={{ span: 4 }}>
 								<div className="table-col">$ {value.amount}</div>
 							</Col>
 						</Row>
 					);
 				})}
 				<Row>
-					<Col span={18} />
-					<Col xs={{ span: 4, offset: 2 }}>
+					<Col span={20} />
+					<Col xs={{ span: 4 }}>
 						<div className="total">
 							Total: $
 							<div className="total-amount">&nbsp;{total}</div>

mission-control/src/actions/helpers.js

@@ -0,0 +1,12 @@
+import React from "react"
+
+function RechargeCard({ amount, extraCredits, handleClick, active }) {
+  return (
+    <div onClick={handleClick}>
+      <p>{active && "active"}{amount}$</p>
+      {extraCredits && <p>Free {extraCredits}$</p>}
+    </div>
+  )
+}
+
+export default RechargeCard