Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate SUIR components to MUI. #10576

Merged
merged 1 commit into from
Jan 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
189 changes: 3 additions & 186 deletions components/frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions components/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,15 @@
"@mui/x-date-pickers": "^7.23.6",
"crypto-js": "^4.2.0",
"dayjs": "^1.11.13",
"fomantic-ui-css": "^2.9.3",
"history": "^5.3.0",
"prop-types": "^15.8.1",
"react": "^18.3.1",
"react-datepicker": "^7.6.0",
"react-dom": "^18.3.1",
"react-grid-layout": "^1.5.0",
"react-hash-link": "1.0.2",
"react-is": "^18.3.1",
"react-timeago": "^7.2.0",
"react-toastify": "^11.0.3",
"semantic-ui-react": "^2.1.5",
"victory": "^37.3.6"
},
"scripts": {
Expand Down
20 changes: 1 addition & 19 deletions components/frontend/src/App.css
Original file line number Diff line number Diff line change
@@ -1,21 +1,3 @@
.MainContainer {
flex: 1;
margin-top: 6em;
padding-left: 1em;
padding-right: 1em;
}

@media print {
.MainContainer {
margin-top: 0em;
}
}

html {
scroll-padding-top: 163px; /* height of sticky header */
}

:root {
--inverted-menu-background-color: #1b1c1d;
--selection-color: #2185d0;
scroll-padding-top: 176px; /* height of sticky header */
}
12 changes: 4 additions & 8 deletions components/frontend/src/App.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import "./App.css"

import { createTheme, ThemeProvider } from "@mui/material/styles"
import { CssBaseline } from "@mui/material"
import { ThemeProvider } from "@mui/material/styles"
import { Action } from "history"
import history from "history/browser"
import { Component } from "react"
Expand All @@ -11,16 +12,10 @@ import { nr_measurements_api } from "./api/measurement"
import { get_report, get_reports_overview } from "./api/report"
import { AppUI } from "./AppUI"
import { registeredURLSearchParams } from "./hooks/url_search_query"
import { theme } from "./theme"
import { isValidDate_YYYYMMDD, toISODateStringInCurrentTZ } from "./utils"
import { showConnectionMessage, showMessage } from "./widgets/toast"

const theme = createTheme({
colorSchemes: {
dark: true, // Add a dark theme (light theme is available by default)
},
components: { MuiTooltip: { defaultProps: { arrow: true }, styleOverrides: { tooltip: { fontSize: "1em" } } } },
})

class App extends Component {
constructor(props) {
super(props)
Expand Down Expand Up @@ -245,6 +240,7 @@ class App extends Component {
render() {
return (
<ThemeProvider theme={theme}>
<CssBaseline enableColorScheme />
<AppUI
changed_fields={this.changed_fields}
dataModel={this.state.dataModel}
Expand Down
Loading
Loading