Fakultas Ilmu Komputer UI

Commit 2dc35abe authored by Michael Wiryadinata Halim's avatar Michael Wiryadinata Halim
Browse files

Attempt fix css mui

parent d20b6bd7
{
"presets": ["@babel/preset-react", "@babel/preset-env",
[
"@emotion/babel-preset-css-prop",
{
"sourceMap": false
}
"@emotion/babel-preset-css-prop"
]
],
"plugins": [
[
"transform-inline-environment-variables"
],
[
"emotion"
]
]
}
This diff is collapsed.
......@@ -15,7 +15,6 @@
"moment-timezone": "^0.5.28",
"popper.js": "^1.16.1",
"react": "^16.13.1",
"react-bootstrap": "^1.0.1",
"react-dom": "^16.13.1",
"react-hook-form": "^5.6.1",
"react-moment": "^0.9.7",
......@@ -23,8 +22,8 @@
"react-promise-tracker": "^2.1.0"
},
"scripts": {
"start": "parcel public/index.html",
"build": "parcel build public/index.html --experimental-scope-hoisting",
"start": "cross-env REACT_APP_BASE_URL=https://industripilar-staging.herokuapp.com parcel public/index.html",
"build": "parcel build public/index.html",
"test": "jest",
"test:coverage": "jest --coverage",
"lint": "eslint \"src/**/*.{js,jsx}\" --quiet",
......@@ -55,6 +54,7 @@
"babel-eslint": "^10.1.0",
"babel-plugin-emotion": "^10.0.33",
"babel-plugin-transform-inline-environment-variables": "^0.4.3",
"cross-env": "^7.0.2",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"eslint": "^6.8.0",
......@@ -63,14 +63,14 @@
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-react": "^7.19.0",
"eslint-plugin-react-hooks": "^2.5.1",
"eslint-plugin-react-hooks": "^4.0.0",
"jest": "^25.5.4",
"jest-environment-enzyme": "^7.1.2",
"jest-enzyme": "^7.1.2",
"jest-fetch-mock": "^3.0.3",
"jest-sonar-reporter": "^2.0.0",
"mutationobserver-shim": "^0.3.5",
"parcel-bundler": "^1.12.4",
"parcel": "^2.0.0-alpha.3.2",
"prettier": "^2.0.5",
"regenerator-runtime": "^0.13.5"
},
......
......@@ -2,11 +2,10 @@ import React from "react";
import { usePromiseTracker } from "react-promise-tracker";
import { Backdrop, CircularProgress } from "@material-ui/core";
import { makeStyles } from "@material-ui/core/styles";
import { css } from "@emotion/core";
const useStyles = makeStyles((theme) => ({
backdrop: {
zIndex: theme.zIndex.drawer + 1,
},
circular: {
color: "#6200EE",
},
}));
......@@ -15,7 +14,11 @@ const Loader = () => {
const { promiseInProgress } = usePromiseTracker();
return (
<Backdrop className={classes.backdrop} open={promiseInProgress}>
<CircularProgress className={classes.circular} />
<CircularProgress
css={css`
color: inherit;
`}
/>
</Backdrop>
);
};
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment