Skip to content

Commit

Permalink
Fix Broken Styling On Build #132
Browse files Browse the repository at this point in the history
-Fixed a bug where the component stylings would over write each other. This occurred because the theme provider was missing.
-Removed the banner component as this should deployed separately from the doi ui app.
-The banner component would also interfere with the styling since it uses withStyles while the rest of the app would use makeStyles.
-Added missing styling for the home call to action buttons.
  • Loading branch information
eddiesarevalo committed Apr 20, 2022
1 parent 4995d04 commit 6d01c6c
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 417 deletions.
35 changes: 26 additions & 9 deletions src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,25 +1,42 @@
import React from 'react';
import { Provider } from 'react-redux';
import configureStore from './store';
import Banner from './components/Banner';
import DoiAppBar from './components/DoiAppBar';
import AppBody from './components/AppBody';
import ConnectionCheck from './components/ConnectionCheck';
import {
MuiThemeProvider,
ThemeProvider,
StylesProvider,
createGenerateClassName,
createTheme
} from '@material-ui/core/styles';
import '@fontsource/roboto';
import './App.css';

const generateClassName = createGenerateClassName({
seed: 'doi-ui',
});

let theme = createTheme();

function App() {
const store = configureStore();

return (
<Provider store={store}>
<div className="App">
<Banner/>
<DoiAppBar/>
<ConnectionCheck/>
<AppBody store={store}/>
</div>
</Provider>
<StylesProvider generateClassName={generateClassName}>
<MuiThemeProvider theme={theme}>
<ThemeProvider theme={theme}>
<Provider store={store}>
<div className="App">
<DoiAppBar/>
<ConnectionCheck/>
<AppBody store={store}/>
</div>
</Provider>
</ThemeProvider>
</MuiThemeProvider>
</StylesProvider>
);
}

Expand Down
Loading

0 comments on commit 6d01c6c

Please sign in to comment.