diff --git a/react-app/src/components/CardComponent.tsx b/react-app/src/components/CardComponent.tsx index 12ea661..498595b 100644 --- a/react-app/src/components/CardComponent.tsx +++ b/react-app/src/components/CardComponent.tsx @@ -1,14 +1,13 @@ import { ReactElement } from "react"; -export default function CardComponent(prop: { classes: string, title: string, text: string, button: string }): ReactElement { +export default function CardComponent(prop: { classes: string, title: string, text: string, button: string, buttonClasses: string }): ReactElement { const title: ReactElement = (

{prop.title}

); - var buttonClasses: string = 'btn bg-fuchsia-950 text-white hover:bg-fuchsia-800 active:bg-fuchsia-900 focus:outline-none focus:ring focus:ring-fuchsia-300'; const button: ReactElement = (
- +
); diff --git a/react-app/src/components/FooterComponent.tsx b/react-app/src/components/FooterComponent.tsx index f95068e..38c5ea2 100644 --- a/react-app/src/components/FooterComponent.tsx +++ b/react-app/src/components/FooterComponent.tsx @@ -1,23 +1,22 @@ import { ReactElement } from 'react'; import {ILink, ISVG} from '../interfaces/types'; +import { Link } from 'react-router-dom'; +import { LINK_CLASSES } from '../constants'; export default function FooterComponent(): ReactElement { - - var footerClasses: string = 'footer p-10 bg-base-100 text-base-content'; - var linkClasses: string = 'link link-hover'; var linksCol1: { [id: string] : ILink; } = { - 'l1': { text: 'Anonymization Tool', classes: linkClasses, link: '/' }, - 'l2': { text: 'Data Search', classes: linkClasses, link: '/' }, - 'l3': { text: 'Data Types', classes: linkClasses, link: '/' }, - 'l4': { text: 'Events & News', classes: linkClasses, link: '/' }, + 'l1': { text: 'Anonymization Tool', classes: LINK_CLASSES, link: '/' }, + 'l2': { text: 'Data Search', classes: LINK_CLASSES, link: '/' }, + 'l3': { text: 'Data Types', classes: LINK_CLASSES, link: '/' }, + 'l4': { text: 'Events & News', classes: LINK_CLASSES, link: '/' }, }; var linksCol2: { [id: string] : ILink; } = { - 'l1': { text: 'About us', classes: linkClasses, link: '/' }, - 'l2': { text: 'Contact', classes: linkClasses, link: '/' }, - 'l3': { text: 'Open Source Contribution', classes: linkClasses, link: '/' }, - 'l4': { text: 'Privacy Policy', classes: linkClasses, link: '/' }, + 'l1': { text: 'About us', classes: LINK_CLASSES, link: '/' }, + 'l2': { text: 'Contact', classes: LINK_CLASSES, link: '/' }, + 'l3': { text: 'Open Source Contribution', classes: LINK_CLASSES, link: '/' }, + 'l4': { text: 'Privacy Policy', classes: LINK_CLASSES, link: '/privacy' }, }; var svgConfig: string[] = ['/', 'http://www.w3.org/2000/svg', '24', '24', '0 0 24 24', 'fill-current'] @@ -29,15 +28,15 @@ export default function FooterComponent(): ReactElement { return ( -