Merge branch 'master' into feat/button.

This commit is contained in:
Alex Holliday
2024-05-06 12:28:19 -07:00
2 changed files with 33 additions and 12 deletions

18
Client/src/Utils/Theme.js Normal file
View File

@@ -0,0 +1,18 @@
import { createTheme } from "@mui/material";
// Colors for MUI theme
const secondaryMain = "#475467";
const tertiaryMain = "#475467";
const theme = createTheme({
palette: {
secondary: {
main: secondaryMain,
},
tertiary: {
main: tertiaryMain,
},
},
});
export default theme;

View File

@@ -1,13 +1,16 @@
import React from 'react'
import ReactDOM from 'react-dom/client'
import App from './App.jsx'
import './index.css'
import { BrowserRouter as Router, HashRouter } from 'react-router-dom'
ReactDOM.createRoot(document.getElementById('root')).render(
import React from "react";
import ReactDOM from "react-dom/client";
import App from "./App.jsx";
import "./index.css";
import { BrowserRouter as Router, HashRouter } from "react-router-dom";
import theme from "./Utils/Theme.js";
import { ThemeProvider } from "@mui/material";
ReactDOM.createRoot(document.getElementById("root")).render(
<React.StrictMode>
<Router>
<App />
</Router>
</React.StrictMode>,
)
<ThemeProvider theme={theme}>
<Router>
<App />
</Router>
</ThemeProvider>
</React.StrictMode>
);