Skip to content

Commit

Permalink
Merge pull request #20 from RichardW98/notification-header
Browse files Browse the repository at this point in the history
notification header
  • Loading branch information
mareklibra authored Feb 22, 2023
2 parents a2da51e + 6edc232 commit a8067bc
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 22 deletions.
32 changes: 12 additions & 20 deletions plugins/orion/src/components/notification/Notification.tsx
Original file line number Diff line number Diff line change
@@ -1,29 +1,21 @@
import React from 'react';
import {
Content,
ContentHeader,
Page,
SupportButton,
} from '@backstage/core-components';
import { ContentHeader, SupportButton } from '@backstage/core-components';
import { Grid } from '@material-ui/core';
import { PageHeader } from '../PageHeader';
import { NotificationList } from './NotificationList';
import { ParodosPage } from '../ParodosPage';

export const Notification = () => {
return (
<Page themeId="tool">
<PageHeader />
<Content>
<ContentHeader title="Notification">
<SupportButton title="Need help?">Lorem Ipsum</SupportButton>
</ContentHeader>
<br />
<Grid container direction="row">
<Grid item xs={12}>
<NotificationList />
</Grid>
<ParodosPage>
<ContentHeader title="Notification">
<SupportButton title="Need help?">Lorem Ipsum</SupportButton>
</ContentHeader>
<br />
<Grid container direction="row">
<Grid item xs={12}>
<NotificationList />
</Grid>
</Content>
</Page>
</Grid>
</ParodosPage>
);
};
4 changes: 2 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6917,7 +6917,7 @@
resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==

"@types/react-dom@*", "@types/react-dom@<18.0.0":
"@types/react-dom@*", "@types/react-dom@<18.0.0", "@types/react-dom@^17":
version "17.0.19"
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.19.tgz#36feef3aa35d045cacd5ed60fe0eef5272f19492"
integrity sha512-PiYG40pnQRdPHnlf7tZnp0aQ6q9tspYr72vD61saO6zFCybLfMqwUCN0va1/P+86DXn18ZWeW30Bk7xlC5eEAQ==
Expand Down Expand Up @@ -17894,7 +17894,7 @@ react-refresh@^0.14.0:
resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.0.tgz#4e02825378a5f227079554d4284889354e5f553e"
integrity sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==

react-router-dom@^6.3.0, react-router-dom@^6.8.1:
react-router-dom@^6.3.0:
version "6.8.1"
resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.8.1.tgz#7e136b67d9866f55999e9a8482c7008e3c575ac9"
integrity sha512-67EXNfkQgf34P7+PSb6VlBuaacGhkKn3kpE51+P6zYSG2kiRoumXEL6e27zTa9+PGF2MNXbgIUHTVlleLbIcHQ==
Expand Down

0 comments on commit a8067bc

Please sign in to comment.