From a6a5288262f600ec2ea3837727ec416e77698bdf Mon Sep 17 00:00:00 2001 From: itoshi Date: Wed, 28 May 2025 11:08:28 +0300 Subject: [PATCH] fix: Fix for correct usage --- index.html | 6 +- public/favicon-ship.png | Bin 0 -> 3924 bytes src/components/LinkedItems.tsx | 7 +- src/components/header/index.tsx | 11 +- src/components/ui/SidebarTitle.tsx | 17 +- src/pages/route-preview/InfiniteCanvas.tsx | 1 - src/pages/route-preview/MapDataContext.tsx | 55 ++++-- src/pages/route-preview/Station.tsx | 209 ++++++++++++--------- src/pages/route-preview/index.tsx | 19 +- src/pages/route/edit.tsx | 8 +- src/pages/sight/create.tsx | 4 +- src/pages/sight/edit.tsx | 8 +- src/pages/station/edit.tsx | 3 + src/providers/data.ts | 26 +-- 14 files changed, 230 insertions(+), 144 deletions(-) create mode 100644 public/favicon-ship.png diff --git a/index.html b/index.html index 3896296..cbf860d 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - + - - Белые ночи - + Белые ночи diff --git a/public/favicon-ship.png b/public/favicon-ship.png new file mode 100644 index 0000000000000000000000000000000000000000..2682c3b1c74bcb7eac9732481aec60e72c50c7e5 GIT binary patch literal 3924 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 ig$flaRH#rPg8u>Y=3w7{capvU0000 = { disableCreation?: boolean; updatedLinkedItems?: T[]; refresh?: number; + cityId?: number; }; const reorder = (list: any[], startIndex: number, endIndex: number) => { @@ -131,6 +132,7 @@ export const LinkedItemsContents = < disableCreation = false, updatedLinkedItems, refresh, + cityId, }: LinkedItemsProps) => { const { language } = languageStore; const { setArticleModalOpenAction, setArticleIdAction } = articleStore; @@ -216,7 +218,7 @@ export const LinkedItemsContents = < useEffect(() => { if (type === "edit") { axiosInstance - .get(`${import.meta.env.VITE_KRBL_API}/${childResource}/`) + .get(`${import.meta.env.VITE_KRBL_API}/${childResource}/`, {}) .then((response) => { setItems(response?.data || []); setIsLoading(false); @@ -445,7 +447,7 @@ export const LinkedItemsContents = < availableItems?.find((item) => item.id === selectedItemId) || null } onChange={(_, newValue) => setSelectedItemId(newValue?.id || null)} - options={availableItems} + options={availableItems.filter((item) => item.city_id == cityId)} getOptionLabel={(item) => String(item[fields[0].data])} renderInput={(params) => ( @@ -456,6 +458,7 @@ export const LinkedItemsContents = < .toLowerCase() .split(" ") .filter((word) => word.length > 0); + return options.filter((option) => { const optionWords = String(option[fields[0].data]) .toLowerCase() diff --git a/src/components/header/index.tsx b/src/components/header/index.tsx index 8ce69f4..077c375 100644 --- a/src/components/header/index.tsx +++ b/src/components/header/index.tsx @@ -143,8 +143,17 @@ export const Header: React.FC = observer( justifyContent="flex-end" alignItems="center" spacing={2} + color="white" + sx={{ + "& .MuiSelect-select": { + color: "white", + }, + }} > - + {city_id && cities && (