diff --git a/back/api.py b/back/api.py index ca359da..815043b 100644 --- a/back/api.py +++ b/back/api.py @@ -87,7 +87,7 @@ def put_in_db(name: Annotated[str, Form()], category: Annotated[str, Form()], be temp_ancmt = models.Announcement(user_id=current_user.id, name=name, category=category, best_by=bestBy, address=address, longtitude=longtitude, latitude=latitude, description=description, metro=metro, - trashId=trashId, booked_by=0) + trashId=trashId, src=uploaded_name, booked_by=0) db.add(temp_ancmt) # добавляем в бд db.commit() # сохраняем изменения db.refresh(temp_ancmt) # обновляем состояние объекта @@ -211,8 +211,10 @@ def poems_to_front(db: Annotated[Session, Depends(utils.get_db)]): # db: Annotat @app.get("/api/trashbox", response_model=List[schemas.TrashboxResponse]) def get_trashboxes(data: schemas.TrashboxRequest = Depends()):#крутая функция для работы с api # json, передаваемый стороннему API - head = {'Authorization': 'Bearer {}'.format(service.my_token)} - # Данные пользователя (местоположение, количество мусорок, которое пользователь хочет видеть) + BASE_URL= "https://geointelect2.gate.petersburg.ru" + my_token="eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJhU1RaZm42bHpTdURYcUttRkg1SzN5UDFhT0FxUkhTNm9OendMUExaTXhFIn0.eyJleHAiOjE3ODYyMjUzMzMsImlhdCI6MTY5MTUzMDkzMywianRpIjoiYjU0MmU3MTQtYzJkMS00NTY2LWJkY2MtYmQ5NzA0ODY1ZjgzIiwiaXNzIjoiaHR0cHM6Ly9rYy5wZXRlcnNidXJnLnJ1L3JlYWxtcy9lZ3MtYXBpIiwiYXVkIjoiYWNjb3VudCIsInN1YiI6ImJjYjQ2NzljLTU3ZGItNDU5ZC1iNWUxLWRlOGI4Yzg5MTMwMyIsInR5cCI6IkJlYXJlciIsImF6cCI6ImFkbWluLXJlc3QtY2xpZW50Iiwic2Vzc2lvbl9zdGF0ZSI6IjJhOTgwMzUyLTY1M2QtNGZlZC1iMDI1LWQ1N2U0NDRjZmM3NiIsImFjciI6IjEiLCJhbGxvd2VkLW9yaWdpbnMiOlsiLyoiXSwicmVhbG1fYWNjZXNzIjp7InJvbGVzIjpbImRlZmF1bHQtcm9sZXMtZWdzLWFwaSIsIm9mZmxpbmVfYWNjZXNzIiwidW1hX2F1dGhvcml6YXRpb24iXX0sInJlc291cmNlX2FjY2VzcyI6eyJhY2NvdW50Ijp7InJvbGVzIjpbIm1hbmFnZS1hY2NvdW50IiwibWFuYWdlLWFjY291bnQtbGlua3MiLCJ2aWV3LXByb2ZpbGUiXX19LCJzY29wZSI6ImVtYWlsIHByb2ZpbGUiLCJzaWQiOiIyYTk4MDM1Mi02NTNkLTRmZWQtYjAyNS1kNTdlNDQ0Y2ZjNzYiLCJlbWFpbF92ZXJpZmllZCI6ZmFsc2UsIm5hbWUiOiLQktC70LDQtNC40LzQuNGAINCv0LrQvtCy0LvQtdCyIiwicHJlZmVycmVkX3VzZXJuYW1lIjoiZTBmYzc2OGRhOTA4MjNiODgwZGQzOGVhMDJjMmQ5NTciLCJnaXZlbl9uYW1lIjoi0JLQu9Cw0LTQuNC80LjRgCIsImZhbWlseV9uYW1lIjoi0K_QutC-0LLQu9C10LIifQ.FTKiC1hpWcOkmSW9QZpC-RY7Ko50jw1mDMfXIWYxlQ-zehLm2CLmOnHvYoOoI39k2OzeCIAB9ZdRrrGZc6G9Z1eFELUjNGEqKxSC1Phj9ATemKgbOKEttk-OGc-rFr9VPA8_SnfvLts6wTI2YK33YBIxCF5nCbnr4Qj3LeEQ0d6Hy8PO4ATrBF5EOeuAZRprvIEjXe_f8N9ONKckCPB-xFB4P2pZlVXGoCNoewGEcY3zXH4khezN6zcVr6tpc6G8dBv9EqT_v92IDSg-aXQk6ysA0cO0-6x5w1-_qU0iHGIAPsLNV9IKBoFbjc0JH6cWabldPRH12NP1trvYfqKDGQ" + head = {'Authorization': 'Bearer {}'.format(my_token)} + my_data={ 'x' : f"{data.Lng}", 'y' : f"{data.Lat}", @@ -223,26 +225,25 @@ def get_trashboxes(data: schemas.TrashboxRequest = Depends()):#крутая фу list_of_category = [] # лист по которому будет отбираться uniq_trashboxes match data.Category: case "PORRIDGE": - list_of_category=["Опасные отходы", "Иное"] + list_of_category = ["Опасные отходы", "Иное"] case "Конспекты": - list_of_category=["Бумага"] + list_of_category = ["Бумага"] case "Молочные продукты": - list_of_category=["Стекло","Тетра Пак", "Иное"] + list_of_category = ["Стекло", "Тетра Пак", "Иное"] case "Хлебобулочные изделия": - list_of_category=["Пластик", "Иное"] + list_of_category = ["Пластик", "Иное"] case "Моющие средства": - list_of_category=["Пластик", "Опасные отходы", "Иное"] + list_of_category = ["Пластик", "Опасные отходы", "Иное"] case "Одежда": - list_of_category=["Одежда"] + list_of_category = ["Одежда"] case "Фрукты и овощи": - list_of_category=["Иное"] + list_of_category = ["Иное"] case "Всякая всячина": - list_of_category=["Металл", "Бумага", "Стекло","Иное", "Тетра Пак", "Батарейки", "Крышечки", "Шины", "Опасные отходы", "Лампочки", "Пластик"] - - - response = requests.post(f"{service.BASE_URL}/nearest_recycling/get", headers=head, data=my_data) + list_of_category = ["Металл", "Бумага", "Стекло", "Иное", "Тетра Пак", "Батарейки", "Крышечки", "Шины", + "Опасные отходы", "Лампочки", "Пластик"] + + response = requests.post(f"{BASE_URL}/nearest_recycling/get", headers=head, data=my_data) infos = response.json() - trashboxes = [] for trashbox in infos["results"]: temp_dict = {} diff --git a/back/service.py b/back/service.py index 61f7201..5b3e572 100644 --- a/back/service.py +++ b/back/service.py @@ -7,7 +7,7 @@ import datetime # Переменные для получения данных о мусорках с внешнего API # url API -BASE_URL='https://geointelect2.gate.petersburg.ru/nearest_recycling/get'#адрес сайта и мой токин +BASE_URL='https://geointelect2.gate.petersburg.ru'#адрес сайта и мой токин # токен для получения данных my_token='eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJhU1RaZm42bHpTdURYcUttRkg1SzN5UDFhT0FxUkhTNm9OendMUExaTXhFIn0.eyJleHAiOjE3ODM3ODk4NjgsImlhdCI6MTY4OTA5NTQ2OCwianRpIjoiNDUzNjQzZTgtYTkyMi00NTI4LWIzYmMtYWJiYTNmYjkyNTkxIiwiaXNzIjoiaHR0cHM6Ly9rYy5wZXRlcnNidXJnLnJ1L3JlYWxtcy9lZ3MtYXBpIiwiYXVkIjoiYWNjb3VudCIsInN1YiI6ImJjYjQ2NzljLTU3ZGItNDU5ZC1iNWUxLWRlOGI4Yzg5MTMwMyIsInR5cCI6IkJlYXJlciIsImF6cCI6ImFkbWluLXJlc3QtY2xpZW50Iiwic2Vzc2lvbl9zdGF0ZSI6ImM2ZDJiOTZhLWMxNjMtNDAxZS05ZjMzLTI0MmE0NDcxMDY5OCIsImFjciI6IjEiLCJhbGxvd2VkLW9yaWdpbnMiOlsiLyoiXSwicmVhbG1fYWNjZXNzIjp7InJvbGVzIjpbImRlZmF1bHQtcm9sZXMtZWdzLWFwaSIsIm9mZmxpbmVfYWNjZXNzIiwidW1hX2F1dGhvcml6YXRpb24iXX0sInJlc291cmNlX2FjY2VzcyI6eyJhY2NvdW50Ijp7InJvbGVzIjpbIm1hbmFnZS1hY2NvdW50IiwibWFuYWdlLWFjY291bnQtbGlua3MiLCJ2aWV3LXByb2ZpbGUiXX19LCJzY29wZSI6ImVtYWlsIHByb2ZpbGUiLCJzaWQiOiJjNmQyYjk2YS1jMTYzLTQwMWUtOWYzMy0yNDJhNDQ3MTA2OTgiLCJlbWFpbF92ZXJpZmllZCI6ZmFsc2UsIm5hbWUiOiLQktC70LDQtNC40LzQuNGAINCv0LrQvtCy0LvQtdCyIiwicHJlZmVycmVkX3VzZXJuYW1lIjoiZTBmYzc2OGRhOTA4MjNiODgwZGQzOGVhMDJjMmQ5NTciLCJnaXZlbl9uYW1lIjoi0JLQu9Cw0LTQuNC80LjRgCIsImZhbWlseV9uYW1lIjoi0K_QutC-0LLQu9C10LIifQ.E2bW0B-c6W5Lj63eP_G8eI453NlDMnW05l11TZT0GSsAtGayXGaolHtWrmI90D5Yxz7v9FGkkCmcUZYy1ywAdO9dDt_XrtFEJWFpG-3csavuMjXmqfQQ9SmPwDw-3toO64NuZVv6qVqoUlPPj57sLx4bLtVbB4pdqgyJYcrDHg7sgwz4d1Z3tAeUfSpum9s5ZfELequfpLoZMXn6CaYZhePaoK-CxeU3KPBPTPOVPKZZ19s7QY10VdkxLULknqf9opdvLs4j8NMimtwoIiHNBFlgQz10Cr7bhDKWugfvSRsICouniIiBJo76wrj5T92s-ztf1FShJuqnQcKE_QLd2A' diff --git a/front/src/components/StoriesPreview.tsx b/front/src/components/StoriesPreview.tsx index 4bd6cf6..1c73357 100644 --- a/front/src/components/StoriesPreview.tsx +++ b/front/src/components/StoriesPreview.tsx @@ -1,5 +1,5 @@ import { Link } from 'react-router-dom' -import { CSSProperties, useEffect, useMemo, useRef, useState } from 'react' +import { useEffect, useLayoutEffect, useRef, useState } from 'react' import { Button } from 'react-bootstrap' import { UserCategory, composeUserCategoriesFilters, userCategoriesInfos } from '../assets/userCategories' @@ -9,64 +9,37 @@ import { URLEncodeFilters } from '../utils/filters' import rightAngleIcon from '../assets/rightAngle.svg' +import styles from '../styles/StoriesPreview.module.css' + type StoriesPreviewProps = { announcements: Announcement[], category: UserCategory, } -const styles = { - container: { - transform: 'translateX(0)', - } as CSSProperties, - ul: { - display: 'flex', - gap: 10, - listStyleType: 'none', - overflow: 'scroll', - paddingLeft: 0, - scrollBehavior: 'smooth', - } as CSSProperties, - link: { - textDecoration: 'none', - color: 'var(--bs-body-color)', - maxWidth: 'calc(25vh * 9 / 16)', - display: 'inline-block', - } as CSSProperties, - image: { - height: '25vh', - objectFit: 'contain', - borderRadius: 12, - marginBottom: 5, - maxWidth: 'inherit', - } as CSSProperties, - title: { - overflow: 'hidden', - textOverflow: 'ellipsis', - marginBottom: 5, - } as CSSProperties, - scrollButton: { - position: 'fixed', - right: 0, - top: 0, - zIndex: 100, - background: 'linear-gradient(to right, rgba(17, 17, 17, 0) 0%, rgba(17, 17, 17, 255) 100%)', - display: 'block', - height: '100%', - width: '10%', - border: 'none', - cursor: 'default', - borderRadius: 0, - } as CSSProperties, - leftScrollButton: { - left: 0, - transform: 'scaleX(-1)', - } as CSSProperties, - rightScrollButton: { - right: 0, - } as CSSProperties, -} +const StoriesPreview = ({ announcements, category }: StoriesPreviewProps) => ( + announcements.map((ann, i) => ( +
  • + + {ann.src?.endsWith('mp4') ? ( +
    • + )) +) -function StoriesPreview({ announcements, category }: StoriesPreviewProps) { +function StoriesPreviewCarousel({ announcements, category }: StoriesPreviewProps) { const ulElement = useRef(null) const [showScrollButtons, setShowScrollButtons] = useState({ left: false, right: false }) @@ -90,7 +63,7 @@ function StoriesPreview({ announcements, category }: StoriesPreviewProps) { } }, []) - useEffect(() => { + useLayoutEffect(() => { const ul = ulElement.current if (ul) { @@ -106,40 +79,26 @@ function StoriesPreview({ announcements, category }: StoriesPreviewProps) { } } - return
    + return
    {showScrollButtons.left && - } -
      - {useMemo(() => announcements.map((ann, i) => ( -
    • - - {ann.src?.endsWith('mp4') ? ( -
      • - )), [announcements, category])} -
    + + {announcements.length > 0 ? ( +
      + +
    + ) : ( +

    Здесь пока пусто

    + )} {showScrollButtons.right && - }
    } -export default StoriesPreview \ No newline at end of file +export default StoriesPreviewCarousel \ No newline at end of file diff --git a/front/src/hooks/api/useSignIn.ts b/front/src/hooks/api/useSignIn.ts index 7cf7e32..06a5dda 100644 --- a/front/src/hooks/api/useSignIn.ts +++ b/front/src/hooks/api/useSignIn.ts @@ -20,7 +20,7 @@ function useSignIn() { body: formData, }) - if (token !== undefined) { + if (token !== null && token !== undefined) { setToken(token) return true diff --git a/front/src/hooks/useFetch.ts b/front/src/hooks/useFetch.ts index c0e9319..bcac6c5 100644 --- a/front/src/hooks/useFetch.ts +++ b/front/src/hooks/useFetch.ts @@ -20,7 +20,7 @@ type UseFetchLoading = { } & UseFetchShared type UseFetchErrored = { - data: undefined, + data: null, loading: false, error: string, } & UseFetchShared @@ -32,8 +32,7 @@ const gotError = (res: UseFetchReturn): res is UseFetchErrored => ( ) function fallbackError(res: UseFetchSucced | UseFetchErrored): T | string -function fallbackError(res: UseFetchReturn): T | string | undefined -function fallbackError(res: UseFetchReturn): T | string | undefined { +function fallbackError(res: UseFetchReturn): T | string | null | undefined { return ( gotError(res) ? res.error : res.data ) @@ -62,7 +61,6 @@ function useFetch>( needAuth, guardResponse, processResponse, - true, params, ) @@ -70,10 +68,14 @@ function useFetch>( setFetchLoading(true) doSend().then( data => { - if (data !== undefined) { + if (data !== undefined && data !== null) { setData(data) + console.log('Got data', data) + } + + if (data !== undefined) { + setFetchLoading(false) } - setFetchLoading(false) } ).catch( // must never occur err => import.meta.env.DEV && console.error('Failed to do fetch request', err) @@ -93,7 +95,7 @@ function useFetch>( if (error !== null) { return { - data: undefined, + data: null, loading: fetchLoading, error, refetch, diff --git a/front/src/hooks/useSend.ts b/front/src/hooks/useSend.ts index 1742ac5..53eec3a 100644 --- a/front/src/hooks/useSend.ts +++ b/front/src/hooks/useSend.ts @@ -2,7 +2,7 @@ import { useCallback, useEffect, useRef, useState } from 'react' import { useNavigate } from 'react-router-dom' import { getToken } from '../utils/auth' -import { handleHTTPErrors, isAborted } from '../utils' +import { AbortError, handleHTTPErrors, isAborted } from '../utils' function useSend>( url: string, @@ -10,17 +10,19 @@ function useSend>( needAuth: boolean, guardResponse: (data: unknown) => data is R, processResponse: (data: R) => T, - startWithLoading = false, defaultParams?: Omit, ) { - const [loading, setLoading] = useState(startWithLoading) + const [loading, setLoading] = useState(false) const [error, setError] = useState(null) const navigate = useNavigate() const abortControllerRef = useRef() - useEffect(() => () => abortControllerRef.current?.abort(), []) + useEffect(() => () => { + const reason = new AbortError('unmount') + abortControllerRef.current?.abort(reason) + }, []) /** Don't use in useEffect. If you need request result, go with useFetch instead */ const doSend = useCallback(async (urlProps?: Record, params?: Omit) => { @@ -28,7 +30,8 @@ function useSend>( setError(null) if (abortControllerRef.current) { - abortControllerRef.current.abort() + const reason = new AbortError('resent') + abortControllerRef.current.abort(reason) } const abortController = new AbortController() @@ -45,7 +48,7 @@ function useSend>( if (token === null) { navigate('/login') - return undefined + return null } headers.append('Authorization', `Bearer ${token}`) @@ -73,21 +76,33 @@ function useSend>( return processResponse(data) } catch (err) { - if (err instanceof Error && !isAborted(err)) { - if (err instanceof TypeError) { - setError('Ошибка сети') - } else { - setError(err.message) - } + if (err instanceof Error) { + if (isAborted(err)) { + if (err.message !== 'resent') { + setLoading(false) + } - if (import.meta.env.DEV) { - console.error(url, params, err) + if (err.fallback !== undefined) { + return err.fallback + } + + return undefined + } else { + if (err instanceof TypeError) { + setError('Ошибка сети') + } else { + setError(err.message) + } + + if (import.meta.env.DEV) { + console.error(url, params, err) + } + + setLoading(false) } } - setLoading(false) - - return undefined + return null } }, [defaultParams, needAuth, navigate, url, method, guardResponse, processResponse]) diff --git a/front/src/hooks/useSendButtonCaption.ts b/front/src/hooks/useSendButtonCaption.ts index 4ab2f81..55e1fa0 100644 --- a/front/src/hooks/useSendButtonCaption.ts +++ b/front/src/hooks/useSendButtonCaption.ts @@ -11,8 +11,8 @@ function useSendButtonCaption( const [disabled, setDisabled] = useState(false) const [title, setTitle] = useState(initial) - const update = useCallback(>(data: T | undefined) => { - if (data !== undefined) { + const update = useCallback(>(data: T | null | undefined) => { + if (data !== undefined) { // not loading setCaption(result) setTitle('Отправить ещё раз') diff --git a/front/src/styles/StoriesPreview.module.css b/front/src/styles/StoriesPreview.module.css new file mode 100644 index 0000000..769100c --- /dev/null +++ b/front/src/styles/StoriesPreview.module.css @@ -0,0 +1,56 @@ +.container { + transform: translateX(0); +} + +.list { + display: flex; + gap: 10px; + list-style-type: none; + overflow: scroll; + padding-left: 0; + scroll-behavior: smooth; +} + +.link { + text-decoration: none; + color: var(--bs-body-color); + max-width: calc(25vh * 9 / 16); + display: inline-block; +} + +.image { + height: 25vh; + object-fit: contain; + border-radius: 12px; + margin-bottom: 5px; + max-width: inherit; +} + +.title { + overflow: hidden; + text-overflow: ellipsis; + margin-bottom: 5px; +} + +.scrollButton { + position: fixed; + right: 0; + top: 0; + z-index: 100; + background: linear-gradient(to right, rgba(17, 17, 17, 0) 0%, rgba(17, 17, 17, 255) 100%); + display: block; + height: 100%; + width: 10%; + border: none; + cursor: default; + border-radius: 0; +} + +.leftScrollButton { + left: 0; + transform: scaleX(-1); +} + +.rightScrollButton { + right: 0; +} \ No newline at end of file diff --git a/front/src/utils/index.ts b/front/src/utils/index.ts index e173552..4eda3eb 100644 --- a/front/src/utils/index.ts +++ b/front/src/utils/index.ts @@ -1,7 +1,21 @@ -const isAborted = (err: Error) => ( +const isAborted = (err: Error): err is AbortError => ( err.name === 'AbortError' ) +type AbortErrorMessage = 'resent' | 'unmount' | 'cancel' + +class AbortError extends DOMException { + readonly fallback: T | undefined + message: AbortErrorMessage + + constructor(message: AbortErrorMessage, fallback?: T) { + super(message, 'AbortError') + this.message = message + + this.fallback = fallback + } +} + function handleHTTPErrors(res: Response) { if (!res.ok) { switch (res.status) { @@ -16,4 +30,4 @@ function handleHTTPErrors(res: Response) { } } -export { isAborted, handleHTTPErrors } +export { isAborted, AbortError, handleHTTPErrors }