diff --git a/webui/src/components/CurrentIdentity/CurrentIdentity.tsx b/webui/src/components/CurrentIdentity/CurrentIdentity.tsx
index f3dff5edddf523bb31398dc814db3e3b7e2ebb9f..b68b84e5728d0840ecf4783968bbee7825a0502f 100644
--- a/webui/src/components/CurrentIdentity/CurrentIdentity.tsx
+++ b/webui/src/components/CurrentIdentity/CurrentIdentity.tsx
@@ -26,6 +26,9 @@ const useStyles = makeStyles((theme) => ({
profileLink: {
...theme.typography.button,
},
+ popupButton: {
+ textTransform: 'none',
+ },
}));
const CurrentIdentity = () => {
@@ -57,15 +60,14 @@ const CurrentIdentity = () => {
aria-controls={open ? 'menu-list-grow' : undefined}
aria-haspopup="true"
onClick={handleToggle}
+ className={classes.popupButton}
>
{user.displayName.charAt(0).toUpperCase()}
+
{user.displayName}
+
-
{
)}
- {user.displayName}
>
);
};
diff --git a/webui/src/pages/identity/BugList.tsx b/webui/src/pages/identity/BugList.tsx
index e1083cfb6eadfa501f49576d7ebac709b82a3b08..623deda56edf245a97ae765f308c36818bd8f3bf 100644
--- a/webui/src/pages/identity/BugList.tsx
+++ b/webui/src/pages/identity/BugList.tsx
@@ -1,18 +1,37 @@
import React from 'react';
-import { Link } from '@material-ui/core';
+import { Card, Link, Typography } from '@material-ui/core';
import CircularProgress from '@material-ui/core/CircularProgress';
+import { makeStyles } from '@material-ui/core/styles';
+
+import Date from '../../components/Date';
import { useGetBugsByUserQuery } from './GetBugsByUser.generated';
+const useStyles = makeStyles((theme) => ({
+ main: {
+ ...theme.typography.body2,
+ },
+ bugLink: {
+ ...theme.typography.button,
+ },
+ cards: {
+ backgroundColor: theme.palette.background.default,
+ color: theme.palette.info.contrastText,
+ padding: theme.spacing(1),
+ margin: theme.spacing(1),
+ },
+}));
+
type Props = {
humanId: string;
};
function BugList({ humanId }: Props) {
+ const classes = useStyles();
const { loading, error, data } = useGetBugsByUserQuery({
variables: {
- query: 'author:' + humanId,
+ query: 'author:' + humanId + ' sort:creation',
},
});
@@ -22,10 +41,31 @@ function BugList({ humanId }: Props) {
console.log(bugs);
return (
-
- - {bugs ? bugs[0].title : ''}
- Klick
-
+
+ {bugs?.map((bug, index) => {
+ return (
+
+
+
+ {bug.title}
+
+
+
+ Created
+
+
+
+ Last edited
+
+
+
+ );
+ })}
+
);
}
diff --git a/webui/src/pages/identity/GetBugsByUser.graphql b/webui/src/pages/identity/GetBugsByUser.graphql
index 0be85578e6a364f45fe8e7db30ca8dae5770c897..0f170dc1f3b7d153134200a7b57046a517752475 100644
--- a/webui/src/pages/identity/GetBugsByUser.graphql
+++ b/webui/src/pages/identity/GetBugsByUser.graphql
@@ -4,6 +4,8 @@ query GetBugsByUser ($query: String){
nodes {
id
title
+ createdAt
+ lastEdit
}
}
}
diff --git a/webui/src/pages/identity/Identity.tsx b/webui/src/pages/identity/Identity.tsx
index 43925f4f98c66e35b9b61f27993fd0e9450afdfb..8261c0f44eb676b904f4bcaa9cdfb72a4ba253dd 100644
--- a/webui/src/pages/identity/Identity.tsx
+++ b/webui/src/pages/identity/Identity.tsx
@@ -2,16 +2,15 @@ import React from 'react';
import {
Checkbox,
- Divider,
- FormControl,
FormControlLabel,
- FormGroup,
- FormLabel,
+ Link,
Paper,
- TextField,
+ Typography,
} from '@material-ui/core';
import Avatar from '@material-ui/core/Avatar';
import { makeStyles } from '@material-ui/core/styles';
+import InfoIcon from '@material-ui/icons/Info';
+import MailOutlineIcon from '@material-ui/icons/MailOutline';
import { useCurrentIdentityQuery } from '../../components/CurrentIdentity/CurrentIdentity.generated';
@@ -19,26 +18,24 @@ import BugList from './BugList';
const useStyles = makeStyles((theme) => ({
main: {
- maxWidth: 1200,
+ maxWidth: 1000,
margin: 'auto',
marginTop: theme.spacing(4),
+ padding: theme.spacing(3, 2),
+ display: 'flex',
},
container: {
display: 'flex',
marginBottom: theme.spacing(1),
- marginRight: theme.spacing(2),
- marginLeft: theme.spacing(2),
},
leftSidebar: {
marginTop: theme.spacing(2),
- marginRight: theme.spacing(2),
+ flex: '0 0 200px',
},
content: {
marginTop: theme.spacing(5),
- marginRight: theme.spacing(4),
padding: theme.spacing(3, 2),
minWidth: 800,
- display: 'flex',
backgroundColor: theme.palette.background.paper,
},
rightSidebar: {
@@ -53,7 +50,7 @@ const useStyles = makeStyles((theme) => ({
paddingBottom: theme.spacing(3),
},
header: {
- ...theme.typography.h5,
+ ...theme.typography.h4,
},
}));
@@ -70,67 +67,58 @@ const Identity = () => {
{user?.displayName ? user?.displayName : 'none'}
-
- {user?.displayName.charAt(0).toUpperCase()}
-
-
-
-
-
-
-
- Your account
-
-
-
-
-
-
- }
- />
-
-
-
-
{user?.displayName.charAt(0).toUpperCase()}
+
+ Your account
+
+
+ Name: {user?.name ? user?.name : '---'}
+
+
+ Id (truncated): {user?.humanId ? user?.humanId : '---'}
+
+
+
+ Login: {user?.login ? user?.login : '---'}
+
+
+
+
+ {user?.email ? user?.email : '---'}
+
+
+
}
+ />
+
+
+ Bugs authored by {user?.displayName}
+
+
+
+
-
);
};