diff --git a/client/.env b/client/.env index c404ee2..a11a7cc 100644 --- a/client/.env +++ b/client/.env @@ -1,2 +1,3 @@ VITE_TEST_VAR=123 -VITE_SERVER_API=http://192.168.56.1:3000 \ No newline at end of file +# VITE_SERVER_API=http://192.168.56.1:3000/ +VITE_SERVER_API=https://irth.graff.tech/api \ No newline at end of file diff --git a/client/src/components/searchPage/LayoutOptions.tsx b/client/src/components/searchPage/LayoutOptions.tsx index 13a389e..0d2a4e1 100644 --- a/client/src/components/searchPage/LayoutOptions.tsx +++ b/client/src/components/searchPage/LayoutOptions.tsx @@ -22,7 +22,6 @@ import SearchLoader from "./SearchLoader"; const LayoutOptions = () => { const { apartments, setApartments } = useApartments(); const [isLoading, setIsLoading] = useState(false); - console.log("first", import.meta.env.VITE_TEST_VAR); const { setModal } = useModal(); const { @@ -68,43 +67,78 @@ const LayoutOptions = () => { const zohoToken = localStorage.getItem("ACCESS_TOKEN"); setIsLoading(true); - getFilteredApartments( - zohoToken, - setApartments, - roveHomeTypeCheckboxes, - apartmentTypeCheckboxes, - debouncedSliders, - switchers, - viewCheckboxes, - sortList, - pageInitial, - perPage - ) - .catch((error) => { - const errorStatus = error.response.status; - - if (errorStatus === 401) { - updateAccessToken().then((token) => { - if (token) { - getFilteredApartments( - token, - setApartments, - roveHomeTypeCheckboxes, - apartmentTypeCheckboxes, - debouncedSliders, - switchers, - viewCheckboxes, - sortList, - pageInitial, - perPage - ); - } - }); + updateAccessToken() + .then((token) => { + if (token) { + getFilteredApartments( + token, + setApartments, + roveHomeTypeCheckboxes, + apartmentTypeCheckboxes, + debouncedSliders, + switchers, + viewCheckboxes, + sortList, + pageInitial, + perPage + ); } }) + .then(() => + getFilteredApartments( + zohoToken, + setApartments, + roveHomeTypeCheckboxes, + apartmentTypeCheckboxes, + debouncedSliders, + switchers, + viewCheckboxes, + sortList, + pageInitial, + perPage + ) + ) .finally(() => { setIsLoading(false); }); + + // getFilteredApartments( + // zohoToken, + // setApartments, + // roveHomeTypeCheckboxes, + // apartmentTypeCheckboxes, + // debouncedSliders, + // switchers, + // viewCheckboxes, + // sortList, + // pageInitial, + // perPage + // ) + // .catch((error) => { + // const errorStatus = error.response.status; + + // if (errorStatus === 401) { + // updateAccessToken().then((token) => { + // if (token) { + // getFilteredApartments( + // token, + // setApartments, + // roveHomeTypeCheckboxes, + // apartmentTypeCheckboxes, + // debouncedSliders, + // switchers, + // viewCheckboxes, + // sortList, + // pageInitial, + // perPage + // ); + // } + // }); + // } + // }) + // .finally(() => { + // setIsLoading(false); + // }); }, [ setApartments, roveHomeTypeCheckboxes,