Skip to content

Commit

Permalink
merge from dev
Browse files Browse the repository at this point in the history
  • Loading branch information
SKairinos committed Sep 25, 2024
2 parents f1f8318 + 6b1e6fc commit f907c52
Show file tree
Hide file tree
Showing 3 changed files with 86 additions and 80 deletions.
156 changes: 80 additions & 76 deletions src/pages/privacyNotice/adults/Adults.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,81 +20,85 @@ import YourRights from "./YourRights"

export interface AdultsProps {}

const Adults: FC<AdultsProps> = () => (
<pages.Section>
<Typography fontWeight="bold">Last Updated: 11th April 2024</Typography>
<Typography>
Please read this notice carefully. This notice contains important
information on who manages the Code for Life portal, how and why we
collect information about you (for example, your name and email address),
how we use your information, and with which persons we share your
information. We also explain what rights you have in relation to your
personal information, for example, the right to say no to the use of your
information in certain cases, and how to contact us if you want to find
out more about your rights or if you have other questions about this
notice.
</Typography>
<TableOfContents
contents={[
{
header: "Our commitment",
children: <OurCommitment />,
},
{
header: "Who we are",
children: <WhoWeAre />,
},
{
header: "Types of information we hold about you",
children: <TypesOfInfo />,
},
{
header: "How we will use information about you",
children: <HowWeUseInfo />,
},
{
header: "Change of purpose",
children: <ChangeOfPurpose />,
},
{
header: "Cookies",
children: <Cookies />,
},
{
header: "Sharing your personal information with other persons",
children: <SharingInfo />,
},
{
header: "How long will we keep your personal information?",
children: <KeepInfo />,
},
{
header: "Your rights",
children: <YourRights />,
},
{
header: "Keeping your personal information secure",
children: <InfoSecurity />,
},
{
header: "How to complain",
children: <HowToComplain />,
},
{
header: "Changes to this Privacy Notice",
children: <Changes />,
},
{
header: "How to contact us",
children: <ContactUs />,
},
{
header: "Do you need extra help?",
children: <ExtraHelp />,
},
]}
/>
</pages.Section>
)
const Adults: FC<AdultsProps> = () => {
const lastUpdated = "11th April 2024"

return (
<pages.Section>
<Typography fontWeight="bold">Last Updated: {lastUpdated}</Typography>
<Typography>
Please read this notice carefully. This notice contains important
information on who manages the Code for Life portal, how and why we
collect information about you (for example, your name and email
address), how we use your information, and with which persons we share
your information. We also explain what rights you have in relation to
your personal information, for example, the right to say no to the use
of your information in certain cases, and how to contact us if you want
to find out more about your rights or if you have other questions about
this notice.
</Typography>
<TableOfContents
contents={[
{
header: "Our commitment",
children: <OurCommitment />,
},
{
header: "Who we are",
children: <WhoWeAre />,
},
{
header: "Types of information we hold about you",
children: <TypesOfInfo />,
},
{
header: "How we will use information about you",
children: <HowWeUseInfo />,
},
{
header: "Change of purpose",
children: <ChangeOfPurpose />,
},
{
header: "Cookies",
children: <Cookies />,
},
{
header: "Sharing your personal information with other persons",
children: <SharingInfo />,
},
{
header: "How long will we keep your personal information?",
children: <KeepInfo />,
},
{
header: "Your rights",
children: <YourRights />,
},
{
header: "Keeping your personal information secure",
children: <InfoSecurity />,
},
{
header: "How to complain",
children: <HowToComplain />,
},
{
header: "Changes to this Privacy Notice",
children: <Changes lastUpdated={lastUpdated} />,
},
{
header: "How to contact us",
children: <ContactUs />,
},
{
header: "Do you need extra help?",
children: <ExtraHelp />,
},
]}
/>
</pages.Section>
)
}

export default Adults
8 changes: 5 additions & 3 deletions src/pages/privacyNotice/adults/Changes.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import { type FC } from "react"
import { Typography } from "@mui/material"

export interface ChangesProps {}
export interface ChangesProps {
lastUpdated: string
}

const Changes: FC<ChangesProps> = () => (
const Changes: FC<ChangesProps> = ({ lastUpdated }) => (
<>
<Typography>
This Privacy Notice was last updated on 25th January 2023.
This Privacy Notice was last updated on {lastUpdated}.
</Typography>
<Typography mb={0}>
We may change this Privacy Notice from time to time and you should check
Expand Down
2 changes: 1 addition & 1 deletion src/pages/privacyNotice/children/HowToComplain.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const HowToComplain: FC<HowToComplainProps> = () => (
use your personal information fairly and keep it safe. You may contact the
ICO by telephoning them on the number below or by visiting their website.
</Typography>
<Typography>Telephone: 0303 123 1113</Typography>
<Typography>Telephone: +44 303 123 1113</Typography>
<Typography mb={0}>
Website:&nbsp;
<Link to="https://ico.org.uk/concerns" target="_blank">
Expand Down

0 comments on commit f907c52

Please sign in to comment.