From faf5473d5dc7944d9459122c1defe2cf43b1f817 Mon Sep 17 00:00:00 2001
From: Kyle Gill <kylerobertgill@gmail.com>
Date: Fri, 29 Mar 2019 09:38:21 -0600
Subject: [PATCH] chore: swap loading component for react-spinner

---
 .prettierrc                       |  7 +++++++
 package.json                      |  1 +
 public/index.html                 |  4 ++++
 src/components/Icon/Icon.js       | 17 +++++++++--------
 src/components/screens/Day/Day.js |  9 +++++++--
 yarn.lock                         | 15 ++++++++++++---
 6 files changed, 40 insertions(+), 13 deletions(-)
 create mode 100644 .prettierrc

diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 0000000..48e90e8
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,7 @@
+{
+  "endOfLine": "lf",
+  "semi": false,
+  "singleQuote": false,
+  "tabWidth": 2,
+  "trailingComma": "es5"
+}
diff --git a/package.json b/package.json
index c273ffa..34735bc 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "react-feather": "^1.1.6",
     "react-router-dom": "^5.0.0",
     "react-scripts": "2.1.8",
+    "react-spinners": "^0.5.3",
     "recompose": "^0.30.0"
   },
   "scripts": {
diff --git a/public/index.html b/public/index.html
index 75980d5..9493bee 100644
--- a/public/index.html
+++ b/public/index.html
@@ -13,6 +13,10 @@
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
     -->
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+    <link
+      href="https://fonts.googleapis.com/css?family=Montserrat:400,700"
+      rel="stylesheet"
+    />
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
diff --git a/src/components/Icon/Icon.js b/src/components/Icon/Icon.js
index c88ca3b..963e3b7 100644
--- a/src/components/Icon/Icon.js
+++ b/src/components/Icon/Icon.js
@@ -1,16 +1,17 @@
-import React from "react";
-import styled from "@emotion/styled";
+import React from "react"
+import styled from "@emotion/styled"
 import {
   Book,
   Calendar,
   ChevronLeft,
   ChevronRight,
   Circle,
+  Edit2,
   Moon,
   Sun,
-  User
-} from "react-feather";
-import { withTheme } from "emotion-theming";
+  User,
+} from "react-feather"
+import { withTheme } from "emotion-theming"
 
 const IconBase = styled.div`
   display: flex;
@@ -25,7 +26,7 @@ const IconBase = styled.div`
     background-color: ${props => !props.disabled && props.theme.colors.hover};
     cursor: pointer;
   }
-`;
+`
 
 const Icon = ({ name, ...rest }) => (
   <IconBase {...rest}>
@@ -38,6 +39,6 @@ const Icon = ({ name, ...rest }) => (
     {name === "Sun" && <Sun />}
     {name === "User" && <User />}
   </IconBase>
-);
+)
 
-export default withTheme(Icon);
+export default withTheme(Icon)
diff --git a/src/components/screens/Day/Day.js b/src/components/screens/Day/Day.js
index a13f1c7..eca6e84 100644
--- a/src/components/screens/Day/Day.js
+++ b/src/components/screens/Day/Day.js
@@ -6,6 +6,7 @@ import { withTheme } from "emotion-theming";
 import { withFirebase } from "../../firebase";
 import { withAuthentication } from "../../session";
 import { addDays, subDays, format, isAfter, startOfYesterday } from "date-fns";
+import { BeatLoader } from "react-spinners";
 
 import { SIZES } from "../../../styles/constants";
 
@@ -145,7 +146,8 @@ class Day extends Component {
     const {
       match: {
         params: { year, month, day }
-      }
+      },
+      theme
     } = this.props;
     const { text, loading } = this.state;
     const currentDay = new Date(year, month - 1, day);
@@ -161,7 +163,10 @@ class Day extends Component {
         />
         <JournalHeading>RECORD THOUGHTS ABOUT YOUR DAY</JournalHeading>
         {loading ? (
-          <JournalEntryArea disabled placeholder="Loading..." />
+          // <JournalEntryArea disabled placeholder="Loading..." />
+          <div style={{ marginTop: 10 }}>
+            <BeatLoader color={theme.colors.tertiary} size={10} margin="4px" />
+          </div>
         ) : (
           <JournalEntryArea
             placeholder="Start writing..."
diff --git a/yarn.lock b/yarn.lock
index 2696991..3a08f25 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -878,7 +878,7 @@
     "@emotion/utils" "0.11.1"
     "@emotion/weak-memoize" "0.2.2"
 
-"@emotion/core@^10.0.10":
+"@emotion/core@^10.0.10", "@emotion/core@^10.0.4":
   version "10.0.10"
   resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.0.10.tgz#8d3114e5a2f8b178a7067c603a2937516f180b08"
   integrity sha512-U1aE2cOWUscjc8ZJ3Cx32udOzLeRoJwGxBH93xQD850oQFpwPKZARzdUtdc9SByUOwzSFYxhDhrpXnV34FJmWg==
@@ -8229,7 +8229,7 @@ prompts@^0.1.9:
     kleur "^2.0.1"
     sisteransi "^0.1.1"
 
-prop-types@^15.6.2:
+prop-types@^15.5.10, prop-types@^15.6.2:
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
   integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -8571,6 +8571,15 @@ react-scripts@2.1.8:
   optionalDependencies:
     fsevents "1.2.4"
 
+react-spinners@^0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/react-spinners/-/react-spinners-0.5.3.tgz#b4fa956da9674f3300442cef10186de7d749099c"
+  integrity sha512-5erLzg/7uduB0rbO2CAvi8seg1FJ98dQhYxWoBgjU8XNnfb45RF1eARUemMwjtRQ3b5zZ9JVK4+AQtlHOK4ksQ==
+  dependencies:
+    "@emotion/core" "^10.0.4"
+    prop-types "^15.5.10"
+    recompose "0.27.1 - 0.30.0"
+
 react@^16.8.4:
   version "16.8.4"
   resolved "https://registry.yarnpkg.com/react/-/react-16.8.4.tgz#fdf7bd9ae53f03a9c4cd1a371432c206be1c4768"
@@ -8653,7 +8662,7 @@ realpath-native@^1.0.0:
   dependencies:
     util.promisify "^1.0.0"
 
-recompose@^0.30.0:
+"recompose@0.27.1 - 0.30.0", recompose@^0.30.0:
   version "0.30.0"
   resolved "https://registry.yarnpkg.com/recompose/-/recompose-0.30.0.tgz#82773641b3927e8c7d24a0d87d65aeeba18aabd0"
   integrity sha512-ZTrzzUDa9AqUIhRk4KmVFihH0rapdCSMFXjhHbNrjAWxBuUD/guYlyysMnuHjlZC/KRiOKRtB4jf96yYSkKE8w==