Add icons to file tree

embark-ui/package.json

@@ -81,7 +81,7 @@
     "start": "npm-run-all --parallel css-compile react-start watch-css",
     "build": "npm run css-compile && node scripts/build.js",
     "test": "node scripts/test.js --env=jsdom",
-    "css-compile": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 src/dark-theme/coreui.scss src/css/coreui-dark.css",
+    "css-compile": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 src/scss/coreui.scss src/css/coreui-dark.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 src/scss/icons.scss src/css/icons.css",
     "watch-css": "nodemon --ignore dist/ -e scss -x \"npm run css-compile\""
   },
   "homepage": "http://localhost:8000/embark",

embark-ui/src/components/FileExplorer.js

@@ -3,22 +3,23 @@ import {Label} from 'reactstrap';
 import React from 'react';
 import PropTypes from 'prop-types';
 import {Treebeard, decorators} from 'react-treebeard';
+import classNames from 'classnames';
 
 const style = {
   tree: {
     base: {
-      height: '100%',
+      height: '450px',
+      overflowX: 'auto',
       listStyle: 'none',
       backgroundColor: '#1C1C1C',
+      color: '#ffffff',
+      padding: '10px 0 0 10px',
       margin: 0,
-      padding: 0,
-      color: '#9DA5AB',
-      fontFamily: 'lucida grande ,tahoma,verdana,arial,sans-serif',
-      fontSize: '14px'
     },
     node: {
       base: {
-        position: 'relative'
+        position: 'relative',
+        verticalAlign: 'middle',
       },
       link: {
         cursor: 'pointer',
@@ -26,37 +27,24 @@ const style = {
         padding: '0px 5px',
         display: 'block'
       },
-      activeLink: {
-        background: '#31363F'
-      },
       toggle: {
         base: {
-          position: 'relative',
           display: 'inline-block',
-          verticalAlign: 'top',
+          marginRight: '10px'
-          marginLeft: '-5px',
-          height: '24px',
-          width: '24px'
         },
         wrapper: {
-          position: 'absolute',
+          margin: '-7px 0 0 0',
-          top: '50%',
-          left: '50%',
-          margin: '-7px 0 0 -7px',
-          height: '14px'
         },
-        height: 14,
+        height: 7,
-        width: 14,
+        width: 7,
         arrow: {
-          fill: '#9DA5AB',
+          fill: '#FFFFFF',
           strokeWidth: 0
         }
       },
       header: {
         base: {
           display: 'inline-block',
-          verticalAlign: 'top',
-          color: '#9DA5AB'
         },
         connector: {
           width: '2px',
@@ -69,12 +57,11 @@ const style = {
         },
         title: {
           lineHeight: '24px',
-          verticalAlign: 'middle'
         }
       },
       subtree: {
         listStyle: 'none',
-        paddingLeft: '19px'
+        paddingLeft: '22px'
       },
       loading: {
         color: '#E2C089'
@@ -83,15 +70,62 @@ const style = {
   }
 };
 
+
 const Header = ({style, node}) => {
-  const iconType = node.children ? 'folder' : 'file';
+  let icon;
-  const iconClass = `fe fe-${iconType}`;
+
-  const iconStyle = {marginRight: '5px'};
+  if (!node.children) {
+    const extension = node.path.split('.').pop();
+    switch(extension) {
+      case 'html':
+        icon = 'text-danger fa fa-html5';
+        break;
+      case 'css':
+        icon = 'text-warning fa fa-css3';
+        break;
+      case 'js':
+      case 'jsx':
+        icon = 'text-primary icon js-icon';
+        break;
+      case 'json':
+        icon = 'text-success icon hjson-icon';
+        break;
+      case 'sol':
+        icon = 'text-warning icon solidity-icon';
+        break;
+      default:
+        icon = 'fa fa-file-o';
+    }
+  } else {
+    switch(node.name) {
+      case 'dist':
+        icon = 'text-danger icon easybuild-icon';
+        break;
+      case 'config':
+        icon = 'text-warning fa fa-cogs';
+        break;
+      case 'contracts':
+        icon = 'text-success icon appstore-icon';
+        break;
+      case 'app':
+        icon = 'text-primary fa fa-code';
+        break;
+      case 'test':
+        icon = 'icon test-dir-icon';
+        break;
+      case 'node_modules':
+        icon = 'fa fa-folder-o';
+        break;
+      default:
+        icon = 'fa fa-folder'
+    }
+
+  }
 
   return (
-    <div style={style.base}>
+    <div className="mb-1" style={style.base}>
       <div style={style.title}>
-        <i className={iconClass} style={iconStyle} />
+        <i className={classNames('mr-1', icon)} />
         {node.name}
       </div>
     </div>

embark-ui/src/components/TextEditorToolbar.js

@@ -6,10 +6,7 @@ import FontAwesomeIcon from 'react-fontawesome';
 const TextEditorToolbar = (props) => (
   <ol className="breadcrumb mb-0">
     <li className="breadcrumb-item">
-      {props.currentFile.name}
+      <Button color="success" size="sm" className="mr-1" onClick={props.save}>
-    </li>
-    <li className="breadcrumb-item">
-      <Button color="success" size="sm" onClick={props.save}>
         <FontAwesomeIcon className="mr-2" name="save"/>
         Save
       </Button>
@@ -48,8 +45,7 @@ TextEditorToolbar.propTypes = {
   save: PropTypes.func,
   remove: PropTypes.func,
   toggleShowHiddenFiles: PropTypes.func,
-  openAsideTab: PropTypes.func,
+  openAsideTab: PropTypes.func
-  currentFile: PropTypes.object
 };
 
 export default TextEditorToolbar;

embark-ui/src/containers/TextEditorToolbarContainer.js

@@ -18,8 +18,7 @@ class TextEditorToolbarContainer extends Component {
   }
 
   render() {
-    return <TextEditorToolbar currentFile={this.props.currentFile}
+    return <TextEditorToolbar isContract={this.props.isContract}
-                              isContract={this.props.isContract}
                               toggleShowHiddenFiles={this.props.toggleShowHiddenFiles}
                               openAsideTab={this.props.openAsideTab}
                               save={() => this.save()}

embark-ui/src/index.js

@@ -15,6 +15,9 @@ import 'simple-line-icons/css/simple-line-icons.css';
 import '@coreui/coreui/dist/css/coreui.min.css';
 // Dark theme
 import './css/coreui-dark.css';
+// Custom icons set from https://github.com/file-icons/atom
+import './css/icons.css';
+
 // Custom style
 import './index.css';