From 592bedbd6f3480b10bee59a629c384e20885009d Mon Sep 17 00:00:00 2001 From: Christoph Jerolimov Date: Sun, 17 Nov 2024 23:15:25 +0100 Subject: [PATCH] chore(marketplace): add theme Signed-off-by: Christoph Jerolimov --- workspaces/marketplace/packages/app/package.json | 1 + workspaces/marketplace/packages/app/src/App.tsx | 13 ++++++++----- workspaces/marketplace/yarn.lock | 16 ++++++++++++++++ 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/workspaces/marketplace/packages/app/package.json b/workspaces/marketplace/packages/app/package.json index f8e6e2590..a9e3e6f61 100644 --- a/workspaces/marketplace/packages/app/package.json +++ b/workspaces/marketplace/packages/app/package.json @@ -46,6 +46,7 @@ "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@red-hat-developer-hub/backstage-plugin-marketplace": "workspace:^", + "@redhat-developer/red-hat-developer-hub-theme": "^0.4.0", "react": "^18.0.2", "react-dom": "^18.0.2", "react-router": "^6.3.0", diff --git a/workspaces/marketplace/packages/app/src/App.tsx b/workspaces/marketplace/packages/app/src/App.tsx index 52ba20bcf..235001cd1 100644 --- a/workspaces/marketplace/packages/app/src/App.tsx +++ b/workspaces/marketplace/packages/app/src/App.tsx @@ -36,11 +36,6 @@ import { import { TechDocsAddons } from '@backstage/plugin-techdocs-react'; import { ReportIssue } from '@backstage/plugin-techdocs-module-addons-contrib'; import { UserSettingsPage } from '@backstage/plugin-user-settings'; -import { apis } from './apis'; -import { entityPage } from './components/catalog/EntityPage'; -import { searchPage } from './components/search/SearchPage'; -import { Root } from './components/Root'; - import { AlertDisplay, OAuthRequestDialog, @@ -51,8 +46,15 @@ import { AppRouter, FlatRoutes } from '@backstage/core-app-api'; import { CatalogGraphPage } from '@backstage/plugin-catalog-graph'; import { RequirePermission } from '@backstage/plugin-permission-react'; import { catalogEntityCreatePermission } from '@backstage/plugin-catalog-common/alpha'; + +import { getThemes } from '@redhat-developer/red-hat-developer-hub-theme'; import { MarketplacePage } from '@red-hat-developer-hub/backstage-plugin-marketplace'; +import { apis } from './apis'; +import { entityPage } from './components/catalog/EntityPage'; +import { searchPage } from './components/search/SearchPage'; +import { Root } from './components/Root'; + const app = createApp({ apis, bindRoutes({ bind }) { @@ -75,6 +77,7 @@ const app = createApp({ components: { SignInPage: props => , }, + themes: getThemes(), }); const routes = ( diff --git a/workspaces/marketplace/yarn.lock b/workspaces/marketplace/yarn.lock index d5c54cdd4..70efb0768 100644 --- a/workspaces/marketplace/yarn.lock +++ b/workspaces/marketplace/yarn.lock @@ -10063,6 +10063,21 @@ __metadata: languageName: unknown linkType: soft +"@redhat-developer/red-hat-developer-hub-theme@npm:^0.4.0": + version: 0.4.0 + resolution: "@redhat-developer/red-hat-developer-hub-theme@npm:0.4.0" + peerDependencies: + "@backstage/theme": ^0.5.2 + "@emotion/react": ^11.11.1 + "@emotion/styled": ^11.11.0 + "@material-ui/core": ^4.12.4 + "@material-ui/icons": ^4.11.3 + "@mui/icons-material": ^5.14.19 + "@mui/material": ^5.14.20 + checksum: 8684f8faa2fe87100dba2c19f1e1a306e808cf98bc65da829c3203a325ea6520a93e54c174e25a220ccf8280ecc2750a178a0d18b12f5ba354c7c415e8a9dc7b + languageName: node + linkType: hard + "@remix-run/router@npm:1.21.0": version: 1.21.0 resolution: "@remix-run/router@npm:1.21.0" @@ -14362,6 +14377,7 @@ __metadata: "@material-ui/icons": ^4.9.1 "@playwright/test": ^1.32.3 "@red-hat-developer-hub/backstage-plugin-marketplace": "workspace:^" + "@redhat-developer/red-hat-developer-hub-theme": ^0.4.0 "@testing-library/dom": ^9.0.0 "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^14.0.0