Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into crud-list
Browse files Browse the repository at this point in the history
  • Loading branch information
apedroferreira committed Feb 14, 2025
2 parents fadcdec + 6dc29be commit 3b62551
Show file tree
Hide file tree
Showing 81 changed files with 1,522 additions and 580 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@

</div>

<div align="center">
<a href="https://trendshift.io/repositories/12027" target="_blank"><img src="https://trendshift.io/api/badge/repositories/12027" alt="mui%2Ftoolpad | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
</div>

## Product walkthrough

- [Toolpad Core](https://mui.com/toolpad/core/introduction/) is a set of high level React components that abstract common concepts such as layout navigation and routing. It aims at helping you build and maintain dashboards and internal tooling faster. It's built on top of [Material UI](http://github.com/mui/material-ui/).
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { AuthenticationContext, SessionContext } from '@toolpad/core/AppProvider';
import { AppProvider } from '@toolpad/core/AppProvider';
import { Account } from '@toolpad/core/Account';

const demoSession = {
Expand Down Expand Up @@ -31,17 +31,15 @@ export default function AccountCustomLocaleText() {
}, []);

return (
<AuthenticationContext.Provider value={authentication}>
<SessionContext.Provider value={session}>
{/* preview-start */}
<Account
localeText={{
signInLabel: 'लॉग इन',
signOutLabel: 'लॉग आउट',
}}
/>
{/* preview-end */}
</SessionContext.Provider>
</AuthenticationContext.Provider>
<AppProvider authentication={authentication} session={session}>
{/* preview-start */}
<Account
localeText={{
accountSignInLabel: 'लॉग इन',
accountSignOutLabel: 'लॉग आउट',
}}
/>
{/* preview-end */}
</AppProvider>
);
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
import * as React from 'react';
import {
AuthenticationContext,
Session,
SessionContext,
} from '@toolpad/core/AppProvider';
import { AppProvider, type Session } from '@toolpad/core/AppProvider';
import { Account } from '@toolpad/core/Account';

const demoSession = {
Expand Down Expand Up @@ -35,17 +31,15 @@ export default function AccountCustomLocaleText() {
}, []);

return (
<AuthenticationContext.Provider value={authentication}>
<SessionContext.Provider value={session}>
{/* preview-start */}
<Account
localeText={{
signInLabel: 'लॉग इन',
signOutLabel: 'लॉग आउट',
}}
/>
{/* preview-end */}
</SessionContext.Provider>
</AuthenticationContext.Provider>
<AppProvider authentication={authentication} session={session}>
{/* preview-start */}
<Account
localeText={{
accountSignInLabel: 'लॉग इन',
accountSignOutLabel: 'लॉग आउट',
}}
/>
{/* preview-end */}
</AppProvider>
);
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Account
localeText={{
signInLabel: 'लॉग इन',
signOutLabel: 'लॉग आउट',
accountSignInLabel: 'लॉग इन',
accountSignOutLabel: 'लॉग आउट',
}}
/>
56 changes: 27 additions & 29 deletions docs/data/toolpad/core/components/account/AccountCustomSlotProps.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import Logout from '@mui/icons-material/Logout';
import { Account } from '@toolpad/core/Account';
import { AuthenticationContext, SessionContext } from '@toolpad/core/AppProvider';
import { AppProvider } from '@toolpad/core/AppProvider';

const demoSession = {
user: {
Expand Down Expand Up @@ -32,36 +32,34 @@ export default function AccountCustomSlotProps() {
}, []);

return (
<AuthenticationContext.Provider value={authentication}>
<SessionContext.Provider value={session}>
{/* preview-start */}
<Account
slotProps={{
signInButton: {
color: 'success',
},
signOutButton: {
color: 'success',
startIcon: <Logout />,
},
preview: {
variant: 'expanded',
slotProps: {
avatarIconButton: {
sx: {
width: 'fit-content',
margin: 'auto',
},
},
avatar: {
variant: 'rounded',
<AppProvider authentication={authentication} session={session}>
{/* preview-start */}
<Account
slotProps={{
signInButton: {
color: 'success',
},
signOutButton: {
color: 'success',
startIcon: <Logout />,
},
preview: {
variant: 'expanded',
slotProps: {
avatarIconButton: {
sx: {
width: 'fit-content',
margin: 'auto',
},
},
avatar: {
variant: 'rounded',
},
},
}}
/>
{/* preview-end */}
</SessionContext.Provider>
</AuthenticationContext.Provider>
},
}}
/>
{/* preview-end */}
</AppProvider>
);
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
import * as React from 'react';
import Logout from '@mui/icons-material/Logout';
import { Account } from '@toolpad/core/Account';
import {
AuthenticationContext,
SessionContext,
Session,
} from '@toolpad/core/AppProvider';
import { AppProvider, Session } from '@toolpad/core/AppProvider';

const demoSession = {
user: {
Expand Down Expand Up @@ -36,36 +32,34 @@ export default function AccountCustomSlotProps() {
}, []);

return (
<AuthenticationContext.Provider value={authentication}>
<SessionContext.Provider value={session}>
{/* preview-start */}
<Account
slotProps={{
signInButton: {
color: 'success',
},
signOutButton: {
color: 'success',
startIcon: <Logout />,
},
preview: {
variant: 'expanded',
slotProps: {
avatarIconButton: {
sx: {
width: 'fit-content',
margin: 'auto',
},
},
avatar: {
variant: 'rounded',
<AppProvider authentication={authentication} session={session}>
{/* preview-start */}
<Account
slotProps={{
signInButton: {
color: 'success',
},
signOutButton: {
color: 'success',
startIcon: <Logout />,
},
preview: {
variant: 'expanded',
slotProps: {
avatarIconButton: {
sx: {
width: 'fit-content',
margin: 'auto',
},
},
avatar: {
variant: 'rounded',
},
},
}}
/>
{/* preview-end */}
</SessionContext.Provider>
</AuthenticationContext.Provider>
},
}}
/>
{/* preview-end */}
</AppProvider>
);
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
import { Account } from '@toolpad/core/Account';
import { AuthenticationContext, SessionContext } from '@toolpad/core/AppProvider';
import { AppProvider } from '@toolpad/core/AppProvider';
import { UserOrg } from '../UserOrg';

const demoSession = {
Expand Down Expand Up @@ -30,16 +30,14 @@ export default function AccountCustomUserDetails() {
}, []);

return (
<AuthenticationContext.Provider value={authentication}>
<SessionContext.Provider value={customSession}>
{/* preview-start */}
<Account
slots={{
popoverContent: UserOrg,
}}
/>
{/* preview-end */}
</SessionContext.Provider>
</AuthenticationContext.Provider>
<AppProvider authentication={authentication} session={customSession}>
{/* preview-start */}
<Account
slots={{
popoverContent: UserOrg,
}}
/>
{/* preview-end */}
</AppProvider>
);
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
import { Account } from '@toolpad/core/Account';
import { AuthenticationContext, SessionContext } from '@toolpad/core/AppProvider';
import { AppProvider } from '@toolpad/core/AppProvider';
import { UserOrg, CustomSession } from '../UserOrg';

const demoSession: CustomSession = {
Expand Down Expand Up @@ -32,16 +32,14 @@ export default function AccountCustomUserDetails() {
}, []);

return (
<AuthenticationContext.Provider value={authentication}>
<SessionContext.Provider value={customSession}>
{/* preview-start */}
<Account
slots={{
popoverContent: UserOrg,
}}
/>
{/* preview-end */}
</SessionContext.Provider>
</AuthenticationContext.Provider>
<AppProvider authentication={authentication} session={customSession}>
{/* preview-start */}
<Account
slots={{
popoverContent: UserOrg,
}}
/>
{/* preview-end */}
</AppProvider>
);
}
14 changes: 6 additions & 8 deletions docs/data/toolpad/core/components/account/AccountDemoSignedIn.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { AuthenticationContext, SessionContext } from '@toolpad/core/AppProvider';
import { AppProvider } from '@toolpad/core/AppProvider';
import { Account } from '@toolpad/core/Account';

const demoSession = {
Expand All @@ -24,12 +24,10 @@ export default function AccountDemoSignedIn() {
}, []);

return (
<AuthenticationContext.Provider value={authentication}>
<SessionContext.Provider value={session}>
{/* preview-start */}
<Account />
{/* preview-end */}
</SessionContext.Provider>
</AuthenticationContext.Provider>
<AppProvider authentication={authentication} session={session}>
{/* preview-start */}
<Account />
{/* preview-end */}
</AppProvider>
);
}
18 changes: 6 additions & 12 deletions docs/data/toolpad/core/components/account/AccountDemoSignedIn.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
import * as React from 'react';
import {
AuthenticationContext,
SessionContext,
type Session,
} from '@toolpad/core/AppProvider';
import { AppProvider, type Session } from '@toolpad/core/AppProvider';
import { Account } from '@toolpad/core/Account';

const demoSession = {
Expand All @@ -28,12 +24,10 @@ export default function AccountDemoSignedIn() {
}, []);

return (
<AuthenticationContext.Provider value={authentication}>
<SessionContext.Provider value={session}>
{/* preview-start */}
<Account />
{/* preview-end */}
</SessionContext.Provider>
</AuthenticationContext.Provider>
<AppProvider authentication={authentication} session={session}>
{/* preview-start */}
<Account />
{/* preview-end */}
</AppProvider>
);
}
20 changes: 14 additions & 6 deletions docs/data/toolpad/core/components/account/AccountDemoSignedOut.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import * as React from 'react';
import { AuthenticationContext, SessionContext } from '@toolpad/core/AppProvider';
import {
AuthenticationContext,
LocalizationProvider,
SessionContext,
} from '@toolpad/core/AppProvider';
import { Account } from '@toolpad/core/Account';

const demoSession = {
Expand All @@ -24,10 +28,14 @@ export default function AccountDemoSignedOut() {
}, []);

return (
<AuthenticationContext.Provider value={authentication}>
<SessionContext.Provider value={session}>
<Account />
</SessionContext.Provider>
</AuthenticationContext.Provider>
// preview-start
<LocalizationProvider>
<AuthenticationContext.Provider value={authentication}>
<SessionContext.Provider value={session}>
<Account />
</SessionContext.Provider>
</AuthenticationContext.Provider>
</LocalizationProvider>
// preview-end
);
}
Loading

0 comments on commit 3b62551

Please sign in to comment.