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 0000000..2682c3b Binary files /dev/null and b/public/favicon-ship.png differ diff --git a/src/components/LinkedItems.tsx b/src/components/LinkedItems.tsx index 6f6c8d0..1f59346 100644 --- a/src/components/LinkedItems.tsx +++ b/src/components/LinkedItems.tsx @@ -70,6 +70,7 @@ type LinkedItemsProps = { 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 && (