mirror of
https://github.com/inventree/InvenTree.git
synced 2026-10-07 02:41:21 +00:00
Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue5729
This commit is contained in:
95 files changed
+67407
-52365
No files matched your search
@@ -81,12 +81,12 @@ export function NotificationDrawer({
|
||||
<Stack spacing="xs">
|
||||
<Divider />
|
||||
<LoadingOverlay visible={notificationQuery.isFetching} />
|
||||
{notificationQuery.data?.results?.length == 0 && (
|
||||
{(notificationQuery.data?.results?.length ?? 0) == 0 && (
|
||||
<Alert color="green">
|
||||
<Text size="sm">{t`You have no unread notifications.`}</Text>
|
||||
</Alert>
|
||||
)}
|
||||
{notificationQuery.data?.results.map((notification: any) => (
|
||||
{notificationQuery.data?.results?.map((notification: any) => (
|
||||
<Group position="apart">
|
||||
<Stack spacing="3">
|
||||
<Text size="sm">{notification.target?.name ?? 'target'}</Text>
|
||||
|
||||
@@ -21,7 +21,10 @@ export const doClassicLogin = async (username: string, password: string) => {
|
||||
.get(apiUrl(ApiPaths.user_token), {
|
||||
auth: { username, password },
|
||||
baseURL: host.toString(),
|
||||
timeout: 5000
|
||||
timeout: 5000,
|
||||
params: {
|
||||
name: 'inventree-web-app'
|
||||
}
|
||||
})
|
||||
.then((response) => response.data.token)
|
||||
.catch((error) => {
|
||||
@@ -114,7 +117,10 @@ export function handleReset(navigate: any, values: { email: string }) {
|
||||
export function checkLoginState(navigate: any, redirect?: string) {
|
||||
api
|
||||
.get(apiUrl(ApiPaths.user_token), {
|
||||
timeout: 5000
|
||||
timeout: 5000,
|
||||
params: {
|
||||
name: 'inventree-web-app'
|
||||
}
|
||||
})
|
||||
.then((val) => {
|
||||
if (val.status === 200 && val.data.token) {
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
@@ -70,7 +70,7 @@ function PlaygroundArea({
|
||||
}) {
|
||||
return (
|
||||
<>
|
||||
<Accordion.Item value={`accordion-playground-{title}`}>
|
||||
<Accordion.Item value={`accordion-playground-${title}`}>
|
||||
<Accordion.Control>
|
||||
<Text>{title}</Text>
|
||||
</Accordion.Control>
|
||||
|
||||
Reference in new issue
Block a user