inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-11-04 07:05:41 +00:00
Code Activity

fix group aligment

Browse Source
This commit is contained in:
Matthias Mair
2024-04-15 20:52:24 +02:00
parent f8c055bf4e
commit 48e224672a
32 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/frontend/src/components/forms/AuthenticationForm.tsx
View File

@@ -118,7 +118,7 @@ export function AuthenticationForm() {
{...classicForm.getInputProps('password')} {...classicForm.getInputProps('password')}
/> />
{auth_settings?.password_forgotten_enabled === true && ( {auth_settings?.password_forgotten_enabled === true && (
<Group justify="apart" mt="0"> <Group justify="space-between" mt="0">
<Anchor <Anchor
component="button" component="button"
type="button" type="button"
@@ -143,7 +143,7 @@ export function AuthenticationForm() {
</Stack> </Stack>
)} )}
<Group justify="apart" mt="xl"> <Group justify="space-between" mt="xl">
<Anchor <Anchor
component="button" component="button"
type="button" type="button"
@@ -256,7 +256,7 @@ export function RegistrationForm() {
/> />
</Stack> </Stack>
<Group justify="apart" mt="xl"> <Group justify="space-between" mt="xl">
<Button <Button
type="submit" type="submit"
disabled={isRegistering} disabled={isRegistering}

2
src/frontend/src/components/items/DashboardItem.tsx
View File

@@ -19,7 +19,7 @@ export function StatisticItem({
return ( return (
<Paper withBorder p="xs" key={id} pos="relative"> <Paper withBorder p="xs" key={id} pos="relative">
<LoadingOverlay visible={isLoading} overlayProps={{ blur: 2 }} /> <LoadingOverlay visible={isLoading} overlayProps={{ blur: 2 }} />
<Group justify="apart"> <Group justify="space-between">
<Text size="xs" color="dimmed" className={classes.dashboardItemTitle}> <Text size="xs" color="dimmed" className={classes.dashboardItemTitle}>
{data.title} {data.title}
</Text> </Text>

2
src/frontend/src/components/items/InfoItem.tsx
View File

@@ -43,7 +43,7 @@ export function InfoItem({
} }
return ( return (
<Group justify="apart"> <Group justify="space-between">
<Text fz="sm" fw={700}> <Text fz="sm" fw={700}>
{name}: {name}:
</Text> </Text>

4
src/frontend/src/components/modals/AboutInvenTreeModal.tsx
View File

@@ -59,7 +59,7 @@ export function AboutInvenTreeModal({
<tr key={idx}> <tr key={idx}>
<td>{map.title}</td> <td>{map.title}</td>
<td> <td>
<Group justify="apart" gap="xs"> <Group justify="space-between" gap="xs">
{alwaysLink ? ( {alwaysLink ? (
<Anchor href={data[map.ref]} target="_blank"> <Anchor href={data[map.ref]} target="_blank">
{data[map.ref]} {data[map.ref]}
@@ -177,7 +177,7 @@ export function AboutInvenTreeModal({
</tbody> </tbody>
</Table> </Table>
<Divider /> <Divider />
<Group justify="apart"> <Group justify="space-between">
<CopyButton <CopyButton
value={copyval} value={copyval}
label={<Trans>Copy version information</Trans>} label={<Trans>Copy version information</Trans>}

2
src/frontend/src/components/modals/LicenseModal.tsx
View File

@@ -25,7 +25,7 @@ export function LicenceView(entries: Readonly<any[]>) {
{entries?.map((entry: any, index: number) => ( {entries?.map((entry: any, index: number) => (
<Accordion.Item key={entry.name} value={`entry-${index}`}> <Accordion.Item key={entry.name} value={`entry-${index}`}>
<Accordion.Control> <Accordion.Control>
<Group justify="apart" grow> <Group justify="space-between" grow>
<Text>{entry.name}</Text> <Text>{entry.name}</Text>
<Text>{entry.license}</Text> <Text>{entry.license}</Text>
<Space /> <Space />

2
src/frontend/src/components/nav/Header.tsx
View File

@@ -88,7 +88,7 @@ export function Header() {
}} }}
/> />
<Container className={classes.layoutHeaderSection} size="100%"> <Container className={classes.layoutHeaderSection} size="100%">
<Group justify="apart"> <Group justify="space-between">
<Group> <Group>
<NavHoverMenu openDrawer={openNavDrawer} /> <NavHoverMenu openDrawer={openNavDrawer} />
<NavTabs /> <NavTabs />

4
src/frontend/src/components/nav/NavHoverMenu.tsx
View File

@@ -58,7 +58,7 @@ export function NavHoverMenu({
</HoverCard.Target> </HoverCard.Target>
<HoverCard.Dropdown style={{ overflow: 'hidden' }}> <HoverCard.Dropdown style={{ overflow: 'hidden' }}>
<Group justify="apart" px="md"> <Group justify="space-between" px="md">
<ActionIcon <ActionIcon
onClick={openDrawer} onClick={openDrawer}
onMouseOver={openDrawer} onMouseOver={openDrawer}
@@ -96,7 +96,7 @@ export function NavHoverMenu({
/> />
<MenuLinks links={onlyItems} highlighted={true} /> <MenuLinks links={onlyItems} highlighted={true} />
<div className={classes.headerDropdownFooter}> <div className={classes.headerDropdownFooter}>
<Group justify="apart"> <Group justify="space-between">
<div> <div>
<Text fw={500} fz="sm"> <Text fw={500} fz="sm">
<Trans>Get started</Trans> <Trans>Get started</Trans>

4
src/frontend/src/components/nav/NotificationDrawer.tsx
View File

@@ -66,7 +66,7 @@ export function NotificationDrawer({
} }
}} }}
title={ title={
<Group justify="apart" wrap="nowrap"> <Group justify="space-between" wrap="nowrap">
<StylishText size="lg">{t`Notifications`}</StylishText> <StylishText size="lg">{t`Notifications`}</StylishText>
<ActionIcon <ActionIcon
onClick={() => { onClick={() => {
@@ -89,7 +89,7 @@ export function NotificationDrawer({
</Alert> </Alert>
)} )}
{notificationQuery.data?.results?.map((notification: any) => ( {notificationQuery.data?.results?.map((notification: any) => (
<Group justify="apart" key={notification.pk}> <Group justify="space-between" key={notification.pk}>
<Stack gap="3"> <Stack gap="3">
{notification?.target?.link ? ( {notification?.target?.link ? (
<Text <Text

2
src/frontend/src/components/nav/PageDetail.tsx
View File

@@ -43,7 +43,7 @@ export function PageDetail({
)} )}
<Paper p="xs" radius="xs" shadow="xs"> <Paper p="xs" radius="xs" shadow="xs">
<Stack gap="xs"> <Stack gap="xs">
<Group justify="apart" wrap="nowrap"> <Group justify="space-between" wrap="nowrap">
<Group justify="left" wrap="nowrap"> <Group justify="left" wrap="nowrap">
{imageUrl && ( {imageUrl && (
<ApiImage src={imageUrl} radius="sm" h={64} w={64} /> <ApiImage src={imageUrl} radius="sm" h={64} w={64} />

2
src/frontend/src/components/nav/PartCategoryTree.tsx
View File

@@ -54,7 +54,7 @@ export function PartCategoryTree({
function renderNode({ node }: { node: any }) { function renderNode({ node }: { node: any }) {
return ( return (
<Group <Group
justify="apart" justify="space-between"
key={node.id} key={node.id}
wrap="nowrap" wrap="nowrap"
onClick={() => { onClick={() => {

4
src/frontend/src/components/nav/SearchDrawer.tsx
View File

@@ -68,7 +68,7 @@ function QueryResultGroup({
return ( return (
<Paper shadow="sm" radius="xs" p="md" key={`paper-${query.model}`}> <Paper shadow="sm" radius="xs" p="md" key={`paper-${query.model}`}>
<Stack key={`stack-${query.model}`}> <Stack key={`stack-${query.model}`}>
<Group justify="apart" wrap="nowrap"> <Group justify="space-between" wrap="nowrap">
<Group justify="left" gap={5} wrap="nowrap"> <Group justify="left" gap={5} wrap="nowrap">
<Text size="lg">{model.label_multiple}</Text> <Text size="lg">{model.label_multiple}</Text>
<Text size="sm" style={{ fontStyle: 'italic' }}> <Text size="sm" style={{ fontStyle: 'italic' }}>
@@ -331,7 +331,7 @@ export function SearchDrawer({
withCloseButton={false} withCloseButton={false}
styles={{ header: { width: '100%' }, title: { width: '100%' } }} styles={{ header: { width: '100%' }, title: { width: '100%' } }}
title={ title={
<Group justify="apart" gap={1} wrap="nowrap"> <Group justify="space-between" gap={1} wrap="nowrap">
<TextInput <TextInput
placeholder={t`Enter search text`} placeholder={t`Enter search text`}
radius="xs" radius="xs"

2
src/frontend/src/components/nav/StockLocationTree.tsx
View File

@@ -51,7 +51,7 @@ export function StockLocationTree({
function renderNode({ node }: { node: any }) { function renderNode({ node }: { node: any }) {
return ( return (
<Group <Group
justify="apart" justify="space-between"
key={node.id} key={node.id}
wrap="nowrap" wrap="nowrap"
onClick={() => { onClick={() => {

2
src/frontend/src/components/render/Instance.tsx
View File

@@ -113,7 +113,7 @@ export function RenderInlineModel({
// TODO: Handle URL // TODO: Handle URL
return ( return (
<Group gap="xs" justify="apart" wrap="nowrap"> <Group gap="xs" justify="space-between" wrap="nowrap">
<Group gap="xs" justify="left" wrap="nowrap"> <Group gap="xs" justify="left" wrap="nowrap">
{image && Thumbnail({ src: image, size: 18 })} {image && Thumbnail({ src: image, size: 18 })}
<Text size="sm">{primary}</Text> <Text size="sm">{primary}</Text>

2
src/frontend/src/components/settings/SettingItem.tsx
View File

@@ -178,7 +178,7 @@ export function SettingItem({
return ( return (
<Paper style={style}> <Paper style={style}>
<Group justify="apart" p="3"> <Group justify="space-between" p="3">
<Stack gap="2" p="4px"> <Stack gap="2" p="4px">
<Text> <Text>
{setting.name} {setting.name}

6
src/frontend/src/pages/Index/Scan.tsx
View File

@@ -273,7 +273,7 @@ export default function Scan() {
// rendering // rendering
return ( return (
<> <>
<Group justify="apart"> <Group justify="space-between">
<Group justify="left"> <Group justify="left">
<StylishText> <StylishText>
<Trans>Scan Page</Trans> <Trans>Scan Page</Trans>
@@ -291,7 +291,7 @@ export default function Scan() {
<Grid.Col span={4}> <Grid.Col span={4}>
<Stack> <Stack>
<Stack gap="xs"> <Stack gap="xs">
<Group justify="apart"> <Group justify="space-between">
<TitleWithDoc <TitleWithDoc
order={3} order={3}
text={t`Select the input method you want to use to scan items.`} text={t`Select the input method you want to use to scan items.`}
@@ -361,7 +361,7 @@ export default function Scan() {
</Stack> </Stack>
</Grid.Col> </Grid.Col>
<Grid.Col span={8}> <Grid.Col span={8}>
<Group justify="apart"> <Group justify="space-between">
<TitleWithDoc <TitleWithDoc
order={3} order={3}
text={t`History is locally kept in this browser.`} text={t`History is locally kept in this browser.`}

4
src/frontend/src/pages/Index/Settings/AccountSettings/SecurityContent.tsx
View File

@@ -137,7 +137,7 @@ function EmailContent({}: {}) {
key={link.id} key={link.id}
value={String(link.id)} value={String(link.id)}
label={ label={
<Group justify="apart"> <Group justify="space-between">
{link.email} {link.email}
{link.primary && ( {link.primary && (
<Badge color="blue"> <Badge color="blue">
@@ -251,7 +251,7 @@ function SsoContent({ dataProvider }: { dataProvider: any | undefined }) {
variant="outline" variant="outline"
disabled={!provider.configured} disabled={!provider.configured}
> >
<Group justify="apart"> <Group justify="space-between">
{provider.display_name} {provider.display_name}
{provider.configured == false && <IconAlertCircle />} {provider.configured == false && <IconAlertCircle />}
</Group> </Group>

4
src/frontend/src/pages/part/pricing/PurchaseHistoryPanel.tsx
View File

@@ -64,7 +64,7 @@ export default function PurchaseHistoryPanel({
let units = record.supplier_part_detail?.pack_quantity; let units = record.supplier_part_detail?.pack_quantity;
return ( return (
<Group justify="apart" gap="xs"> <Group justify="space-between" gap="xs">
<Text>{price}</Text> <Text>{price}</Text>
{units && <Text size="xs">[{units}]</Text>} {units && <Text size="xs">[{units}]</Text>}
</Group> </Group>
@@ -85,7 +85,7 @@ export default function PurchaseHistoryPanel({
let units = record.part_detail?.units; let units = record.part_detail?.units;
return ( return (
<Group justify="apart" gap="xs"> <Group justify="space-between" gap="xs">
<Text>{price}</Text> <Text>{price}</Text>
{units && <Text size="xs">[{units}]</Text>} {units && <Text size="xs">[{units}]</Text>}
</Group> </Group>

2
src/frontend/src/tables/FilterSelectDrawer.tsx
View File

@@ -41,7 +41,7 @@ function FilterItem({
return ( return (
<Paper p="sm" shadow="sm" radius="xs"> <Paper p="sm" shadow="sm" radius="xs">
<Group justify="apart" key={flt.name}> <Group justify="space-between" key={flt.name}>
<Stack gap="xs"> <Stack gap="xs">
<Text size="sm">{flt.label}</Text> <Text size="sm">{flt.label}</Text>
<Text size="xs">{flt.description}</Text> <Text size="xs">{flt.description}</Text>

2
src/frontend/src/tables/InvenTreeTable.tsx
View File

@@ -551,7 +551,7 @@ export function InvenTreeTable<T = any>({
/> />
)} )}
<Stack gap="sm"> <Stack gap="sm">
<Group justify="apart"> <Group justify="space-between">
<Group justify="left" key="custom-actions" gap={5}> <Group justify="left" key="custom-actions" gap={5}>
{tableProps.tableActions?.map((group, idx) => ( {tableProps.tableActions?.map((group, idx) => (
<Fragment key={idx}>{group}</Fragment> <Fragment key={idx}>{group}</Fragment>

2
src/frontend/src/tables/TableHoverCard.tsx
View File

@@ -29,7 +29,7 @@ export function TableHoverCard({
return ( return (
<HoverCard withinPortal={true}> <HoverCard withinPortal={true}>
<HoverCard.Target> <HoverCard.Target>
<Group gap="xs" justify="apart" wrap="nowrap"> <Group gap="xs" justify="space-between" wrap="nowrap">
{value} {value}
<IconInfoCircle size="16" color="blue" /> <IconInfoCircle size="16" color="blue" />
</Group> </Group>

4
src/frontend/src/tables/build/BuildLineTable.tsx
View File

@@ -146,7 +146,7 @@ export default function BuildLineTable({ params = {} }: { params?: any }) {
ordering: 'unit_quantity', ordering: 'unit_quantity',
render: (record: any) => { render: (record: any) => {
return ( return (
<Group justify="apart"> <Group justify="space-between">
<Text>{record.bom_item_detail?.quantity}</Text> <Text>{record.bom_item_detail?.quantity}</Text>
{record?.part_detail?.units && ( {record?.part_detail?.units && (
<Text size="xs">[{record.part_detail.units}]</Text> <Text size="xs">[{record.part_detail.units}]</Text>
@@ -160,7 +160,7 @@ export default function BuildLineTable({ params = {} }: { params?: any }) {
sortable: true, sortable: true,
render: (record: any) => { render: (record: any) => {
return ( return (
<Group justify="apart"> <Group justify="space-between">
<Text>{record.quantity}</Text> <Text>{record.quantity}</Text>
{record?.part_detail?.units && ( {record?.part_detail?.units && (
<Text size="xs">[{record.part_detail.units}]</Text> <Text size="xs">[{record.part_detail.units}]</Text>

2
src/frontend/src/tables/general/AttachmentTable.tsx
View File

@@ -54,7 +54,7 @@ function attachmentTableColumns(): TableColumn[] {
render: function (record: any) { render: function (record: any) {
return ( return (
<Group justify="apart"> <Group justify="space-between">
<Text>{record.upload_date}</Text> <Text>{record.upload_date}</Text>
{record.user_detail && ( {record.user_detail && (
<Badge size="xs">{record.user_detail.username}</Badge> <Badge size="xs">{record.user_detail.username}</Badge>

6
src/frontend/src/tables/machine/MachineListTable.tsx
View File

@@ -207,7 +207,7 @@ function MachineDrawer({
return ( return (
<Stack gap="xs"> <Stack gap="xs">
<Group justify="apart"> <Group justify="space-between">
<Box></Box> <Box></Box>
<Group> <Group>
@@ -278,7 +278,7 @@ function MachineDrawer({
<Card withBorder> <Card withBorder>
<Stack gap="md"> <Stack gap="md">
<Group justify="apart"> <Group justify="space-between">
<Title order={4}> <Title order={4}>
<Trans>Machine information</Trans> <Trans>Machine information</Trans>
</Title> </Title>
@@ -336,7 +336,7 @@ function MachineDrawer({
<Text fz="sm">{machine?.status_text}</Text> <Text fz="sm">{machine?.status_text}</Text>
</Flex> </Flex>
</InfoItem> </InfoItem>
<Group justify="apart" gap="xs"> <Group justify="space-between" gap="xs">
<Text fz="sm" fw={700}> <Text fz="sm" fw={700}>
<Trans>Errors</Trans>: <Trans>Errors</Trans>:
</Text> </Text>

6
src/frontend/src/tables/machine/MachineTypeTable.tsx
View File

@@ -92,7 +92,7 @@ function MachineTypeDrawer({ machineTypeSlug }: { machineTypeSlug: string }) {
<Card withBorder> <Card withBorder>
<Stack gap="md"> <Stack gap="md">
<Group justify="apart"> <Group justify="space-between">
<Title order={4}> <Title order={4}>
<Trans>Machine type information</Trans> <Trans>Machine type information</Trans>
</Title> </Title>
@@ -199,7 +199,7 @@ function MachineDriverDrawer({
<Card withBorder> <Card withBorder>
<Stack gap="md"> <Stack gap="md">
<Group justify="apart"> <Group justify="space-between">
<Title order={4}> <Title order={4}>
<Trans>Machine driver information</Trans> <Trans>Machine driver information</Trans>
</Title> </Title>
@@ -256,7 +256,7 @@ function MachineDriverDrawer({
value={machineDriver?.is_builtin} value={machineDriver?.is_builtin}
type="boolean" type="boolean"
/> />
<Group justify="apart" gap="xs"> <Group justify="space-between" gap="xs">
<Text fz="sm" fw={700}> <Text fz="sm" fw={700}>
<Trans>Errors</Trans>: <Trans>Errors</Trans>:
</Text> </Text>

2
src/frontend/src/tables/part/ParametricPartTable.tsx
View File

@@ -67,7 +67,7 @@ function ParameterCell({
return ( return (
<div> <div>
<Group grow ref={ref} justify="apart"> <Group grow ref={ref} justify="space-between">
<Group grow style={{ flex: 1 }}> <Group grow style={{ flex: 1 }}>
<TableHoverCard <TableHoverCard
value={value ?? '-'} value={value ?? '-'}

2
src/frontend/src/tables/part/PartCategoryTemplateTable.tsx
View File

@@ -94,7 +94,7 @@ export default function PartCategoryTemplateTable({}: {}) {
} }
return ( return (
<Group justify="apart" grow> <Group justify="space-between" grow>
<Text>{record.default_value}</Text> <Text>{record.default_value}</Text>
{units && <Text size="xs">{units}</Text>} {units && <Text size="xs">{units}</Text>}
</Group> </Group>

2
src/frontend/src/tables/part/PartThumbTable.tsx
View File

@@ -185,7 +185,7 @@ export function PartThumbTable({
<Divider /> <Divider />
<Paper p="sm"> <Paper p="sm">
<Group justify="apart"> <Group justify="space-between">
<TextInput <TextInput
placeholder={t`Search...`} placeholder={t`Search...`}
onChange={(event) => { onChange={(event) => {

2
src/frontend/src/tables/plugin/PluginListTable.tsx
View File

@@ -120,7 +120,7 @@ export function PluginDrawer({
return ( return (
<Stack gap={'xs'}> <Stack gap={'xs'}>
<Group justify="apart"> <Group justify="space-between">
<Box></Box> <Box></Box>
<Group gap={'xs'}> <Group gap={'xs'}>

2
src/frontend/src/tables/purchasing/SupplierPriceBreakTable.tsx
View File

@@ -96,7 +96,7 @@ export function SupplierPriceBreakColumns(): TableColumn[] {
}); });
return ( return (
<Group justify="apart" gap="xs" grow> <Group justify="space-between" gap="xs" grow>
<Text>{price}</Text> <Text>{price}</Text>
{units && <Text size="xs">[{units}]</Text>} {units && <Text size="xs">[{units}]</Text>}
</Group> </Group>

2
src/frontend/src/tables/settings/ScheduledTasksTable.tsx
View File

@@ -31,7 +31,7 @@ export default function ScheduledTasksTable() {
} }
return ( return (
<Group justify="apart"> <Group justify="space-between">
<Text>{record.last_run}</Text> <Text>{record.last_run}</Text>
{record.success ? ( {record.success ? (
<IconCircleCheck color="green" /> <IconCircleCheck color="green" />

2
src/frontend/src/tables/settings/TemplateTable.tsx
View File

@@ -134,7 +134,7 @@ export function TemplateDrawer({
{editTemplate.modal} {editTemplate.modal}
{deleteTemplate.modal} {deleteTemplate.modal}
<Group justify="apart"> <Group justify="space-between">
<Box></Box> <Box></Box>
<Group> <Group>

8
src/frontend/src/tables/stock/StockItemTestResultTable.tsx
View File

@@ -132,7 +132,7 @@ export default function StockItemTestResultTable({
record.stock_item != undefined && record.stock_item != itemId; record.stock_item != undefined && record.stock_item != itemId;
return ( return (
<Group justify="apart"> <Group justify="space-between">
<Text <Text
style={{ fontStyle: installed ? 'italic' : undefined }} style={{ fontStyle: installed ? 'italic' : undefined }}
fw={required && 700} fw={required && 700}
@@ -194,7 +194,7 @@ export default function StockItemTestResultTable({
title: t`Date`, title: t`Date`,
render: (record: any) => { render: (record: any) => {
return ( return (
<Group justify="apart"> <Group justify="space-between">
{renderDate(record.date)} {renderDate(record.date)}
{record.user_detail && ( {record.user_detail && (
<RenderUser instance={record.user_detail} /> <RenderUser instance={record.user_detail} />
@@ -214,7 +214,7 @@ export default function StockItemTestResultTable({
title: t`Started`, title: t`Started`,
render: (record: any) => { render: (record: any) => {
return ( return (
<Group justify="apart"> <Group justify="space-between">
{renderDate(record.started_datetime, { {renderDate(record.started_datetime, {
showTime: true, showTime: true,
showSeconds: true showSeconds: true
@@ -229,7 +229,7 @@ export default function StockItemTestResultTable({
title: t`Finished`, title: t`Finished`,
render: (record: any) => { render: (record: any) => {
return ( return (
<Group justify="apart"> <Group justify="space-between">
{renderDate(record.finished_datetime, { {renderDate(record.finished_datetime, {
showTime: true, showTime: true,
showSeconds: true showSeconds: true