Skip to content

Commit

Permalink
fix(usage page issue layout) (#2276)
Browse files Browse the repository at this point in the history
* Fix/darkmode accounts (#2249)

* fix(logout): multiple cookies not being deleted (#2227)

Co-authored-by: darwin.apolinario <[email protected]>

* Fix/mindshare rendering issues (#2218)

* fix(pages 1 to 6 mindshare fix rendering): pages 1 to 6 mindshare fix rendering

pages 1 to 6 mindshare fix rendering

* fix(remove unnecessary color): remove unnecessary color

remove unnecessary color

* fix(adjust pre tag background): adjust pre tag background

adjust pre tag background

---------

Co-authored-by: Darwin ❤️❤️❤️ <[email protected]>

* fix(fix white bg issue and accounts tab): fix white bg issue and accounts tab

fix white bg issue and accounts tab

* fix(fix issue in portal): fix issue in portal

fix issue in portal

* fix(disable portal in dropdown on users menu): disable portal in dropdown on users menu

disable portal in dropdown on users menu

* fix(disable portal on the autocomplete to prevent zindex issue): disable portal

disable portal on the autocomplete to prevent zindex issue

* fix(fixing background issue in darkmode): fixing background issue in darkmode

fixing background issue in darkmode

---------

Co-authored-by: Darwin ❤️❤️❤️ <[email protected]>
Co-authored-by: darwin.apolinario <[email protected]>

* fix(contact.js): keep leadsource website as default (#2255)

* fix(contact.js): keep leadsource website as default

* feat(restore): restore

* fix(demo.js): optimize demos page for tablet views (#2259)

* feat: fix ppc explore forms (#2243)

* fix(logout): multiple cookies not being deleted (#2227)

Co-authored-by: darwin.apolinario <[email protected]>

* Fix/mindshare rendering issues (#2218)

* fix(pages 1 to 6 mindshare fix rendering): pages 1 to 6 mindshare fix rendering

pages 1 to 6 mindshare fix rendering

* fix(remove unnecessary color): remove unnecessary color

remove unnecessary color

* fix(adjust pre tag background): adjust pre tag background

adjust pre tag background

---------

Co-authored-by: Darwin ❤️❤️❤️ <[email protected]>

* Feat/dynamic contact form (#2225)

* feat(getdemosection): adjusted demo content based on query params

* chore(clean up): clean up

* chore(usegetdynamicdata): clean up

* feat(demo): update demo page

update demo page to select user journey

* fix(demo): add ternary check to avoid error

* fix(contact page): remove form attributes

* fix(join.js): update copy of the join page (#2236)

* fix(join.js): update copy of the join page

* fix(join.js): update page copy

* fix(join.js): update form copy

* feat: fix ppc explore forms

* feat(restore): restore vscode settings

* feat(upadte): updates

* feat(restore vscode): restore vscode settings

* feat(restore vscode settings): fix vscode settings

* fix(fix undefined): fix undefined

---------

Co-authored-by: Darwin ❤️❤️❤️ <[email protected]>
Co-authored-by: darwin.apolinario <[email protected]>
Co-authored-by: Gian Espinosa <[email protected]>

* update search modal in product page (#2268)

Co-authored-by: root <[email protected]>

* fix(usage page issue layout): usage page issue layout

usage page issue layout

* Refactor: Remove Unused Scripts & Git Commitizen Trigger (#2280)

* chore: remove unused `scripts`

* remove: precommit-msg

---------

Co-authored-by: darwin.apolinario <[email protected]>

* remove if this is cause of duplicate props

* remove semi colon

---------

Co-authored-by: Darwin ❤️❤️❤️ <[email protected]>
Co-authored-by: darwin.apolinario <[email protected]>
Co-authored-by: Jomar Montuya <[email protected]>
Co-authored-by: Arzl James <[email protected]>
Co-authored-by: root <[email protected]>
  • Loading branch information
6 people committed Jan 10, 2024
1 parent 3f900b0 commit 93ae353
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 6 deletions.
3 changes: 1 addition & 2 deletions src/components/accounts/ui/select/AccountsComboBox.js
Original file line number Diff line number Diff line change
Expand Up @@ -180,14 +180,13 @@ const Index = ({
filterOptions={filterOptions}
id="virtualize-demo"
onChange={handleChange}
disablePortal
size="small"
sx={(theme) => ({
width,
backgroundColor:
theme.palette.mode === 'light' && theme.palette.common.white,
})}
disablePortal
disableListWrap
PopperComponent={StyledPopper}
ListboxComponent={ListboxComponent}
options={OPTIONS}
Expand Down
2 changes: 1 addition & 1 deletion src/pages/dashboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ function DashboardPage(props) {
return (
<InstanceContainer isDashboard>
<ZestyAccountsHead title={'Zesty.io - Accounts Dashboard'} />
<Dashboard content={props} />;
<Dashboard content={props} />
</InstanceContainer>
);
}
Expand Down
18 changes: 15 additions & 3 deletions src/views/accounts/instances/Usage.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,14 @@ const getMonthDates = ({ start = '', end = '' }) => {
const ReportCard = ({ title = '', data = 0, type = '', _limit = 0 }) => {
// console.log(limit);
return (
<Card sx={{ py: 4, borderRadius: '20px' }}>
<Card
sx={{
py: 4,
borderRadius: '20px',
height: '100%',
overflowWrap: 'break-word',
}}
>
<Typography variant="h4" textAlign={'center'} mb={2}>
{title}
</Typography>
Expand Down Expand Up @@ -126,10 +133,15 @@ const ThisMonthReport = ({ usage, loading }) => {
<CircularProgress />
</Stack>
) : (
<Grid container px={10} py={5} spacing={8}>
<Grid
container
py={5}
spacing={8}
sx={(theme) => ({ [theme.breakpoints.up('lg')]: { px: 10 } })}
>
{arr.map((e) => {
return (
<Grid item xs={6}>
<Grid item sm={6} xs={12}>
<ReportCard
title={e.title}
data={e.data}
Expand Down

0 comments on commit 93ae353

Please sign in to comment.