merge and small fixes
This commit is contained in:
Med Mouine
@@ -15,31 +15,31 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@backstage-community/plugin-github-actions": "^0.6.16",
|
||||
"@backstage/app-defaults": "^1.5.4",
|
||||
"@backstage/catalog-model": "^1.4.5",
|
||||
"@backstage/cli": "^0.26.3",
|
||||
"@backstage/core-app-api": "^1.12.4",
|
||||
"@backstage/core-components": "^0.14.4",
|
||||
"@backstage/app-defaults": "^1.5.5",
|
||||
"@backstage/catalog-model": "^1.5.0",
|
||||
"@backstage/cli": "^0.26.6",
|
||||
"@backstage/core-app-api": "^1.12.5",
|
||||
"@backstage/core-components": "^0.14.7",
|
||||
"@backstage/core-plugin-api": "^1.9.2",
|
||||
"@backstage/integration-react": "^1.1.26",
|
||||
"@backstage/plugin-api-docs": "^0.11.4",
|
||||
"@backstage/plugin-catalog": "^1.19.0",
|
||||
"@backstage/plugin-catalog-common": "^1.0.22",
|
||||
"@backstage/plugin-catalog-graph": "^0.4.4",
|
||||
"@backstage/plugin-catalog-import": "^0.10.10",
|
||||
"@backstage/plugin-catalog-react": "^1.11.3",
|
||||
"@backstage/integration-react": "^1.1.27",
|
||||
"@backstage/plugin-api-docs": "^0.11.5",
|
||||
"@backstage/plugin-catalog": "^1.20.0",
|
||||
"@backstage/plugin-catalog-common": "^1.0.23",
|
||||
"@backstage/plugin-catalog-graph": "^0.4.5",
|
||||
"@backstage/plugin-catalog-import": "^0.11.0",
|
||||
"@backstage/plugin-catalog-react": "^1.12.0",
|
||||
"@backstage/plugin-devtools": "^0.1.13",
|
||||
"@backstage/plugin-org": "^0.6.24",
|
||||
"@backstage/plugin-org": "^0.6.25",
|
||||
"@backstage/plugin-permission-react": "^0.4.22",
|
||||
"@backstage/plugin-scaffolder": "^1.19.3",
|
||||
"@backstage/plugin-search": "^1.4.10",
|
||||
"@backstage/plugin-search-react": "^1.7.10",
|
||||
"@backstage/plugin-scaffolder": "^1.20.0",
|
||||
"@backstage/plugin-search": "^1.4.11",
|
||||
"@backstage/plugin-search-react": "^1.7.11",
|
||||
"@backstage/plugin-tech-radar": "^0.7.3",
|
||||
"@backstage/plugin-techdocs": "^1.10.4",
|
||||
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.9",
|
||||
"@backstage/plugin-techdocs-react": "^1.2.3",
|
||||
"@backstage/plugin-user-settings": "^0.8.5",
|
||||
"@backstage/theme": "^0.5.3",
|
||||
"@backstage/plugin-techdocs": "^1.10.5",
|
||||
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.10",
|
||||
"@backstage/plugin-techdocs-react": "^1.2.4",
|
||||
"@backstage/plugin-user-settings": "^0.8.6",
|
||||
"@backstage/theme": "^0.5.5",
|
||||
"@bestsellerit/backstage-plugin-harbor": "^0.3.1",
|
||||
"@mui/material": "next",
|
||||
"@internal/backstage-plugin-devspaces-plugin": "^0.1.0",
|
||||
|
||||
@@ -26,8 +26,7 @@ import {githubAuthApiRef} from '@backstage/core-plugin-api';
|
||||
import {UnifiedThemeProvider} from '@backstage/theme';
|
||||
import {SreezCustomTheme} from './theme/custom';
|
||||
import LightIcon from '@material-ui/icons/WbSunny';
|
||||
import {TechRadarPage} from "@backstage-community/plugin-tech-radar";
|
||||
import {DevToolsPage} from '@backstage/plugin-devtools';
|
||||
import {DevspacesPluginPage} from '@internal/backstage-plugin-devspaces-plugin';
|
||||
|
||||
const app = createApp({
|
||||
themes: [{
|
||||
@@ -77,6 +76,7 @@ const app = createApp({
|
||||
|
||||
const routes = (
|
||||
<FlatRoutes>
|
||||
<Route path="/devspaces-plugin" element={<DevspacesPluginPage/>}></Route>
|
||||
<Route path="/" element={<Navigate to="catalog"/>}/>
|
||||
<Route path="/catalog" element={<CatalogIndexPage/>}/>
|
||||
<Route
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import {EntityDependsOnComponentsCard, EntityDependsOnResourcesCard, EntityLayout} from "@backstage/plugin-catalog";
|
||||
import {EntityIFrameContent} from "@roadiehq/backstage-plugin-iframe";
|
||||
import {EntityGithubInsightsContent} from "@roadiehq/backstage-plugin-github-insights";
|
||||
import {EntityGithubPullRequestsContent} from "@roadiehq/backstage-plugin-github-pull-requests";
|
||||
import {Grid} from "@material-ui/core";
|
||||
@@ -15,17 +14,17 @@ export const serviceEntityPage = (
|
||||
<EntityLayout.Route path="/" title="Overview">
|
||||
{overviewContent}
|
||||
</EntityLayout.Route>
|
||||
<EntityLayout.Route
|
||||
path="/logs"
|
||||
title="Logs">
|
||||
<EntityIFrameContent title={" "} iframe={{
|
||||
src: 'https://sreez.nationtech.io',
|
||||
// src: 'http://localhost:8080/search',
|
||||
title: " ",
|
||||
width: "100%",
|
||||
height: "1000px"
|
||||
}}/>
|
||||
</EntityLayout.Route>
|
||||
{/*<EntityLayout.Route*/}
|
||||
{/* path="/logs"*/}
|
||||
{/* title="Logs">*/}
|
||||
{/* <EntityIFrameContent title={" "} iframe={{*/}
|
||||
{/* src: 'https://sreez.nationtech.io',*/}
|
||||
{/* // src: 'http://localhost:8080/search',*/}
|
||||
{/* title: " ",*/}
|
||||
{/* width: "100%",*/}
|
||||
{/* height: "1000px"*/}
|
||||
{/* }}/>*/}
|
||||
{/*</EntityLayout.Route>*/}
|
||||
<EntityLayout.Route
|
||||
path="/code-insights"
|
||||
title="Code Insights">
|
||||
@@ -34,7 +33,7 @@ export const serviceEntityPage = (
|
||||
<EntityLayout.Route path="/pull-requests" title="Pull Requests">
|
||||
<EntityGithubPullRequestsContent/>
|
||||
</EntityLayout.Route>
|
||||
<EntityLayout.Route path="/github-actions" title="Builds">
|
||||
<EntityLayout.Route path="/ci-cd" title="Builds">
|
||||
{buildsContent}
|
||||
</EntityLayout.Route>
|
||||
<EntityLayout.Route
|
||||
|
||||
@@ -1,39 +1,51 @@
|
||||
import {Grid} from "@material-ui/core";
|
||||
import {EntityAboutCard, EntityLinksCard} from "@backstage/plugin-catalog";
|
||||
import {EntityAboutCard, EntityHasSubcomponentsCard, EntityLinksCard} from "@backstage/plugin-catalog";
|
||||
import React from "react";
|
||||
import {entityWarningContent} from "./EntityWarningContent";
|
||||
import {GithubWorkflowsCard} from "@veecode-platform/backstage-plugin-github-workflows";
|
||||
import {LatestWorkflowRunCard} from "@backstage-community/plugin-github-actions";
|
||||
import {EntityGithubInsightsContent} from "@roadiehq/backstage-plugin-github-insights";
|
||||
import {EntityGithubInsightsReadmeCard} from "@roadiehq/backstage-plugin-github-insights";
|
||||
import {EntityArgoCDOverviewCard} from "@roadiehq/backstage-plugin-argo-cd";
|
||||
import {DevspacesPluginPage} from "@internal/backstage-plugin-devspaces-plugin";
|
||||
import {EntityGithubPullRequestsOverviewCard} from "@roadiehq/backstage-plugin-github-pull-requests";
|
||||
import {EntityCatalogGraphCard} from "@backstage/plugin-catalog-graph";
|
||||
|
||||
export const overviewContent = (
|
||||
<Grid container spacing={1} alignItems={'stretch'} justifyContent={'flex-start'}>
|
||||
<Grid item xs={12}>
|
||||
{entityWarningContent}
|
||||
</Grid>
|
||||
<Grid item md={6} xs={12}>
|
||||
<DevspacesPluginPage/>
|
||||
</Grid>
|
||||
<Grid item xs={3}>
|
||||
|
||||
<Grid item xs={4}>
|
||||
<EntityAboutCard variant={'flex'}/>
|
||||
<EntityLinksCard variant="flex"/>
|
||||
{/*<DevspacesPluginPage/>*/}
|
||||
</Grid>
|
||||
<Grid item xs={9}>
|
||||
<Grid item xs={8}>
|
||||
<Grid container>
|
||||
<Grid item xs={4}>
|
||||
<LatestWorkflowRunCard branch={'master'} variant="flex"/>
|
||||
<LatestWorkflowRunCard branch={'master'} variant="fullHeight"/>
|
||||
</Grid>
|
||||
<Grid item xs={8}>
|
||||
<EntityArgoCDOverviewCard/>
|
||||
</Grid>
|
||||
</Grid>
|
||||
<GithubWorkflowsCard/>
|
||||
|
||||
{/*<EntityGithubInsightsReadmeCard maxHeight={300}/>*/}
|
||||
</Grid>
|
||||
<Grid container spacing={1} alignItems={'stretch'}>
|
||||
<Grid item xs={4}>
|
||||
<EntityHasSubcomponentsCard variant="flex"/>
|
||||
</Grid>
|
||||
<Grid item xs={8}>
|
||||
<EntityGithubPullRequestsOverviewCard/>
|
||||
</Grid>
|
||||
</Grid>
|
||||
<Grid item xs={3}>
|
||||
<EntityCatalogGraphCard variant="gridItem"/>
|
||||
</Grid>
|
||||
<Grid item xs={9}>
|
||||
<EntityGithubInsightsContent/>
|
||||
<EntityGithubInsightsReadmeCard/>
|
||||
</Grid>
|
||||
|
||||
|
||||
@@ -58,13 +70,10 @@ export const overviewContent = (
|
||||
{/*/!*</EntitySwitch>*!/*/}
|
||||
|
||||
{/*<Grid item md={4}>*/}
|
||||
{/* <EntityGithubPullRequestsOverviewCard/>*/}
|
||||
{/*</Grid>*/}
|
||||
{/*<Grid item md={4} xs={12}>*/}
|
||||
{/* <EntityHasSubcomponentsCard variant="gridItem"/>*/}
|
||||
{/*</Grid>*/}
|
||||
{/*<Grid item md={4} xs={12}>*/}
|
||||
{/* <EntityCatalogGraphCard variant="gridItem" height={400}/>*/}
|
||||
{/*</Grid>*/}
|
||||
|
||||
</Grid>
|
||||
|
||||
Reference in New Issue
Block a user