From dac2d43f559d446e88af03fac534cb4f2d24ef2c Mon Sep 17 00:00:00 2001 From: Tom Moor Date: Wed, 26 Feb 2020 21:10:20 -0800 Subject: [PATCH] dashboard -> home (#1194) --- app/components/Sidebar/Main.js | 2 +- app/embeds/Abstract.test.js | 2 +- app/routes.js | 5 +++-- app/scenes/Dashboard.js | 12 ++++++------ app/scenes/Home.js | 2 +- app/utils/routeHelpers.js | 2 +- public/manifest.json | 2 +- server/__snapshots__/mailer.test.js.snap | 4 ++-- server/auth/index.js | 2 +- server/emails/ExportEmail.js | 2 +- server/emails/WelcomeEmail.js | 4 ++-- server/middlewares/authentication.js | 2 +- 12 files changed, 21 insertions(+), 20 deletions(-) diff --git a/app/components/Sidebar/Main.js b/app/components/Sidebar/Main.js index d77ea2e76..76302a595 100644 --- a/app/components/Sidebar/Main.js +++ b/app/components/Sidebar/Main.js @@ -81,7 +81,7 @@ class MainSidebar extends React.Component {
} exact={false} label="Home" diff --git a/app/embeds/Abstract.test.js b/app/embeds/Abstract.test.js index 7231e09ca..85986f3e6 100644 --- a/app/embeds/Abstract.test.js +++ b/app/embeds/Abstract.test.js @@ -52,7 +52,7 @@ describe('Abstract', () => { expect('https://goabstract.com'.match(match)).toBe(null); expect('https://app.goabstract.com'.match(match)).toBe(null); expect('https://abstract.com/features'.match(match)).toBe(null); - expect('https://app.abstract.com/dashboard'.match(match)).toBe(null); + expect('https://app.abstract.com/home'.match(match)).toBe(null); expect('https://abstract.com/pricing'.match(match)).toBe(null); expect('https://goabstract.com/pricing'.match(match)).toBe(null); expect('https://www.goabstract.com/pricing'.match(match)).toBe(null); diff --git a/app/routes.js b/app/routes.js index f91aaa38b..4049d1c0f 100644 --- a/app/routes.js +++ b/app/routes.js @@ -43,8 +43,9 @@ export default function Routes() { - - + + + diff --git a/app/scenes/Dashboard.js b/app/scenes/Dashboard.js index ad46a2ae3..556a991c9 100644 --- a/app/scenes/Dashboard.js +++ b/app/scenes/Dashboard.js @@ -31,16 +31,16 @@ class Dashboard extends React.Component {

Home

- + Recently updated - + Recently viewed - Created by me + Created by me - + { showCollection /> - + { showCollection /> - + { - if (auth.authenticated) return ; + if (auth.authenticated) return ; auth.logout(true); return null; }); diff --git a/app/utils/routeHelpers.js b/app/utils/routeHelpers.js index b557ba97e..0cbdf8ae2 100644 --- a/app/utils/routeHelpers.js +++ b/app/utils/routeHelpers.js @@ -2,7 +2,7 @@ import Document from 'models/Document'; export function homeUrl(): string { - return '/dashboard'; + return '/home'; } export function starredUrl(): string { diff --git a/public/manifest.json b/public/manifest.json index db420c32c..f609946d6 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -13,7 +13,7 @@ "sizes": "512x512" } ], - "start_url": "/dashboard?source=pwa", + "start_url": "/home?source=pwa", "background_color": "#FFFFFF", "display": "standalone", "theme_color": "#FFFFFF" diff --git a/server/__snapshots__/mailer.test.js.snap b/server/__snapshots__/mailer.test.js.snap index c12832725..37be51ef9 100644 --- a/server/__snapshots__/mailer.test.js.snap +++ b/server/__snapshots__/mailer.test.js.snap @@ -43,7 +43,7 @@ Object { Outline is a place for your team to build and share knowledge. -
 
\\"Outline\\"
 

Welcome to Outline!

Outline is a place for your team to build and share knowledge.

To get started, head to your dashboard and try creating a collection to help document your workflow, create playbooks or help with team onboarding.

You can also import existing Markdown documents by dragging and dropping them to your collections.

 

View my dashboard

 
OutlineTwitterSpectrum
+
 
\\"Outline\\"
 

Welcome to Outline!

Outline is a place for your team to build and share knowledge.

To get started, head to your dashboard and try creating a collection to help document your workflow, create playbooks or help with team onboarding.

You can also import existing Markdown documents by dragging and dropping them to your collections.

 

View my dashboard

 
OutlineTwitterSpectrum
@@ -61,7 +61,7 @@ To get started, head to your dashboard and try creating a collection to help doc You can also import existing Markdown documents by dragging and dropping them to your collections. -http://example.com/dashboard +http://example.com/home ", "to": "user@example.com", } diff --git a/server/auth/index.js b/server/auth/index.js index fd4b74e70..ad5e5fe38 100644 --- a/server/auth/index.js +++ b/server/auth/index.js @@ -34,7 +34,7 @@ router.get('/redirect', auth(), async ctx => { }); const team = await Team.findByPk(user.teamId); - ctx.redirect(`${team.url}/dashboard`); + ctx.redirect(`${team.url}/home`); }); app.use(bodyParser()); diff --git a/server/emails/ExportEmail.js b/server/emails/ExportEmail.js index f3d50c352..14b3572d7 100644 --- a/server/emails/ExportEmail.js +++ b/server/emails/ExportEmail.js @@ -26,7 +26,7 @@ export const ExportEmail = () => {

- +

diff --git a/server/emails/WelcomeEmail.js b/server/emails/WelcomeEmail.js index 62b106d2b..e1a1bb0df 100644 --- a/server/emails/WelcomeEmail.js +++ b/server/emails/WelcomeEmail.js @@ -21,7 +21,7 @@ To get started, head to your dashboard and try creating a collection to help doc You can also import existing Markdown documents by dragging and dropping them to your collections. -${teamUrl}/dashboard +${teamUrl}/home `; export const WelcomeEmail = ({ teamUrl }: Props) => { @@ -43,7 +43,7 @@ export const WelcomeEmail = ({ teamUrl }: Props) => {

- +

diff --git a/server/middlewares/authentication.js b/server/middlewares/authentication.js index 3fcf9b36f..027849ed8 100644 --- a/server/middlewares/authentication.js +++ b/server/middlewares/authentication.js @@ -134,7 +134,7 @@ export default function auth(options?: { required?: boolean } = {}) { httpOnly: false, expires, }); - ctx.redirect(`${team.url}/dashboard${isFirstSignin ? '?welcome' : ''}`); + ctx.redirect(`${team.url}/home${isFirstSignin ? '?welcome' : ''}`); } };