Skip to content

Commit

Permalink
BE-422 | UI Responsiveness and Misc
Browse files Browse the repository at this point in the history
Signed-off-by: deekshithvarma256 <[email protected]>
  • Loading branch information
deekshithvarma256 authored and ArchanaArige committed Jul 28, 2023
1 parent cd6ea8b commit 8ff33af
Show file tree
Hide file tree
Showing 11 changed files with 476 additions and 355 deletions.
1 change: 1 addition & 0 deletions client/src/components/App/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ const styles = theme => {
left: 0,
bottom: 0,
right: 0,
overflow: 'auto',
'& ol, & ul': {
listStyle: 'none'
}
Expand Down
4 changes: 2 additions & 2 deletions client/src/components/Container.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ const styles = theme => ({
root: {
width: 'auto',
display: 'block', // Fix IE 11 issue.
marginLeft: theme.spacing.unit * 3,
marginRight: theme.spacing.unit * 3,
marginLeft: 'auto',
marginRight: 'auto',
[theme.breakpoints.up(400 + theme.spacing.unit * 3 * 2)]: {
width: 400,
marginLeft: 'auto',
Expand Down
47 changes: 29 additions & 18 deletions client/src/components/Header/HeaderView.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const {
transactionByOrg,
dashStats,
changeChannel,
blockActivity,
blockActivity
} = chartOperations;

const {
Expand All @@ -77,9 +77,13 @@ const {
} = tableOperations;

const { currentChannelSelector } = chartSelectors;
const { channelsSelector, transactionListSearchPageParamSelector,
transactionListSearchQuerySelector,
blockListSearchPageParamSelector, blockListSearchQuerySelector} = tableSelectors;
const {
channelsSelector,
transactionListSearchPageParamSelector,
transactionListSearchQuerySelector,
blockListSearchPageParamSelector,
blockListSearchQuerySelector
} = tableSelectors;
/* istanbul ignore next */
const styles = theme => {
const { type } = theme.palette;
Expand Down Expand Up @@ -203,7 +207,7 @@ const styles = theme => {
},
logoutIcon: {
color: dark ? 'rgb(139, 143, 148)' : '#5f6164',
fontSize: '18pt',
fontSize: '16pt',
float: 'none',
'&:hover': {
color: dark ? '#c1d7f0' : '#24272a'
Expand All @@ -213,7 +217,7 @@ const styles = theme => {
},
userIcon: {
color: dark ? 'rgb(139, 143, 148)' : '#5f6164',
fontSize: '18pt',
fontSize: '16pt',
float: 'none',
'&:hover': {
color: dark ? '#c1d7f0' : '#24272a'
Expand Down Expand Up @@ -469,7 +473,11 @@ export class HeaderView extends Component {
} = this.props;

await Promise.all([
getBlockListSearch( currentChannel, blockListSearchQuery, blockListSearchPageParam),
getBlockListSearch(
currentChannel,
blockListSearchQuery,
blockListSearchPageParam
),
getBlocksPerHour(currentChannel),
getBlocksPerMin(currentChannel),
getChaincodeList(currentChannel),
Expand All @@ -478,7 +486,11 @@ export class HeaderView extends Component {
getBlockActivity(currentChannel),
getPeerList(currentChannel),
getTransactionByOrg(currentChannel),
getTransactionListSearch(currentChannel,transactionListSearchQuery,transactionListSearchPageParam),
getTransactionListSearch(
currentChannel,
transactionListSearchQuery,
transactionListSearchPageParam
),
getTransactionPerHour(currentChannel),
getTransactionPerMin(currentChannel)
]);
Expand Down Expand Up @@ -595,19 +607,18 @@ export class HeaderView extends Component {
</div>
</DropdownItem>
<DropdownItem>
<div className={classes.userIcon}>
<FontAwesome
name="user-plus"
onClick={() => this.registerOpen()}
/>{' '}
<div
className={classes.userIcon}
onClick={() => this.registerOpen()}
>
<FontAwesome name="user-plus" />
User management
</div>
</DropdownItem>
<DropdownItem divider />
<DropdownItem>
<div className={classes.logoutIcon}>
<FontAwesome name="sign-out" onClick={() => this.logout()} /> Sign
out
<div className={classes.logoutIcon} onClick={() => this.logout()}>
<FontAwesome name="sign-out" /> Sign out
</div>
</DropdownItem>
</DropdownMenu>
Expand Down Expand Up @@ -699,7 +710,7 @@ const mapStateToProps = state => {
};

const mapDispatchToProps = {
getBlockListSearch: blockListSearch,
getBlockListSearch: blockListSearch,
getBlocksPerHour: blockPerHour,
getBlocksPerMin: blockPerMin,
getChaincodeList: chaincodeList,
Expand All @@ -710,7 +721,7 @@ const mapDispatchToProps = {
getBlockActivity: blockActivity,
getTransactionByOrg: transactionByOrg,
getTransactionList: transactionList,
getTransactionListSearch:transactionListSearch,
getTransactionListSearch: transactionListSearch,
getTransactionPerHour: transactionPerHour,
getTransactionPerMin: transactionPerMin,
logout: authOperations.logout
Expand Down
Loading

0 comments on commit 8ff33af

Please sign in to comment.