From f3112d13933f99650e005da75f216284bed24c70 Mon Sep 17 00:00:00 2001
From: Jori Lallo <jtlallo@gmail.com>
Date: Sun, 10 Sep 2017 22:38:20 -0700
Subject: [PATCH 1/9] Allow help text select

---
 frontend/components/HelpText/HelpText.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/components/HelpText/HelpText.js b/frontend/components/HelpText/HelpText.js
index ac4b96673..dcb48df84 100644
--- a/frontend/components/HelpText/HelpText.js
+++ b/frontend/components/HelpText/HelpText.js
@@ -3,7 +3,6 @@ import styled from 'styled-components';
 import { color } from 'styles/constants';
 
 const HelpText = styled.p`
-  user-select: none;
   color: ${color.slateDark};
 `;
 

From 14b7f07e7f213e7a98517badc4bb824af7b3dde0 Mon Sep 17 00:00:00 2001
From: Jori Lallo <jtlallo@gmail.com>
Date: Sun, 10 Sep 2017 22:59:14 -0700
Subject: [PATCH 2/9] Load dashboard items in one

---
 .../LoadingPlaceholder/ListPlaceholder.js     | 27 ++++++++++------
 frontend/scenes/Dashboard/Dashboard.js        | 32 +++++++++++--------
 frontend/stores/DocumentsStore.js             |  2 +-
 3 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/frontend/components/LoadingPlaceholder/ListPlaceholder.js b/frontend/components/LoadingPlaceholder/ListPlaceholder.js
index bf26f0f52..379799d6f 100644
--- a/frontend/components/LoadingPlaceholder/ListPlaceholder.js
+++ b/frontend/components/LoadingPlaceholder/ListPlaceholder.js
@@ -1,11 +1,16 @@
 // @flow
 import React from 'react';
+import _ from 'lodash';
 import ReactCSSTransitionGroup from 'react-addons-css-transition-group';
 import styled from 'styled-components';
 import Mask from './components/Mask';
 import Flex from 'components/Flex';
 
-export default (props: Object) => {
+type Props = {
+  count: number,
+};
+
+const ListPlaceHolder = ({ count }: Props) => {
   return (
     <ReactCSSTransitionGroup
       transitionName="fadeIn"
@@ -16,18 +21,22 @@ export default (props: Object) => {
       transitionEnter
       transitionLeave
     >
-      <Item column auto>
-        <Mask header />
-        <Mask />
-      </Item>
-      <Item column auto>
-        <Mask header />
-        <Mask />
-      </Item>
+      {_.times(count, () => (
+        <Item column auto>
+          <Mask header />
+          <Mask />
+        </Item>
+      ))}
     </ReactCSSTransitionGroup>
   );
 };
 
+ListPlaceHolder.defaultProps = {
+  count: 2,
+};
+
 const Item = styled(Flex)`
   padding: 18px 0;
 `;
+
+export default ListPlaceHolder;
diff --git a/frontend/scenes/Dashboard/Dashboard.js b/frontend/scenes/Dashboard/Dashboard.js
index f8adf4b03..9b363c3e8 100644
--- a/frontend/scenes/Dashboard/Dashboard.js
+++ b/frontend/scenes/Dashboard/Dashboard.js
@@ -1,9 +1,11 @@
 // @flow
 import React from 'react';
+import { observable } from 'mobx';
 import { observer, inject } from 'mobx-react';
 import styled from 'styled-components';
 
 import DocumentsStore from 'stores/DocumentsStore';
+import Flex from 'components/Flex';
 import DocumentList from 'components/DocumentList';
 import PageTitle from 'components/PageTitle';
 import CenteredContent from 'components/CenteredContent';
@@ -26,29 +28,33 @@ type Props = {
 
 @observer class Dashboard extends React.Component {
   props: Props;
+  @observable isLoaded = false;
 
   componentDidMount() {
-    this.props.documents.fetchRecentlyModified({ limit: 5 });
-    this.props.documents.fetchRecentlyViewed({ limit: 5 });
+    this.loadContent();
   }
 
-  get showPlaceholder() {
-    const { isLoaded, isFetching } = this.props.documents;
-    return !isLoaded && isFetching;
-  }
+  loadContent = async () => {
+    await Promise.all([
+      this.props.documents.fetchRecentlyModified({ limit: 5 }),
+      this.props.documents.fetchRecentlyViewed({ limit: 5 }),
+    ]);
+    this.isLoaded = true;
+  };
 
   render() {
     return (
       <CenteredContent>
         <PageTitle title="Home" />
         <h1>Home</h1>
-        <Subheading>Recently viewed</Subheading>
-        {this.showPlaceholder && <ListPlaceholder />}
-        <DocumentList documents={this.props.documents.recentlyViewed} />
-
-        <Subheading>Recently edited</Subheading>
-        <DocumentList documents={this.props.documents.recentlyEdited} />
-        {this.showPlaceholder && <ListPlaceholder />}
+        {this.isLoaded
+          ? <Flex column>
+              <Subheading>Recently viewed</Subheading>
+              <DocumentList documents={this.props.documents.recentlyViewed} />
+              <Subheading>Recently edited</Subheading>
+              <DocumentList documents={this.props.documents.recentlyEdited} />
+            </Flex>
+          : <ListPlaceholder count={5} />}
       </CenteredContent>
     );
   }
diff --git a/frontend/stores/DocumentsStore.js b/frontend/stores/DocumentsStore.js
index 444a47bbf..7ccedcad5 100644
--- a/frontend/stores/DocumentsStore.js
+++ b/frontend/stores/DocumentsStore.js
@@ -88,7 +88,7 @@ class DocumentsStore extends BaseStore {
   };
 
   @action fetchRecentlyModified = async (options: ?Object): Promise<*> => {
-    return this.fetchAll('list', options);
+    return await this.fetchAll('list', options);
   };
 
   @action fetchRecentlyViewed = async (options: ?Object): Promise<*> => {

From 9aa49deeeb2cb00752f40c40f1ef58e6a4242c07 Mon Sep 17 00:00:00 2001
From: Jori Lallo <jtlallo@gmail.com>
Date: Sun, 10 Sep 2017 23:01:22 -0700
Subject: [PATCH 3/9] Fixes discoloration on menuitems

---
 frontend/components/DropdownMenu/DropdownMenu.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/components/DropdownMenu/DropdownMenu.js b/frontend/components/DropdownMenu/DropdownMenu.js
index 20ecf1ce8..89fa150c5 100644
--- a/frontend/components/DropdownMenu/DropdownMenu.js
+++ b/frontend/components/DropdownMenu/DropdownMenu.js
@@ -92,12 +92,15 @@ const MenuItem = styled.div`
   cursor: pointer;
   border-left: 2px solid transparent;
 
+  color: ${color.text};
+
   span {
     margin-top: 2px;
   }
 
   a {
     text-decoration: none;
+    color: ${color.text};
     width: 100%;
   }
 

From d73f2e856ec461b8fca33200163d5e834a7b446d Mon Sep 17 00:00:00 2001
From: Jori Lallo <jtlallo@gmail.com>
Date: Sun, 10 Sep 2017 23:14:32 -0700
Subject: [PATCH 4/9] Fixed collaborator avatars

---
 frontend/components/Collaborators/Collaborators.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/frontend/components/Collaborators/Collaborators.js b/frontend/components/Collaborators/Collaborators.js
index ae62fd1b4..8bb7c7882 100644
--- a/frontend/components/Collaborators/Collaborators.js
+++ b/frontend/components/Collaborators/Collaborators.js
@@ -25,15 +25,20 @@ const Collaborators = function({ document }: { document: Document }) {
 
   return (
     <Avatars>
-      <Tooltip tooltip={tooltip} placement="bottom">
+      <StyledTooltip tooltip={tooltip} placement="bottom">
         {collaborators.map(user => (
           <Avatar key={user.id} src={user.avatarUrl} />
         ))}
-      </Tooltip>
+      </StyledTooltip>
     </Avatars>
   );
 };
 
+const StyledTooltip = styled(Tooltip)`
+  display: flex;
+  flex-direction: row-reverse;
+`;
+
 const Avatars = styled(Flex)`
   flex-direction: row-reverse;
   height: 26px;
@@ -45,7 +50,7 @@ const Avatar = styled.img`
   flex-shrink: 0;
   border-radius: 50%;
   border: 2px solid ${color.white};
-  margin-right: -13px;
+  margin-right: -10px;
 
   &:first-child {
     margin-right: 0;

From 429f0be93992134d1b2db1a1505a73f80c8ba166 Mon Sep 17 00:00:00 2001
From: Jori Lallo <jtlallo@gmail.com>
Date: Sun, 10 Sep 2017 23:23:28 -0700
Subject: [PATCH 5/9] Fill starred star

---
 frontend/components/DocumentPreview/DocumentPreview.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontend/components/DocumentPreview/DocumentPreview.js b/frontend/components/DocumentPreview/DocumentPreview.js
index f82bb1424..c87e6ff4f 100644
--- a/frontend/components/DocumentPreview/DocumentPreview.js
+++ b/frontend/components/DocumentPreview/DocumentPreview.js
@@ -22,6 +22,8 @@ const StyledStar = styled(Icon).attrs({
   margin-left: 4px;
   opacity: ${props => (props.solid ? '1 !important' : 0)};
   transition: opacity 100ms ease-in-out;
+
+  ${props => props.solid && 'polygon { fill: #000};'}
 `;
 
 const DocumentLink = styled(Link)`

From 2fc0aee1b782024a7f78331b6601e26c32204db5 Mon Sep 17 00:00:00 2001
From: Jori Lallo <jtlallo@gmail.com>
Date: Sun, 10 Sep 2017 23:33:07 -0700
Subject: [PATCH 6/9] Linting

---
 frontend/components/LoadingPlaceholder/ListPlaceholder.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/frontend/components/LoadingPlaceholder/ListPlaceholder.js b/frontend/components/LoadingPlaceholder/ListPlaceholder.js
index 379799d6f..3eb818d3e 100644
--- a/frontend/components/LoadingPlaceholder/ListPlaceholder.js
+++ b/frontend/components/LoadingPlaceholder/ListPlaceholder.js
@@ -7,7 +7,7 @@ import Mask from './components/Mask';
 import Flex from 'components/Flex';
 
 type Props = {
-  count: number,
+  count?: number,
 };
 
 const ListPlaceHolder = ({ count }: Props) => {
@@ -21,7 +21,7 @@ const ListPlaceHolder = ({ count }: Props) => {
       transitionEnter
       transitionLeave
     >
-      {_.times(count, () => (
+      {_.times(count || 2, () => (
         <Item column auto>
           <Mask header />
           <Mask />
@@ -31,10 +31,6 @@ const ListPlaceHolder = ({ count }: Props) => {
   );
 };
 
-ListPlaceHolder.defaultProps = {
-  count: 2,
-};
-
 const Item = styled(Flex)`
   padding: 18px 0;
 `;

From c44c25b53eafe094ac8f07ddcd23f187d73dd646 Mon Sep 17 00:00:00 2001
From: Jori Lallo <jtlallo@gmail.com>
Date: Mon, 11 Sep 2017 00:15:27 -0700
Subject: [PATCH 7/9] Fix Icon prop warning

---
 frontend/components/DocumentPreview/DocumentPreview.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/components/DocumentPreview/DocumentPreview.js b/frontend/components/DocumentPreview/DocumentPreview.js
index c87e6ff4f..b28644515 100644
--- a/frontend/components/DocumentPreview/DocumentPreview.js
+++ b/frontend/components/DocumentPreview/DocumentPreview.js
@@ -15,7 +15,7 @@ type Props = {
   innerRef?: Function,
 };
 
-const StyledStar = styled(Icon).attrs({
+const StyledStar = styled(({ solid, ...props }) => <Icon {...props} />).attrs({
   type: 'Star',
   color: color.text,
 })`

From aa9478d878e723d35ff651e11564ae84f8a107e3 Mon Sep 17 00:00:00 2001
From: Jori Lallo <jtlallo@gmail.com>
Date: Mon, 11 Sep 2017 00:17:07 -0700
Subject: [PATCH 8/9] Added a missing `key`

---
 frontend/components/LoadingPlaceholder/ListPlaceholder.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/components/LoadingPlaceholder/ListPlaceholder.js b/frontend/components/LoadingPlaceholder/ListPlaceholder.js
index 3eb818d3e..7fba72172 100644
--- a/frontend/components/LoadingPlaceholder/ListPlaceholder.js
+++ b/frontend/components/LoadingPlaceholder/ListPlaceholder.js
@@ -21,8 +21,8 @@ const ListPlaceHolder = ({ count }: Props) => {
       transitionEnter
       transitionLeave
     >
-      {_.times(count || 2, () => (
-        <Item column auto>
+      {_.times(count || 2, index => (
+        <Item key={index} column auto>
           <Mask header />
           <Mask />
         </Item>

From 98175c3d99b6d76dae87aef2b96b3a3052584ea9 Mon Sep 17 00:00:00 2001
From: Jori Lallo <jtlallo@gmail.com>
Date: Mon, 11 Sep 2017 22:08:47 -0700
Subject: [PATCH 9/9] make the star smaller

---
 frontend/components/DocumentPreview/DocumentPreview.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/components/DocumentPreview/DocumentPreview.js b/frontend/components/DocumentPreview/DocumentPreview.js
index b28644515..ad8002954 100644
--- a/frontend/components/DocumentPreview/DocumentPreview.js
+++ b/frontend/components/DocumentPreview/DocumentPreview.js
@@ -19,6 +19,9 @@ const StyledStar = styled(({ solid, ...props }) => <Icon {...props} />).attrs({
   type: 'Star',
   color: color.text,
 })`
+  width: 16px;
+  height: 16px;
+  top: 1px;
   margin-left: 4px;
   opacity: ${props => (props.solid ? '1 !important' : 0)};
   transition: opacity 100ms ease-in-out;