Skip to content

Commit

Permalink
Merge pull request #35 from eresearchqut/ERP-2495-TEQSA-CRICOS
Browse files Browse the repository at this point in the history
[ERP-2495] Added TEQSA & CRICOS as requested
  • Loading branch information
NikuPAN authored Sep 9, 2024
2 parents 6d309d7 + e7788f8 commit 31ce580
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 8 deletions.
18 changes: 18 additions & 0 deletions src/components/footer/Footer.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,21 @@ Default.args = {
acknowledgement:
"[Acknowledgement of Country](https://www.indigenous.gov.au/contact-us/welcome_acknowledgement-country)",
};

export const TEQSAAndCRICOS = Template.bind({});
TEQSAAndCRICOS.args = {
notice:
"TEQSA Provider ID [PRV12079](https://www.teqsa.gov.au/national-register/provider/queensland-university-technology) Australian University | CRICOS No. 00213J",
acknowledgement:
"[Acknowledgement of Country](https://www.indigenous.gov.au/contact-us/welcome_acknowledgement-country)",
};

export const TEQSAAndCRICOSWithShortNotice = Template.bind({});
TEQSAAndCRICOSWithShortNotice.args = {
notice:
"TEQSA Provider ID [PRV12079](https://www.teqsa.gov.au/national-register/provider/queensland-university-technology) Australian University | CRICOS No. 00213J",
shortNotice:
"TEQSA [PRV12079](https://www.teqsa.gov.au/national-register/provider/queensland-university-technology) | CRICOS 00213J",
acknowledgement:
"[Acknowledgement of Country](https://www.indigenous.gov.au/contact-us/welcome_acknowledgement-country)",
};
21 changes: 13 additions & 8 deletions src/components/footer/Footer.tsx
Original file line number Diff line number Diff line change
@@ -1,24 +1,29 @@
import { FunctionComponent, PropsWithChildren } from "react";
import { Stack } from "@chakra-ui/react";
import { Fragment, FunctionComponent, PropsWithChildren } from "react";
import { Show, Stack } from "@chakra-ui/react";
import { Markdown } from "../markdown";

export interface FooterProps {
acknowledgement: string;
notice: string;
shortNotice?: string;
}

export const Footer: FunctionComponent<PropsWithChildren<FooterProps>> = (
props
) => {
const { acknowledgement, notice, children } = props;
const { acknowledgement, notice, shortNotice, children } = props;
return (
<Stack
direction={["column", "row"]}
justifyContent={["flex-start", "space-between"]}
>
<Stack direction={["row"]} justifyContent={["space-between"]}>
<Markdown markdown={acknowledgement} />
{children}
<Markdown markdown={notice} />
<Fragment>
<Show below={"md"}>
<Markdown markdown={shortNotice ?? notice} />
</Show>
<Show above={"md"}>
<Markdown markdown={notice} />
</Show>
</Fragment>
</Stack>
);
};
Expand Down
14 changes: 14 additions & 0 deletions src/components/page/Page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
useMultiStyleConfig,
} from "@chakra-ui/react";
import { Header, HeaderProps } from "../header";
import { Footer } from "../footer";

export interface PageProps {
header: HeaderProps;
Expand Down Expand Up @@ -78,6 +79,19 @@ export const Page: FunctionComponent<PropsWithChildren<PageProps>> = (
</Link>
</Alert>
</CardFooter>
<Box p={12} pt={6}>
<Footer
acknowledgement={
"[QUT acknowledges the Traditional Owners of the lands where QUT now stands.](https://www.qut.edu.au/about/indigenous)"
}
notice={
"TEQSA Provider ID [PRV12079](https://www.teqsa.gov.au/national-register/provider/queensland-university-technology) Australian University | CRICOS No. 00213J"
}
shortNotice={
"TEQSA [PRV12079](https://www.teqsa.gov.au/national-register/provider/queensland-university-technology) | CRICOS 00213J"
}
/>
</Box>
</Card>
</chakra.main>
</Box>
Expand Down

0 comments on commit 31ce580

Please sign in to comment.