mirror of
https://github.com/rjNemo/ticket_manager
synced 2026-06-12 03:36:39 +00:00
update UserPageLayout
This commit is contained in:
parent
f9e1fd9392
commit
6de5e17b79
3 changed files with 14 additions and 18 deletions
|
|
@ -12,11 +12,11 @@
|
||||||
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
|
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
|
||||||
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
|
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
|
||||||
|
|
||||||
<link
|
<!-- <link
|
||||||
rel="stylesheet"
|
rel="stylesheet"
|
||||||
href="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css"
|
href="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css"
|
||||||
/>
|
/>
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"></script> -->
|
||||||
<link
|
<link
|
||||||
rel="stylesheet"
|
rel="stylesheet"
|
||||||
href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap"
|
href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap"
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,7 @@ const a11yProps = (index: any) => {
|
||||||
const useStyles = makeStyles((theme: Theme) => ({
|
const useStyles = makeStyles((theme: Theme) => ({
|
||||||
root: {
|
root: {
|
||||||
backgroundColor: theme.palette.background.paper,
|
backgroundColor: theme.palette.background.paper,
|
||||||
width: 500
|
flexGrow: 1
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
|
@ -71,7 +71,7 @@ export const UserTabPanel: FC<IProps> = ({ tickets, tabNames, projects }) => {
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={classes.root}>
|
<div className={classes.root}>
|
||||||
<AppBar position="static" color="default">
|
<AppBar position="static" color="inherit">
|
||||||
<Tabs
|
<Tabs
|
||||||
value={value}
|
value={value}
|
||||||
onChange={handleChange}
|
onChange={handleChange}
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ import { UserVM } from "../VM/UserVM";
|
||||||
import { UserHeader } from "../components/UserHeader";
|
import { UserHeader } from "../components/UserHeader";
|
||||||
import { UserTabRouter } from "../components/UserTabRouter";
|
import { UserTabRouter } from "../components/UserTabRouter";
|
||||||
import { UserTabPanel } from "../components/UserTabPanel";
|
import { UserTabPanel } from "../components/UserTabPanel";
|
||||||
|
import { Container } from "@material-ui/core";
|
||||||
|
|
||||||
interface IProps {
|
interface IProps {
|
||||||
viewModel: UserVM;
|
viewModel: UserVM;
|
||||||
|
|
@ -11,20 +12,15 @@ interface IProps {
|
||||||
export const UserPage: FC<IProps> = ({ viewModel }) => {
|
export const UserPage: FC<IProps> = ({ viewModel }) => {
|
||||||
const { fullName, presentation, picture, projects, tickets } = viewModel;
|
const { fullName, presentation, picture, projects, tickets } = viewModel;
|
||||||
const tabNames: string[] = ["Projects", "Tickets"];
|
const tabNames: string[] = ["Projects", "Tickets"];
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="section">
|
<Container maxWidth="md">
|
||||||
<div className="container">
|
<UserHeader
|
||||||
<UserHeader
|
picture={picture}
|
||||||
picture={picture}
|
fullName={fullName}
|
||||||
fullName={fullName}
|
presentation={presentation}
|
||||||
presentation={presentation}
|
/>
|
||||||
/>
|
<UserTabPanel tabNames={tabNames} projects={projects} tickets={tickets} />
|
||||||
<UserTabPanel
|
</Container>
|
||||||
tabNames={tabNames}
|
|
||||||
projects={projects}
|
|
||||||
tickets={tickets}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue