fixes to asset list

Author: catarak

client/modules/IDE/components/AssetList.jsx

@@ -3,9 +3,10 @@ import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import { Link } from 'react-router';
 import InlineSVG from 'react-inlinesvg';
-import * as AssetActions from '../actions/assets';
 import prettyBytes from 'pretty-bytes';
 
+import * as AssetActions from '../actions/assets';
+
 const trashCan = require('../../../images/trash-can.svg');
 
 class AssetList extends React.Component {

client/styles/components/_asset-list.scss

@@ -3,6 +3,7 @@
   overflow-y: scroll;
   max-width: 100%;
   width: #{1000 / $base-font-size}rem;
+  min-height: #{400 / $base-font-size}rem;
 }
 
 .asset-table {
@@ -31,7 +32,6 @@
   margin: #{10 / $base-font-size}rem;
   height: #{72 / $base-font-size}rem;
   font-size: #{16 / $base-font-size}rem;
-  cursor: pointer;
 
   &:nth-child(odd) {
     @include themify() {
@@ -52,18 +52,18 @@
   height:#{20 / $base-font-size}rem;
 }
 
-.visibility-toggle:hover .asset-list__delete-button {
-   @include themify() {
-    background-color: transparent;
-    border: none;
-    cursor: pointer;
-    padding: 0;
-    position: initial;
-    left: 0;
-    top: 0;
-      & g {
-        opacity: 1;
-        fill: getThemifyVariable('icon-hover-color');
-      }
-  }
-}
+// .visibility-toggle:hover .asset-list__delete-button {
+//    @include themify() {
+//     background-color: transparent;
+//     border: none;
+//     cursor: pointer;
+//     padding: 0;
+//     position: initial;
+//     left: 0;
+//     top: 0;
+//       & g {
+//         opacity: 1;
+//         fill: getThemifyVariable('icon-hover-color');
+//       }
+//   }
+// }

client/styles/components/_keyboard-shortcuts.scss

@@ -0,0 +1,20 @@
+.keyboard-shortcuts {
+  padding: #{20 / $base-font-size}rem;
+  padding-bottom: #{40 / $base-font-size}rem;
+  width: #{450 / $base-font-size}rem;
+}
+
+.keyboard-shortcut-item {
+  display: flex;
+  & + & {
+    margin-top: #{10 / $base-font-size}rem;
+  }
+  align-items: baseline;
+}
+
+.keyboard-shortcut__command {
+  width: 50%;
+  font-weight: bold;
+  text-align: right;
+  padding-right: #{10 / $base-font-size}rem;
+}

client/styles/components/_modal.scss

@@ -50,30 +50,3 @@
   text-align: center;
   margin: #{20 / $base-font-size}rem 0;
 }
-
-.uploader {
-  min-height: #{200 / $base-font-size}rem;
-  width: 100%;
-  text-align: center;
-}
-
-.keyboard-shortcuts {
-  padding: #{20 / $base-font-size}rem;
-  padding-bottom: #{40 / $base-font-size}rem;
-  width: #{450 / $base-font-size}rem;
-}
-
-.keyboard-shortcut-item {
-  display: flex;
-  & + & {
-    margin-top: #{10 / $base-font-size}rem;
-  }
-  align-items: baseline;
-}
-
-.keyboard-shortcut__command {
-  width: 50%;
-  font-weight: bold;
-  text-align: right;
-  padding-right: #{10 / $base-font-size}rem;
-}

client/styles/components/_uploader.scss

@@ -1,3 +1,9 @@
 .dropzone {
   color: $primary-text-color;
+}
+
+.uploader {
+  min-height: #{200 / $base-font-size}rem;
+  width: 100%;
+  text-align: center;
 }

client/styles/main.scss

@@ -36,6 +36,7 @@
 @import 'components/help-modal';
 @import 'components/share';
 @import 'components/asset-list';
+@import 'components/keyboard-shortcuts';
 
 @import 'layout/ide';
 @import 'layout/fullscreen';

server/controllers/aws.controller.js

@@ -120,15 +120,11 @@ export function listObjectsInS3ForUser(req, res) {
     let assets = [];
     const list = client.listObjects(params)
       .on('data', (data) => {
-        console.log(data);
         assets = assets.concat(data["Contents"].map((object) => {
           return { key: object["Key"], size: object["Size"] };
         }));
       })
       .on('end', () => {
-        console.log(assets);
-        // res.json({assets});
-        //map objects to project
         const projectAssets = [];
         getProjectsForUserId(userId).then((projects) => {
           projects.forEach((project) => {
@@ -145,9 +141,9 @@ export function listObjectsInS3ForUser(req, res) {
                 key: foundAsset.key,
                 size: foundAsset.size
               });
+              res.json({assets: projectAssets});
             });
           });
-          res.json({assets});
         });
       });
   });