From b8b19c3e0d88192e27107759d0c2e4950409c5e1 Mon Sep 17 00:00:00 2001
From: Matthew Wilcoxson <Matthew.Wilcoxson@diamond.ac.uk>
Date: Fri, 10 Jan 2025 13:02:26 +0000
Subject: [PATCH 1/2] Correct imports when imported in certain setups.

---
 src/components/Footer.tsx         | 3 +--
 src/components/User.tsx           | 4 ++--
 src/themes/DiamondTheme.ts        | 2 +-
 src/themes/GenericTheme.ts        | 2 +-
 src/themes/ThemeProvider.test.tsx | 2 +-
 src/themes/ThemeProvider.tsx      | 2 +-
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx
index f8fb7f2..8fa554f 100644
--- a/src/components/Footer.tsx
+++ b/src/components/Footer.tsx
@@ -1,5 +1,4 @@
-import { Link, LinkProps, Typography, useTheme } from "@mui/material";
-import Grid from "@mui/material/Grid2";
+import { Grid2 as Grid, Link, LinkProps, Typography, useTheme } from "@mui/material";
 
 import React from "react";
 import {
diff --git a/src/components/User.tsx b/src/components/User.tsx
index ee88c1b..74bea35 100644
--- a/src/components/User.tsx
+++ b/src/components/User.tsx
@@ -4,13 +4,13 @@ import {
   Button,
   Box,
   Link,
+  Menu,
+  MenuItem,
   Stack,
   Typography,
   useTheme,
 } from "@mui/material";
 
-import Menu from "@mui/material/Menu";
-import MenuItem from "@mui/material/MenuItem";
 import { ReactNode, useState } from "react";
 
 import { MdLogin } from "react-icons/md";
diff --git a/src/themes/DiamondTheme.ts b/src/themes/DiamondTheme.ts
index 884679f..65ebb1a 100644
--- a/src/themes/DiamondTheme.ts
+++ b/src/themes/DiamondTheme.ts
@@ -1,4 +1,4 @@
-import { createTheme, Theme } from "@mui/material/styles";
+import { createTheme, Theme } from "@mui/material";
 
 import { BaseThemeOptions } from "./BaseTheme";
 
diff --git a/src/themes/GenericTheme.ts b/src/themes/GenericTheme.ts
index 113234f..dff0360 100644
--- a/src/themes/GenericTheme.ts
+++ b/src/themes/GenericTheme.ts
@@ -1,4 +1,4 @@
-import { createTheme, Theme } from "@mui/material/styles";
+import { createTheme, Theme } from "@mui/material";
 
 import { BaseThemeOptions } from "./BaseTheme";
 
diff --git a/src/themes/ThemeProvider.test.tsx b/src/themes/ThemeProvider.test.tsx
index 9c06ef4..df80a93 100644
--- a/src/themes/ThemeProvider.test.tsx
+++ b/src/themes/ThemeProvider.test.tsx
@@ -1,7 +1,7 @@
 import "@testing-library/jest-dom";
 import { render } from "@testing-library/react";
 
-import { createTheme, Theme } from "@mui/material/styles";
+import { createTheme, Theme } from "@mui/material";
 
 import { ThemeProvider } from "./ThemeProvider";
 import { BaseThemeOptions } from "./BaseTheme";
diff --git a/src/themes/ThemeProvider.tsx b/src/themes/ThemeProvider.tsx
index d4328d3..fb763ff 100644
--- a/src/themes/ThemeProvider.tsx
+++ b/src/themes/ThemeProvider.tsx
@@ -1,4 +1,4 @@
-import { ThemeProvider as Mui_ThemeProvider } from "@mui/material/styles";
+import { ThemeProvider as Mui_ThemeProvider } from "@mui/material";
 import { CssBaseline } from "@mui/material";
 import { GenericTheme } from "./GenericTheme";
 import { ThemeProviderProps as Mui_ThemeProviderProps } from "@mui/material/styles/ThemeProvider";

From 3fee94cb207d7148206d998aba5e7ccf1a926df7 Mon Sep 17 00:00:00 2001
From: Matthew Wilcoxson <Matthew.Wilcoxson@diamond.ac.uk>
Date: Tue, 14 Jan 2025 14:36:45 +0000
Subject: [PATCH 2/2] stupid stuff

---
 src/components/Footer.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx
index 8fa554f..cd88017 100644
--- a/src/components/Footer.tsx
+++ b/src/components/Footer.tsx
@@ -1,4 +1,10 @@
-import { Grid2 as Grid, Link, LinkProps, Typography, useTheme } from "@mui/material";
+import {
+  Grid2 as Grid,
+  Link,
+  LinkProps,
+  Typography,
+  useTheme,
+} from "@mui/material";
 
 import React from "react";
 import {