Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(feat) O3-3782: Use styleguide page header component in lab app #83

Merged
merged 3 commits into from
Aug 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 0 additions & 34 deletions src/header/laboratory-header.component.tsx

This file was deleted.

71 changes: 0 additions & 71 deletions src/header/laboratory-header.scss

This file was deleted.

13 changes: 0 additions & 13 deletions src/header/laboratory-illustration.component.tsx

This file was deleted.

20 changes: 15 additions & 5 deletions src/laboratory-dashboard.component.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,26 @@
import React from "react";
import { LaboratoryHeader } from "./header/laboratory-header.component";
import { useTranslation } from "react-i18next";
import { PageHeader, LaboratoryPictogram } from "@openmrs/esm-framework";
import Overlay from "./components/overlay/overlay.component";
import LaboratoryOrdersTabs from "./lab-tabs/laboratory-tabs.component";
import LaboratorySummaryTiles from "./lab-tiles/laboratory-summary-tiles.component";
import styles from "./laboratory-dashboard.scss";

const LaboratoryDashboard: React.FC = () => {
const { t } = useTranslation();

return (
<div className={`omrs-main-content`}>
<LaboratoryHeader />
<LaboratorySummaryTiles />
<LaboratoryOrdersTabs />
<Overlay />
<PageHeader
illustration={<LaboratoryPictogram />}
title={t("laboratory", "Laboratory")}
className={styles.pageHeader}
/>
<div className={styles.container}>
<LaboratorySummaryTiles />
<LaboratoryOrdersTabs />
<Overlay />
</div>
</div>
);
};
Expand Down
10 changes: 10 additions & 0 deletions src/laboratory-dashboard.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
@use '@carbon/layout';
@use '~@openmrs/esm-styleguide/src/vars' as *;

.pageHeader {
border-bottom: 1px solid $ui-03;
}

.container {
margin-top: layout.$spacing-07;
}
Loading
Loading