Merge 0ce1433 into b553ace

ubclaunchpad · Jun 29, 2018 · 32233a4 · 32233a4
2 parents b553ace + 0ce1433
commit 32233a4
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 7 deletions.
diff --git a/daemon/web/actions/dashboard.js b/daemon/web/actions/dashboard.js
@@ -5,7 +5,6 @@ import {
 
 export const testAction = payload => (dispatch) => {
   // remove later
-  console.log('dashboard action fired!');
   dispatch({
     type: TEST_DASHBOARD_ACTION,
     payload,

diff --git a/daemon/web/actions/login.js b/daemon/web/actions/login.js
@@ -10,4 +10,4 @@ export const testAction = payload => (dispatch) => {
     type: TEST_LOGIN_ACTION,
     payload,
   });
-};
+};
diff --git a/daemon/web/components/IconHeader/IconHeader.js b/daemon/web/components/IconHeader/IconHeader.js
@@ -0,0 +1,24 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import './index.sass';
+
+const icons = {
+  dashboard: <i className="fas fa-th-large" />,
+  containers: <i className="fas fa-database fa-lg" />,
+  team: <i className="fas fa-users" />,
+  settings: <i className="fas fa-cog" />,
+};
+
+const IconHeader = ({ title, type }) => (
+  <div className="iconheader">
+    {icons[type]}
+    <h1 className="header">{title}</h1>
+  </div>
+);
+
+IconHeader.propTypes = {
+  title: PropTypes.string.isRequired,
+  type: PropTypes.string.isRequired,
+};
+
+export default IconHeader;
diff --git a/daemon/web/components/IconHeader/index.sass b/daemon/web/components/IconHeader/index.sass
@@ -0,0 +1,13 @@
+@import '../../styles/index'
+
+.header
+    color: $grey
+    display: inline
+    margin-left: 10px;
+    font-weight: bold;
+
+i
+    color: $grey
+
+.iconheader
+    margin: 30px 0 30px 40px
diff --git a/daemon/web/index.html b/daemon/web/index.html
@@ -4,6 +4,8 @@
 <head>
   <meta charset="UTF-8">
     <link href="https://fonts.googleapis.com/css?family=Rubik" rel="stylesheet">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.1.0/css/all.css" integrity="sha384-lKuwvrZot6UHsBSfcMvOkWwlCMgc0TaWr+30HWe3a4ltaBwTZhyTEggF5tJv8tbt" crossorigin="anonymous">
   <title>Inertia Web</title>
 </head>
 

diff --git a/daemon/web/pages/containers/Containers.js b/daemon/web/pages/containers/Containers.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import TerminalView from '../../components/TerminalView/TerminalView';
+import IconHeader from '../../components/IconHeader/IconHeader';
 
 const mocklogs = [
   'log1asdasdasdasdasdasdasdssdasdasdssdasdasdssdasdasdssdasdasdsa',
@@ -21,7 +22,8 @@ class ContainersWrapper extends React.Component {
   render() {
     return (
       <div>
-        <h1>Hello!</h1>
+        <IconHeader type="containers" title="/inertia-deploy-test_dev_1" />
+        <div className="containerInfo" />
         <TerminalView logs={mocklogs} />
       </div>
     );

diff --git a/daemon/web/styles/typography.sass b/daemon/web/styles/typography.sass
@@ -2,7 +2,7 @@
 
 h1
   font-family: Rubik
-  font-size: 16px
+  font-size: 24px
   font-weight: 500
   letter-spacing: 1px
   color: $grey

diff --git a/daemon/web/webpack.config.js b/daemon/web/webpack.config.js
@@ -13,9 +13,9 @@ const config = {
     inline: true,
     contentBase: './public',
     publicPath: '/web/',
-    proxy: {
-      '/': { target: 'https://127.0.0.1:4303', secure: false },
-    },
+    // proxy: {
+    //   '/': { target: 'https://127.0.0.1:4303', secure: false },
+    // },
   },
   devtool: 'inline-source-map',
   module: {