Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
melissaSchmidt0302 committed Feb 17, 2020
1 parent b9c0797 commit 504976f
Show file tree
Hide file tree
Showing 9 changed files with 92 additions and 71 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ DOCKER_REGISTRY_PASSWORD
*~
*-audit.json
.vscode/*
.vs/*
Untitled*
node_modules
yarn-error.log
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
55 changes: 55 additions & 0 deletions frontend/src/pages/Common/EmptyStates.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
import React from 'react';

import Typography from "@material-ui/core/Typography";
import ListItem from "@material-ui/core/ListItem";
import ListItemText from "@material-ui/core/ListItemText";
import Divider from "@material-ui/core/Divider";
import TableRow from "@material-ui/core/TableRow";
import TableCell from "@material-ui/core/TableCell";

import globalStyles from "../../styles";

// open source for images for empty fields: https://undraw.co/
// color-code: #53BBFE

// icons from freepik: Icons made by <a href="https://www.flaticon.com/authors/freepik" title="Freepik">Freepik</a> from <a href="https://www.flaticon.com/" title="Flaticon"> www.flaticon.com</a>


export const GetNodesForOrgaEmptyState = () => {
return (
<Typography variant="subtitle1"><p><i>No additonal information found</i></p></Typography>
);
};

export const GetListEntriesEmptyState = () => {
return (
<div key="default">
<table style={{ alignItems: "center", textAlign: "center"}}>
<tr>
<td width="150vw"><img src="images-for-empty-state/organization-empty-state.png" alt="No notifications found" width="100vw"/></td>
<td><Typography variant="subtitle1">No organizations found.</Typography></td>
</tr>
</table>
</div>
);
};

export const GetNodesTableEmptyState = () => {
return (
<div style={{ textAlign: "center" }}>
<img src="images-for-empty-state/nodes-network-table-empty-state.png" alt="No entries" width="505vw"/>
<Typography variant="subtitle1">We couldn't find any entries.</Typography>
<br></br>
</div>
);
};

export const GetNotificationEmptyState = () => {
return (
<div style={{ textAlign: "center" }}>
<img src="images-for-empty-state/notification-empty-state.png" alt="No notifications found" width="505vw"/>
<Typography variant="subtitle1">We couldn't find any notifications.</Typography>
</div>
);
};

12 changes: 3 additions & 9 deletions frontend/src/pages/Navbar/SideNavCard.js
Original file line number Diff line number Diff line change
Expand Up @@ -120,22 +120,16 @@ const SideNavCard = ({
</List>
) : null}
<List>
<Subheader> {strings.users.groups} </Subheader>
{groups.length ? (groups.map(group => {
{groups.length ? <Subheader> {strings.users.groups} </Subheader> : undefined}
{groups.map(group => {
return(
<div key={group.groupId}>
<ListItem>
<ListItemText primary={group.displayName} secondary={strings.common.id + ": " + group.groupId} />
</ListItem>
<Divider />
</div>);
})) : (
<div key="default">
<ListItem>
<ListItemText secondary={<i>No groups found</i>} />
</ListItem>
</div>
)}
})}
</List>
<div style={{ flexGrow: 1 }} />
<VersionsTable versions={versions} />
Expand Down
31 changes: 5 additions & 26 deletions frontend/src/pages/Nodes/NodeVoting.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import Button from "@material-ui/core/Button";
import { withStyles } from "@material-ui/core/styles";
import strings from "../../localizeStrings";
import { canApproveNode } from "../../permissions";
import { GetNodesForOrgaEmptyState, GetListEntriesEmptyState } from "../Common/EmptyStates";

const styles = theme => ({
container: {
Expand Down Expand Up @@ -113,33 +114,11 @@ const getListEntries = (newNodesForExistingOrga, canApprove, classes, cb) => {
</div>
);
});
} else{
return (
<div key="default">
<ListItem key="default">
<ListItemText
primary={
<div className={classes.listItem}>
<Typography variant="subtitle1"><i>No organization</i></Typography>
</div>
}
secondary={<i>Address: No address</i>}
/>
</ListItem>
<Divider />
</div>
);
} else {
return <GetListEntriesEmptyState />;
}
};

const getNodesForOrgaPlaceholder = (classes) => {
return (
<div className={classes.listItem}>
<Typography variant="subtitle1"><p><i>No additonal information found</i></p></Typography>
</div>
)
}

const NodeVoting = ({
showErrorSnackbar,
storeSnackbarMessage,
Expand All @@ -157,8 +136,7 @@ const NodeVoting = ({
approveNewNodeForExistingOrganization(address)
);

const nodesOrgaForPlaceholder = getNodesForOrgaPlaceholder(classes);
let nodesForOrga = nodesExistingOrga.length ? nodesExistingOrga : nodesOrgaForPlaceholder;
let nodesForOrga = nodesExistingOrga.length ? nodesExistingOrga : <GetNodesForOrgaEmptyState />;

const newOrganizationNodes = getNewOrganizationNodes(nodes);
const nodesNewOrga = getListEntries(newOrganizationNodes, canApprove, classes, ({ organization }) =>
Expand All @@ -184,4 +162,5 @@ const NodeVoting = ({
</div>
);
};

export default withStyles(styles)(NodeVoting);
54 changes: 26 additions & 28 deletions frontend/src/pages/Nodes/NodesTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import Paper from "@material-ui/core/Paper";
import { withStyles } from "@material-ui/core/styles";
import blueGrey from "@material-ui/core/colors/blueGrey";
import strings from "../../localizeStrings";
import { GetNodesTableEmptyState } from '../Common/EmptyStates';

const styles = {
paper: {
Expand Down Expand Up @@ -49,35 +50,32 @@ const NodesTable = ({ nodes, classes }) => {
{strings.nodesDashboard.network}
</Typography>
</div>
<Table>
<TableHead>
<TableRow>
<TableCell>{strings.common.organization}</TableCell>
<TableCell>{strings.nodesDashboard.nodes}</TableCell>
<TableCell>{strings.nodesDashboard.access}</TableCell>
</TableRow>
</TableHead>
<TableBody>

{groupedNodes.length ? groupedNodes.map(nodeGroup => {
return (
<TableRow key={nodeGroup.organization}>
<TableCell component="th" scope="row">
{nodeGroup.organization}
</TableCell>
<TableCell> {nodeGroup.count} </TableCell>
<TableCell> {nodeGroup.permissions}</TableCell>

{false ? (
<Table>
<TableHead>
<TableRow>
<TableCell>{strings.common.organization}</TableCell>
<TableCell>{strings.nodesDashboard.nodes}</TableCell>
<TableCell>{strings.nodesDashboard.access}</TableCell>
</TableRow>
);
}) :
<TableRow key="default">
<TableCell component="th" scope="row">
<i>No entries</i>
</TableCell>
</TableRow>}

</TableBody>
</Table>
</TableHead>
<TableBody>
{groupedNodes.map(nodeGroup => {
return (
<TableRow key={nodeGroup.organization}>
<TableCell component="th" scope="row">
{nodeGroup.organization}
</TableCell>
<TableCell> {nodeGroup.count} </TableCell>
<TableCell> {nodeGroup.permissions}</TableCell>
</TableRow>
);
})}
</TableBody>
</Table>
) : <GetNodesTableEmptyState />}

</Paper>
);
};
Expand Down
10 changes: 2 additions & 8 deletions frontend/src/pages/Notifications/NotificationListItems.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import LaunchIcon from "@material-ui/icons/ZoomIn";
import dayjs from "dayjs";
import React from "react";
import classNames from "classnames";
import { GetNotificationEmptyState } from '../Common/EmptyStates';

import { intentMapping, parseURI, getParentData, isAllowedToSee } from "./helper";
import strings from "../../localizeStrings";
Expand Down Expand Up @@ -115,14 +116,7 @@ const NotificationListItems = ({
);
});
}else{
return (
<div key="default">
<Divider />
<ListItemText
secondary={<p><i>We didn't find any notifications</i></p>}
/>
</div>
);
return <GetNotificationEmptyState />;
}
};

Expand Down

0 comments on commit 504976f

Please sign in to comment.