diff --git a/react-app/src/App.tsx b/react-app/src/App.tsx index c9d9819..25c0436 100644 --- a/react-app/src/App.tsx +++ b/react-app/src/App.tsx @@ -1,45 +1,52 @@ import React from 'react'; import FooterComponent from './components/FooterComponent'; import HeaderComponent from './components/HeaderComponent'; -import ArticleComponent from './components/ArticleComponent'; import CardComponent from './components/CardComponent'; +import { useMatomo } from '@jonkoops/matomo-tracker-react' +import TextBarComponent from './components/TextBarComponent'; +import ImageCarouselComponent from './components/ImageCarouselComponent'; export default function App() { - let body = ( -

- Under Construction -

- ) + const { trackPageView, trackEvent } = useMatomo() + + // Track page view + React.useEffect(() => { + trackPageView() + }, []) var headerOne: string = "text-left text-black text-[40px] font-semibold"; var whiteTextCardClasses: string = "w-[580px] h-20 bg-white text-black bg-opacity-95 shadow-xl border-2 border-zinc-300"; - var blackCardClasses: string = "w-[700px] h-[253px] bg-base-100 bg-opacity-95 rounded-[10px] shadow border-2" + var blackCardClasses: string = "w-[700px] h-[253px] bg-base-100 bg-opacity-95 rounded-[10px] shadow border-2"; + var textBarClasses: string = "bg-gradient-to-b from-base-100 from-90% to-white text-justify text-[48px] font-bold py-8"; + var textBarContent: string = "UNDER CONSTRUCTION - Web portal by DDLS Data Science Node"; return ( -
- {HeaderComponent()} - {body} -
-
-

Latest News

- - - - +
+ + +
+ +
+
+

Latest News

+ + + + +
+
+

Upcoming Events

+ + + +
-
-

Upcoming Events

- - - +
+ +
+
-
- - -
- {ArticleComponent()} - {FooterComponent()}
); } \ No newline at end of file diff --git a/react-app/src/components/FooterComponent.tsx b/react-app/src/components/FooterComponent.tsx index be838f3..cf99211 100644 --- a/react-app/src/components/FooterComponent.tsx +++ b/react-app/src/components/FooterComponent.tsx @@ -2,7 +2,7 @@ import {ILink, ISVG} from '../interfaces/types'; export default function FooterComponent() { - var footerClasses: string = 'footer p-10 bg-base-300 text-base-content fixed bottom-0'; + var footerClasses: string = 'footer p-10 bg-base-100 text-base-content'; var linkClasses: string = 'link link-hover'; var linksCol1: { [id: string] : ILink; } = { diff --git a/react-app/src/components/ImageCarouselComponent.tsx b/react-app/src/components/ImageCarouselComponent.tsx new file mode 100644 index 0000000..81bd7e3 --- /dev/null +++ b/react-app/src/components/ImageCarouselComponent.tsx @@ -0,0 +1,29 @@ +import { ReactElement } from "react"; + +export default function ImageCarouselComponent(): ReactElement { + return ( +
+
+ Pizza +
+
+ Pizza +
+
+ Pizza +
+
+ Pizza +
+
+ Pizza +
+
+ Pizza +
+
+ Pizza +
+
+ ); +} \ No newline at end of file diff --git a/react-app/src/components/TextBarComponent.tsx b/react-app/src/components/TextBarComponent.tsx new file mode 100644 index 0000000..f771df8 --- /dev/null +++ b/react-app/src/components/TextBarComponent.tsx @@ -0,0 +1,9 @@ +import { ReactElement } from "react"; + +export default function TextBarComponent(prop: { classes: string, text: string }): ReactElement { + return ( +
+

{prop.text}

+
+ ); +}; \ No newline at end of file