diff --git a/package-lock.json b/package-lock.json index 772508d..b5e3e86 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2222,6 +2222,16 @@ "normalize-path": "^2.1.1" } }, + "aos": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/aos/-/aos-2.3.4.tgz", + "integrity": "sha512-zh/ahtR2yME4I51z8IttIt4lC1Nw0ktsFtmeDzID1m9naJnWXhCoARaCgNOGXb5CLy3zm+wqmRAEgMYB5E2HUw==", + "requires": { + "classlist-polyfill": "^1.0.3", + "lodash.debounce": "^4.0.6", + "lodash.throttle": "^4.0.1" + } + }, "aproba": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", @@ -4050,6 +4060,11 @@ } } }, + "classlist-polyfill": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/classlist-polyfill/-/classlist-polyfill-1.2.0.tgz", + "integrity": "sha1-k1vC39lFiodrJ5YXUUY4vKqWSi4=" + }, "classnames": { "version": "2.2.6", "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz", diff --git a/package.json b/package.json index a308f8e..76fb4f6 100644 --- 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 @@ } } } -} \ No newline at end of file +} diff --git a/src/__tests__/routes.test.jsx b/src/__tests__/routes.test.jsx index d99b9e0..94d7b51 100644 --- a/src/__tests__/routes.test.jsx +++ b/src/__tests__/routes.test.jsx @@ -77,7 +77,7 @@ describe('Routes', () => { )) - 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(( ), { 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', () => { )) - 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', () => { )) - 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 index b4f1875..2f48a84 100644 --- a/src/common/LoginButton/index.jsx +++ b/src/common/LoginButton/index.jsx @@ -62,14 +62,7 @@ const LoginButton = () => { )} { user.isAuthenticatedWith === 'guest' && ( -<<<<<<< HEAD -======= - ->>>>>>> initial updates )}