mirror of
https://github.com/BarkProductions/barkman.git
synced 2026-06-12 22:11:54 +00:00
cleaned up ui and code
This commit is contained in:
+30
-31
@@ -1,7 +1,7 @@
|
||||
import { Routes, Route} from 'react-router';
|
||||
import {Routes, Route} from 'react-router';
|
||||
import Home from './pages/home.tsx';
|
||||
import InventoryList from "./features/inventory/InventoryList.tsx";
|
||||
import { QueryClientProvider, QueryClient } from '@tanstack/react-query';
|
||||
import {QueryClientProvider, QueryClient} from '@tanstack/react-query';
|
||||
import {createTheme, MantineProvider} from '@mantine/core';
|
||||
import '@mantine/core/styles.css';
|
||||
import ItemDetail from "./features/inventory/ItemDetail.tsx";
|
||||
@@ -12,39 +12,38 @@ import {BarkHeader} from "./common/components/BarkHeader.tsx";
|
||||
const queryClient = new QueryClient()
|
||||
|
||||
const barkTheme = createTheme({
|
||||
primaryColor: 'red',
|
||||
colors: {
|
||||
'red': [
|
||||
"#ffe8e8",
|
||||
"#ffcfd0",
|
||||
"#fd9d9d",
|
||||
"#fb6868",
|
||||
"#fa3c3b",
|
||||
"#f9211e",
|
||||
"#fa120f",
|
||||
"#df0404",
|
||||
"#c70002",
|
||||
"#ae0000"
|
||||
],
|
||||
},
|
||||
primaryColor: 'red',
|
||||
colors: {
|
||||
'red': [
|
||||
"#ffe8e8",
|
||||
"#ffcfd0",
|
||||
"#fd9d9d",
|
||||
"#fb6868",
|
||||
"#fa3c3b",
|
||||
"#f9211e",
|
||||
"#fa120f",
|
||||
"#df0404",
|
||||
"#c70002",
|
||||
"#ae0000"
|
||||
],
|
||||
},
|
||||
|
||||
});
|
||||
|
||||
function App() {
|
||||
return <MantineProvider defaultColorScheme="auto" theme={barkTheme}>{ (
|
||||
<QueryClientProvider client={queryClient}>
|
||||
<>
|
||||
<BarkHeader></BarkHeader>
|
||||
<Routes>
|
||||
<Route index element={<Home />} />
|
||||
<Route path="inventory" element={<InventoryList />} />
|
||||
<Route path="itemDetail/:itemId" element={<ItemDetail />} />
|
||||
<Route path="editItem/:itemId" element={<EditItem />} />
|
||||
</Routes>
|
||||
|
||||
</>
|
||||
</QueryClientProvider>
|
||||
) }</MantineProvider>;
|
||||
return <MantineProvider defaultColorScheme="auto" theme={barkTheme}>{(
|
||||
<QueryClientProvider client={queryClient}>
|
||||
<>
|
||||
<BarkHeader></BarkHeader>
|
||||
<Routes>
|
||||
<Route index element={<Home/>}/>
|
||||
<Route path="inventory" element={<InventoryList/>}/>
|
||||
<Route path="itemDetail/:itemId" element={<ItemDetail/>}/>
|
||||
<Route path="editItem/:itemId" element={<EditItem/>}/>
|
||||
</Routes>
|
||||
</>
|
||||
</QueryClientProvider>
|
||||
)}</MantineProvider>;
|
||||
}
|
||||
|
||||
export default App
|
||||
|
||||
@@ -21,8 +21,8 @@ export function BarkHeader() {
|
||||
|
||||
return (
|
||||
<header className={classes.header}>
|
||||
<Container size="md" className={classes.inner}>
|
||||
<Image src="public/barklogo.png" h={55} w={55}/>
|
||||
<Container fluid className={classes.inner}>
|
||||
<Image ml="lg" src="/barklogo.png" h={55} w={55}/>
|
||||
<Group gap={5} visibleFrom="xs">
|
||||
{items}
|
||||
</Group>
|
||||
|
||||
@@ -10,7 +10,7 @@ type EditableInventoryItem = Omit<InventoryItem, 'id'>;
|
||||
function EditItem() {
|
||||
const params = useParams();
|
||||
|
||||
const form = useForm<EditableInventoryItem>({
|
||||
const editItemForm = useForm<EditableInventoryItem>({
|
||||
mode: 'uncontrolled',
|
||||
initialValues: {
|
||||
name: "",
|
||||
@@ -67,7 +67,7 @@ function EditItem() {
|
||||
useEffect(() => {
|
||||
if (data) {
|
||||
// Even if query.data changes, form will be initialized only once
|
||||
form.initialize(data);
|
||||
editItemForm.initialize(data);
|
||||
}
|
||||
}, [data]);
|
||||
|
||||
@@ -76,9 +76,9 @@ function EditItem() {
|
||||
if (error) return 'An error has occurred: ' + error.message
|
||||
|
||||
return (
|
||||
<form onSubmit={form.onSubmit(async (values) => await
|
||||
<form onSubmit={editItemForm.onSubmit(async (values) => await
|
||||
updateItem.mutateAsync(values))}>
|
||||
<Container fluid>
|
||||
<Container m="lg">
|
||||
<Flex mih={50}
|
||||
gap="md"
|
||||
justify="flex-start"
|
||||
@@ -89,20 +89,20 @@ function EditItem() {
|
||||
<div>{isFetching ? 'Updating...' : ''}</div>
|
||||
<Title order={1}>Edit Item</Title>
|
||||
<Text>ID: {data.id}</Text>
|
||||
<TextInput withAsterisk key={form.key('brand')} size="md" label="Brand"
|
||||
placeholder="Brand" {...form.getInputProps('brand')}/>
|
||||
<TextInput withAsterisk key={form.key('name')} size="md" label="Name"
|
||||
placeholder="Name" {...form.getInputProps('name')}/>
|
||||
<TextInput size="md" key={form.key('status')} label="Status"
|
||||
placeholder="Status" {...form.getInputProps('status')}/>
|
||||
<TextInput size="md" key={form.key('serialNumber')} label="Serial Number"
|
||||
placeholder="Serial Number"{...form.getInputProps('serialNumber')}/>
|
||||
<NumberInput size="md" key={form.key('rentalPrice')} label="Rental Price"
|
||||
placeholder="Rental Price" {...form.getInputProps('rentalPrice')}/>
|
||||
<NumberInput size="md" key={form.key('replacementCost')} label="Replacement Cost"
|
||||
placeholder="Replacement Cost" {...form.getInputProps('replacementCost')}/>
|
||||
<Textarea label="Notes" key={form.key('notes')}
|
||||
placeholder="Notes" {...form.getInputProps('notes')}/>
|
||||
<TextInput withAsterisk key={editItemForm.key('brand')} size="md" label="Brand"
|
||||
placeholder="Brand" {...editItemForm.getInputProps('brand')}/>
|
||||
<TextInput withAsterisk key={editItemForm.key('name')} size="md" label="Name"
|
||||
placeholder="Name" {...editItemForm.getInputProps('name')}/>
|
||||
<TextInput size="md" key={editItemForm.key('status')} label="Status"
|
||||
placeholder="Status" {...editItemForm.getInputProps('status')}/>
|
||||
<TextInput size="md" key={editItemForm.key('serialNumber')} label="Serial Number"
|
||||
placeholder="Serial Number"{...editItemForm.getInputProps('serialNumber')}/>
|
||||
<NumberInput size="md" key={editItemForm.key('rentalPrice')} label="Rental Price"
|
||||
placeholder="Rental Price" {...editItemForm.getInputProps('rentalPrice')}/>
|
||||
<NumberInput size="md" key={editItemForm.key('replacementCost')} label="Replacement Cost"
|
||||
placeholder="Replacement Cost" {...editItemForm.getInputProps('replacementCost')}/>
|
||||
<Textarea label="Notes" key={editItemForm.key('notes')}
|
||||
placeholder="Notes" {...editItemForm.getInputProps('notes')}/>
|
||||
|
||||
<Group justify="flex-end" mt="md">
|
||||
<Button type="submit">Submit</Button>
|
||||
|
||||
@@ -26,7 +26,7 @@ function ItemDetail() {
|
||||
|
||||
return (
|
||||
<>
|
||||
<Container fluid>
|
||||
<Container m="lg">
|
||||
<Title order={1}>Item Detail</Title>
|
||||
<div>{isFetching ? 'Updating...' : ''}</div>
|
||||
<Text>ID: {data.id}</Text>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import {Text} from "@mantine/core";
|
||||
import {Container, Text} from "@mantine/core";
|
||||
|
||||
|
||||
function Home() {
|
||||
@@ -6,7 +6,9 @@ function Home() {
|
||||
|
||||
return (
|
||||
<>
|
||||
<Text>Bark productions: at the intersection of professionalism and degeneracy</Text>
|
||||
<Container m="lg">
|
||||
<Text>Bark productions: at the intersection of professionalism and degeneracy</Text>
|
||||
</Container>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user