Skip to content

Commit

Permalink
Merge branch 'dev' into kitchen-order
Browse files Browse the repository at this point in the history
  • Loading branch information
@iamtrazy
iamtrazy committed Jul 25, 2024
2 parents b4259d2 + e5e5217 commit 307df92
Show file tree
Hide file tree
Showing 23 changed files with 608 additions and 393 deletions.
3 changes: 3 additions & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"@mui/icons-material": "^5.16.0",
"@mui/material": "^5.16.0",
"@nextui-org/react": "^2.4.2",
"@sweetalert2/theme-dark": "^5.0.17",
"apexcharts": "^3.41.0",
"clsx": "^2.1.1",
"flatpickr": "^4.6.13",
Expand All @@ -47,6 +48,8 @@
"react-toastify": "^9.1.3",
"sonner": "^1.5.0",
"sort-by": "^0.0.2",
"sweetalert2": "^11.12.3",
"sweetalert2-react-content": "^5.0.7",
"tailwind-merge": "^2.4.0",
"zod": "^3.23.8"
},
Expand Down
32 changes: 32 additions & 0 deletions pnpm-lock.yaml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

169 changes: 20 additions & 149 deletions src/App.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import ViewGrns from '@/pages/Storekeeper/GrnList';
import AddGrn from '@/pages/Storekeeper/AddGrn';
import EditGrn from '@/pages/Storekeeper/EditGrn';
import KitchenManagerDashboard from '@/pages/KitchenManager/Dashboard';
import Unauthorized from './components/Unauthorized';
import Unauthorized from '@/components/Unauthorized';

const { refresh } = useAuth();

Expand Down Expand Up @@ -164,7 +164,6 @@ const routes = createRoutesFromElements(
/>
</Route>
</Route>

<Route path="branch-manager/*" element={<BranchManagerLayout />}>
<Route
index
Expand Down Expand Up @@ -315,138 +314,11 @@ const routes = createRoutesFromElements(
index
element={
<>
<PageTitle title="La Fresca | Food List" />
<FoodList />
</>
}
/>
<Route
path="add"
element={
<>
<PageTitle title="Branch Manager | Add Food" />
<AddFoods />
</>
}
/>
<Route
path="edit/:foodId"
element={
<>
<PageTitle title="Branch Manager | Edit Food" />
<EditFoods />
</>
}
/>
</Route>
<Route path="food-combos">
<Route
index
element={
<>
<PageTitle title="Branch Manager | Food Combos" />
<Combos />
</>
}
/>
<Route
path="add"
element={
<>
<PageTitle title="Branch Manager | Add Food Combo" />
<AddCombos />
</>
}
/>
<Route
path="edit/:comboId"
element={
<>
<PageTitle title="Branch Manager | Edit Food Combo" />
<EditCombos />
</>
}
/>
</Route>
<Route path="users">
<Route
index
element={
<>
<PageTitle title="Branch Manager | Users" />
<User />
<PageTitle title="Store Keeper | Inventory" />
</>
}
/>
<Route
path="add"
element={
<>
<PageTitle title="Branch Manager | Add User" />
<UserAdd />
</>
}
/>
<Route
path="edit/:userId"
element={
<>
<PageTitle title="Branch Manager | Edit User" />
<UserEdit />
</>
}
/>
</Route>
<Route
path="discountlist"
element={
<>
<PageTitle title="Branch Manager | Discount List" />
<DiscountList />
</>
}
/>
</Route>

<Route path="storekeeper/*" element={<StorekeeperLayout />}>
<Route
index
element={
<>
<PageTitle title="Storekeeper | Inventory" />
</>
}
/>
<Route path="grn">
<Route
index
element={
<>
<PageTitle title="Storekeeper | GRN List" />
<ViewGrns />
</>
}
/>
<Route
path="add"
element={
<>
<PageTitle title="Storekeeper | Add GRN" />
<AddGrn />
</>
}
/>
<Route
path="edit/:grnId"
element={
<>
<PageTitle title="Storekeeper | Edit GRN" />
<EditGrn />
<PageTitle title="Storekeeper | Inventory" />
</>
}
/>
<Route path="grn">
<Route path="stock">
<Route
index
element={
Expand All @@ -460,44 +332,43 @@ const routes = createRoutesFromElements(
path="add"
element={
<>
<PageTitle title="Storekeeper | Add GRN" />
<PageTitle title="Store Keeper | Add Stock" />
<AddGrn />
</>
}
/>
<Route
path="edit/:grnId"
path="edit/:stockId"
element={
<>
<PageTitle title="Storekeeper | Edit GRN" />
<PageTitle title="Store Keeper | Edit Stock" />
<EditGrn />
</>
}
/>
</Route>
</Route>
</Route>

<Route path="kitchen-manager/*" element={<StorekeeperLayout />}>
<Route
index
element={
<>
<PageTitle title="La Fresca | Kitchen Manager" />
<KitchenManagerDashboard />
</>
}
/>
<Route path="d">
<Route path="kitchen-manager/*" element={<StorekeeperLayout />}>
<Route
index
element={
<>
<PageTitle title="Storekeeper | GRN List" />
<ViewGrns />
<PageTitle title="La Fresca | Kitchen Manager" />
<KitchenManagerDashboard />
</>
}
/>
<Route path="d">
<Route
index
element={
<>
<PageTitle title="Storekeeper | GRN List" />
<ViewGrns />
</>
}
/>
</Route>
</Route>
</Route>
</Route>,
Expand Down
48 changes: 47 additions & 1 deletion src/api/useCategories.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,5 +90,51 @@ export const useCategories = () => {
}
};

return { getAllCategories, addCategory, getCategoryById, updateCategory };
const deleteCategory = async (id: string) => {
try {
const response = await fetch(`${API_URL}/category/${id}`, {
method: 'PUT',
headers: {
'Content-Type': 'application/json',
Authorization: `Bearer ${getToken()}`,
},
body: JSON.stringify({
deleted: 1,
}),
});
if (!response.ok) {
throw new Error('Failed to delete category');
}
} catch (error: any) {
console.error(error);
throw new Error(error.message);
}
};

const unsafeDeleteCategory = async (id: string) => {
try {
const response = await fetch(`${API_URL}/category/${id}`, {
method: 'DELETE',
headers: {
'Content-Type': 'application/json',
Authorization: `Bearer ${getToken()}`,
},
});
if (!response.ok) {
throw new Error('Failed to delete category');
}
} catch (error: any) {
console.error(error);
throw new Error(error);
}
};

return {
getAllCategories,
addCategory,
getCategoryById,
updateCategory,
deleteCategory,
unsafeDeleteCategory,
};
};
Loading

0 comments on commit 307df92

Please sign in to comment.