diff --git a/src/components/common/logos/Logos.tsx b/src/components/common/logos/Logos.tsx
index 8e738e1b..e049b34f 100644
--- a/src/components/common/logos/Logos.tsx
+++ b/src/components/common/logos/Logos.tsx
@@ -1,4 +1,4 @@
-import { Divider, Grid, Box, Typography } from "@mui/material";
+import { Divider, Grid, Box, Typography, Stack } from "@mui/material";
import AIOMS from "@/assets/logos/aioms-logo2.png";
import AustralianGovernment from "@/assets/logos/aioms-logo1.png";
@@ -18,12 +18,23 @@ import UNSW from "@/assets/logos/unsw-logo.png";
import UTAS from "@/assets/logos/utas-logo.png";
import UTS from "@/assets/logos/uts-logo.png";
import UWA from "@/assets/logos/uniwa-logo.png";
+import {
+ color,
+ fontColor,
+ fontWeight,
+ padding,
+} from "../../../styles/constants";
type LogoProps = { src: string; alt: string; height: string };
const Logo = ({ src, alt, height }: LogoProps) => {
return (
-
+
);
};
@@ -47,97 +58,144 @@ const LogoList = () => {
];
return (
-
+
-
-
- Australia's Integrated Marine Observing System (IMOS) is
- enabled by the National Collaborative Research Infrastructre
- Strategy (NCRIS) It is operated by a consortium of institutions as
- an unincorperated joint venture with the Unviersity of Tasmania as
- Lead Agent.
-
+
+
+
+ Australia's Integrated Marine Observing System (IMOS) is
+ enabled by the National Collaborative Research Infrastructre
+ Strategy (NCRIS) It is operated by a consortium of institutions as
+ an unincorperated joint venture with the Unviersity of Tasmania as
+ Lead Agent.
+
+
-
- PRINCIPLE PARTICIPANTS
-
-
-
-
- LEAD AGENT
-
- {principals.map((logo, index) => (
-
-
-
- ))}
-
-
-
- {sims.map((logo, index) => (
-
-
-
- ))}
-
-
-
+
+ PRINCIPLE PARTICIPANTS
+
+
+
+
+
+ LEAD AGENT
+
+
+ {principals.map((logo, index) => (
+
+
+
+ ))}
+
+
+
+
+ {sims.map((logo, index) => (
+
+
+
+ ))}
+
+
SIMS IS A PARTNERSHIP INVOLVING FOUR UNIVERSITIES
-
- ASSOCIATE PARTICIPANTS
-
- {associates.map((logo, index) => (
-
-
-
- ))}
+
+ ASSOCIATE PARTICIPANTS
+
+
+ {associates.map((logo, index) => (
+
+
+
+ ))}
+
);
diff --git a/src/components/details/Carousel.tsx b/src/components/details/Carousel.tsx
index 43aea7fe..569a7e7d 100644
--- a/src/components/details/Carousel.tsx
+++ b/src/components/details/Carousel.tsx
@@ -109,7 +109,7 @@ const Carousel: FC = () => {
{/* Container for the cards and the slide animation */}
{cards.map((card, index) => (
- {
const navigate = useNavigate();
@@ -46,21 +49,26 @@ const ComplexTextSearch = () => {
-
+
-
}
onClick={onFilterClick}
@@ -70,12 +78,22 @@ const ComplexTextSearch = () => {
-
+
-
+
+
+
);
};
diff --git a/src/components/storyboard/StoryBoardPanel.tsx b/src/components/storyboard/StoryBoardPanel.tsx
index 7fee282d..6a8e7e6e 100644
--- a/src/components/storyboard/StoryBoardPanel.tsx
+++ b/src/components/storyboard/StoryBoardPanel.tsx
@@ -1,11 +1,11 @@
import * as React from "react";
-import { Grid, Typography } from "@mui/material";
+import { Box, Grid, Typography } from "@mui/material";
import StoryBoard from "./StoryBoard";
import NotebookModel, {
//NotebookModelCallbackProps,
NotebookModelProps,
} from "../common/ipython/NotebookModel";
-import { margin } from "../../styles/constants";
+import { padding } from "../../styles/constants";
const StoryBoardPanel = () => {
const [value] = React.useState(0);
@@ -18,100 +18,86 @@ const StoryBoardPanel = () => {
// };
return (
- <>
+
setNotebook({ showDialog: false })}
/>
-
-
-
-
-
-
- Data Story 01
-
-
- OceanHackWeek 2023: Data Access{" "}
-
-
- Marty Hidas
-
- >
- }
- content="This tutorial demostrates several ways data can be accessed remotely and loaded into a Python environment , direct access to files on cloud storage (AWS S3), cloud-optimised formats Zarr & Parquet"
- buttons={[
- {
- label: "iPython",
- onClick: () =>
- setNotebook({
- url: "https://raw.githubusercontent.com/oceanhackweek/ohw-tutorials/OHW23/01-Tue/Data_access_methods_Python.ipynb?raw=true",
- showDialog: true,
- }),
- },
- { label: "OGC Web Feature Service (WFS)" },
- { label: "S3" },
- { label: "Zarr" },
- { label: "Parquet" },
- { label: "OPeNDAP" },
- ]}
- />
-
-
+
+
+ Data Story 01
+
+
+ OceanHackWeek 2023: Data Access{" "}
+
+
+ Marty Hidas
+
+ >
+ }
+ content="This tutorial demostrates several ways data can be accessed remotely and loaded into a Python environment , direct access to files on cloud storage (AWS S3), cloud-optimised formats Zarr & Parquet"
+ buttons={[
+ {
+ label: "iPython",
+ onClick: () =>
+ setNotebook({
+ url: "https://raw.githubusercontent.com/oceanhackweek/ohw-tutorials/OHW23/01-Tue/Data_access_methods_Python.ipynb?raw=true",
+ showDialog: true,
+ }),
+ },
+ { label: "OGC Web Feature Service (WFS)" },
+ { label: "S3" },
+ { label: "Zarr" },
+ { label: "Parquet" },
+ { label: "OPeNDAP" },
+ ]}
+ />
+
+
-
-
- {/*
-
-
-
- */}
-
-
+ buttons={[
+ { label: "Metadata" },
+ { label: "NISB maps" },
+ { label: "netCDF" },
+ ]}
+ />
+
+
+ {/*
+
+
+
+ */}
- >
+
);
};
diff --git a/src/pages/LandingPage.tsx b/src/pages/LandingPage.tsx
index 865c4a99..58daae36 100644
--- a/src/pages/LandingPage.tsx
+++ b/src/pages/LandingPage.tsx
@@ -12,7 +12,7 @@ import {
import { useNavigate } from "react-router-dom";
import { useDispatch } from "react-redux";
import { AppDispatch } from "../components/common/store/store";
-import { Box } from "@mui/material";
+import { Box, Stack } from "@mui/material";
import { CARD_ID } from "../components/smartpanel/utils";
import Layout from "../components/layout/layout";
import landingImageUrl from "@/assets/images/bg_landing_page.png";
@@ -43,28 +43,46 @@ const LandingPage = () => {
backgroundImage: `url(${landingImageUrl})`,
backgroundSize: "cover",
display: "flex",
- flexDirection: "column",
justifyContent: "center",
alignItems: "center",
}}
>
-
-
+
+
+
+
+
+
+
-
-
);
};
diff --git a/src/pages/detail-page/DetailsPage.tsx b/src/pages/detail-page/DetailsPage.tsx
index 80babbf8..16d1fa18 100644
--- a/src/pages/detail-page/DetailsPage.tsx
+++ b/src/pages/detail-page/DetailsPage.tsx
@@ -1,5 +1,4 @@
import { OGCCollection } from "../../components/common/store/searchReducer";
-
import Layout from "../../components/layout/layout";
import { Box, Grid } from "@mui/material";
import { color, padding } from "../../styles/constants";
@@ -25,7 +24,7 @@ const DetailsPage = () => {
backgroundColor: color.blue.light,
}}
>
-
+
diff --git a/src/pages/detail-page/subpages/side-cards/AssociatedCategoriesCard.tsx b/src/pages/detail-page/subpages/side-cards/AssociatedCategoriesCard.tsx
index 09f837ea..ffdaab13 100644
--- a/src/pages/detail-page/subpages/side-cards/AssociatedCategoriesCard.tsx
+++ b/src/pages/detail-page/subpages/side-cards/AssociatedCategoriesCard.tsx
@@ -18,7 +18,7 @@ const AssociatedCategoriesCard = () => {
sx={{
border: "none",
borderRadius: borderRadius.small,
- backgroundColor: color.blue.extraLight,
+ backgroundColor: color.blue.extraLightSemiTransparent,
padding: padding.extraSmall,
}}
>
diff --git a/src/pages/detail-page/subpages/side-cards/RatingsAndCommentsCard.tsx b/src/pages/detail-page/subpages/side-cards/RatingsAndCommentsCard.tsx
index 1791dcda..b6e75d96 100644
--- a/src/pages/detail-page/subpages/side-cards/RatingsAndCommentsCard.tsx
+++ b/src/pages/detail-page/subpages/side-cards/RatingsAndCommentsCard.tsx
@@ -81,7 +81,7 @@ const RatingsAndCommentsCard = () => {
sx={{
border: "none",
borderRadius: borderRadius.small,
- backgroundColor: color.blue.extraLight,
+ backgroundColor: color.blue.extraLightSemiTransparent,
padding: padding.small,
cursor: "pointer",
}}
@@ -116,7 +116,7 @@ const RatingsAndCommentsCard = () => {
sx={{
border: "none",
borderRadius: borderRadius.small,
- backgroundColor: color.blue.extraLight,
+ backgroundColor: color.blue.extraLightSemiTransparent,
padding: padding.small,
cursor: "pointer",
}}
@@ -154,7 +154,7 @@ const RatingsAndCommentsCard = () => {
key={index}
sx={{
borderRadius: borderRadius.small,
- backgroundColor: color.blue.extraLight,
+ backgroundColor: color.blue.extraLightSemiTransparent,
cursor: "pointer",
}}
>
diff --git a/src/pages/detail-page/subpages/side-cards/TemporalExtentCard.tsx b/src/pages/detail-page/subpages/side-cards/TemporalExtentCard.tsx
index 0a52b2a7..294d6de1 100644
--- a/src/pages/detail-page/subpages/side-cards/TemporalExtentCard.tsx
+++ b/src/pages/detail-page/subpages/side-cards/TemporalExtentCard.tsx
@@ -63,7 +63,7 @@ const TemporalExtentCard = () => {
alignItems: "center",
border: `${border.xs} ${color.gray.extraLight}`,
borderRadius: borderRadius.medium,
- backgroundColor: color.blue.extraLight,
+ backgroundColor: color.blue.extraLightSemiTransparent,
padding: padding.small,
}}
>
@@ -112,7 +112,7 @@ const TemporalExtentCard = () => {
alignItems: "center",
border: `${border.xs} ${color.gray.extraLight}`,
borderRadius: borderRadius.medium,
- backgroundColor: color.blue.extraLight,
+ backgroundColor: color.blue.extraLightSemiTransparent,
padding: padding.small,
}}
>
diff --git a/src/pages/detail-page/subpages/tab-panels/AbstractAndDownloadPanel.tsx b/src/pages/detail-page/subpages/tab-panels/AbstractAndDownloadPanel.tsx
index 60ee9bd8..a714b4f9 100644
--- a/src/pages/detail-page/subpages/tab-panels/AbstractAndDownloadPanel.tsx
+++ b/src/pages/detail-page/subpages/tab-panels/AbstractAndDownloadPanel.tsx
@@ -81,7 +81,7 @@ const AbstractAndDownloadPanel = () => {
const selectSxProps = {
height: "30px",
textAlign: "start",
- backgroundColor: color.blue.extraLight,
+ backgroundColor: color.blue.extraLightSemiTransparent,
boxShadow: theme.shadows[5],
};
diff --git a/src/setupTests.ts b/src/setupTests.ts
index 1dd407a6..f45465d0 100644
--- a/src/setupTests.ts
+++ b/src/setupTests.ts
@@ -3,3 +3,22 @@
// expect(element).toHaveTextContent(/react/i)
// learn more: https://github.com/testing-library/jest-dom
import "@testing-library/jest-dom";
+
+class ResizeObserver {
+ callback: ResizeObserverCallback;
+
+ constructor(callback: ResizeObserverCallback) {
+ this.callback = callback;
+ }
+
+ observe() {
+ // Trigger the callback immediately to simulate observing behavior
+ this.callback([], this);
+ }
+
+ unobserve() {}
+
+ disconnect() {}
+}
+
+(global as any).ResizeObserver = ResizeObserver;
diff --git a/src/styles/constants.ts b/src/styles/constants.ts
index b719f93e..1c4c7df4 100644
--- a/src/styles/constants.ts
+++ b/src/styles/constants.ts
@@ -79,7 +79,8 @@ const color = {
divider: "#8B959C",
},
blue: {
- extraLight: "rgba(231,242,255,0.5)",
+ extraLightSemiTransparent: "rgba(231,242,255,0.5)",
+ xLight: "#eaf1f6",
light: "#E2ECF3",
medium: "#E7F2FF",
dark: "#618CA5",
@@ -90,7 +91,8 @@ const color = {
dark: "#575757",
medium: "#787878",
light: "#979797",
- extraLight: "#DFDFDF",
+ extraLight: "#dfdfdf",
+ xxLight: "#f8f8f8",
},
};