From 643bc5df772b9438a971f0aecdd9d9886d01dfa7 Mon Sep 17 00:00:00 2001
From: Andre Wanlin <awanlin@rapidrtc.com>
Date: Mon, 6 Sep 2021 09:08:16 -0500
Subject: [PATCH] Keep using HomepageCompositionRoot

Signed-off-by: Andre Wanlin <awanlin@rapidrtc.com>
---
 packages/app/src/App.tsx                          |  4 +++-
 .../src/components/HomepageCompositionRoot.tsx    | 15 +--------------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx
index 244bc7aa2a..81dbdf4cac 100644
--- a/packages/app/src/App.tsx
+++ b/packages/app/src/App.tsx
@@ -114,7 +114,9 @@ const routes = (
   <FlatRoutes>
     <Navigate key="/" to="catalog" />
     {/* TODO(rubenl): Move this to / once its more mature and components exist */}
-    <Route path="/home" element={<HomePage />} />
+    <Route path="/home" element={<HomepageCompositionRoot />}>
+      <HomePage />
+    </Route>
     <Route path="/catalog" element={<CatalogIndexPage />} />
     <Route
       path="/catalog/:namespace/:kind/:name"
diff --git a/plugins/home/src/components/HomepageCompositionRoot.tsx b/plugins/home/src/components/HomepageCompositionRoot.tsx
index a6e4f482f8..563af75d64 100644
--- a/plugins/home/src/components/HomepageCompositionRoot.tsx
+++ b/plugins/home/src/components/HomepageCompositionRoot.tsx
@@ -16,12 +16,6 @@
 
 import React, { ReactNode } from 'react';
 import { useOutlet } from 'react-router';
-import {
-  Content,
-  Header,
-  Page,
-  HomepageTimer,
-} from '@backstage/core-components';
 
 export const HomepageCompositionRoot = (props: {
   title?: string;
@@ -29,12 +23,5 @@ export const HomepageCompositionRoot = (props: {
 }) => {
   const outlet = useOutlet();
   const children = props.children ?? outlet;
-  return (
-    <Page themeId="home">
-      <Header title={props.title ?? 'Home'}>
-        <HomepageTimer />
-      </Header>
-      <Content>{children}</Content>
-    </Page>
-  );
+  return <div>{children}</div>;
 };