clean up

sreez-showcase/packages/app/package.json

@@ -40,6 +40,7 @@
     "@backstage/plugin-techdocs-react": "^1.2.3",
     "@backstage/plugin-user-settings": "^0.8.5",
     "@backstage/theme": "^0.5.3",
+    "@bestsellerit/backstage-plugin-harbor": "^0.3.1",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@roadiehq/backstage-plugin-argo-cd": "^2.6.4",

sreez-showcase/packages/app/src/components/catalog/EntityPage.tsx

@@ -67,7 +67,10 @@ import {
   isGithubAvailable,
   isGithubWorkflowsAvailable,
 } from '@veecode-platform/backstage-plugin-github-workflows';
-import { EntityGithubPullRequestsContent, EntityGithubPullRequestsOverviewCard } from '@roadiehq/backstage-plugin-github-pull-requests';
+import {
+  EntityGithubPullRequestsContent,
+  EntityGithubPullRequestsOverviewCard,
+} from '@roadiehq/backstage-plugin-github-pull-requests';
 
 const techdocsContent = (
   <EntityTechdocsContent>
@@ -154,20 +157,16 @@ const entityWarningContent = (
 const overviewContent = (
   <Grid container spacing={1} alignItems="stretch">
     {entityWarningContent}
+    <Grid item md={6} xs={12}>
+      <EntityAboutCard variant="gridItem" />
+    </Grid>
     <EntitySwitch>
       <EntitySwitch.Case if={isArgocdAvailable}>
-        <Grid item md={4} xs={12}>
+        <Grid item md={6} xs={12}>
           <EntityArgoCDOverviewCard />
         </Grid>
       </EntitySwitch.Case>
     </EntitySwitch>
-    <Grid item md={6}>
-        <EntityGithubPullRequestsOverviewCard />
-      </Grid>
-    <Grid item md={6} xs={12}>
-      <EntityAboutCard variant="gridItem" />
-    </Grid>
-
     <EntitySwitch>
       <EntitySwitch.Case if={isGithubWorkflowsAvailable}>
         <Grid item md={6} xs={12}>
@@ -175,6 +174,9 @@ const overviewContent = (
         </Grid>
       </EntitySwitch.Case>
     </EntitySwitch>
+    <Grid item md={6}>
+      <EntityGithubPullRequestsOverviewCard />
+    </Grid>
     <Grid item md={6} xs={12}>
       <EntityHasSubcomponentsCard variant="gridItem" />
     </Grid>
@@ -184,7 +186,6 @@ const overviewContent = (
     <Grid item md={6} xs={12}>
       <EntityLinksCard />
     </Grid>
-
   </Grid>
 );
 
@@ -196,6 +197,16 @@ const serviceEntityPage = (
     <EntityLayout.Route path="/pull-requests" title="Pull Requests">
       <EntityGithubPullRequestsContent />
     </EntityLayout.Route>
+    <EntityLayout.Route path="/ci-cd" title="CI/CD">
+      {cicdContent}
+    </EntityLayout.Route>
+    <EntityLayout.Route
+      if={isGithubAvailable}
+      path="/workflows"
+      title="Workflows"
+    >
+      {workflowsContent}
+    </EntityLayout.Route>
     <EntityLayout.Route path="/api" title="API">
       <Grid container spacing={3} alignItems="stretch">
         <Grid item md={6}>
@@ -259,16 +270,7 @@ const defaultEntityPage = (
     <EntityLayout.Route path="/" title="Overview">
       {overviewContent}
     </EntityLayout.Route>
-    <EntityLayout.Route path="/ci-cd" title="CI/CD">
-      {cicdContent}
-    </EntityLayout.Route>
-    <EntityLayout.Route
-      if={isGithubAvailable}
-      path="/workflows"
-      title="Workflows"
-    >
-      {workflowsContent}
-    </EntityLayout.Route>
+
     <EntityLayout.Route path="/docs" title="Docs">
       {techdocsContent}
     </EntityLayout.Route>