Update home page to make it responsive; Update copy

entaxy-project · Nov 17, 2019 · 9239297 · 9239297
1 parent dc197ba
commit 9239297
Show file tree

Hide file tree

Showing 7 changed files with 157 additions and 261 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -38,6 +38,7 @@
     "@vx/scale": "0.0.192",
     "@vx/shape": "0.0.192",
     "@vx/tooltip": "0.0.192",
+    "aos": "^2.3.4",
     "big.js": "^5.2.2",
     "blockstack": "^19.2.5",
     "chroma-js": "^2.1.0",
@@ -140,4 +141,4 @@
       }
     }
   }
-}
+}
diff --git a/src/__tests__/routes.test.jsx b/src/__tests__/routes.test.jsx
@@ -77,7 +77,7 @@ describe('Routes', () => {
           <Routes />
         </Provider>
       ))
-      expect(getByText('Insight into your finances, without sacrificing your data')).toBeInTheDocument()
+      expect(getByText('Your Personal Finances Simple & Private')).toBeInTheDocument()
       expect(history.entries.map((e) => e.pathname)).toEqual(['/'])
       expect(queryByText((_, element) => element.tagName.toLowerCase() === 'header')).not.toBeInTheDocument()
     })
@@ -91,17 +91,17 @@ describe('Routes', () => {
       ), { route: '/handle-login' })
       expect(blockstackUserSession.handlePendingSignIn).toHaveBeenCalled()
       await wait(() => expect(historyPushSpy).toHaveBeenCalled())
-      expect(getByText('Insight into your finances, without sacrificing your data')).toBeInTheDocument()
+      expect(getByText('Your Personal Finances Simple & Private')).toBeInTheDocument()
       expect(history.entries.map((e) => e.pathname)).toEqual(['/handle-login', '/'])
     })
 
-    it.only('redirects to home page if not logged in', () => {
+    it('redirects to home page if not logged in', () => {
       const { history, getByText } = renderWithRouter((
         <Provider store={store}>
           <Routes />
         </Provider>
       ), { route: '/dashboard' })
-      expect(getByText('Insight into your finances, without sacrificing your data')).toBeInTheDocument()
+      expect(getByText('Your Personal Finances Simple & Private')).toBeInTheDocument()
       expect(history.entries.map((e) => e.pathname)).toEqual(['/'])
     })
   })
@@ -113,7 +113,7 @@ describe('Routes', () => {
           <Routes />
         </Provider>
       ))
-      expect(getByText('Insight into your finances, without sacrificing your data')).toBeInTheDocument()
+      expect(getByText('Your Personal Finances Simple & Private')).toBeInTheDocument()
       expect(getByText('Sign in with Blockstack')).toBeInTheDocument()
 
       // Login with blockstack
@@ -127,7 +127,7 @@ describe('Routes', () => {
       // Logout
       fireEvent.click(getByTestId('userNavButton'))
       fireEvent.click(getByTestId('logoutButton'))
-      await waitForElement(() => getByText('Insight into your finances, without sacrificing your data'))
+      await waitForElement(() => getByText('Your Personal Finances Simple & Private'))
       expect(queryByText((_, element) => element.tagName.toLowerCase() === 'header')).not.toBeInTheDocument()
       expect(persistor).toBeNull()
     })
@@ -138,7 +138,7 @@ describe('Routes', () => {
           <Routes />
         </Provider>
       ))
-      expect(getByText('Insight into your finances, without sacrificing your data')).toBeInTheDocument()
+      expect(getByText('Your Personal Finances Simple & Private')).toBeInTheDocument()
       expect(getByText('Sign in with Blockstack')).toBeInTheDocument()
 
       // Login with blockstack
@@ -153,7 +153,7 @@ describe('Routes', () => {
       blockstackUserSession.isUserSignedIn.mockReturnValue(false)
       fireEvent.click(getByTestId('userNavButton'))
       fireEvent.click(getByTestId('logoutButton'))
-      await waitForElement(() => getByText('Insight into your finances, without sacrificing your data'))
+      await waitForElement(() => getByText('Your Personal Finances Simple & Private'))
       expect(persistor).toBeNull()
     })
 

diff --git a/src/common/LoginButton/index.jsx b/src/common/LoginButton/index.jsx
@@ -62,14 +62,7 @@ const LoginButton = () => {
         </Tooltip>
       )}
       { user.isAuthenticatedWith === 'guest' && (
-<<<<<<< HEAD
         <Avatar alt={user.name} src={user.pictureUrl} />
-=======
-        <Avatar
-          src={user.pictureUrl}
-          alt={user.name}
-        />
->>>>>>> initial updates
       )}
       <Button
         ref={anchorRef}

diff --git a/src/core/Landing/__tests__/LandingCard.test.jsx b/src/core/Landing/__tests__/LandingCard.test.jsx
@@ -36,7 +36,7 @@ describe('LandingCard', () => {
       </Provider>
     )
     expect(getByText('Sign in with Blockstack')).toBeInTheDocument()
-    expect(getByText('Don\'t sign in yet')).toBeInTheDocument()
+    expect(getByText('Sign in as guest user')).toBeInTheDocument()
   })
 
   it('handles login with blockstack', async () => {

diff --git a/src/core/Landing/__tests__/index.test.jsx b/src/core/Landing/__tests__/index.test.jsx
@@ -23,6 +23,6 @@ describe('Landing page', () => {
         </BrowserRouter>
       </Provider>
     )
-    expect(getByText('Insight into your finances, without sacrificing your data')).toBeInTheDocument()
+    expect(getByText('Your Personal Finances Simple & Private')).toBeInTheDocument()
   })
 })