Merge pull request #6 from Devteamvietnam/dev

update
Devteamvietnam · Sep 3, 2022 · 1bf882d · 1bf882d
2 parents 7961843 + e129da8
commit 1bf882d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -36,8 +36,6 @@
     "@types/react": "^18.0.17",
     "@types/react-dom": "^18.0.6",
     "@types/react-router-dom": "^5.3.3",
-    "@types/redux": "^3.6.0",
-    "@types/redux-thunk": "^2.1.0",
     "@typescript-eslint/eslint-plugin": "^5.36.1",
     "@typescript-eslint/parser": "^5.36.1",
     "babel-eslint": "^10.1.0",

diff --git a/src/components/header/UIHeader.tsx b/src/components/header/UIHeader.tsx
@@ -25,8 +25,15 @@ export class UIHeader extends Component<HeaderProps> {
 
     return (
       <React.Fragment>
-        <AppBar position="relative">
-          <Toolbar sx={{ borderBottom: 1, borderColor: 'divider' }}>
+        <AppBar
+          position="static"
+          color="default"
+          elevation={0}
+          sx={{ borderBottom: theme => `1px solid ${theme.palette.divider}` }}
+        >
+          <Toolbar
+            sx={{ borderBottom: 1, borderColor: 'divider', flexWrap: 'wrap' }}
+          >
             <Typography
               component="h1"
               variant="h5"
@@ -49,12 +56,16 @@ export class UIHeader extends Component<HeaderProps> {
             >
               <img src={logo} className="App-logo-header" alt="logo" />
             </Typography>
-            <Button variant="outlined" size="small"></Button>
+            <Button size="small"></Button>
           </Toolbar>
           <Toolbar
             component="nav"
             variant="dense"
-            sx={{ justifyContent: 'center', overflowX: 'auto' }}
+            sx={{
+              justifyContent: 'center',
+              overflowX: 'auto',
+              flexWrap: 'wrap'
+            }}
           >
             {sections.map(section => (
               <Link

diff --git a/src/index.tsx b/src/index.tsx
@@ -3,6 +3,7 @@ import ReactDOM from 'react-dom/client';
 
 import reportWebVitals from './reportWebVitals';
 import * as serviceWorker from './serviceWorker';
+
 import AppRouter from './routes';
 
 const root = ReactDOM.createRoot(

diff --git a/src/pages/index.tsx b/src/pages/index.tsx
@@ -7,6 +7,7 @@ import FacebookIcon from '@mui/icons-material/Facebook';
 import TwitterIcon from '@mui/icons-material/Twitter';
 import { createTheme, ThemeProvider } from '@mui/material/styles';
 import Grid from '@mui/material/Grid';
+import GlobalStyles from '@mui/material/GlobalStyles';
 
 import { AppContext } from '../api';
 
@@ -86,6 +87,9 @@ export class UIPages extends Component {
     const posts = [];
     return (
       <ThemeProvider theme={theme}>
+        <GlobalStyles
+          styles={{ ul: { margin: 0, padding: 0, listStyle: 'none' } }}
+        />
         <CssBaseline />
         <Container maxWidth="xl">
           <UIHeader sections={sections} title={'SHDSVN'} />