mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2026-08-05 18:57:03 -05:00
- Update MUI v4 to v5
- Remove the SCSS dependency completely and use MUI for theming. - Update - date-fns, @date-io, notistack. Remove - popper.js, sass-loader. - Cleanup webpack config. - Port PSQL tool to use MUI themes instead of SCSS theme. - Theme change will reflect realtime without refreshing pgAdmin.
This commit is contained in:
@@ -11,11 +11,11 @@ import PropTypes from 'prop-types';
|
||||
|
||||
import React, { useEffect, useRef } from 'react';
|
||||
|
||||
import DeleteSweepIcon from '@material-ui/icons/DeleteSweep';
|
||||
import { Box } from '@material-ui/core';
|
||||
import { makeStyles } from '@material-ui/core/styles';
|
||||
import BugReportRoundedIcon from '@material-ui/icons/BugReportRounded';
|
||||
import CloseSharpIcon from '@material-ui/icons/CloseSharp';
|
||||
import DeleteSweepIcon from '@mui/icons-material/DeleteSweep';
|
||||
import { Box } from '@mui/material';
|
||||
import { makeStyles } from '@mui/styles';
|
||||
import BugReportRoundedIcon from '@mui/icons-material/BugReportRounded';
|
||||
import CloseSharpIcon from '@mui/icons-material/CloseSharp';
|
||||
|
||||
import url_for from 'sources/url_for';
|
||||
import gettext from 'sources/gettext';
|
||||
@@ -883,4 +883,3 @@ DebuggerArgumentComponent.propTypes = {
|
||||
pgTreeInfo: PropTypes.object,
|
||||
pgData: PropTypes.object,
|
||||
};
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
//
|
||||
//////////////////////////////////////////////////////////////
|
||||
|
||||
import { Box } from '@material-ui/core';
|
||||
import { Box } from '@mui/material';
|
||||
import React, { useEffect, useRef, useState } from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
//
|
||||
//////////////////////////////////////////////////////////////
|
||||
|
||||
import { makeStyles } from '@material-ui/styles';
|
||||
import { makeStyles } from '@mui/styles';
|
||||
import PropTypes from 'prop-types';
|
||||
|
||||
import React, { useContext, useEffect } from 'react';
|
||||
@@ -69,7 +69,7 @@ export default function DebuggerEditor({ getEditor, params }) {
|
||||
self = this;
|
||||
getEditor(editor.current);
|
||||
}, [editor.current]);
|
||||
|
||||
|
||||
return (
|
||||
<CodeMirror
|
||||
currEditor={(obj) => {
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// This software is released under the PostgreSQL Licence
|
||||
//
|
||||
//////////////////////////////////////////////////////////////
|
||||
import { makeStyles } from '@material-ui/styles';
|
||||
import { makeStyles } from '@mui/styles';
|
||||
import React from 'react';
|
||||
import { DebuggerEventsContext } from './DebuggerComponent';
|
||||
import { DEBUGGER_EVENTS } from '../DebuggerConstants';
|
||||
|
||||
@@ -13,9 +13,9 @@ import PropTypes from 'prop-types';
|
||||
|
||||
import React, { useCallback, useState } from 'react';
|
||||
|
||||
import { makeStyles } from '@material-ui/styles';
|
||||
import Paper from '@material-ui/core/Paper';
|
||||
import TableContainer from '@material-ui/core/TableContainer';
|
||||
import { makeStyles } from '@mui/styles';
|
||||
import Paper from '@mui/material/Paper';
|
||||
import TableContainer from '@mui/material/TableContainer';
|
||||
|
||||
import gettext from 'sources/gettext';
|
||||
|
||||
|
||||
@@ -11,8 +11,8 @@ import clsx from 'clsx';
|
||||
|
||||
import React, { useState } from 'react';
|
||||
|
||||
import { makeStyles } from '@material-ui/styles';
|
||||
import Paper from '@material-ui/core/Paper';
|
||||
import { makeStyles } from '@mui/styles';
|
||||
import Paper from '@mui/material/Paper';
|
||||
|
||||
import { DebuggerEventsContext } from './DebuggerComponent';
|
||||
import { DEBUGGER_EVENTS } from '../DebuggerConstants';
|
||||
|
||||
@@ -13,9 +13,9 @@ import gettext from 'sources/gettext';
|
||||
|
||||
import React, { useState } from 'react';
|
||||
|
||||
import { makeStyles } from '@material-ui/styles';
|
||||
import TableContainer from '@material-ui/core/TableContainer';
|
||||
import Paper from '@material-ui/core/Paper';
|
||||
import { makeStyles } from '@mui/styles';
|
||||
import TableContainer from '@mui/material/TableContainer';
|
||||
import Paper from '@mui/material/Paper';
|
||||
|
||||
import { DebuggerEventsContext } from './DebuggerComponent';
|
||||
import { DEBUGGER_EVENTS } from '../DebuggerConstants';
|
||||
@@ -44,7 +44,7 @@ export function Stack() {
|
||||
const eventBus = React.useContext(DebuggerEventsContext);
|
||||
const [stackData, setStackData] = useState([]);
|
||||
const [disableFrameSelection, setDisableFrameSelection] = useState(false);
|
||||
|
||||
|
||||
React.useEffect(() => {
|
||||
eventBus.registerListener(DEBUGGER_EVENTS.SET_STACK, (stackValues) => {
|
||||
setStackData(stackValues);
|
||||
|
||||
@@ -9,15 +9,16 @@
|
||||
|
||||
import React, { useCallback, useContext, useEffect, useState } from 'react';
|
||||
|
||||
import { Box, makeStyles } from '@material-ui/core';
|
||||
import FormatIndentIncreaseIcon from '@material-ui/icons/FormatIndentIncrease';
|
||||
import FormatIndentDecreaseIcon from '@material-ui/icons/FormatIndentDecrease';
|
||||
import PlayCircleFilledWhiteIcon from '@material-ui/icons/PlayCircleFilledWhite';
|
||||
import FiberManualRecordIcon from '@material-ui/icons/FiberManualRecord';
|
||||
import NotInterestedIcon from '@material-ui/icons/NotInterested';
|
||||
import StopIcon from '@material-ui/icons/Stop';
|
||||
import HelpIcon from '@material-ui/icons/HelpRounded';
|
||||
import RotateLeftRoundedIcon from '@material-ui/icons/RotateLeftRounded';
|
||||
import { Box } from '@mui/material';
|
||||
import { makeStyles } from '@mui/styles';
|
||||
import FormatIndentIncreaseIcon from '@mui/icons-material/FormatIndentIncrease';
|
||||
import FormatIndentDecreaseIcon from '@mui/icons-material/FormatIndentDecrease';
|
||||
import PlayCircleFilledWhiteIcon from '@mui/icons-material/PlayCircleFilledWhite';
|
||||
import FiberManualRecordIcon from '@mui/icons-material/FiberManualRecord';
|
||||
import NotInterestedIcon from '@mui/icons-material/NotInterested';
|
||||
import StopIcon from '@mui/icons-material/Stop';
|
||||
import HelpIcon from '@mui/icons-material/HelpRounded';
|
||||
import RotateLeftRoundedIcon from '@mui/icons-material/RotateLeftRounded';
|
||||
|
||||
import gettext from 'sources/gettext';
|
||||
import { shortcut_key } from 'sources/keyboard_shortcuts';
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
|
||||
/* To make font same as Query tool in messages tab */
|
||||
.messages {
|
||||
white-space: pre-wrap;
|
||||
font-family: $font-family-editor;
|
||||
padding-top: 5px;
|
||||
padding-left: 10px;
|
||||
overflow: auto;
|
||||
height: 100%;
|
||||
font-size: 0.925em;
|
||||
-webkit-user-select: text;
|
||||
-moz-user-select: text;
|
||||
-ms-user-select: text;
|
||||
user-select: text;
|
||||
}
|
||||
|
||||
.debugger-args {
|
||||
display: block;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
overflow: auto;
|
||||
}
|
||||
Reference in New Issue
Block a user