Added query filters getting and setting on homepage

fixes #27

back/main.py

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #подключение библиотек
 from fastapi import FastAPI, Response, Path, Depends, Body, Form, Query, status, HTTPException, APIRouter, UploadFile, File
 from fastapi.responses import HTMLResponse, FileResponse, JSONResponse, RedirectResponse
@@ -103,7 +102,7 @@ def put_in_db(name: Annotated[str, Form()], category: Annotated[str, Form()], be
 
             uploaded_name = "/uploads/"+destination.name
 
-        temp_ancmt = Announcement(user_id=userId, name=name, category=category, best_by=bestBy, address=address, longtitude=longtitude, latitude=latitude, description=description, src=uploaded_name, metro=metro, trashId=trashId)
+        temp_ancmt = Announcement(user_id=userId, name=name, category=category, best_by=bestBy, address=address, longtitude=longtitude, latitude=latitude, description=description, src=uploaded_name, metro=metro, trashId=trashId, booked_by=-1)
         db.add(temp_ancmt)     # добавляем в бд
         db.commit()     # сохраняем изменения
         db.refresh(temp_ancmt)  # обновляем состояние объекта
@@ -165,7 +164,7 @@ async def login_for_access_token(
     access_token = create_access_token(
         data={"user_id": user.id}, expires_delta=access_token_expires
     )
-    return {"access_token": access_token}
+    return access_token
 
 
 @app.get("/api/users/me/", response_model=User)
@@ -186,7 +185,7 @@ async def read_own_items(
 @app.get("/api/trashbox")
 def get_trashboxes(lat:float, lng:float):#крутая функция для работы с api
     BASE_URL='https://geointelect2.gate.petersburg.ru'#адрес сайта и мой токин
-    my_token='eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJhU1RaZm42bHpTdURYcUttRkg1SzN5UDFhT0FxUkhTNm9OendMUExaTXhFIn0.eyJleHAiOjE3Nzg2NTk4MjEsImlhdCI6MTY4Mzk2NTQyMSwianRpIjoiOTI2ZGMyNmEtMGYyZi00OTZiLWI0NTUtMWQyYWM5YmRlMTZkIiwiaXNzIjoiaHR0cHM6Ly9rYy5wZXRlcnNidXJnLnJ1L3JlYWxtcy9lZ3MtYXBpIiwiYXVkIjoiYWNjb3VudCIsInN1YiI6ImJjYjQ2NzljLTU3ZGItNDU5ZC1iNWUxLWRlOGI4Yzg5MTMwMyIsInR5cCI6IkJlYXJlciIsImF6cCI6ImFkbWluLXJlc3QtY2xpZW50Iiwic2Vzc2lvbl9zdGF0ZSI6IjE2MGU1ZGVkLWFmMjMtNDkyNS05OTc1LTRhMzM0ZjVmNTkyOSIsImFjciI6IjEiLCJhbGxvd2VkLW9yaWdpbnMiOlsiLyoiXSwicmVhbG1fYWNjZXNzIjp7InJvbGVzIjpbImRlZmF1bHQtcm9sZXMtZWdzLWFwaSIsIm9mZmxpbmVfYWNjZXNzIiwidW1hX2F1dGhvcml6YXRpb24iXX0sInJlc291cmNlX2FjY2VzcyI6eyJhY2NvdW50Ijp7InJvbGVzIjpbIm1hbmFnZS1hY2NvdW50IiwibWFuYWdlLWFjY291bnQtbGlua3MiLCJ2aWV3LXByb2ZpbGUiXX19LCJzY29wZSI6ImVtYWlsIHByb2ZpbGUiLCJzaWQiOiIxNjBlNWRlZC1hZjIzLTQ5MjUtOTk3NS00YTMzNGY1ZjU5MjkiLCJlbWFpbF92ZXJpZmllZCI6ZmFsc2UsIm5hbWUiOiLQktC70LDQtNC40LzQuNGAINCv0LrQvtCy0LvQtdCyIiwicHJlZmVycmVkX3VzZXJuYW1lIjoiZTBmYzc2OGRhOTA4MjNiODgwZGQzOGVhMDJjMmQ5NTciLCJnaXZlbl9uYW1lIjoi0JLQu9Cw0LTQuNC80LjRgCIsImZhbWlseV9uYW1lIjoi0K_QutC-0LLQu9C10LIifQ.BRyUIyY-KKnZ9xqTNa9vIsfKF0UN2VoA9h4NN4y7IgBVLiiS-j43QbeE6qgjIQo0pV3J8jtCAIPvJbO-Ex-GNkw_flgMiGHhKEpsHPW3WK-YZ-XsZJzVQ_pOmLte-Kql4z97WJvolqiXT0nMo2dlX2BGvNs6JNbupvcuGwL4YYpekYAaFNYMQrxi8bSN-R7FIqxP-gzZDAuQSWRRSUqVBLvmgRhphTM-FAx1sX833oXL9tR7ze3eDR_obSV0y6cKVIr4eIlKxFd82qiMrN6A6CTUFDeFjeAGERqeBPnJVXU36MHu7Ut7eOVav9OUARARWRkrZRkqzTfZ1iqEBq5Tsg'
+    my_token='eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJhU1RaZm42bHpTdURYcUttRkg1SzN5UDFhT0FxUkhTNm9OendMUExaTXhFIn0.eyJleHAiOjE3ODM3ODk4NjgsImlhdCI6MTY4OTA5NTQ2OCwianRpIjoiNDUzNjQzZTgtYTkyMi00NTI4LWIzYmMtYWJiYTNmYjkyNTkxIiwiaXNzIjoiaHR0cHM6Ly9rYy5wZXRlcnNidXJnLnJ1L3JlYWxtcy9lZ3MtYXBpIiwiYXVkIjoiYWNjb3VudCIsInN1YiI6ImJjYjQ2NzljLTU3ZGItNDU5ZC1iNWUxLWRlOGI4Yzg5MTMwMyIsInR5cCI6IkJlYXJlciIsImF6cCI6ImFkbWluLXJlc3QtY2xpZW50Iiwic2Vzc2lvbl9zdGF0ZSI6ImM2ZDJiOTZhLWMxNjMtNDAxZS05ZjMzLTI0MmE0NDcxMDY5OCIsImFjciI6IjEiLCJhbGxvd2VkLW9yaWdpbnMiOlsiLyoiXSwicmVhbG1fYWNjZXNzIjp7InJvbGVzIjpbImRlZmF1bHQtcm9sZXMtZWdzLWFwaSIsIm9mZmxpbmVfYWNjZXNzIiwidW1hX2F1dGhvcml6YXRpb24iXX0sInJlc291cmNlX2FjY2VzcyI6eyJhY2NvdW50Ijp7InJvbGVzIjpbIm1hbmFnZS1hY2NvdW50IiwibWFuYWdlLWFjY291bnQtbGlua3MiLCJ2aWV3LXByb2ZpbGUiXX19LCJzY29wZSI6ImVtYWlsIHByb2ZpbGUiLCJzaWQiOiJjNmQyYjk2YS1jMTYzLTQwMWUtOWYzMy0yNDJhNDQ3MTA2OTgiLCJlbWFpbF92ZXJpZmllZCI6ZmFsc2UsIm5hbWUiOiLQktC70LDQtNC40LzQuNGAINCv0LrQvtCy0LvQtdCyIiwicHJlZmVycmVkX3VzZXJuYW1lIjoiZTBmYzc2OGRhOTA4MjNiODgwZGQzOGVhMDJjMmQ5NTciLCJnaXZlbl9uYW1lIjoi0JLQu9Cw0LTQuNC80LjRgCIsImZhbWlseV9uYW1lIjoi0K_QutC-0LLQu9C10LIifQ.E2bW0B-c6W5Lj63eP_G8eI453NlDMnW05l11TZT0GSsAtGayXGaolHtWrmI90D5Yxz7v9FGkkCmcUZYy1ywAdO9dDt_XrtFEJWFpG-3csavuMjXmqfQQ9SmPwDw-3toO64NuZVv6qVqoUlPPj57sLx4bLtVbB4pdqgyJYcrDHg7sgwz4d1Z3tAeUfSpum9s5ZfELequfpLoZMXn6CaYZhePaoK-CxeU3KPBPTPOVPKZZ19s7QY10VdkxLULknqf9opdvLs4j8NMimtwoIiHNBFlgQz10Cr7bhDKWugfvSRsICouniIiBJo76wrj5T92s-ztf1FShJuqnQcKE_QLd2A'
     head = {'Authorization': 'Bearer {}'.format(my_token)}
 
     my_data={
@@ -218,223 +217,3 @@ def get_trashboxes(lat:float, lng:float):#крутая функция для р
 @app.get("/{rest_of_path:path}")
 async def react_app(req: Request, rest_of_path: str):
     return templates.TemplateResponse('index.html', { 'request': req })
-=======
-#подключение библиотек
-from fastapi import FastAPI, Response, Path, Depends, Body, Form, Query, status, HTTPException, APIRouter, UploadFile, File
-from fastapi.responses import HTMLResponse, FileResponse, JSONResponse, RedirectResponse
-from fastapi.staticfiles import StaticFiles
-from fastapi.security import OAuth2PasswordRequestForm, OAuth2PasswordBearer
-from fastapi.templating import Jinja2Templates
-from fastapi.requests import Request
-
-from pydantic import json
-
-from starlette.staticfiles import StaticFiles
-
-import requests
-from uuid import uuid4
-
-import ast
-import pathlib
-import shutil
-import os
-
-from .utils import *
-from .models import Announcement, Trashbox, UserDatabase, Base
-from .db import engine, SessionLocal
-
-from . import schema
-
-
-Base.metadata.create_all(bind=engine)
-
-db = SessionLocal()
-
-
-app = FastAPI()
-
-templates = Jinja2Templates(directory="./front/dist")
-
-app.mount("/static", StaticFiles(directory = "./front/dist"))
-app.mount("/uploads", StaticFiles(directory = "./uploads"))
-
-@app.get("/api/announcements")#адрес объявлений 
-def annoncements_list(user_id: int = None, metro: str = None, category: str = None, booked_by: int = -1):
-    # Считываем данные из Body и отображаем их на странице.
-    # В последствии будем вставлять данные в html-форму
-
-    a = db.query(Announcement)
-    b = db.query(Announcement)
-    c = db.query(Announcement)
-    d = db.query(Announcement)
-    e = db.query(Announcement)
-
-    if user_id != None:
-        b = a.filter(Announcement.user_id == user_id)
-
-    if metro != None:
-        c = a.filter(Announcement.metro == metro)
-
-    if category != None:
-        d = a.filter(Announcement.category == category)
-
-    if booked_by != -1:
-        e = a.filter(Announcement.booked_by == booked_by)
-
-    if not any([category, user_id, metro]) and booked_by == -1:
-        result = a.all()
-    
-    else:
-        result = b.intersect(c, d, e).all()
-
-    return {"Success" : True, "list_of_announcements": result}
-
-
-@app.get("/api/announcement")#адрес объявлений
-def single_annoncement(user_id:int):
-# Считываем данные из Body и отображаем их на странице.
-# В последствии будем вставлять данные в html-форму
-    try:
-        annoncement = db.get(Announcement, user_id)
-        return {"id": annoncement.id, "user_id": annoncement.user_id, "name": annoncement.name,
-                "category": annoncement.category, "best_by": annoncement.best_by, "address": annoncement.address,
-                "description": annoncement.description, "metro": annoncement.metro, "latitude": annoncement.latitude,
-                "longtitude":annoncement.longtitude, "trashId": annoncement.trashId, "src":annoncement.src, 
-                "booked_by":annoncement.booked_by}
-    except:
-        return {"Answer" : False} #если неуданый доступ, то сообщаем об этом
-
-
-# Занести объявление в базу 
-@app.put("/api/announcement")#адрес объявлений
-def put_in_db(name: Annotated[str, Form()], category: Annotated[str, Form()], bestBy: Annotated[int, Form()], address: Annotated[str, Form()], longtitude: Annotated[float, Form()], latitude: Annotated[float, Form()], description: Annotated[str, Form()], src: Annotated[UploadFile | None, File()], metro: Annotated[str, Form()], trashId: Annotated[int | None, Form()] = -1):
-    # try:
-        userId = 1 # temporary
-        
-        uploaded_name = ""
-
-        f = src.file
-        f.seek(0, os.SEEK_END)
-        if f.tell() > 0:
-            f.seek(0)
-            destination = pathlib.Path("./uploads/" + str(hash(src.file)) + pathlib.Path(src.filename).suffix.lower())
-            with destination.open('wb') as buffer:
-                shutil.copyfileobj(src.file, buffer)
-
-            uploaded_name = "/uploads/"+destination.name
-
-        temp_ancmt = Announcement(user_id=userId, name=name, category=category, best_by=bestBy, address=address, longtitude=longtitude, latitude=latitude, description=description, src=uploaded_name, metro=metro, trashId=trashId, booked_by=-1)
-        db.add(temp_ancmt)     # добавляем в бд
-        db.commit()     # сохраняем изменения
-        db.refresh(temp_ancmt)  # обновляем состояние объекта
-        return {"Answer" : True}
-    # except:
-    #     return {"Answer" : False}
-
-
-# Удалить объявления из базы
-@app.delete("/api/announcement") #адрес объявления
-def delete_from_db(data = Body()):#функция удаления объекта из БД
-    try:
-        db.delete(user_id=data.user_id)#удаление из БД
-        db.commit()     # сохраняем изменения
-        return {"Answer" : True}
-    except:
-        return {"Answer" : False}
-
-
-# Забронировать объявление
-@app.post("/api/book")
-def change_book_status(data: schema.Book):
-    try:
-        # Получаем id пользователя, который бронирует объявление
-        temp_user_id = 1
-        # Находим объявление по данному id
-        announcement_to_change = db.query(Announcement).filter(id == data.id).first()
-        # Изменяем поле booked_status на полученный id
-        announcement_to_change.booked_status = temp_user_id
-        return {"Success": True}
-    except:
-        return {"Success": False}
-
-
-@app.post("/api/signup")
-def create_user(data = Body()):
-    if db.query(UserDatabase).filter(User.email == data["email"]).first() == None:
-        new_user = UserDatabase(id=data["id"], email=data["email"], password=data["password"], name=data["name"], surname=data["surname"])
-        db.add(new_user)
-        db.commit()
-        db.refresh(new_user)  # обновляем состояние объекта
-        return {"Success": True}
-    return {"Success": False, "Message": "Пользователь с таким email уже зарегестрирован."}
-
-
-@app.post("/api/token", response_model=Token)
-async def login_for_access_token(
-    form_data: Annotated[OAuth2PasswordRequestForm, Depends()]
-):
-    user = authenticate_user(db.query(UserDatabase).all(), form_data.username, form_data.password)
-    if not user:
-        raise HTTPException(
-            status_code=status.HTTP_401_UNAUTHORIZED,
-            detail="Incorrect username or password",
-            headers={"WWW-Authenticate": "Bearer"},
-        )
-    access_token_expires = timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES)
-    access_token = create_access_token(
-        data={"user_id": user.id}, expires_delta=access_token_expires
-    )
-    return {"access_token": access_token, "token_type": "bearer"}
-
-
-@app.get("/api/users/me/", response_model=User)
-async def read_users_me(
-    current_user: Annotated[User, Depends(get_current_active_user)]
-):
-    return current_user
-
-
-@app.get("/api/users/me/items/")
-async def read_own_items(
-    current_user: Annotated[User, Depends(get_current_active_user)]
-):
-    return [{"Current user name": current_user.name, "Current user surname": current_user.surname}]
-
-
-
-@app.get("/api/trashbox")
-def get_trashboxes(lat:float, lng:float):#крутая функция для работы с api
-    BASE_URL='https://geointelect2.gate.petersburg.ru'#адрес сайта и мой токин
-    my_token='eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJhU1RaZm42bHpTdURYcUttRkg1SzN5UDFhT0FxUkhTNm9OendMUExaTXhFIn0.eyJleHAiOjE3Nzg2NTk4MjEsImlhdCI6MTY4Mzk2NTQyMSwianRpIjoiOTI2ZGMyNmEtMGYyZi00OTZiLWI0NTUtMWQyYWM5YmRlMTZkIiwiaXNzIjoiaHR0cHM6Ly9rYy5wZXRlcnNidXJnLnJ1L3JlYWxtcy9lZ3MtYXBpIiwiYXVkIjoiYWNjb3VudCIsInN1YiI6ImJjYjQ2NzljLTU3ZGItNDU5ZC1iNWUxLWRlOGI4Yzg5MTMwMyIsInR5cCI6IkJlYXJlciIsImF6cCI6ImFkbWluLXJlc3QtY2xpZW50Iiwic2Vzc2lvbl9zdGF0ZSI6IjE2MGU1ZGVkLWFmMjMtNDkyNS05OTc1LTRhMzM0ZjVmNTkyOSIsImFjciI6IjEiLCJhbGxvd2VkLW9yaWdpbnMiOlsiLyoiXSwicmVhbG1fYWNjZXNzIjp7InJvbGVzIjpbImRlZmF1bHQtcm9sZXMtZWdzLWFwaSIsIm9mZmxpbmVfYWNjZXNzIiwidW1hX2F1dGhvcml6YXRpb24iXX0sInJlc291cmNlX2FjY2VzcyI6eyJhY2NvdW50Ijp7InJvbGVzIjpbIm1hbmFnZS1hY2NvdW50IiwibWFuYWdlLWFjY291bnQtbGlua3MiLCJ2aWV3LXByb2ZpbGUiXX19LCJzY29wZSI6ImVtYWlsIHByb2ZpbGUiLCJzaWQiOiIxNjBlNWRlZC1hZjIzLTQ5MjUtOTk3NS00YTMzNGY1ZjU5MjkiLCJlbWFpbF92ZXJpZmllZCI6ZmFsc2UsIm5hbWUiOiLQktC70LDQtNC40LzQuNGAINCv0LrQvtCy0LvQtdCyIiwicHJlZmVycmVkX3VzZXJuYW1lIjoiZTBmYzc2OGRhOTA4MjNiODgwZGQzOGVhMDJjMmQ5NTciLCJnaXZlbl9uYW1lIjoi0JLQu9Cw0LTQuNC80LjRgCIsImZhbWlseV9uYW1lIjoi0K_QutC-0LLQu9C10LIifQ.BRyUIyY-KKnZ9xqTNa9vIsfKF0UN2VoA9h4NN4y7IgBVLiiS-j43QbeE6qgjIQo0pV3J8jtCAIPvJbO-Ex-GNkw_flgMiGHhKEpsHPW3WK-YZ-XsZJzVQ_pOmLte-Kql4z97WJvolqiXT0nMo2dlX2BGvNs6JNbupvcuGwL4YYpekYAaFNYMQrxi8bSN-R7FIqxP-gzZDAuQSWRRSUqVBLvmgRhphTM-FAx1sX833oXL9tR7ze3eDR_obSV0y6cKVIr4eIlKxFd82qiMrN6A6CTUFDeFjeAGERqeBPnJVXU36MHu7Ut7eOVav9OUARARWRkrZRkqzTfZ1iqEBq5Tsg'
-    head = {'Authorization': 'Bearer {}'.format(my_token)}
-
-    my_data={
-        'x' : f"{lng}",
-        'y' : f"{lat}",
-        'limit' : '1'
-    }
-
-    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 = {}
-        for obj in trashbox["Objects"]:
-            coord_list = obj["geometry"]
-            temp_dict["Lat"] = coord_list["coordinates"][1]
-            temp_dict["Lng"] = coord_list["coordinates"][0]
-            
-            properties = obj["properties"]
-            temp_dict["Name"] = properties["title"]
-            temp_dict["Address"] = properties["address"]
-            temp_dict["Categories"] = properties["content_text"].split(',')
-        trashboxes.append(temp_dict)
-
-    uniq_trashboxes = [ast.literal_eval(el1) for el1 in set([str(el2) for el2 in trashboxes])]
-    return JSONResponse(uniq_trashboxes)
-
-@app.get("/{rest_of_path:path}")
-async def react_app(req: Request, rest_of_path: str):
-    return templates.TemplateResponse('index.html', { 'request': req })
->>>>>>> 3668e8c33f71b7a79a0c83d41a106d9b55e2df71

front/package-lock.json

@@ -20,6 +20,7 @@
         "react-router-dom": "^6.14.1"
       },
       "devDependencies": {
+        "@faker-js/faker": "^8.0.2",
         "@types/react": "^18.2.14",
         "@types/react-dom": "^18.2.6",
         "@typescript-eslint/eslint-plugin": "^5.61.0",
@@ -817,6 +818,22 @@
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
+    "node_modules/@faker-js/faker": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-8.0.2.tgz",
+      "integrity": "sha512-Uo3pGspElQW91PCvKSIAXoEgAUlRnH29sX2/p89kg7sP1m2PzCufHINd0FhTXQf6DYGiUlVncdSPa2F9wxed2A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fakerjs"
+        }
+      ],
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0",
+        "npm": ">=6.14.13"
+      }
+    },
     "node_modules/@humanwhocodes/config-array": {
       "version": "0.11.10",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",

front/package.json

@@ -24,6 +24,7 @@
     "react-router-dom": "^6.14.1"
   },
   "devDependencies": {
+    "@faker-js/faker": "^8.0.2",
     "@types/react": "^18.2.14",
     "@types/react-dom": "^18.2.6",
     "@typescript-eslint/eslint-plugin": "^5.61.0",

front/prototype.html

@@ -0,0 +1,315 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Document</title>
+</head>
+
+<body>
+    <nav>
+        <a href="#back" class="back">
+            <svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" class="bi bi-arrow-left" viewBox="0 0 16 16">
+                <path fill-rule="evenodd"
+                    d="M15 8a.5.5 0 0 0-.5-.5H2.707l3.147-3.146a.5.5 0 1 0-.708-.708l-4 4a.5.5 0 0 0 0 .708l4 4a.5.5 0 0 0 .708-.708L2.707 8.5H14.5A.5.5 0 0 0 15 8z" />
+            </svg>
+        </a>
+        <h1 class="heading">Иванов Иван, с нами с 17.07.2023</h1>
+    </nav>
+    <div id="root"></div>
+    <div class="poemContainer">
+        <h1>Поэзия</h1>
+        <div class="poemText">
+            <div class="eleven" style="position:relative;left:-60px">"Fury said to</div>
+            <div class="ten" style="position:relative;left:-40px">a mouse, That</div>
+            <div class="ten" style="position:relative;left:0px">he met</div>
+            <div class="ten" style="position:relative;left:10px">in the</div>
+            <div class="ten" style="position:relative;left:20px">house,</div>
+            <div class="ten" style="position:relative;left:17px">'Let us</div>
+            <div class="ten" style="position:relative;left:5px">both go</div>
+            <div class="ten" style="position:relative;left:-7px">to law:</div>
+            <div class="ten" style="position:relative;left:-23px"><i>I</i> will</div>
+            <div class="ten" style="position:relative;left:-26px">prosecute</div>
+            <div class="nine" style="position:relative;left:-40px"><i>you.</i>—</div>
+            <div class="nine" style="position:relative;left:-30px">Come, I'll</div>
+            <div class="nine" style="position:relative;left:-20px">take no</div>
+            <div class="nine" style="position:relative;left:-7px">denial;</div>
+            <div class="nine" style="position:relative;left:19px">We must</div>
+            <div class="nine" style="position:relative;left:45px">have a</div>
+            <div class="nine" style="position:relative;left:67px">trial:</div>
+            <div class="nine" style="position:relative;left:80px">For</div>
+            <div class="eight" style="position:relative;left:70px">really</div>
+            <div class="eight" style="position:relative;left:57px">this</div>
+            <div class="eight" style="position:relative;left:75px">morning</div>
+            <div class="eight" style="position:relative;left:95px">I've</div>
+            <div class="eight" style="position:relative;left:77px">nothing</div>
+            <div class="eight" style="position:relative;left:57px">to do.'</div>
+            <div class="seven" style="position:relative;left:38px">Said the</div>
+            <div class="seven" style="position:relative;left:30px">mouse to</div>
+            <div class="seven" style="position:relative;left:18px">the cur,</div>
+            <div class="seven" style="position:relative;left:22px">'Such a</div>
+            <div class="seven" style="position:relative;left:37px">trial,</div>
+            <div class="seven" style="position:relative;left:27px">dear sir,</div>
+            <div class="seven" style="position:relative;left:9px">With no</div>
+            <div class="seven" style="position:relative;left:-8px">jury or</div>
+            <div class="seven" style="position:relative;left:-18px">judge,</div>
+            <div class="seven" style="position:relative;left:-6px">would be</div>
+            <div class="seven" style="position:relative;left:7px">wasting</div>
+            <div class="seven" style="position:relative;left:25px">our breath.'</div>
+            <div class="six" style="position:relative;left:30px">'I'll be</div>
+            <div class="six" style="position:relative;left:24px">judge,</div>
+            <div class="six" style="position:relative;left:15px">I'll be</div>
+            <div class="six" style="position:relative;left:2px">jury,'</div>
+            <div class="six" style="position:relative;left:-4px">Said</div>
+            <div class="six" style="position:relative;left:17px">cunning</div>
+            <div class="six" style="position:relative;left:29px">old Fury;</div>
+            <div class="six" style="position:relative;left:37px">'I'll try</div>
+            <div class="six" style="position:relative;left:51px">the whole</div>
+            <div class="six" style="position:relative;left:70px">cause,</div>
+            <div class="six" style="position:relative;left:65px">and</div>
+            <div class="six" style="position:relative;left:60px">condemn</div>
+            <div class="six" style="position:relative;left:60px">you</div>
+            <div class="six" style="position:relative;left:68px">to</div>
+            <div class="six" style="position:relative;left:82px">death.' "</div>
+        </div>
+        <img src="uploads/mouse.jpg" class="poemImg">
+    </div>
+
+
+    <script>
+        const categoryGraphics = {
+            'PORRIDGE': 'dist/PORRIDGE.jpg',
+            'conspects': 'dist/conspects.jpg',
+            'milk': 'dist/milk.jpg',
+            'bred': 'dist/bred.jpg',
+            'wathing': 'dist/wathing.jpg',
+            'cloth': 'dist/cloth.jpg',
+            'fruits_vegatables': 'dist/fruits_vegatables.jpg',
+            'soup': 'dist/soup.jpg',
+            'dinner': 'dist/dinner.jpg',
+            'conserves': 'dist/conserves.jpg',
+            'pens': 'dist/pens.jpg',
+            'other_things': 'dist/other_things.jpg',
+        }
+
+        const categoryNames = {
+            'PORRIDGE': 'PORRIDGE',
+            'conspects': 'Конспекты',
+            'milk': 'Молочные продукты',
+            'bred': 'Хлебобулочные изделия',
+            'wathing': 'Моющие средства',
+            'cloth': 'Одежда',
+            'fruits_vegatables': 'Фрукты и овощи',
+            'soup': 'Супы',
+            'dinner': 'Ужин',
+            'conserves': 'Консервы',
+            'pens': 'Канцелярия',
+            'other_things': 'Всякая всячина',
+        }
+
+        const cats = ["Раздача", "Бронь", "История"]
+
+        const props = ["Годен до 01.09.2023", "Бронь ещё 5 чел.", "Забрал 16.07.2023"]
+
+
+        const stories = [2, 4, 1].map(
+            (n) => (new Array(n)).fill(1).map(
+                () => (
+                    {
+                        title: (Math.random() * Math.pow(10, Math.random() * 100)).toString(36),
+                        category: Object.keys(categoryGraphics)[Math.round(Math.random() * (Object.keys(categoryGraphics).length - 1))]
+                    }
+                )
+            )
+        )
+
+        console.log(stories)
+
+        const render = () => {
+            const root = document.getElementById('root')
+
+            root.innerHTML = ''
+
+            stories.forEach((c, i) => {
+                const section = document.createElement('section')
+                section.className = 'section'
+                section.innerHTML = `<h1>${cats[i]}</h1>`
+                const ul = document.createElement('ul')
+                c.forEach((v, j) => {
+                    const story = document.createElement('li')
+                    story.className = 'story'
+                    story.innerHTML = `
+                    <a href="#${i},${j}">
+                        <img class="storyPic" src="${categoryGraphics[v.category]}" />
+                        <p class="storyTitle">${v.title}</p>
+                        <p class="storyTitle">${props[i]}</p>
+                    `.trim()
+                    ul.appendChild(story)
+                })
+
+                console.log(window.innerWidth, (window.innerHeight * 0.25 * 9 / 16), (window.innerWidth * 0.25 * 9 / 16) * c.length)
+
+                if ((window.innerWidth - 60) < (window.innerHeight * 0.25 * 9 / 16 + 10) * c.length) {
+                    const seeMore = document.createElement('a')
+                    seeMore.href = "#more"
+                    seeMore.innerHTML = `<svg fill="currentColor" width="24" height="24" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 512"><!--! Font Awesome Free 6.1.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2022 Fonticons, Inc. --><path d="M64 448c-8.188 0-16.38-3.125-22.62-9.375c-12.5-12.5-12.5-32.75 0-45.25L178.8 256L41.38 118.6c-12.5-12.5-12.5-32.75 0-45.25s32.75-12.5 45.25 0l160 160c12.5 12.5 12.5 32.75 0 45.25l-160 160C80.38 444.9 72.19 448 64 448z"/></svg>`
+                    seeMore.className = 'seeMore'
+
+                    ul.appendChild(seeMore)
+                    ul.classList.add('grad')
+                }
+
+                section.appendChild(ul)
+                root.appendChild(section)
+            })
+        }
+
+        // window.addEventListener('resize', render)
+        document.addEventListener('DOMContentLoaded', render)
+    </script>
+
+    <style>
+        * {
+            padding: 0;
+            margin: 0;
+            font-family: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+        }
+
+        a {
+            color: rgb(185, 179, 170);
+            text-decoration: none;
+        }
+
+        body {
+            background-color: #111;
+            color: rgb(185, 179, 170);
+            width: 100%;
+            max-width: calc(100vh*9/16);
+            margin: auto;
+        }
+
+        .section {
+            padding: 30px;
+            padding-bottom: 0;
+        }
+
+        ul {
+            display: flex;
+            list-style-type: none;
+            padding-top: 20px;
+            width: 100%;
+            overflow: hidden;
+            position: relative;
+        }
+
+        .grad::after {
+            content: '';
+            background: linear-gradient(to right, rgba(17, 17, 17, 0) 0%, rgba(17, 17, 17, 255) 100%);
+            display: block;
+            height: 100%;
+            width: 10%;
+            position: absolute;
+            right: 0;
+        }
+
+        li {
+            padding-right: 10px;
+            width: calc(25vh*9/16);
+        }
+
+        .storyPic {
+            max-height: 25vh;
+            border-radius: 12px;
+        }
+
+        .storyTitle {
+            padding-top: 5px;
+            text-overflow: ellipsis;
+            overflow: hidden;
+            /* max-width: 100%; */
+        }
+
+        .seeMore {
+            position: absolute;
+            left: calc(100% - 5% / 3 - 30px + 8px);
+            top: calc(50% - 15px);
+            z-index: 100;
+            width: 24px;
+            height: 24px;
+            padding: 3px;
+            color: rgb(185, 179, 170);
+            /* background-color: #111; */
+            border-radius: 100%;
+        }
+
+        nav {
+            padding: 30px;
+            padding-bottom: 0;
+            display: flex;
+        }
+
+        .back {
+            color: rgb(185, 179, 170);
+            display: flex;
+            align-items: center;
+        }
+
+        .back svg {
+            display: block;
+            height: 24px;
+            width: 24px;
+            padding: 3px;
+        }
+
+        .heading {
+            padding-left: 7px;
+        }
+
+        .poemContainer {
+            padding: 30px;
+        }
+
+        .poemText {
+            padding: 0 60px;
+            padding-top: 10px;
+        }
+
+        .eleven {
+            font-size: 105%;
+            margin: 0px;
+        }
+
+        .ten {
+            font-size: 100%;
+            margin: 0px;
+        }
+
+        .nine {
+            font-size: 90%;
+            margin: 0px;
+        }
+
+        .eight {
+            font-size: 80%;
+            margin: 0px;
+        }
+
+        .seven {
+            font-size: 70%;
+            margin: 0px;
+        }
+
+        .six {
+            font-size: 60%;
+            margin: 0px;
+        }
+
+        .poemImg {
+            max-width: 100%;
+            padding-top: 10px;
+        }
+    </style>
+</body>
+
+</html>

front/src/App.css

@@ -1,16 +1,9 @@
-body {
+:root {
-  height: 100vh;
+  --bs-body-bg: rgb(17, 17, 17) !important;
-  overflow: hidden;
-  color: white;
-  font-family: sans-serif;
-}
-
-.modal-content, .modal-content .form-select {
-  background-color: rgb(17, 17, 17) !important;
 }
 
 /* В связи со сложившейся политической обстановкой */
 .leaflet-attribution-flag {
   position: absolute;
   right: -100px;
-}
+}

front/src/api/announcement/index.ts

@@ -0,0 +1,12 @@
+import { Announcement, AnnouncementResponse } from './types'
+
+const processAnnouncement = (data: AnnouncementResponse): Announcement => ({
+    ...data,
+    lat: data.latitude,
+    lng: data.longtitude,
+    bestBy: data.best_by,
+    bookedBy: data.booked_by,
+    userId: data.user_id
+})
+
+export { processAnnouncement }

front/src/api/announcements/index.ts

@@ -1,5 +1,6 @@
 import { API_URL } from '../../config'
 import { FiltersType, URLEncodeFilters } from '../../utils/filters'
+import { processAnnouncement } from '../announcement'
 import { Announcement } from '../announcement/types'
 import { AnnouncementsResponse } from './types'
 
@@ -9,17 +10,8 @@ const composeAnnouncementsURL = (filters: FiltersType) => (
     API_URL + '/announcements?' + new URLSearchParams(URLEncodeFilters(filters)).toString()
 )
 
-const processAnnouncements = (data: AnnouncementsResponse): Announcement[] => {
+const processAnnouncements = (data: AnnouncementsResponse): Announcement[] => (
-    const annList = data.list_of_announcements
+    data.list_of_announcements.map(processAnnouncement)
-
+)
-    return annList.map(ann => ({
-        ...ann,
-        lat: ann.latitude,
-        lng: ann.longtitude,
-        bestBy: ann.best_by,
-        bookedBy: ann.booked_by,
-        userId: ann.user_id
-    }))
-}
 
 export { initialAnnouncements, composeAnnouncementsURL, processAnnouncements }

front/src/api/putAnnouncement/index.ts

@@ -0,0 +1,12 @@
+import { API_URL } from '../../config'
+import { PutAnnouncement, PutAnnouncementResponse } from './types'
+
+const composePutAnnouncementURL = () => (
+    API_URL + '/announcement?'
+)
+
+const processPutAnnouncement = (data: PutAnnouncementResponse): PutAnnouncement => {
+    return data.Answer
+}
+
+export { composePutAnnouncementURL, processPutAnnouncement }

front/src/api/putAnnouncement/types.ts

@@ -0,0 +1,17 @@
+import { isObject } from '../../utils/types'
+
+type PutAnnouncementResponse = {
+    Answer: boolean
+}
+
+const isPutAnnouncementResponse = (obj: unknown): obj is PutAnnouncementResponse => (
+    isObject(obj, {
+        'Answer': 'boolean'
+    })
+)
+
+type PutAnnouncement = boolean
+
+export type { PutAnnouncementResponse, PutAnnouncement }
+
+export { isPutAnnouncementResponse }

front/src/api/trashbox/index.ts

@@ -1,6 +1,7 @@
 import { LatLng } from 'leaflet'
 
 import { API_URL } from '../../config'
+import { Trashbox, TrashboxResponse } from './types'
 
 const composeTrashboxURL = (position: LatLng) => (
     API_URL + '/trashbox?' + new URLSearchParams({
@@ -9,4 +10,7 @@ const composeTrashboxURL = (position: LatLng) => (
     }).toString()
 )
 
-export { composeTrashboxURL }
+const processTrashbox = (data: TrashboxResponse): Trashbox[] =>
+    data
+
+export { composeTrashboxURL, processTrashbox }

front/src/api/user/index.ts

@@ -0,0 +1,25 @@
+import { API_URL } from '../../config'
+import { UserResponse, User } from './types'
+
+import { faker } from '@faker-js/faker/locale/ru'
+
+
+const initialUser: User = import.meta.env.DEV ? { // Temporary, until api is realized
+    id: Math.random() * 100,
+    name: faker.person.firstName() + ' ' + faker.person.lastName(),
+    regDate: faker.date.anytime().getTime(),
+} : {
+    id: -1,
+    name: '',
+    regDate: 0,
+}
+
+const composeUserURL = () => (
+    API_URL + '/user?'
+)
+
+const processUser = (data: UserResponse): User => {
+    return data
+}
+
+export { initialUser, composeUserURL, processUser }

front/src/api/user/types.ts

@@ -0,0 +1,29 @@
+import { isObject } from '../../utils/types'
+
+type User = {
+    id: number,
+    name: string,
+    regDate: number,
+}
+
+const isUser = (obj: unknown): obj is User => (
+    isObject(obj, {
+        'id': 'number',
+        'name': 'string',
+        'regDate': 'number',
+    })
+)
+
+type UserResponse = User
+
+// const isUserResponse = (obj: unknown): obj is UserResponse => (
+//     isObject(obj, {
+
+//     })
+// )
+
+const isUserResponse = isUser
+
+export type { UserResponse, User }
+
+export { isUserResponse, isUser }

front/src/assets/backArrow.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="rgb(185, 179, 170)" width="24" height="24" class="bi bi-arrow-left" viewBox="0 0 16 16">
+    <path fill-rule="evenodd"
+        d="M15 8a.5.5 0 0 0-.5-.5H2.707l3.147-3.146a.5.5 0 1 0-.708-.708l-4 4a.5.5 0 0 0 0 .708l4 4a.5.5 0 0 0 .708-.708L2.707 8.5H14.5A.5.5 0 0 0 15 8z" />
+</svg>

front/src/assets/rightAngle.svg

@@ -0,0 +1,4 @@
+<svg fill="rgb(185, 179, 170)" width="24" height="24" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 512">
+    <!--! Font Awesome Free 6.1.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2022 Fonticons, Inc. -->
+    <path d="M64 448c-8.188 0-16.38-3.125-22.62-9.375c-12.5-12.5-12.5-32.75 0-45.25L178.8 256L41.38 118.6c-12.5-12.5-12.5-32.75 0-45.25s32.75-12.5 45.25 0l160 160c12.5 12.5 12.5 32.75 0 45.25l-160 160C80.38 444.9 72.19 448 64 448z"/>
+</svg>

front/src/assets/userCategories.ts

@@ -0,0 +1,45 @@
+import { Announcement } from '../api/announcement/types'
+import { FiltersType } from '../utils/filters'
+
+const userCategories = ['givingOut', 'booked', 'history'] as const
+
+type UserCategory = typeof userCategories[number]
+
+const UserCategoriesNames: Record<UserCategory, string> = {
+    givingOut: 'Раздача',
+    booked: 'Бронь',
+    history: 'История',
+}
+
+const userCategoriesInfos: Record<UserCategory, (ann: Announcement) => string> = {
+    givingOut: (ann: Announcement) => (
+        `Годен до ${new Date(ann.bestBy).toLocaleDateString('ru')}`
+    ),
+    booked: (ann: Announcement) => (
+        `Бронь ещё ${(ann as Announcement & { bookedBy: number[] }).bookedBy.length} чел.`
+    ),
+    history: (ann: Announcement) => (
+        `Забрал ${new Date((ann as Announcement & { taken: number }).taken).toLocaleDateString('ru')}`
+    ),
+}
+
+const composeUserCategoriesFilters: Record<UserCategory, () => FiltersType> = {
+    givingOut: () => {
+        const userId = -1
+
+        return ({ userId })
+    },
+    booked: () => {
+        const userId = -1
+
+        return ({ bookedBy: userId })
+    },
+    history: () => {
+        const userId = -1
+
+        return ({ userId, status: 'taken' })
+    }
+}
+
+export type { UserCategory }
+export { userCategories, UserCategoriesNames, userCategoriesInfos, composeUserCategoriesFilters }

front/src/components/BackHeader.tsx

@@ -0,0 +1,25 @@
+import { Link } from 'react-router-dom'
+import { Navbar } from 'react-bootstrap'
+
+import BackButton from '../assets/backArrow.svg'
+
+type BackHeaderProps = {
+    text: string
+}
+
+function BackHeader({ text }: BackHeaderProps) {
+    return (
+        <Navbar>
+            <Navbar.Brand as={Link} to='/'>
+                <img src={BackButton} alt='Go back' />
+            </Navbar.Brand>
+            <Navbar.Text className='me-auto'>
+                <h4 className='mb-0'>
+                    {text}
+                </h4>
+            </Navbar.Text>
+        </Navbar>
+    )
+}
+
+export default BackHeader

front/src/components/CategoryPreview.tsx

@@ -0,0 +1,25 @@
+import { StoriesPreview } from '.'
+import { UserCategoriesNames, UserCategory, composeUserCategoriesFilters } from '../assets/userCategories'
+import { useAnnouncements } from '../hooks/api'
+import { gotError } from '../hooks/useFetch'
+
+type CategoryPreviewProps = {
+    category: UserCategory
+}
+
+function CategoryPreview({ category }: CategoryPreviewProps) {
+    const announcements = useAnnouncements(composeUserCategoriesFilters[category]())
+
+    return (
+        <section>
+            <h4 className='fw-bold'>{UserCategoriesNames[category]}</h4>
+            {gotError(announcements) ? (
+                <p className='text-danger'>{announcements.error}</p>
+            ) : (announcements.loading ? 'Загрузка...' :
+                <StoriesPreview announcements={announcements.data} category={category} />
+            )}
+        </section>
+    )
+}
+
+export default CategoryPreview

front/src/components/StoriesPreview.tsx

@@ -0,0 +1,143 @@
+import { Link } from 'react-router-dom'
+import { CSSProperties, useEffect, useMemo, useRef, useState } from 'react'
+import { Button } from 'react-bootstrap'
+
+import { UserCategory, composeUserCategoriesFilters, userCategoriesInfos } from '../assets/userCategories'
+import { Announcement } from '../api/announcement/types'
+import { categoryGraphics, categoryNames } from '../assets/category'
+import { URLEncodeFilters } from '../utils/filters'
+
+import rightAngleIcon from '../assets/rightAngle.svg'
+
+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)'
+    } as CSSProperties,
+    image: {
+        height: '25vh',
+        maxWidth: 'calc(25vh * 9 / 16)',
+        objectFit: 'contain',
+        borderRadius: 12,
+        marginBottom: 5,
+    } 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,
+}
+
+function StoriesPreview({ announcements, category }: StoriesPreviewProps) {
+    const ulElement = useRef<HTMLUListElement | null>(null)
+    const [showScrollButtons, setShowScrollButtons] = useState({ left: false, right: false })
+
+    const determineShowScrollButtons = (ul: HTMLUListElement) => (
+        setShowScrollButtons({
+            left: ul.scrollLeft > 0,
+            right: ul.scrollLeft < (ul.scrollWidth - ul.clientWidth),
+        })
+    )
+
+    useEffect(() => {
+        const ul = ulElement.current
+        if (ul) {
+            determineShowScrollButtons(ul)
+
+            const f = () => determineShowScrollButtons(ul)
+
+            ul.addEventListener('scroll', f)
+
+            return () => ul.removeEventListener('scroll', f)
+        }
+    }, [])
+
+    useEffect(() => {
+        const ul = ulElement.current
+
+        if (ul) {
+            determineShowScrollButtons(ul)
+        }
+    }, [announcements])
+
+    const doScroll = (forward: boolean) => () => {
+        const ul = ulElement.current
+        if (ul) {
+            const storyWidth = window.innerHeight * 0.25 * 9 / 16 + 10
+            ul.scrollLeft += forward ? storyWidth : -storyWidth
+        }
+    }
+
+    return <div style={styles.container}>
+        {showScrollButtons.left &&
+            <Button onClick={doScroll(false)} style={{ ...styles.scrollButton, ...styles.leftScrollButton }}>
+                <img src={rightAngleIcon} alt='Показать ещё' />
+            </Button>
+        }
+        <ul style={styles.ul} className='StoriesPreview_ul' ref={ulElement}>
+            {useMemo(() => announcements.map((ann, i) => (
+                <li key={`${category}${i}`}>
+                    <Link to={'/?' + new URLSearchParams({
+                        ...URLEncodeFilters(composeUserCategoriesFilters[category]()),
+                        storyIndex: i.toString()
+                    }).toString()} style={styles.link}>
+                        {ann.src?.endsWith('mp4') ? (
+                            <video src={ann.src} style={styles.image} />
+                        ) : (
+                            <img
+                                src={ann.src || categoryGraphics[ann.category]}
+                                alt={'Изображение' + (ann.src ? 'предмета' : categoryNames[ann.category])}
+                                style={styles.image}
+                            />
+                        )}
+                        <p style={styles.title}>{ann.name}</p>
+                        <p style={styles.title}>{userCategoriesInfos[category](ann)}</p>
+                    </Link>
+                </li>
+            )), [announcements, category])}
+        </ul>
+        {showScrollButtons.right &&
+            <Button onClick={doScroll(true)} style={{ ...styles.scrollButton, ...styles.rightScrollButton }}>
+                <img src={rightAngleIcon} alt='Показать ещё' />
+            </Button>
+        }
+    </div>
+}
+
+export default StoriesPreview

front/src/components/index.ts

@@ -7,3 +7,6 @@ export { default as TrashboxMarkers } from './TrashboxMarkers'
 export { default as WithToken } from './WithToken'
 export { default as ClickHandler } from './ClickHandler'
 export { default as AuthForm } from './AuthForm'
+export { default as BackHeader } from './BackHeader'
+export { default as CategoryPreview } from './CategoryPreview'
+export { default as StoriesPreview } from './StoriesPreview'

front/src/hooks/api/index.ts

@@ -4,3 +4,4 @@ export { default as useAuth } from './useAuth'
 export { default as useTrashboxes } from './useTrashboxes'
 export { default as useAddAnnouncement } from './useAddAnnouncement'
 export { default as useOsmAddresses } from './useOsmAddress'
+export { default as useUser } from './useUser'

front/src/hooks/api/useAddAnnouncement.ts

@@ -1,79 +1,31 @@
-import { useEffect, useRef, useState } from 'react'
+import { useCallback } from 'react'
 
-import { API_URL } from '../../config'
+import { useSend } from '..'
-import { isLiteralUnion } from '../../utils/types'
+import { composePutAnnouncementURL, processPutAnnouncement } from '../../api/putAnnouncement'
-import { handleHTTPErrors } from '../../utils'
+import { isPutAnnouncementResponse } from '../../api/putAnnouncement/types'
-
+import useSendButtonCaption from '../useSendButtonCaption'
-const addErrors = ['Не удалось опубликовать объявление', 'Неверный ответ от сервера', 'Неизвестная ошибка'] as const
-type AddError = typeof addErrors[number]
-
-const isAddError = (obj: unknown): obj is AddError => (
-    isLiteralUnion(obj, addErrors)
-)
-
-const buttonStates = ['Опубликовать', 'Загрузка...', 'Опубликовано', 'Отменено'] as const
-type ButtonState = typeof buttonStates[number] | AddError
-
-type AddResponse = {
-    Answer: boolean
-}
-
-const isAddResponse = (obj: unknown): obj is AddResponse => (
-    typeof obj === 'object' && obj !== null && typeof Reflect.get(obj, 'Answer') === 'boolean'
-)
 
 const useAddAnnouncement = () => {
-    const [status, setStatus] = useState<ButtonState>('Опубликовать')
+    const { doSend, loading, error } = useSend(
+        composePutAnnouncementURL(),
+        'PUT',
+        true,
+        isPutAnnouncementResponse,
+        processPutAnnouncement,
+    )
 
-    const timerIdRef = useRef<number>()
+    const { update, ...button } = useSendButtonCaption('Опубликовать', loading, error, 'Опубликовано')
-    const abortControllerRef = useRef<AbortController>()
 
-    const doAdd = async (formData: FormData) => {
+    const doSendWithButton = useCallback(async (formData: FormData) => {
-        if (status === 'Загрузка...') {
+        const data = await doSend({}, {
-            abortControllerRef.current?.abort()
+            body: formData
-            setStatus('Отменено')
+        })
-            timerIdRef.current = setTimeout(() => setStatus('Опубликовать'), 3000)
+        update(data)
-            return
-        }
 
-        setStatus('Загрузка...')
+        return data
+    }, [doSend, update])
 
-        const abortController = new AbortController()
+    return { doSend: doSendWithButton, button }
-        abortControllerRef.current = abortController
-
-        try {
-            const res = await fetch(API_URL + '/announcement', {
-                method: 'PUT',
-                body: formData,
-                signal: abortController.signal
-            })
-
-            handleHTTPErrors(res)
-
-            const data: unknown = await res.json()
-
-            if (!isAddResponse(data)) throw new Error('Неверный ответ от сервера')
-
-            if (!data.Answer) {
-                throw new Error('Не удалось опубликовать объявление')
-            }
-            setStatus('Опубликовано')
-
-        } catch (err) {
-            setStatus(isAddError(err) ? err : 'Неизвестная ошибка')
-            timerIdRef.current = setTimeout(() => setStatus('Опубликовать'), 10000)
-        }
-    }
-
-    useEffect(() => {
-        const abortController = abortControllerRef.current
-        return () => {
-            clearTimeout(timerIdRef.current)
-            abortController?.abort()
-        }
-    })
-
-    return { doAdd, status }
 }
 
 export default useAddAnnouncement

front/src/hooks/api/useTrashboxes.ts

@@ -1,7 +1,7 @@
 import { LatLng } from 'leaflet'
 
 import { useFetch } from '../'
-import { composeTrashboxURL } from '../../api/trashbox'
+import { composeTrashboxURL, processTrashbox } from '../../api/trashbox'
 import { isTrashboxResponse } from '../../api/trashbox/types'
 
 const useTrashboxes = (position: LatLng) => (
@@ -10,7 +10,7 @@ const useTrashboxes = (position: LatLng) => (
         'GET',
         true,
         isTrashboxResponse,
-        (data) => data,
+        processTrashbox,
         []
     )
 )

front/src/hooks/api/useUser.ts

@@ -0,0 +1,23 @@
+import { initialUser } from '../../api/user'
+import { User } from '../../api/user/types'
+import { UseFetchReturn } from '../useFetch'
+
+const useUser = (): UseFetchReturn<User> => (
+    // useFetch(
+    //     composeUserUrl(getToken()),
+    //     'GET',
+    //     true,
+    //     isUserResponse,
+    //     processUser,
+    //     initialUser
+    // )
+
+    {
+        data: initialUser,
+        loading: false,
+        error: null,
+        setData: () => {0}
+    }
+)
+
+export default useUser

front/src/hooks/index.ts

@@ -1,3 +1,5 @@
 export { default as useStoryDimensions } from './useStoryDimensions'
 export { default as useSend } from './useSend'
 export { default as useFetch } from './useFetch'
+export { default as useStoryIndex } from './useStoryIndex'
+export { default as useFilters } from './useFilters'

front/src/hooks/useFetch.ts

@@ -3,40 +3,31 @@ import { useEffect, useState } from 'react'
 import { SetState } from '../utils/types'
 import useSend from './useSend'
 
-type UseFetchShared = {
+type UseFetchShared<T> = {
     loading: boolean,
     abort?: () => void,
+    setData: SetState<T | undefined>
 }
 
 type UseFetchSucced<T> = {
     error: null,
     data: T,
-} & UseFetchShared
+} & UseFetchShared<T>
 
-type UseFetchErrored = {
+type UseFetchErrored<T> = {
     error: string,
     data: undefined
-} & UseFetchShared
+} & UseFetchShared<T>
 
-const gotError = <T>(res: UseFetchErrored | UseFetchSucced<T>): res is UseFetchErrored => (
+const gotError = <T>(res: UseFetchErrored<T> | UseFetchSucced<T>): res is UseFetchErrored<T> => (
     typeof res.error === 'string'
 )
 
-const fallbackError = <T>(res: UseFetchSucced<T> | UseFetchErrored) => (
+const fallbackError = <T>(res: UseFetchSucced<T> | UseFetchErrored<T>) => (
     gotError(res) ? res.error : res.data
 )
 
-type UseFetchReturn<T> = ({
+type UseFetchReturn<T> = UseFetchSucced<T> | UseFetchErrored<T>
-    error: null,
-    data: T
-} | {
-    error: string,
-    data: undefined
-}) & {
-    loading: boolean,
-    setData: SetState<T | undefined>
-    abort?: (() => void)
-}
 
 function useFetch<R, T>(
     url: string,
@@ -70,6 +61,8 @@ function useFetch<R, T>(
     }
 }
 
+export type { UseFetchReturn }
+
 export default useFetch
 
 export { gotError, fallbackError }

front/src/hooks/useFilters.ts

@@ -0,0 +1,47 @@
+import { useEffect, useState } from 'react'
+import { useSearchParams } from 'react-router-dom'
+import { FiltersType, URLDecoreFilters, URLEncodeFilters, defaultFilters } from '../utils/filters'
+import { SetState } from '../utils/types'
+
+function useFilters(initialFilters: FiltersType = defaultFilters): [FiltersType, SetState<FiltersType>] {
+    const [searchParams, setSearchParams] = useSearchParams()
+
+    const [filters, setFilters] = useState(initialFilters)
+
+    const appendFiltersSearchParams = (filters: FiltersType) => (
+        setSearchParams(params => ({
+            ...Object.fromEntries(params),
+            ...URLEncodeFilters(filters)
+        }), { replace: true })
+    )
+
+    useEffect(() => {
+        const urlFilters = URLDecoreFilters(searchParams)
+
+        setFilters(prev => ({
+            ...prev,
+            ...urlFilters,
+        }))
+
+        appendFiltersSearchParams({
+            ...URLEncodeFilters(initialFilters),
+            ...URLEncodeFilters(urlFilters),
+        })
+        // searchParams have actual query string at first render
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [])
+
+    const withQuery = (f: SetState<FiltersType>) => (
+        (nextInit: (FiltersType | ((prev: FiltersType) => FiltersType))) => {
+            const newFilters = (typeof nextInit === 'function') ? nextInit(filters) : nextInit
+
+            appendFiltersSearchParams(newFilters)
+
+            f(nextInit)
+        }
+    )
+
+    return [filters, withQuery(setFilters)]
+}
+
+export default useFilters

front/src/hooks/useSend.ts

@@ -24,6 +24,7 @@ function useSend<R, T>(
     /** Don't use in useEffect. If you need request result, go with useFetch instead */
     const doSend = useCallback(async (urlProps?: Record<string, string>, params?: Omit<RequestInit, 'method'>) => {
         setLoading(true)
+        setError(null)
 
         if (abortControllerRef.current) {
             abortControllerRef.current.abort()

front/src/hooks/useSendButtonCaption.ts

@@ -0,0 +1,44 @@
+import { useCallback, useEffect, useState } from 'react'
+
+function useSendButtonCaption(
+    initial: string,
+    loading: boolean,
+    error: string | null,
+    result = initial,
+    singular = true
+) {
+    const [caption, setCaption] = useState(initial)
+    const [disabled, setDisabled] = useState(false)
+    const [title, setTitle] = useState(initial)
+
+    const update = useCallback(<T extends NonNullable<unknown>>(data: T | undefined) => {
+        if (data !== undefined) {
+            setCaption(result)
+            setTitle('Отправить ещё раз')
+
+            if (singular) {
+                setDisabled(true)
+                setTitle('')
+            }
+        }
+
+    }, [result, singular])
+
+    useEffect(() => {
+        if (loading) {
+            setCaption('Загрузка...')
+            setTitle('Отменить и отправить ещё раз')
+        }
+    }, [loading])
+
+    useEffect(() => {
+        if (!loading && error !== null) {
+            setCaption(error + ', нажмите, чтобы попробовать ещё раз')
+            setTitle('')
+        }
+    }, [error, loading])
+
+    return { update, children: caption, disabled, title }
+}
+
+export default useSendButtonCaption

front/src/hooks/useStoryDimensions.ts

@@ -14,12 +14,14 @@ function useStoryDimensions(maxRatio = 16 / 9) {
         function handleResize() {
             setWindowDimensions(getWindowDimensions());
         }
-    
+
         window.addEventListener('resize', handleResize);
         return () => window.removeEventListener('resize', handleResize);
     }, []);
 
-    const height = windowDimensions.height - 56
+    const bottomBarHeight = 56
+
+    const height = windowDimensions.height - bottomBarHeight
 
     const ratio = Math.max(maxRatio, height / windowDimensions.width)
 

front/src/hooks/useStoryIndex.ts

@@ -0,0 +1,47 @@
+import { useEffect, useState } from 'react'
+import { useSearchParams } from 'react-router-dom'
+import { SetState } from '../utils/types'
+
+function useStoryIndex(annLength: number | undefined) {
+    const [index, setIndex] = useState(0)
+
+    const [searchParams, setSearchParams] = useSearchParams()
+
+    const withReset = <T>(f: SetState<T>) => (...args: Parameters<SetState<T>>) => {
+        console.log('resetting index')
+        setIndex(0)
+        setSearchParams(prev => ({ ...prev, storyIndex: '0' }), { replace: true })
+        f(...args)
+    }
+
+    useEffect(() => {
+        setIndex(annLength ?
+            Number.parseInt(searchParams.get('storyIndex') || '0') :
+            0)
+        // searchParams have actual query string at first render
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [annLength])
+
+    const increment = () => setIndex(prev => {
+        const newIndex = (prev + 1) % (annLength || 1)
+        setSearchParams(prev => ({ ...prev, storyIndex: newIndex.toString() }), { replace: true })
+
+        return newIndex
+    })
+
+    const decrement = () => setIndex(prev => {
+        const newIndex = prev > 0 ? (prev - 1) : 0
+        setSearchParams(prev => ({ ...prev, storyIndex: newIndex.toString() }), { replace: true })
+
+        return newIndex
+    })
+
+    return {
+        n: index,
+        withReset,
+        increment,
+        decrement
+    }
+}
+
+export default useStoryIndex

front/src/pages/AddPage.tsx

@@ -1,11 +1,10 @@
-import { CSSProperties, FormEventHandler, useEffect, useState } from 'react'
+import { CSSProperties, FormEventHandler, useState } from 'react'
 import { Form, Button, Card } from 'react-bootstrap'
 import { MapContainer, TileLayer } from 'react-leaflet'
 import { latLng } from 'leaflet'
 
 import { ClickHandler, LocationMarker, TrashboxMarkers } from '../components'
 import { useAddAnnouncement, useTrashboxes } from '../hooks/api'
-import { handleHTTPErrors } from '../utils'
 import { categories, categoryNames } from '../assets/category'
 import { stations, lines, lineNames } from '../assets/metro'
 import { fallbackError, gotError } from '../hooks/useFetch'
@@ -32,25 +31,7 @@ function AddPage() {
 
     const address = useOsmAddresses(addressPosition)
 
-    useEffect(() => {
+    const { doSend, button } = useAddAnnouncement()
-        if (!gotError(address))
-            void (async () => {
-                try {
-                    const res = await fetch(location.protocol + '//nominatim.openstreetmap.org/search?format=json&q=' + encodeURIComponent(address.data))
-
-                    handleHTTPErrors(res)
-
-                    const fetchData: unknown = await res.json()
-
-                    console.log('f', fetchData)
-
-                } catch (err) {
-                    console.error(err)
-                }
-            })()
-    }, [address])
-
-    const { doAdd, status } = useAddAnnouncement()
 
     const handleSubmit: FormEventHandler<HTMLFormElement> = (event) => {
         event.preventDefault()
@@ -63,7 +44,7 @@ function AddPage() {
         formData.append('address', address.data || '') // if address.error
         formData.set('bestBy', new Date((formData.get('bestBy') as number | null) || 0).getTime().toString())
 
-        void doAdd(formData)
+        void doSend(formData)
     }
 
     return (
@@ -151,7 +132,7 @@ function AddPage() {
                         </Form.Select>
                     </Form.Group>
 
-                    <Form.Group className='mb-3' controlId='password'>
+                    <Form.Group className='mb-3' controlId='trashbox'>
                         <Form.Label>Пункт сбора мусора</Form.Label>
                         <div className='mb-3'>
                             {trashboxes.loading
@@ -195,9 +176,7 @@ function AddPage() {
                         )}
                     </Form.Group>
 
-                    <Button variant='success' type='submit'>
+                    <Button variant='success' type='submit' {...button} />
-                        {status}
-                    </Button>
                 </Form>
             </Card.Body>
         </Card>

front/src/pages/HomePage.tsx

@@ -1,16 +1,16 @@
-import { CSSProperties, useEffect, useState } from 'react'
+import { CSSProperties, useEffect, useMemo, useState } from 'react'
 import Stories from 'react-insta-stories'
 import { Story } from 'react-insta-stories/dist/interfaces'
 
 import { BottomNavBar, AnnouncementDetails, Filters } from '../components'
-import { useStoryDimensions } from '../hooks'
+import { useFilters, useStoryDimensions } from '../hooks'
 import { useAnnouncements } from '../hooks/api'
-import { defaultFilters } from '../utils/filters'
 import { Announcement } from '../api/announcement/types'
 import { categoryGraphics } from '../assets/category'
+import { UseFetchReturn, gotError } from '../hooks/useFetch'
+import { useStoryIndex } from '../hooks'
 
 import puffSpinner from '../assets/puff.svg'
-import { gotError } from '../hooks/useFetch'
 
 function generateStories(announcements: Announcement[]): Story[] {
     return announcements.map(announcement => {
@@ -23,14 +23,14 @@ function generateStories(announcements: Announcement[]): Story[] {
     })
 }
 
-function fallbackGenerateStories(announcementsFetch: ReturnType<typeof useAnnouncements>) {
+function fallbackGenerateStories(announcements: UseFetchReturn<Announcement[]>) {
-    if (announcementsFetch.loading)
+    if (announcements.loading)
         return fallbackStory()
 
-    if (gotError(announcementsFetch))
+    if (gotError(announcements))
-        return fallbackStory(announcementsFetch.error, true)
+        return fallbackStory(announcements.error, true)
 
-    const stories = generateStories(announcementsFetch.data)
+    const stories = generateStories(announcements.data)
 
     if (stories.length === 0)
         return fallbackStory('Здесь пока пусто')
@@ -66,16 +66,23 @@ function HomePage() {
     const { height, width } = useStoryDimensions(16 / 9)
 
     const [filterShown, setFilterShown] = useState(false)
-    const [filter, setFilter] = useState(defaultFilters)
 
-    const announcementsFetch = useAnnouncements(filter)
+    const [filter, setFilter] = useFilters()
 
-    const stories = fallbackGenerateStories(announcementsFetch)
+    const announcements = useAnnouncements(filter)
+
+    const stories = useMemo(() => fallbackGenerateStories(announcements), [announcements])
+
+    const index = useStoryIndex(announcements.data?.length)
 
     return (<>
-        <Filters filter={filter} setFilter={setFilter} filterShown={filterShown} setFilterShown={setFilterShown} />
+        <Filters filter={filter} setFilter={index.withReset(setFilter)} filterShown={filterShown} setFilterShown={setFilterShown} />
         <div style={styles.container}>
             <Stories
+                currentIndex={index.n}
+                onStoryEnd={index.increment}
+                onNext={index.increment}
+                onPrevious={index.decrement}
                 stories={stories}
                 defaultInterval={11000}
                 height={height}

front/src/pages/UserPage.tsx

@@ -1,9 +1,26 @@
-import { Link } from 'react-router-dom'
+import { Container } from 'react-bootstrap'
+
+import BackHeader from '../components/BackHeader'
+import { useUser } from '../hooks/api'
+import { userCategories } from '../assets/userCategories'
+import { CategoryPreview } from '../components'
+import { gotError } from '../hooks/useFetch'
 
 function UserPage() {
-    /* TODO */
+    const user = useUser()
 
-    return <h1>For Yet Go <Link to='/'>Home</Link></h1>
+    return (
+        <Container style={{ maxWidth: 'calc(100vh*9/16)' }}>
+            <BackHeader text={
+                gotError(user) ?
+                    user.error :
+                    `${user.data.name}, с нами с ${new Date(user.data.regDate).toLocaleDateString('ru')}`
+            } />
+            {userCategories.map(cat => (
+                <CategoryPreview key={cat} category={cat} />
+            ))}
+        </Container>
+    )
 }
 
 export default UserPage

front/src/utils/filters.ts

@@ -1,4 +1,6 @@
 import { Announcement } from '../api/announcement/types'
+import { isCategory } from '../assets/category'
+import { fallbackToUndefined, isInt } from './types'
 
 const filterNames = ['userId', 'category', 'metro', 'bookedBy'] as const
 type FilterNames = typeof filterNames[number]
@@ -10,10 +12,31 @@ const defaultFilters: FiltersType = { userId: undefined, category: undefined, me
 const URLEncodeFilters = (filters: FiltersType) => (
     Object.fromEntries(
         filterNames.map(
-            fName => [fName, filters[fName]?.toString()]
+            fName => {
+                const v = filters[fName]
+                if (v) {
+                    return [fName, encodeURIComponent(v)]
+                }
+                return [fName, undefined]
+            }
         ).filter((p): p is [string, string] => typeof p[1] !== 'undefined')
     )
 )
 
+const URLDecoreFilters = (params: URLSearchParams): FiltersType => {
+    const strFilters = Object.fromEntries(
+        filterNames.map(
+            fName => [fName, params.get(fName)]
+        ).filter((p): p is [string, string] => p[1] !== null)
+    )
+
+    return {
+        bookedBy: fallbackToUndefined(strFilters['bookedBy'], isInt),
+        category: fallbackToUndefined(strFilters['category'], isCategory),
+        metro: strFilters['metro'],
+        userId: fallbackToUndefined(strFilters['userId'], isInt)
+    }
+}
+
 export type { FilterNames, FiltersType }
-export { defaultFilters, filterNames, URLEncodeFilters }
+export { defaultFilters, filterNames, URLEncodeFilters, URLDecoreFilters }

front/src/utils/types.ts

@@ -60,8 +60,18 @@ const isString = (obj: unknown): obj is string => (
     typeof obj === 'string'
 )
 
+const isInt = (obj: unknown): obj is number => (
+    Number.isSafeInteger(obj)
+)
+
+function fallbackToUndefined<T>(obj: unknown, isT: ((obj: unknown) => obj is T)) {
+    if (!isT(obj)) return undefined
+
+    return obj
+}
+
 type SetState<T> = React.Dispatch<React.SetStateAction<T>>
 
 export type { SetState }
 
-export { isRecord, isObject, isConst, isLiteralUnion, isArrayOf, isString }
+export { isRecord, isObject, isConst, isLiteralUnion, isArrayOf, isString, isInt, fallbackToUndefined }