From 1bf72e17ff69246d32f68bf0888f3317c760618c Mon Sep 17 00:00:00 2001
From: Jan Keromnes <janx@linux.com>
Date: Tue, 5 Oct 2021 11:19:26 +0000
Subject: [PATCH 1/2] =?UTF-8?q?Replace=20/workspaces=20=E2=86=92=20/projec?=
 =?UTF-8?q?ts=20as=20default=20landing=20page=20for=20both=20users=20and?=
 =?UTF-8?q?=20teams?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .werft/build.ts                                        |  2 +-
 components/dashboard/src/App.tsx                       |  4 ++--
 components/dashboard/src/Menu.tsx                      |  2 +-
 components/gitpod-protocol/src/util/gitpod-host-url.ts | 10 +++++-----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.werft/build.ts b/.werft/build.ts
index 5523b2fcff15e7..c45635c222e79e 100644
--- a/.werft/build.ts
+++ b/.werft/build.ts
@@ -395,7 +395,7 @@ export async function deployToDev(deploymentConfig: DeploymentConfig, workspaceF
         werft.fail('deploy', err);
     } finally {
         // produce the result independently of Helm succeding, so that in case Helm fails we still have the URL.
-        exec(`werft log result -d "dev installation" -c github-check-preview-env url ${url}/workspaces/`);
+        exec(`werft log result -d "dev installation" -c github-check-preview-env url ${url}/projects`);
     }
 
     werft.log(`observability`, "Running observability static checks.")
diff --git a/components/dashboard/src/App.tsx b/components/dashboard/src/App.tsx
index 3c04d521e43d7f..cdac620dcab813 100644
--- a/components/dashboard/src/App.tsx
+++ b/components/dashboard/src/App.tsx
@@ -239,7 +239,7 @@ function App() {
                 <Route path="/admin/workspaces" component={WorkspacesSearch} />
 
                 <Route path={["/", "/login"]} exact>
-                    <Redirect to="/workspaces" />
+                    <Redirect to="/projects" />
                 </Route>
                 <Route path={["/settings"]} exact>
                     <Redirect to="/account" />
@@ -283,7 +283,7 @@ function App() {
                 {(teams || []).map(team =>
                     <Route path={`/t/${team.slug}`} key={team.slug}>
                         <Route exact path={`/t/${team.slug}`}>
-                            <Redirect to={`/t/${team.slug}/workspaces`} />
+                            <Redirect to={`/t/${team.slug}/projects`} />
                         </Route>
                         <Route exact path={`/t/${team.slug}/:maybeProject/:resourceOrPrebuild?`} render={(props) => {
                             const { maybeProject, resourceOrPrebuild } = props.match.params;
diff --git a/components/dashboard/src/Menu.tsx b/components/dashboard/src/Menu.tsx
index 675e1fc14b8fce..c10ce3b9279542 100644
--- a/components/dashboard/src/Menu.tsx
+++ b/components/dashboard/src/Menu.tsx
@@ -176,7 +176,7 @@ export default function Menu() {
         return (
             <div className="flex p-1 pl-3 ">
                 { projectName && <div className="flex h-full rounded-lg hover:bg-gray-100 dark:hover:bg-gray-800 px-2 py-1">
-                    <Link to={team ? `/t/${team.slug}/projects` : "/workspaces"}>
+                    <Link to={team ? `/t/${team.slug}/projects` : `/projects`}>
                         <span className="text-base text-gray-600 dark:text-gray-400 font-semibold">{team?.name || userFullName}</span>
                     </Link>
                 </div> }
diff --git a/components/gitpod-protocol/src/util/gitpod-host-url.ts b/components/gitpod-protocol/src/util/gitpod-host-url.ts
index 80dc768dd61d67..af9dbadd244929 100644
--- a/components/gitpod-protocol/src/util/gitpod-host-url.ts
+++ b/components/gitpod-protocol/src/util/gitpod-host-url.ts
@@ -85,23 +85,23 @@ export class GitpodHostUrl {
     }
 
     asDashboard(): GitpodHostUrl {
-        return this.with(url => ({ pathname: '/workspaces/' }));
+        return this.with(url => ({ pathname: '/projects' }));
     }
 
     asLogin(): GitpodHostUrl {
-        return this.with(url => ({ pathname: '/login/' }));
+        return this.with(url => ({ pathname: '/login' }));
     }
 
     asUpgradeSubscription(): GitpodHostUrl {
-        return this.with(url => ({ pathname: '/plans/' }));
+        return this.with(url => ({ pathname: '/plans' }));
     }
 
     asAccessControl(): GitpodHostUrl {
-        return this.with(url => ({ pathname: '/access-control/' }));
+        return this.with(url => ({ pathname: '/integrations' }));
     }
 
     asSettings(): GitpodHostUrl {
-        return this.with(url => ({ pathname: '/settings/' }));
+        return this.with(url => ({ pathname: '/settings' }));
     }
 
     asGraphQLApi(): GitpodHostUrl {

From 55c8f6bca4c8dbce61a3a04b955f905c580c8131 Mon Sep 17 00:00:00 2001
From: Jan Keromnes <janx@linux.com>
Date: Wed, 6 Oct 2021 08:20:17 +0000
Subject: [PATCH 2/2] [projects] Add 'New Workspace' context menu option to all
 Team Projects cards

---
 .../dashboard/src/projects/Projects.tsx       | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/components/dashboard/src/projects/Projects.tsx b/components/dashboard/src/projects/Projects.tsx
index 4649b7a0450e1e..2762dd99fda899 100644
--- a/components/dashboard/src/projects/Projects.tsx
+++ b/components/dashboard/src/projects/Projects.tsx
@@ -112,17 +112,24 @@ export default function () {
                     {projects.filter(filter).sort(hasNewerPrebuild).map(p => (<div key={`project-${p.id}`} className="h-52">
                         <div className="h-42 border border-gray-100 dark:border-gray-800 rounded-t-xl">
                             <div className="h-32 p-6">
-                                <div className="flex text-xl font-semibold text-gray-700 dark:text-gray-200 font-medium">
+                                <div className="flex text-gray-700 dark:text-gray-200 font-medium">
                                     <Link to={`/${teamOrUserSlug}/${p.name}`}>
-                                        {p.name}
+                                        <span className="text-xl font-semibold">{p.name}</span>
                                     </Link>
                                     <span className="flex-grow" />
                                     <div className="justify-end">
-                                        <ContextMenu menuEntries={[{
-                                            title: "Remove Project",
-                                            customFontStyle: 'text-red-600 dark:text-red-400 hover:text-red-800 dark:hover:text-red-300',
-                                            onClick: () => onRemoveProject(p)
-                                        }]} />
+                                        <ContextMenu menuEntries={[
+                                            {
+                                                title: "New Workspace",
+                                                href: `/#${p.cloneUrl}`,
+                                                separator: true,
+                                            },
+                                            {
+                                                title: "Remove Project",
+                                                customFontStyle: 'text-red-600 dark:text-red-400 hover:text-red-800 dark:hover:text-red-300',
+                                                onClick: () => onRemoveProject(p)
+                                            },
+                                        ]} />
                                     </div>
                                 </div>
                                 <a href={p.cloneUrl.replace(/\.git$/, '')}>