Trying to change models

Added useSendButtonCaption hook
Related to #19

.containerignore

@@ -26,6 +26,7 @@ dist-ssr
 .venv
 
 *.db
+uploads/
 .env
 
 __pycache__

.gitignore

@@ -26,6 +26,7 @@ dist-ssr
 .venv
 
 *.db
+uploads/
 .env
 
 __pycache__

Dockerfile

@@ -6,9 +6,9 @@ COPY front .
 RUN npm run build
 
 FROM python:3-slim
-WORKDIR /app
+WORKDIR /srv
 COPY requirements.txt .
 RUN pip install --no-cache-dir --upgrade -r requirements.txt
-COPY ./app ./app
+COPY ./back ./back
 COPY --from=builder /src/dist ./front/dist
-CMD uvicorn app.main:app --host 0.0.0.0 --port 80
+CMD uvicorn back.main:app --host 0.0.0.0 --port 80

README.md

@@ -1,11 +1,15 @@
 # Porridger
 
-Food and other stuff sharing platform
+Food and other stuff sharing platform. The service was developed during Digital Students hackathon by "Полка Billy" team.
+
+Members:
+
+* Dmitry Gantimurov - Backend
+* Dmitriy Shishkov - Frontend
+* Vladimir Yakovlev - Backend & Design
 
 ## Dev build instructions
 
-To connect to backend in dev mode edit `API_URL` to `localhost:8000` in `front/src/config.js`
-
 Frontend:
 
 ```sh
@@ -21,7 +25,7 @@ Backend:
 ```sh
 pip install -r requirements.txt
 
-uvicorn app.main:app --reload
+uvicorn back.main:app --reload
 ```
 
 ## Deploy instructions
@@ -31,5 +35,5 @@ Only docker/podman are required
 ```sh
 docker build . -t porridger:build
 
-docker run --name porridger -p 8080:80 -v ./sql_app.db:/app/sql_app.db porridger:build
+docker run --name porridger -p 8080:80 -v ./sql_app.db:/srv/sql_app.db -v uploads:/srv/uploads porridger:build
 ```

alembic.ini

@@ -0,0 +1,102 @@
+# A generic, single database configuration.
+
+[alembic]
+# path to migration scripts
+script_location = migrations
+
+# template used to generate migration files
+# file_template = %%(rev)s_%%(slug)s
+
+# sys.path path, will be prepended to sys.path if present.
+# defaults to the current working directory.
+prepend_sys_path = .
+
+# timezone to use when rendering the date within the migration file
+# as well as the filename.
+# If specified, requires the python-dateutil library that can be
+# installed by adding `alembic[tz]` to the pip requirements
+# string value is passed to dateutil.tz.gettz()
+# leave blank for localtime
+# timezone =
+
+# max length of characters to apply to the
+# "slug" field
+# truncate_slug_length = 40
+
+# set to 'true' to run the environment during
+# the 'revision' command, regardless of autogenerate
+# revision_environment = false
+
+# set to 'true' to allow .pyc and .pyo files without
+# a source .py file to be detected as revisions in the
+# versions/ directory
+# sourceless = false
+
+# version location specification; This defaults
+# to migrations/versions.  When using multiple version
+# directories, initial revisions must be specified with --version-path.
+# The path separator used here should be the separator specified by "version_path_separator" below.
+# version_locations = %(here)s/bar:%(here)s/bat:migrations/versions
+
+# version path separator; As mentioned above, this is the character used to split
+# version_locations. The default within new alembic.ini files is "os", which uses os.pathsep.
+# If this key is omitted entirely, it falls back to the legacy behavior of splitting on spaces and/or commas.
+# Valid values for version_path_separator are:
+#
+# version_path_separator = :
+# version_path_separator = ;
+# version_path_separator = space
+version_path_separator = os  # Use os.pathsep. Default configuration used for new projects.
+
+# the output encoding used when revision files
+# are written from script.py.mako
+# output_encoding = utf-8
+
+# sqlalchemy.url = driver://user:pass@localhost/dbname
+
+
+[post_write_hooks]
+# post_write_hooks defines scripts or Python functions that are run
+# on newly generated revision scripts.  See the documentation for further
+# detail and examples
+
+# format using "black" - use the console_scripts runner, against the "black" entrypoint
+# hooks = black
+# black.type = console_scripts
+# black.entrypoint = black
+# black.options = -l 79 REVISION_SCRIPT_FILENAME
+
+# Logging configuration
+[loggers]
+keys = root,sqlalchemy,alembic
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARN
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARN
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S

app/main.py

@@ -1,270 +0,0 @@
-#подключение библиотек
-from fastapi import FastAPI, Response, Path, Depends, Body, Query, status, HTTPException, APIRouter
-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 sqlalchemy import create_engine
-from sqlalchemy import Column, Integer, String
-from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import sessionmaker, Session
-from pydantic import json
-from starlette.staticfiles import StaticFiles
-from app.utils import *
-import requests
-from uuid import uuid4
-
-SQLALCHEMY_DATABASE_URL = "sqlite:///./sql_app.db"
-engine = create_engine(
-    SQLALCHEMY_DATABASE_URL, connect_args={"check_same_thread": False}
-)
-
-Base = declarative_base()
-
-class UserDatabase(Base):#класс пользователя
-    __tablename__ = "users"
-
-    id = Column(Integer, primary_key=True, index=True)#айди пользователя
-    phone = Column(Integer, nullable=True)#номер телефона пользователя
-    email = Column(String)#электронная почта пользователя
-    password = Column(String) # пароль
-    hashed_password = Column(String) 
-    name = Column(String, nullable=True)#имя пользователя
-    surname = Column(String)#фамилия пользователя
-
-
-class Announcement(Base): #класс объявления
-    __tablename__ = "announcements"
-
-    id = Column(Integer, primary_key=True, index=True)#айди объявления
-    user_id = Column(Integer)#айди создателя объявления
-    name = Column(String) # название объявления
-    category = Column(String)#категория продукта из объявления
-    best_by = Column(Integer)#срок годности продукта из объявления
-    adress = Column(String)
-    longtitude = Column(Integer)
-    latitude = Column(Integer)
-    description = Column(String)#описание продукта в объявлении
-    src = Column(String, nullable=True) #изображение продукта в объявлении
-    metro = Column(String)#ближайщее метро от адреса нахождения продукта
-    trashId = Column(Integer, nullable=True)
-    booked_by = Column(Integer)#статус бронирования (либо -1, либо айди бронирующего)
-
-
-class Trashbox(Base):#класс мусорных баков
-    __tablename__ = "trashboxes"
-
-    id = Column(Integer, primary_key=True, index=True)#айди 
-    name = Column(String, nullable=True)#имя пользователя
-    adress = Column(String)
-    latitude = Column(Integer)
-    longtitude = Column(Integer)
-    category = Column(String)#категория продукта из объявления
-    
-
-Base.metadata.create_all(bind=engine)
-
-SessionLocal = sessionmaker(autoflush=True, bind=engine)
-db = SessionLocal()
-
-# Пробный чувак
-tom = UserDatabase(name="Tom", phone="89999999", email="pupka", password="1234", surname="Smith")
-# db.add(tom)     # добавляем в бд
-# db.commit()     # сохраняем изменения
-# db.refresh(tom)  # обновляем состояние объекта
-
-# Пробное объявление 1
-a1 = Announcement(user_id=1, category="cat", best_by="201223", adress="abd", longtitude=23, latitude=22,
-description="abv", src="111", metro="Lesnaya", booked_by=2)
-# Пробное объявление 2
-a2 = Announcement(user_id=1, category="dog", best_by="221223", adress="abd", longtitude=50, latitude=12, 
-description="vvv", src="110", metro="Petrogradskaya", booked_by=2)
-
-a3 = Announcement(user_id=1, category="a", best_by="221223", adress="abd", longtitude=20, latitude=25,
-description="vvv", src="101", metro="metro", booked_by=2)
-
-trash1 = Trashbox(name="Tom", adress="abd", longtitude=23, latitude=22, category="indisposable")
-
-# db.add(a1)     # добавляем в бд
-# db.add(a2)     # добавляем в бд
-# db.add(a3)     # добавляем в бд
-# db.add(trash1)     # добавляем в бд
-# db.commit()     # сохраняем изменения
-# db.refresh(a1)  # обновляем состояние объекта
-# db.refresh(a2)  # обновляем состояние объекта
-# db.refresh(a3)  # обновляем состояние объекта
-# db.refresh(trash1)  # обновляем состояние объекта
-
-# # Удалить все
-# db.query(User).delete()
-# db.query(Announcement).delete()
-# db.commit()
-
-# Непосредственно преложение
-app = FastAPI()
-
-templates = Jinja2Templates(directory="./front/dist")
-
-app.mount("/static", StaticFiles(directory = "./front/dist"))
-
-@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, "adress": annoncement.adress,
-                "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(data = Body()):
-    try:
-        temp_ancmt = Announcement(data.id, data.userId, data.name, data.category, data.bestBy, data.adress, data.longtitude, data.latitude, data.description, data.src, data.metro, data.trashId, data.bookedBy)
-        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.put("/api/book")
-def change_book_status(data = Body()):
-    # Получаем id пользователя, который бронирует объявление
-    temp_user_id = 1
-    # Находим объявление по данному id
-    announcement_to_change = db.query(Announcement).filter(user_id == temp_user_id).first()
-    # Изменяем поле booked_status на полученный id
-    announcement_to_change.booked_status = temp_user_id
-    return {"Success": True}
-
-@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"{lat}",
-        'y' : f"{lng}",
-        '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 = {}
-        temp_dict["Category"] = trashbox["Category"]
-        for obj in trashbox["Objects"]:
-            coord_list = obj["geometry"]
-            temp_dict["Lat"] = coord_list["coordinates"][0]
-            temp_dict["Lng"] = coord_list["coordinates"][1]
-            
-            properties = obj["properties"]
-            temp_dict["Name"] = properties["title"]
-            temp_dict["Adress"] = properties["address"]
-        trashboxes.append(temp_dict)
-    return JSONResponse(trashboxes)
-
-@app.get("/{rest_of_path:path}")
-async def react_app(req: Request, rest_of_path: str):
-    return templates.TemplateResponse('index.html', { 'request': req })

app/utils.py

@@ -1,161 +0,0 @@
-# from passlib.context import CryptContext
-# import os
-# from datetime import datetime, timedelta
-# from typing import Union, Any
-# from jose import jwt
-
-# ACCESS_TOKEN_EXPIRE_MINUTES = 30  # 30 minutes
-# REFRESH_TOKEN_EXPIRE_MINUTES = 60 * 24 * 7 # 7 days
-# ALGORITHM = "HS256"
-# # В предположении, что попыток взлома не будет, возьмем простейший ключ
-# JWT_SECRET_KEY = "secret key" # может также быть os.environ["JWT_SECRET_KEY"]
-# JWT_REFRESH_SECRET_KEY = "refresh secret key" # может также быть os.environ["JWT_REFRESH_SECRET_KEY"]
-
-
-# def get_hashed_password(password: str) -> str:
-#     return password_context.hash(password)
-
-
-# def verify_password(password: str, hashed_pass: str) -> bool:
-#     return password_context.verify(password, hashed_pass)
-
-
-# def create_access_token(subject: Union[str, Any], expires_delta: int = None) -> str:
-#     if expires_delta is not None:
-#         expires_delta = datetime.utcnow() + expires_delta
-#     else:
-#         expires_delta = datetime.utcnow() + timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES)
-    
-#     to_encode = {"exp": expires_delta, "sub": str(subject)}
-#     encoded_jwt = jwt.encode(to_encode, JWT_SECRET_KEY, ALGORITHM)
-#     return encoded_jwt
-
-# def create_refresh_token(subject: Union[str, Any], expires_delta: int = None) -> str:
-#     if expires_delta is not None:
-#         expires_delta = datetime.utcnow() + expires_delta
-#     else:
-#         expires_delta = datetime.utcnow() + timedelta(minutes=REFRESH_TOKEN_EXPIRE_MINUTES)
-    
-#     to_encode = {"exp": expires_delta, "sub": str(subject)}
-#     encoded_jwt = jwt.encode(to_encode, JWT_REFRESH_SECRET_KEY, ALGORITHM)
-#     return encoded_jwt
-
-
-
-from datetime import datetime, timedelta
-from typing import Annotated, Union
-
-from fastapi import Depends, FastAPI, HTTPException, status
-from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm
-from jose import JWTError, jwt
-from passlib.context import CryptContext
-from pydantic import BaseModel
-
-# to get a string like this run:
-# openssl rand -hex 32
-SECRET_KEY = "09d25e094faa6ca2556c818166b7a9563b93f7099f6f0f4caa6cf63b88e8d3e7"
-ALGORITHM = "HS256"
-ACCESS_TOKEN_EXPIRE_MINUTES = 30
-
-
-# fake_users_db = {
-#     "johndoe": {
-#         "email": "johndoe",
-#         "full_name": "John Doe",
-#         "email": "johndoe@example.com",
-#         "hashed_password": "$2b$12$EixZaYVK1fsbw1ZfbX3OXePaWxn96p36WQoeG6Lruj3vjPGga31lW",
-#         "disabled": False,
-#     }
-# }
-
-
-class Token(BaseModel):
-    access_token: str
-    token_type: str
-
-
-class TokenData(BaseModel):
-    email: Union[str, None] = None
-
-
-class User(BaseModel):
-    email: str
-    email: Union[str, None] = None
-    # password: str
-    # password: Union[str, None] = None
-    full_name: Union[str, None] = None
-    disabled: Union[bool, None] = None
-
-
-class UserInDB(User):
-    hashed_password: str
-
-
-pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
-
-oauth2_scheme = OAuth2PasswordBearer(tokenUrl="token")
-
-def verify_password(plain_password, hashed_password):
-    return pwd_context.verify(plain_password, hashed_password)
-
-
-def get_password_hash(password):
-    return pwd_context.hash(password)
-
-
-def get_user(db, email: str):
-    user = None
-    for person_with_correct_email in db:
-        if person_with_correct_email.email == email:
-            user = person_with_correct_email
-            break
-    return user #UserInDB(user_email)
-    
-
-
-def authenticate_user(db, email: str, password: str):
-    user = get_user(db, email)
-    if not user:
-        return False
-    if not verify_password(password, user.hashed_password):
-        return False
-    return user
-
-
-def create_access_token(data: dict, expires_delta: Union[timedelta, None] = None):
-    to_encode = data.copy()
-    if expires_delta:
-        expire = datetime.utcnow() + expires_delta
-    else:
-        expire = datetime.utcnow() + timedelta(minutes=15)
-    to_encode.update({"exp": expire})
-    encoded_jwt = jwt.encode(to_encode, SECRET_KEY, algorithm=ALGORITHM)
-    return encoded_jwt
-
-
-async def get_current_user(token: Annotated[str, Depends(oauth2_scheme)]):
-    credentials_exception = HTTPException(
-        status_code=status.HTTP_401_UNAUTHORIZED,
-        detail="Could not validate credentials",
-        headers={"WWW-Authenticate": "Bearer"},
-    )
-    try:
-        payload = jwt.decode(token, SECRET_KEY, algorithms=[ALGORITHM])
-        email: str = payload.get("sub")
-        if email is None:
-            raise credentials_exception
-        token_data = TokenData(email=email)
-    except JWTError:
-        raise credentials_exception
-    user = get_user(fake_users_db, email=token_data.email)
-    if user is None:
-        raise credentials_exception
-    return user
-
-
-async def get_current_active_user(
-    current_user: Annotated[User, Depends(get_current_user)]
-):
-    if current_user.disabled:
-        raise HTTPException(status_code=400, detail="Inactive user")
-    return current_user

back/base.py

@@ -0,0 +1,2 @@
+from .db import Base
+from .models import UserDatabase, Announcement, Trashbox

back/db.py

@@ -0,0 +1,21 @@
+from typing import AsyncGenerator
+
+from sqlalchemy import create_engine, select
+# from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
+from sqlalchemy.orm import sessionmaker, Session
+from sqlalchemy.ext.declarative import declarative_base
+
+from fastapi import Depends
+# from fastapi_users.db import SQLAlchemyBaseUserTableUUID, SQLAlchemyUserDatabase
+
+
+SQLALCHEMY_DATABASE_URL = "sqlite:///./sql_app.db"
+
+engine = create_engine(
+    SQLALCHEMY_DATABASE_URL, connect_args={"check_same_thread": False}
+)
+
+SessionLocal = sessionmaker(bind=engine, autoflush=True, autocommit=False)
+
+database = SessionLocal()
+Base = declarative_base()

back/db_manipultations.py

@@ -0,0 +1,40 @@
+from .db import engine
+from .models import Announcement, UserDatabase, Trashbox, Base
+
+
+Base.metadata.create_all(bind=engine)
+
+db = SessionLocal()
+
+# Пробный чувак
+tom = UserDatabase(name="Tom", phone="89999999", email="pupka", password="1234", surname="Smith")
+# db.add(tom)     # добавляем в бд
+# db.commit()     # сохраняем изменения
+# db.refresh(tom)  # обновляем состояние объекта
+
+# Пробное объявление 1
+a1 = Announcement(user_id=1, category="cat", best_by="201223", address="abd", longtitude=23, latitude=22,
+description="abv", src="111", metro="Lesnaya", booked_by=2)
+# Пробное объявление 2
+a2 = Announcement(user_id=1, category="dog", best_by="221223", address="abd", longtitude=50, latitude=12, 
+description="vvv", src="110", metro="Petrogradskaya", booked_by=2)
+
+a3 = Announcement(user_id=1, category="a", best_by="221223", address="abd", longtitude=20, latitude=25,
+description="vvv", src="101", metro="metro", booked_by=2)
+
+trash1 = Trashbox(name="Tom", address="abd", longtitude=23, latitude=22, category="indisposable")
+
+# db.add(a1)     # добавляем в бд
+# db.add(a2)     # добавляем в бд
+# db.add(a3)     # добавляем в бд
+# db.add(trash1)     # добавляем в бд
+# db.commit()     # сохраняем изменения
+# db.refresh(a1)  # обновляем состояние объекта
+# db.refresh(a2)  # обновляем состояние объекта
+# db.refresh(a3)  # обновляем состояние объекта
+# db.refresh(trash1)  # обновляем состояние объекта
+
+# # Удалить все
+# db.query(User).delete()
+# db.query(Announcement).delete()
+# db.commit()

back/main.py

@@ -0,0 +1,232 @@
+#подключение библиотек
+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 .db import Base, engine, SessionLocal, database
+from .models import Announcement, Trashbox, UserDatabase
+
+from . import schema
+
+Base.metadata.create_all(bind=engine)
+
+app = FastAPI()
+
+templates = Jinja2Templates(directory="./front/dist")
+
+app.mount("/static", StaticFiles(directory = "./front/dist"))
+if not os.path.exists("./uploads"):
+    os.mkdir("C:/Users/38812/porridger/uploads")
+app.mount("/uploads", StaticFiles(directory = "./uploads"))
+
+
+# Функция, создающая сессию БД при каждом запросе к нашему API.
+# Срабатывает до запуска остальных функций.
+# Всегда закрывает сессию при окончании работы с ней
+@app.middleware("http")
+async def db_session_middleware(request: Request, call_next):
+    response = Response("Internal server error", status_code=500)
+    try:
+        request.state.db = SessionLocal()
+        response = await call_next(request)
+    finally:
+        request.state.db.close()
+    return response
+
+
+@app.get("/api/announcements")#адрес объявлений 
+def annoncements_list(user_id: int = None, metro: str = None, category: str = None, booked_by: int = 0):
+    # Считываем данные из Body и отображаем их на странице.
+    # В последствии будем вставлять данные в html-форму
+
+    a = database.query(Announcement)
+    b = database.query(Announcement)
+    c = database.query(Announcement)
+    d = database.query(Announcement)
+    e = database.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 = database.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: UploadFile, metro: Annotated[str, Form()], trashId: Annotated[int, Form()] = None):
+    # 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:
+        database.delete(user_id=data.user_id)#удаление из БД
+        database.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 = database.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}
+
+# reginstration
+@app.post("/api/signup")
+def create_user(data = Body()):
+    if database.query(UserDatabase).filter(UserDatabase.email == data["email"]).first() == None:
+        new_user = UserDatabase(id=data["id"], email=data["email"], password=data["password"], name=data["name"], surname=data["surname"])
+        database.add(new_user)
+        database.commit()
+        database.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(database, 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
+
+
+@app.get("/api/users/me/", response_model=schema.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.eyJleHAiOjE3ODM3ODk4NjgsImlhdCI6MTY4OTA5NTQ2OCwianRpIjoiNDUzNjQzZTgtYTkyMi00NTI4LWIzYmMtYWJiYTNmYjkyNTkxIiwiaXNzIjoiaHR0cHM6Ly9rYy5wZXRlcnNidXJnLnJ1L3JlYWxtcy9lZ3MtYXBpIiwiYXVkIjoiYWNjb3VudCIsInN1YiI6ImJjYjQ2NzljLTU3ZGItNDU5ZC1iNWUxLWRlOGI4Yzg5MTMwMyIsInR5cCI6IkJlYXJlciIsImF6cCI6ImFkbWluLXJlc3QtY2xpZW50Iiwic2Vzc2lvbl9zdGF0ZSI6ImM2ZDJiOTZhLWMxNjMtNDAxZS05ZjMzLTI0MmE0NDcxMDY5OCIsImFjciI6IjEiLCJhbGxvd2VkLW9yaWdpbnMiOlsiLyoiXSwicmVhbG1fYWNjZXNzIjp7InJvbGVzIjpbImRlZmF1bHQtcm9sZXMtZWdzLWFwaSIsIm9mZmxpbmVfYWNjZXNzIiwidW1hX2F1dGhvcml6YXRpb24iXX0sInJlc291cmNlX2FjY2VzcyI6eyJhY2NvdW50Ijp7InJvbGVzIjpbIm1hbmFnZS1hY2NvdW50IiwibWFuYWdlLWFjY291bnQtbGlua3MiLCJ2aWV3LXByb2ZpbGUiXX19LCJzY29wZSI6ImVtYWlsIHByb2ZpbGUiLCJzaWQiOiJjNmQyYjk2YS1jMTYzLTQwMWUtOWYzMy0yNDJhNDQ3MTA2OTgiLCJlbWFpbF92ZXJpZmllZCI6ZmFsc2UsIm5hbWUiOiLQktC70LDQtNC40LzQuNGAINCv0LrQvtCy0LvQtdCyIiwicHJlZmVycmVkX3VzZXJuYW1lIjoiZTBmYzc2OGRhOTA4MjNiODgwZGQzOGVhMDJjMmQ5NTciLCJnaXZlbl9uYW1lIjoi0JLQu9Cw0LTQuNC80LjRgCIsImZhbWlseV9uYW1lIjoi0K_QutC-0LLQu9C10LIifQ.E2bW0B-c6W5Lj63eP_G8eI453NlDMnW05l11TZT0GSsAtGayXGaolHtWrmI90D5Yxz7v9FGkkCmcUZYy1ywAdO9dDt_XrtFEJWFpG-3csavuMjXmqfQQ9SmPwDw-3toO64NuZVv6qVqoUlPPj57sLx4bLtVbB4pdqgyJYcrDHg7sgwz4d1Z3tAeUfSpum9s5ZfELequfpLoZMXn6CaYZhePaoK-CxeU3KPBPTPOVPKZZ19s7QY10VdkxLULknqf9opdvLs4j8NMimtwoIiHNBFlgQz10Cr7bhDKWugfvSRsICouniIiBJo76wrj5T92s-ztf1FShJuqnQcKE_QLd2A'
+    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 })

back/models.py

@@ -0,0 +1,74 @@
+from sqlalchemy import Column, Integer, String
+from fastapi_users.db import SQLAlchemyBaseUserTableUUID, SQLAlchemyUserDatabase
+from fastapi import Depends
+from .db import Base
+
+
+class User(SQLAlchemyBaseUserTableUUID, Base):
+    pass
+
+
+
+class UserDatabase(Base):#класс пользователя
+    __tablename__ = "users"
+
+    id = Column(Integer, primary_key=True, index=True, unique=True)#айди пользователя
+    phone = Column(Integer, nullable=True)#номер телефона пользователя
+    email = Column(String)#электронная почта пользователя
+    password = Column(String) # пароль
+    hashed_password = Column(String) 
+    name = Column(String, nullable=True)#имя пользователя
+    surname = Column(String)#фамилия пользователя
+
+
+class Announcement(Base): #класс объявления
+    __tablename__ = "announcements"
+
+    id = Column(Integer, primary_key=True, index=True)#айди объявления
+    user_id = Column(Integer)#айди создателя объявления
+    name = Column(String) # название объявления
+    category = Column(String)#категория продукта из объявления
+    best_by = Column(Integer)#срок годности продукта из объявления
+    address = Column(String)
+    longtitude = Column(Integer)
+    latitude = Column(Integer)
+    description = Column(String)#описание продукта в объявлении
+    src = Column(String, nullable=True) #изображение продукта в объявлении
+    metro = Column(String)#ближайщее метро от адреса нахождения продукта
+    trashId = Column(Integer, nullable=True)
+    booked_by = Column(Integer)#статус бронирования (либо -1, либо айди бронирующего)
+
+
+class Trashbox(Base):#класс мусорных баков
+    __tablename__ = "trashboxes"
+
+    id = Column(Integer, primary_key=True, index=True)#айди 
+    name = Column(String, nullable=True)#имя пользователя
+    address = Column(String)
+    latitude = Column(Integer)
+    longtitude = Column(Integer)
+    category = Column(String)#категория продукта из объявления
+    
+
+class Poems(Base):#класс поэзии
+    __tablename__ = "poems"
+
+    id = Column(Integer, primary_key=True, index=True)  #айди 
+    poem_text = Column(String) # текст стихотворения
+
+# from typing import AsyncGenerator
+# from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
+# from fastapi_users.db import SQLAlchemyBaseUserTableUUID, SQLAlchemyUserDatabase
+# # This function can be called during the initialization of the FastAPI app.
+# async def create_db_and_tables():
+#     async with engine.begin() as conn:
+#         await conn.run_sync(Base.metadata.create_all)
+
+
+# async def get_async_session() -> AsyncGenerator[AsyncSession, None]:
+#     async with async_session_maker() as session:
+#         yield session
+
+
+# async def get_user_db(session: AsyncSession = Depends(get_async_session)):
+#     yield SQLAlchemyUserDatabase(session, User)

back/schema.py

@@ -0,0 +1,29 @@
+from pydantic import BaseModel
+from typing import Annotated, Union
+
+class Book(BaseModel):
+    id: int
+    
+
+class Token(BaseModel):
+    access_token: str
+    token_type: str
+
+
+class TokenData(BaseModel):
+    email: Union[str, None] = None
+
+
+class User(BaseModel):
+    id: int
+    phone: Union[int, None] = None
+    email: str
+    name: Union[str, None] = None
+    surname: str
+
+    class Config:
+        orm_mode = True
+
+class UserInDB(User):
+    password: str
+    hashed_password: str

back/service.py

@@ -0,0 +1,2 @@
+from sqlalchemy.orm import Session
+

back/utils.py

@@ -0,0 +1,92 @@
+from datetime import datetime, timedelta
+from typing import Annotated, Union
+
+from fastapi import Depends, FastAPI, HTTPException, status, Response, Request
+from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm
+from jose import JWTError, jwt
+from passlib.context import CryptContext
+
+from sqlalchemy.orm import Session
+from sqlalchemy import select
+
+from .db import Session, database
+from .models import UserDatabase
+
+from .schema import Token, TokenData, UserInDB, User
+
+SECRET_KEY = "09d25e094faa6ca2556c818166b7a9563b93f7099f6f0f4caa6cf63b88e8d3e7"
+ALGORITHM = "HS256"
+ACCESS_TOKEN_EXPIRE_MINUTES = 30
+
+
+pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
+
+oauth2_scheme = OAuth2PasswordBearer(tokenUrl="token")
+
+def verify_password(plain_password, hashed_password):
+    return pwd_context.verify(plain_password, hashed_password)
+
+
+def get_password_hash(password):
+    return pwd_context.hash(password)
+
+
+# проблема здесь
+def get_user(db: Session, email: str):
+    user_with_required_email = db.query(UserDatabase).filter(UserDatabase.email == email).first()
+    print(user_with_required_email)
+    if user_with_required_email:
+        return user_with_required_email
+    return None
+    
+
+def authenticate_user(db: Session, email: str, password: str):
+    user = get_user(db, email)
+    if not user:
+        return False
+    if not verify_password(password, user.hashed_password):
+        return False
+    return user
+
+
+def create_access_token(data: dict, expires_delta: Union[timedelta, None] = None):
+    to_encode = data.copy()
+    if expires_delta:
+        expire = datetime.utcnow() + expires_delta
+    else:
+        expire = datetime.utcnow() + timedelta(minutes=15)
+    to_encode.update({"exp": expire})
+    encoded_jwt = jwt.encode(to_encode, SECRET_KEY, algorithm=ALGORITHM)
+    return encoded_jwt
+
+
+async def get_current_user(db: Session, token: Annotated[str, Depends(oauth2_scheme)]):
+    credentials_exception = HTTPException(
+        status_code=status.HTTP_401_UNAUTHORIZED,
+        detail="Could not validate credentials",
+        headers={"WWW-Authenticate": "Bearer"},
+    )
+    try:
+        payload = jwt.decode(token, SECRET_KEY, algorithms=[ALGORITHM])
+        email: str = payload.get("sub")
+        if email is None:
+            raise credentials_exception
+        token_data = TokenData(email=email)
+    except JWTError:
+        raise credentials_exception
+    user = get_user(db, email=token_data.email)
+    if user == None:
+        raise credentials_exception
+    return user
+
+
+async def get_current_active_user(
+    current_user: Annotated[User, Depends(get_current_user)]
+):
+    if current_user.disabled:
+        raise HTTPException(status_code=400, detail="Inactive user")
+    return current_user
+
+
+def get_db(request: Request):
+    return request.state.db

front/.eslintrc.cjs

@@ -1,15 +1,36 @@
+/* eslint-env node */
+
 module.exports = {
+  root: true,
   env: { browser: true, es2020: true },
   extends: [
     'eslint:recommended',
-    'plugin:react/recommended',
-    'plugin:react/jsx-runtime',
+    'plugin:@typescript-eslint/recommended',
+    'plugin:@typescript-eslint/recommended-requiring-type-checking',
     'plugin:react-hooks/recommended',
   ],
-  parserOptions: { ecmaVersion: 'latest', sourceType: 'module' },
-  settings: { react: { version: '18.2' } },
+  parser: '@typescript-eslint/parser',
+  parserOptions: {
+    ecmaVersion: 'latest',
+    sourceType: 'module',
+    project: true,
+    tsconfigRootDir: __dirname,
+  },
   plugins: ['react-refresh'],
   rules: {
-    'react-refresh/only-export-components': 'warn',
+    'react-refresh/only-export-components': [
+      'warn',
+      { allowConstantExport: true },
+    ],
+    '@typescript-eslint/no-non-null-assertion': 'off',
+    '@typescript-eslint/quotes': [
+      'error',
+      'single',
+      {
+        'avoidEscape': true,
+        'allowTemplateLiterals': true
+      }
+    ],
+    'jsx-quotes': [2, 'prefer-single'],
   },
 }

front/index.html

@@ -5,11 +5,9 @@
     <link rel="icon" type="image/png" href="/favicon.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Porridger</title>
-    <!-- most likely will be loaded from browser cache -->
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-KK94CHFLLe+nY2dmCWGMq91rCGa5gtU4mk92HdvYe+M/SXH301p5ILy+dN9+nJOZ" crossorigin="anonymous">
   </head>
   <body>
     <div id="root"></div>
-    <script type="module" src="/src/main.jsx"></script>
+    <script type="module" src="/src/main.tsx"></script>
   </body>
 </html>

front/package.json

@@ -1,32 +1,38 @@
 {
-  "name": "v2",
+  "name": "front",
   "private": true,
   "version": "0.0.0",
   "type": "module",
   "scripts": {
-    "dev": "vite",
-    "build": "vite build",
-    "lint": "eslint src --ext js,jsx --report-unused-disable-directives --max-warnings 0",
-    "preview": "vite preview"
+    "dev": "vite --host 0.0.0.0",
+    "build": "tsc && vite build",
+    "lint": "eslint src --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
+    "preview": "vite preview",
+    "typecheck": "tsc",
+    "addFetchApiRoute": "bash utils/addFetchApiRoute.sh"
   },
   "dependencies": {
-    "bootstrap": "^5.2.3",
-    "leaflet": "^1.9.3",
+    "@types/leaflet": "^1.9.3",
+    "bootstrap": "^5.3.0",
+    "leaflet": "^1.9.4",
     "react": "^18.2.0",
-    "react-bootstrap": "^2.7.4",
+    "react-bootstrap": "^2.8.0",
+    "react-bootstrap-typeahead": "^6.2.3",
     "react-dom": "^18.2.0",
-    "react-insta-stories": "^2.5.9",
+    "react-insta-stories": "^2.6.1",
     "react-leaflet": "^4.2.1",
-    "react-router-dom": "^6.11.1"
+    "react-router-dom": "^6.14.1"
   },
   "devDependencies": {
-    "@types/react": "^18.0.28",
-    "@types/react-dom": "^18.0.11",
-    "@vitejs/plugin-react": "^4.0.0",
-    "eslint": "^8.38.0",
-    "eslint-plugin-react": "^7.32.2",
+    "@types/react": "^18.2.14",
+    "@types/react-dom": "^18.2.6",
+    "@typescript-eslint/eslint-plugin": "^5.61.0",
+    "@typescript-eslint/parser": "^5.61.0",
+    "@vitejs/plugin-react": "^4.0.1",
+    "eslint": "^8.44.0",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-react-refresh": "^0.3.4",
-    "vite": "^4.3.2"
+    "eslint-plugin-react-refresh": "^0.4.1",
+    "typescript": "^5.0.2",
+    "vite": "^4.4.0"
   }
 }

front/src/App.css

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

front/src/App.tsx

@@ -1,9 +1,9 @@
 import { BrowserRouter as Router, Route, Routes } from 'react-router-dom'
 
 import { HomePage, AddPage, LoginPage, UserPage } from './pages'
+import { WithToken } from './components'
 
-import WithToken from './components/WithToken'
-
+import 'leaflet/dist/leaflet.css'
 import './App.css'
 
 function App() {
@@ -11,17 +11,17 @@ function App() {
     <Router>
       <Routes>
         <Route index element={<HomePage />} />
-        <Route path="/add" element={
+        <Route path='/add' element={
           <WithToken>
             <AddPage />
           </WithToken>
         } />
-        <Route path="/user" element={
+        <Route path='/user' element={
           <WithToken>
             <UserPage />
           </WithToken>
         } />
-        <Route path="/login" element={<LoginPage />} />
+        <Route path='/login' element={<LoginPage />} />
       </Routes>
     </Router>
   )

front/src/api/announcement/types.ts

@@ -0,0 +1,61 @@
+import { isObject } from '../../utils/types'
+import { Category, isCategory } from '../../assets/category'
+
+type AnnouncementResponse = {
+    id: number,
+    user_id: number,
+    name: string,
+    category: Category,
+    best_by: number,
+    address: string,
+    longtitude: number,
+    latitude: number,
+    description: string,
+    src: string | null,
+    metro: string,
+    trashId: number | null,
+    booked_by: number
+}
+
+const isAnnouncementResponse = (obj: unknown): obj is AnnouncementResponse => (
+    isObject(obj, {
+        'id': 'number',
+        'user_id': 'number',
+        'name': 'string',
+        'category': isCategory,
+        'best_by': 'number',
+        'address': 'string',
+        'longtitude': 'number',
+        'latitude': 'number',
+        'description': 'string',
+        'src': 'string?',
+        'metro': 'string',
+        'trashId': 'number?',
+        'booked_by': 'number'
+    })
+)
+
+type Announcement = {
+    id: number,
+    userId: number,
+    name: string,
+    category: Category,
+    bestBy: number,
+    address: string,
+    lng: number,
+    lat: number,
+    description: string | null,
+    src: string | null,
+    metro: string,
+    trashId: number | null,
+    bookedBy: number
+}
+
+export type {
+    Announcement,
+    AnnouncementResponse,
+}
+
+export {
+    isAnnouncementResponse,
+}

front/src/api/announcements/index.ts

@@ -0,0 +1,25 @@
+import { API_URL } from '../../config'
+import { FiltersType, URLEncodeFilters } from '../../utils/filters'
+import { Announcement } from '../announcement/types'
+import { AnnouncementsResponse } from './types'
+
+const initialAnnouncements: Announcement[] = []
+
+const composeAnnouncementsURL = (filters: FiltersType) => (
+    API_URL + '/announcements?' + new URLSearchParams(URLEncodeFilters(filters)).toString()
+)
+
+const processAnnouncements = (data: AnnouncementsResponse): Announcement[] => {
+    const annList = data.list_of_announcements
+
+    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/announcements/types.ts

@@ -0,0 +1,22 @@
+import { isArrayOf, isObject } from '../../utils/types'
+import { AnnouncementResponse, isAnnouncementResponse } from '../announcement/types'
+
+type AnnouncementsResponse = {
+    list_of_announcements: AnnouncementResponse[],
+    Success: boolean
+}
+
+const isAnnouncementsResponse = (obj: unknown): obj is AnnouncementsResponse => (
+    isObject(obj, {
+        'list_of_announcements': obj => isArrayOf<AnnouncementResponse>(obj, isAnnouncementResponse),
+        'Success': 'boolean'
+    })
+)
+
+export type {
+    AnnouncementsResponse,
+}
+
+export {
+    isAnnouncementsResponse,
+}

front/src/api/osmAddress/index.ts

@@ -0,0 +1,14 @@
+import { LatLng } from 'leaflet'
+import { OsmAddressResponse } from './types'
+
+const initialOsmAddress = ''
+
+const composeOsmAddressURL = (addressPosition: LatLng) => (
+    `${location.protocol}//nominatim.openstreetmap.org/reverse?format=json&accept-language=ru&lat=${addressPosition.lat}&lon=${addressPosition.lng}`
+)
+
+const processOsmAddress = (data: OsmAddressResponse): string => (
+    data.display_name
+)
+
+export { initialOsmAddress, composeOsmAddressURL, processOsmAddress }

front/src/api/osmAddress/types.ts

@@ -0,0 +1,19 @@
+import { isObject } from '../../utils/types'
+
+type OsmAddressResponse = {
+    display_name: string
+}
+
+const isOsmAddressResponse = (obj: unknown): obj is OsmAddressResponse => (
+    isObject(obj, {
+        'display_name': 'string',
+    })
+)
+
+export type {
+    OsmAddressResponse,
+}
+
+export {
+    isOsmAddressResponse,
+}

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

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

front/src/api/trashbox/types.ts

@@ -0,0 +1,26 @@
+import { isArrayOf, isObject, isString } from '../../utils/types'
+
+type Trashbox = {
+    Lat: number,
+    Lng: number,
+    Address: string,
+    Categories: string[]
+}
+
+const isTrashbox = (obj: unknown): obj is Trashbox => (
+    isObject(obj, {
+        'Lat': 'number',
+        'Lng': 'number',
+        'Address': 'string',
+        'Categories': obj => isArrayOf<string>(obj, isString)
+    })
+)
+
+type TrashboxResponse = Trashbox[]
+
+const isTrashboxResponse = (obj: unknown): obj is Trashbox[] => (
+    isArrayOf(obj, isTrashbox)
+)
+
+export type { Trashbox, TrashboxResponse }
+export { isTrashbox, isTrashboxResponse }

front/src/assets/category.js

@@ -1,32 +0,0 @@
-const categoryGraphics = new Map([
-    ["PORRIDGE", "static/PORRIDGE.jpg"],
-    ["conspects", "static/conspects.jpg"],
-    ["milk", "static/milk.jpg"],
-    ["bred", "static/bred.jpg"],
-    ["wathing", "static/wathing.jpg"],
-    ["cloth", "static/cloth.jpg"],
-    ["fruits_vegatables", "static/fruits_vegatables.jpg"],
-    ["soup", "static/soup.jpg"],
-    ["dinner", "static/dinner.jpg"],
-    ["conserves", "static/conserves.jpg"],
-    ["pens", "static/pens.jpg"],
-    ["other_things", "static/other_things.jpg"]
-
-])
-
-const categoryNames = new Map([
-    ["PORRIDGE", "PORRIDGE"],
-    ["conspects", "Конспекты"],
-    ["milk", "Молочные продукты"],
-    ["bred", "Хлебобулочные изделия"],
-    ["wathing", "Моющие средства"],
-    ["cloth", "Одежда"],
-    ["fruits_vegatables", "Фрукты и овощи"],
-    ["soup", "Супы"],
-    ["dinner", "Ужин"],
-    ["conserves", "Консервы"],
-    ["pens", "Канцелярия"],
-    ["other_things", "Всякая всячина"]
-])
-
-export { categoryNames, categoryGraphics }

front/src/assets/category.ts

@@ -0,0 +1,42 @@
+import { isLiteralUnion } from '../utils/types'
+
+const categories = ['PORRIDGE', 'conspects', 'milk', 'bred', 'wathing', 'cloth',
+    'fruits_vegatables', 'soup', 'dinner', 'conserves', 'pens', 'other_things'] as const
+type Category = typeof categories[number]
+
+const isCategory = (obj: unknown): obj is Category => (
+    isLiteralUnion(obj, categories)
+)
+
+const categoryGraphics: Record<Category, string> = {
+    'PORRIDGE': 'static/PORRIDGE.jpg',
+    'conspects': 'static/conspects.jpg',
+    'milk': 'static/milk.jpg',
+    'bred': 'static/bred.jpg',
+    'wathing': 'static/wathing.jpg',
+    'cloth': 'static/cloth.jpg',
+    'fruits_vegatables': 'static/fruits_vegatables.jpg',
+    'soup': 'static/soup.jpg',
+    'dinner': 'static/dinner.jpg',
+    'conserves': 'static/conserves.jpg',
+    'pens': 'static/pens.jpg',
+    'other_things': 'static/other_things.jpg',
+}
+
+const categoryNames: Record<Category, string> = {
+    'PORRIDGE': 'PORRIDGE',
+    'conspects': 'Конспекты',
+    'milk': 'Молочные продукты',
+    'bred': 'Хлебобулочные изделия',
+    'wathing': 'Моющие средства',
+    'cloth': 'Одежда',
+    'fruits_vegatables': 'Фрукты и овощи',
+    'soup': 'Супы',
+    'dinner': 'Ужин',
+    'conserves': 'Консервы',
+    'pens': 'Канцелярия',
+    'other_things': 'Всякая всячина',
+}
+
+export type { Category }
+export { categories, categoryNames, categoryGraphics, isCategory }

front/src/assets/metro.js

@@ -1,6 +0,0 @@
-const metros = [
-    "Петроградская",
-    "Горьковская"
-]
-
-export { metros }

front/src/assets/metro.ts

@@ -0,0 +1,109 @@
+const lines = ['red', 'blue', 'green', 'orange', 'violet'] as const
+type Lines = typeof lines[number]
+
+const stations: Record<Lines, Set<string>> = {
+    red: new Set([
+        'Девяткино',
+        'Гражданский проспект',
+        'Академическая',
+        'Политехническая',
+        'Площадь Мужества',
+        'Лесная',
+        'Выборгская',
+        'Площадь Ленина',
+        'Чернышевская',
+        'Площадь Восстания',
+        'Владимирская',
+        'Пушкинская',
+        'Технологический институт',
+        'Балтийская',
+        'Нарвская',
+        'Кировский завод',
+        'Автово',
+        'Ленинский проспект',
+        'Проспект Ветеранов'
+    ]),
+    blue: new Set([
+        'Парнас',
+        'Проспект Просвещения',
+        'Озерки',
+        'Удельная',
+        'Пионерская',
+        'Чёрная речка',
+        'Петроградская',
+        'Горьковская',
+        'Невский проспект',
+        'Сенная площадь',
+        'Технологический институт',
+        'Фрунзенская',
+        'Московские ворота',
+        'Электросила',
+        'Парк Победы',
+        'Московская',
+        'Звёздная',
+        'Купчино'
+    ]),
+    green: new Set([
+        'Приморская',
+        'Беговая',
+        'Василеостровская',
+        'Гостиный двор',
+        'Маяковская',
+        'Площадь Александра Невского',
+        'Елизаровская',
+        'Ломоносовская',
+        'Пролетарская',
+        'Обухово',
+        'Рыбацкое'
+    ]),
+    orange: new Set([
+        'Спасская',
+        'Достоевская',
+        'Лиговский проспект',
+        'Площадь Александра Невского',
+        'Новочеркасская',
+        'Ладожская',
+        'Проспект Большевиков',
+        'Улица Дыбенко'
+    ]),
+    violet: new Set([
+        'Комендантский проспект',
+        'Старая Деревня',
+        'Крестовский остров',
+        'Чкаловская',
+        'Спортивная',
+        'Адмиралтейская',
+        'Садовая',
+        'Звенигородская',
+        'Обводный канал',
+        'Волковская',
+        'Бухарестская',
+        'Международная',
+        'Проспект славы',
+        'Дунайскай',
+        'Шушары'
+    ]),
+}
+
+const colors: Record<Lines, string> = {
+    red: '#D6083B',
+    blue: '#0078C9',
+    green: '#009A49',
+    orange: '#EA7125',
+    violet: '#702785',
+}
+
+const lineNames: Record<Lines, string> = {
+    red: 'Красная',
+    blue: 'Синяя',
+    green: 'Зелёная',
+    orange: 'Оранжевая',
+    violet: 'Фиолетовая',
+}
+
+const lineByName = (name: string) => (
+    lines.find(line => stations[line].has(name))
+)
+
+export type { Lines }
+export { lines, stations, colors, lineNames, lineByName }

front/src/assets/puff.svg

@@ -0,0 +1,13 @@
+<!-- By Sam Herbert (@sherb), for everyone. More @ http://goo.gl/7AJzbL -->
+<svg width="44" height="44" viewBox="0 0 44 44" xmlns="http://www.w3.org/2000/svg" stroke="#fff">
+    <g fill="none" fill-rule="evenodd" stroke-width="2">
+        <circle cx="22" cy="22" r="1">
+            <animate attributeName="r" begin="0s" dur="1.8s" values="1; 20" calcMode="spline" keyTimes="0; 1" keySplines="0.165, 0.84, 0.44, 1" repeatCount="indefinite"/>
+            <animate attributeName="stroke-opacity" begin="0s" dur="1.8s" values="1; 0" calcMode="spline" keyTimes="0; 1" keySplines="0.3, 0.61, 0.355, 1" repeatCount="indefinite"/>
+        </circle>
+        <circle cx="22" cy="22" r="1">
+            <animate attributeName="r" begin="-0.9s" dur="1.8s" values="1; 20" calcMode="spline" keyTimes="0; 1" keySplines="0.165, 0.84, 0.44, 1" repeatCount="indefinite"/>
+            <animate attributeName="stroke-opacity" begin="-0.9s" dur="1.8s" values="1; 0" calcMode="spline" keyTimes="0; 1" keySplines="0.3, 0.61, 0.355, 1" repeatCount="indefinite"/>
+        </circle>
+    </g>
+</svg>

front/src/components/AnnouncementDetails.jsx

@@ -1,54 +0,0 @@
-import Modal from 'react-bootstrap/Modal'
-
-import { categoryNames } from '../assets/category'
-import { MapContainer, Marker, Popup, TileLayer } from 'react-leaflet'
-import { Button } from 'react-bootstrap'
-import useBook from '../utils/useBook'
-
-function AnnouncementDetails({ close, announcement: { id, name, category, bestBy, description, lat, lng, address, metro } }) {
-    const handleBook = useBook(id)
-    
-    return (
-        <div
-            className="modal show"
-            style={{ display: 'flex', position: 'initial', alignItems: "center" }}
-        >
-            <Modal.Dialog>
-                <Modal.Header closeButton onHide={close}>
-                    <Modal.Title>
-                        Подробнее
-                    </Modal.Title>
-                </Modal.Header>
-
-                <Modal.Body>
-                    <h1>{name}</h1>
-
-                    <span>{categoryNames.get(category)}</span>
-                    <span className='m-2'>&#x2022;</span> {/* dot */}
-                    <span>Годен до {new Date(bestBy).toLocaleString('ru-RU')}</span>
-                    
-                    <p className='mb-2'>{description}</p>
-
-                    <MapContainer style={{ width: "100%", minHeight: 300 }} center={[lat, lng]} zoom={16} >
-                        <TileLayer
-                            attribution='&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
-                            url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
-                        />
-
-                        <Marker position={[lat, lng]}>
-                            <Popup>{address + "\n" + metro}</Popup>
-                        </Marker>
-                    </MapContainer>
-                </Modal.Body>
-
-                <Modal.Footer>
-                    <Button variant='success' onClick={handleBook}>
-                        Забронировать
-                    </Button>
-                </Modal.Footer>
-            </Modal.Dialog>
-        </div>
-    )
-}
-
-export default AnnouncementDetails

front/src/components/AnnouncementDetails.tsx

@@ -0,0 +1,74 @@
+import { Modal, Button } from 'react-bootstrap'
+import { MapContainer, Marker, Popup, TileLayer } from 'react-leaflet'
+
+import LineDot from './LineDot'
+import { categoryNames } from '../assets/category'
+import { useBook } from '../hooks/api'
+import { Announcement } from '../api/announcement/types'
+import { iconItem } from '../utils/markerIcons'
+import { CSSProperties } from 'react'
+
+type AnnouncementDetailsProps = {
+    close: () => void,
+    announcement: Announcement
+}
+
+const styles = {
+    container: {
+        display: 'flex',
+        alignItems: 'center',
+        justifyContent: 'center',
+    } as CSSProperties,
+}
+
+function AnnouncementDetails({ close, announcement: { id, name, category, bestBy, description, lat, lng, address, metro } }: AnnouncementDetailsProps) {
+    const { handleBook, status: bookStatus } = useBook(id)
+
+    return (
+        <div
+            className='modal'
+            style={styles.container}
+        >
+            <Modal.Dialog style={{ minWidth: '50vw' }}>
+                <Modal.Header closeButton onHide={close}>
+                    <Modal.Title>
+                        Подробнее
+                    </Modal.Title>
+                </Modal.Header>
+
+                <Modal.Body>
+                    <h1>{name}</h1>
+
+                    <span>{categoryNames[category]}</span>
+                    <span className='m-2'>&#x2022;</span>{/* dot */}
+                    <span>Годен до {new Date(bestBy).toLocaleString('ru-RU')}</span>
+
+                    <p className='mb-3'>{description}</p>
+
+                    <MapContainer style={{ width: '100%', minHeight: 300 }} center={[lat, lng]} zoom={16} >
+                        <TileLayer
+                            attribution='&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
+                            url='https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'
+                        />
+
+                        <Marker icon={iconItem} position={[lat, lng]}>
+                            <Popup>
+                                {address}
+                                <br />
+                                <LineDot station={metro} /> {metro}
+                            </Popup>
+                        </Marker>
+                    </MapContainer>
+                </Modal.Body>
+
+                <Modal.Footer>
+                    <Button variant='success' onClick={() => void handleBook()}>
+                        {bookStatus || 'Забронировать'}
+                    </Button>
+                </Modal.Footer>
+            </Modal.Dialog>
+        </div>
+    )
+}
+
+export default AnnouncementDetails

front/src/components/AuthForm.tsx

@@ -0,0 +1,56 @@
+import { FormEventHandler } from 'react'
+import { Button, Form } from 'react-bootstrap'
+
+type AuthFormProps = {
+    register: boolean
+    handleAuth: FormEventHandler<HTMLFormElement>,
+    loading: boolean,
+    error: string
+}
+
+function AuthForm ({ handleAuth, register, loading, error }: AuthFormProps) {
+    const buttonText = loading ? 'Загрузка...' : (error || (register ? 'Зарегистрироваться' : 'Войти'))
+
+    return (
+        <Form onSubmit={handleAuth}>
+            <Form.Group className='mb-3' controlId='email'>
+                <Form.Label>Почта</Form.Label>
+                <Form.Control type='email' required />
+            </Form.Group>
+
+            {register && <>
+                <Form.Group className='mb-3' controlId='name'>
+                    <Form.Label>Имя</Form.Label>
+                    <Form.Control type='text' required />
+                </Form.Group>
+
+                <Form.Group className='mb-3' controlId='surname'>
+                    <Form.Label>Фамилия</Form.Label>
+                    <Form.Control type='text' required />
+                </Form.Group>
+            </>}
+
+            <Form.Group className='mb-3' controlId='password'>
+                <Form.Label>Пароль</Form.Label>
+                <Form.Control type='password' required />
+            </Form.Group>
+
+            {register &&
+                <Form.Group className='mb-3' controlId='privacyPolicyConsent'>
+                    <Form.Check>
+                        <Form.Check.Input type='checkbox' required />
+                        <Form.Check.Label>
+                            Я согласен с <a href={`${document.location.origin}/privacy_policy.pdf`} target='_blank' rel='noopener noreferrer'>условиями обработки персональных данных</a>
+                        </Form.Check.Label>
+                    </Form.Check>
+                </Form.Group>
+            }
+
+            <Button variant='success' type='submit'>
+                {buttonText}
+            </Button>
+        </Form>
+    )
+}
+
+export default AuthForm

front/src/components/BottomNavBar.jsx

@@ -1,50 +0,0 @@
-import { Link } from 'react-router-dom'
-
-import addIcon from '../assets/addIcon.svg'
-import filterIcon from '../assets/filterIcon.svg'
-import userIcon from '../assets/userIcon.svg'
-
-const navBarStyles = {
-    backgroundColor: 'var(--bs-success)',
-    height: 56,
-    width: "100%",
-}
-
-const navBarGroupStyles = {
-    display: "flex",
-    flexDirection: "row",
-    height: "100%",
-    margin: "auto"
-}
-
-const navBarElementStyles = {
-    width: "100%",
-    height: "100%",
-    display: "flex",
-    alignItems: "center",
-    justifyContent: "center"
-}
-
-function BottomNavBar({ width, toggleFilters }) {
-    return (
-        <div style={navBarStyles}>
-            <div style={{ ...navBarGroupStyles, width: width }}>
-
-                <a style={navBarElementStyles} onClick={() => toggleFilters(true)}>
-                    <img src={filterIcon} alt="Фильтровать объявления" title='Фильтровать объявления' />
-                </a>
-
-                <Link style={navBarElementStyles} to="/add" >
-                    <img src={addIcon} alt="Опубликовать объявление" title='Опубликовать объявление' />
-                </Link>
-
-                <Link style={navBarElementStyles} to={"/user"} >
-                    <img src={userIcon} alt="Личный кабинет" title='Личный кабинет' />
-                </Link>
-
-            </div>
-        </div>
-    )
-}
-
-export default BottomNavBar

front/src/components/BottomNavBar.tsx

@@ -0,0 +1,58 @@
+import { Link } from 'react-router-dom'
+
+import addIcon from '../assets/addIcon.svg'
+import filterIcon from '../assets/filterIcon.svg'
+import userIcon from '../assets/userIcon.svg'
+import { CSSProperties } from 'react'
+
+const styles = {
+    navBar: {
+        backgroundColor: 'var(--bs-success)',
+        height: 56,
+        width: '100%',
+    } as CSSProperties,
+    navBarGroup: {
+        display: 'flex',
+        flexDirection: 'row',
+        height: '100%',
+        margin: 'auto'
+    } as CSSProperties,
+    navBarElement: {
+        width: '100%',
+        height: '100%',
+        display: 'flex',
+        alignItems: 'center',
+        justifyContent: 'center'
+    } as CSSProperties,
+}
+
+
+
+type BottomNavBarProps = {
+    width: number,
+    toggleFilters: (p: boolean) => void
+}
+
+function BottomNavBar({ width, toggleFilters }: BottomNavBarProps) {
+    return (
+        <div style={styles.navBar}>
+            <div style={{ ...styles.navBarGroup, width: width }}>
+
+                <a style={styles.navBarElement} onClick={() => toggleFilters(true)}>
+                    <img src={filterIcon} alt='Фильтровать объявления' title='Фильтровать объявления' />
+                </a>
+
+                <Link style={styles.navBarElement} to='/add' >
+                    <img src={addIcon} alt='Опубликовать объявление' title='Опубликовать объявление' />
+                </Link>
+
+                <Link style={styles.navBarElement} to={'/user'} >
+                    <img src={userIcon} alt='Личный кабинет' title='Личный кабинет' />
+                </Link>
+
+            </div>
+        </div>
+    )
+}
+
+export default BottomNavBar

front/src/components/ClickHandler.tsx

@@ -0,0 +1,15 @@
+import { useMapEvent } from 'react-leaflet'
+import { LatLng } from 'leaflet'
+
+import { SetState } from '../utils/types'
+
+function ClickHandler({ setPosition }: { setPosition: SetState<LatLng> }) {
+    const map = useMapEvent('click', (e) => {
+        setPosition(e.latlng)
+        map.setView(e.latlng)
+    })
+
+    return null
+}
+
+export default ClickHandler

front/src/components/Filters.jsx

@@ -1,74 +0,0 @@
-import { Button, Form, Modal } from "react-bootstrap"
-
-import { categoryNames } from "../assets/category"
-import { metros } from '../assets/metro'
-
-function Filters({ filter, setFilter, filterShown, setFilterShown }) {
-
-    const handleSubmit = (event) => {
-        event.preventDefault();
-        event.stopPropagation();
-
-        const formData = new FormData(event.currentTarget)
-
-        setFilter(prev => ({
-            ...prev,
-            category: formData.get("category") || null,
-            metro: formData.get("metro") || null
-        }))
-
-        setFilterShown(false)
-    }
-
-    return (
-        <Modal show={filterShown} onHide={() => setFilterShown(false)} centered>
-            <Modal.Header closeButton>
-                <Modal.Title>
-                    Фильтрация
-                </Modal.Title>
-            </Modal.Header>
-            
-            <Modal.Body>
-                <Form onSubmit={handleSubmit}>
-                    <Form.Group className="mb-3" controlId="categoryFilter">
-                        <Form.Label>
-                            Категория
-                        </Form.Label>
-
-                        <Form.Select name="category" defaultValue={filter.category || undefined}>
-                            <option value="">
-                                Выберите категорию
-                            </option>
-                            {Array.from(categoryNames).map(
-                                ([category, categoryName]) =>
-                                    <option key={category} value={category}>{categoryName}</option>
-                            )}
-                        </Form.Select>
-                    </Form.Group>
-
-                    <Form.Group className="mb-3" controlId="metroFilter">
-                        <Form.Label>
-                            Станция метро
-                        </Form.Label>
-
-                        <Form.Select name="metro" defaultValue={filter.metro || undefined}>
-                            <option value="">
-                                Выберите станцию метро
-                            </option>
-                            {metros.map(
-                                (metro) =>
-                                    <option key={metro} value={metro}>{metro}</option>
-                            )}
-                        </Form.Select>
-                    </Form.Group>
-
-                    <Button variant="success" type="submit">
-                        Отправить
-                    </Button>
-                </Form>
-            </Modal.Body>
-        </Modal>
-    )
-}
-
-export default Filters

front/src/components/Filters.tsx

@@ -0,0 +1,88 @@
+import { Button, Form, Modal } from 'react-bootstrap'
+import { FormEventHandler } from 'react'
+
+import { categories, categoryNames } from '../assets/category'
+import { stations, lines, lineNames } from '../assets/metro'
+import { FiltersType } from '../utils/filters'
+import { SetState } from '../utils/types'
+
+type FiltersProps = {
+    filter: FiltersType,
+    setFilter: SetState<FiltersType>,
+    filterShown: boolean,
+    setFilterShown: SetState<boolean>
+}
+
+function Filters({ filter, setFilter, filterShown, setFilterShown }: FiltersProps) {
+
+    const handleSubmit: FormEventHandler<HTMLFormElement> = (event) => {
+        event.preventDefault();
+        event.stopPropagation();
+
+        const formData = new FormData(event.currentTarget)
+
+        setFilter(prev => ({
+            ...prev,
+            category: (formData.get('category') as (FiltersType['category'] | null)) || undefined,
+            metro: (formData.get('metro') as (FiltersType['metro'] | null)) || undefined
+        }))
+
+        setFilterShown(false)
+    }
+
+    return (
+        <Modal show={filterShown} onHide={() => setFilterShown(false)} centered>
+            <Modal.Header closeButton>
+                <Modal.Title>
+                    Фильтрация
+                </Modal.Title>
+            </Modal.Header>
+
+            <Modal.Body>
+                <Form onSubmit={handleSubmit}>
+                    <Form.Group className='mb-3' controlId='categoryFilter'>
+                        <Form.Label>
+                            Категория
+                        </Form.Label>
+
+                        <Form.Select name='category' defaultValue={filter.category || undefined}>
+                            <option value=''>
+                                Выберите категорию
+                            </option>
+                            {categories.map(
+                                category =>
+                                    <option key={category} value={category}>{categoryNames[category]}</option>
+                            )}
+                        </Form.Select>
+                    </Form.Group>
+
+                    <Form.Group className='mb-3' controlId='metroFilter'>
+                        <Form.Label>
+                            Станция метро
+                        </Form.Label>
+
+                        <Form.Select name='metro' defaultValue={filter.metro || undefined}>
+                            <option value=''>
+                                Выберите станцию метро
+                            </option>
+                            {lines.map(
+                                line =>
+                                    <optgroup key={line} label={lineNames[line]}>
+                                        {Array.from(stations[line]).map(metro =>
+                                            <option key={metro} value={metro}>{metro}</option>
+                                        )}
+                                    </optgroup>
+                            )}
+                        </Form.Select>
+                    </Form.Group>
+
+                    <Button variant='success' type='submit'>
+                        Отправить
+                    </Button>
+                </Form>
+            </Modal.Body>
+        </Modal>
+    )
+}
+
+export default Filters

front/src/components/LineDot.tsx

@@ -0,0 +1,15 @@
+import { colors, lineNames, lineByName } from '../assets/metro'
+
+function LineDot({ station }: { station: string }) {
+    const line = lineByName(station)
+
+    if (line == undefined)
+        return <></>
+
+    const lineTitle = lineNames[line]
+    const color = colors[line]
+
+    return <span title={`${lineTitle} ветка`} style={{ color: color }}>&#11044;</span>
+}
+
+export default LineDot

front/src/components/LocationMarker.tsx

@@ -0,0 +1,37 @@
+import { Marker, Popup, useMapEvents } from 'react-leaflet'
+import { LatLng } from 'leaflet'
+
+import { SetState } from '../utils/types'
+import { iconItem } from '../utils/markerIcons'
+
+type LocationMarkerProps = {
+    address: string,
+    position: LatLng,
+    setPosition: SetState<LatLng>
+}
+
+function LocationMarker({ address, position, setPosition }: LocationMarkerProps) {
+
+    const map = useMapEvents({
+        dragend: () => {
+            setPosition(map.getCenter())
+        },
+        zoomend: () => {
+            setPosition(map.getCenter())
+        },
+        resize: () => {
+            setPosition(map.getCenter())
+        }
+    })
+
+    return (
+        <Marker icon={iconItem} position={position}>
+            <Popup>
+                {address}
+                {position.lat.toFixed(4)}, {position.lng.toFixed(4)}
+            </Popup>
+        </Marker>
+    )
+}
+
+export default LocationMarker

front/src/components/TrashboxMarkers.tsx

@@ -0,0 +1,34 @@
+import { Marker, Popup } from 'react-leaflet'
+
+import { Trashbox } from '../api/trashbox/types'
+import { iconTrash } from '../utils/markerIcons'
+
+type TrashboxMarkersProps = {
+    trashboxes: Trashbox[],
+    selectTrashbox: ({ index, category }: { index: number, category: string }) => void
+}
+
+function TrashboxMarkers({ trashboxes, selectTrashbox }: TrashboxMarkersProps) {
+    return (
+        <>{trashboxes.map((trashbox, index) => (
+            <Marker icon={iconTrash} key={`${trashbox.Lat}${trashbox.Lng}`} position={[trashbox.Lat, trashbox.Lng]}>
+                <Popup>
+                    <p>{trashbox.Address}</p>
+                    <p>Тип мусора: <>
+                        {trashbox.Categories.map((category, j) =>
+                            <span key={trashbox.Address + category}>
+                                <a href='#' onClick={() => selectTrashbox({ index, category })}>
+                                    {category}
+                                </a>
+                                {(j < trashbox.Categories.length - 1) ? ', ' : ''}
+                            </span>
+                        )}
+                    </></p>
+                    <p>{trashbox.Lat.toFixed(4)}, {trashbox.Lng.toFixed(4)}</p>
+                </Popup>
+            </Marker>
+        ))}</>
+    )
+}
+
+export default TrashboxMarkers

front/src/components/WithToken.jsx

@@ -1,19 +0,0 @@
-import { useEffect } from "react"
-import { getToken } from "../utils/auth"
-import { useNavigate } from "react-router-dom"
-
-function WithToken({ children }) {
-    const navigate = useNavigate()
-
-    useEffect(() => {
-        if (!getToken()) {
-            return navigate("/login")
-        }
-    }, [])
-    
-    return (
-        <>{children}</>
-    )
-}
-
-export default WithToken

front/src/components/WithToken.tsx

@@ -0,0 +1,20 @@
+import { PropsWithChildren, useEffect } from 'react'
+import { useNavigate } from 'react-router-dom'
+
+import { getToken } from '../utils/auth'
+
+function WithToken({ children }: PropsWithChildren) {
+    const navigate = useNavigate()
+
+    useEffect(() => {
+        if (!getToken()) {
+            return navigate('/login')
+        }
+    }, [navigate])
+
+    return (
+        <>{children}</>
+    )
+}
+
+export default WithToken

front/src/components/index.ts

@@ -0,0 +1,9 @@
+export { default as AnnouncementDetails } from './AnnouncementDetails'
+export { default as BottomNavBar } from './BottomNavBar'
+export { default as Filters } from './Filters'
+export { default as LineDot } from './LineDot'
+export { default as LocationMarker } from './LocationMarker'
+export { default as TrashboxMarkers } from './TrashboxMarkers'
+export { default as WithToken } from './WithToken'
+export { default as ClickHandler } from './ClickHandler'
+export { default as AuthForm } from './AuthForm'

front/src/config.js

@@ -1,3 +0,0 @@
-const API_URL = "api"
-
-export { API_URL }

front/src/config.ts

@@ -0,0 +1,3 @@
+const API_URL = '/api'
+
+export { API_URL }

front/src/hooks/api/index.ts

@@ -0,0 +1,6 @@
+export { default as useAnnouncements } from './useAnnouncements'
+export { default as useBook } from './useBook'
+export { default as useAuth } from './useAuth'
+export { default as useTrashboxes } from './useTrashboxes'
+export { default as useAddAnnouncement } from './useAddAnnouncement'
+export { default as useOsmAddresses } from './useOsmAddress'

front/src/hooks/api/useAddAnnouncement.ts

@@ -0,0 +1,31 @@
+import { useCallback } from 'react'
+
+import { useSend } from '..'
+import { composePutAnnouncementURL, processPutAnnouncement } from '../../api/putAnnouncement'
+import { isPutAnnouncementResponse } from '../../api/putAnnouncement/types'
+import useSendButtonCaption from '../useSendButtonCaption'
+
+const useAddAnnouncement = () => {
+    const { doSend, loading, error } = useSend(
+        composePutAnnouncementURL(),
+        'PUT',
+        true,
+        isPutAnnouncementResponse,
+        processPutAnnouncement,
+    )
+
+    const { update, ...button } = useSendButtonCaption('Опубликовать', loading, error, 'Опубликовано')
+
+    const doSendWithButton = useCallback(async (formData: FormData) => {
+        const data = await doSend({}, {
+            body: formData
+        })
+        update(data)
+
+        return data
+    }, [doSend, update])
+
+    return { doSend: doSendWithButton, button }
+}
+
+export default useAddAnnouncement

front/src/hooks/api/useAnnouncements.ts

@@ -0,0 +1,18 @@
+import { useFetch } from '../'
+import { FiltersType } from '../../utils/filters'
+import { composeAnnouncementsURL, initialAnnouncements, processAnnouncements } from '../../api/announcements'
+
+import { isAnnouncementsResponse } from '../../api/announcements/types'
+
+const useAnnouncements = (filters: FiltersType) => (
+    useFetch(
+        composeAnnouncementsURL(filters),
+        'GET',
+        false,
+        isAnnouncementsResponse,
+        processAnnouncements,
+        initialAnnouncements
+    )
+)
+
+export default useAnnouncements

front/src/hooks/api/useAuth.ts

@@ -0,0 +1,117 @@
+import { useState } from 'react'
+
+import { API_URL } from '../../config'
+import { isConst, isObject } from '../../utils/types'
+import { handleHTTPErrors } from '../../utils'
+
+interface AuthData {
+    email: string,
+    password: string,
+}
+
+// interface LoginData extends AuthData { }
+
+// interface SignUpData extends AuthData {
+//     name: string,
+//     surname: string
+// }
+
+type SignUpResponse = {
+    Success: true
+} | {
+    Success: false,
+    Message: string
+}
+
+const isSignUpResponse = (obj: unknown): obj is SignUpResponse => (
+    isObject(obj, {
+        'Success': isConst(true)
+    }) ||
+    isObject(obj, {
+        'Success': isConst(false),
+        'Message': 'string'
+    })
+)
+
+interface LogInResponse {
+    access_token: string,
+    token_type: 'bearer'
+}
+
+const isLogInResponse = (obj: unknown): obj is LogInResponse => (
+    isObject(obj, {
+        'access_token': 'string',
+        'token_type': isConst('bearer')
+    })
+)
+
+function useAuth() {
+    const [loading, setLoading] = useState(false)
+    const [error, setError] = useState('')
+
+    async function doAuth(data: AuthData, newAccount: boolean) {
+        setLoading(true)
+
+        if (newAccount) {
+            try {
+                const res = await fetch(API_URL + '/signup', {
+                    method: 'POST',
+                    body: JSON.stringify(data),
+                    headers: {
+                        'Content-Type': 'application/json'
+                    }
+                })
+
+                handleHTTPErrors(res)
+
+                const signupData: unknown = await res.json()
+
+                if (!isSignUpResponse(signupData)) {
+                    throw new Error('Malformed server response')
+                }
+
+                if (signupData.Success === false) {
+                    throw new Error(signupData.Message)
+                }
+
+            } catch (err) {
+                setError(err instanceof Error ? err.message : err as string)
+                setLoading(false)
+                return null
+            }
+        }
+
+        try {
+            const res = await fetch(API_URL + '/auth/token' + new URLSearchParams({
+                username: data.email,
+                password: data.password
+            }).toString(), {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/x-www-form-urlencoded'
+                }
+            })
+
+            const logInData: unknown = await res.json()
+
+            if (!isLogInResponse(logInData)) {
+                throw new Error('Malformed server response')
+            }
+
+            const token = logInData.access_token
+
+            setError('')
+            setLoading(false)
+
+            return token
+        } catch (err) {
+            setError(err instanceof Error ? err.message : err as string)
+            setLoading(false)
+            return null
+        }
+    }
+
+    return { doAuth, loading, error }
+}
+
+export default useAuth

front/src/hooks/api/useBook.ts

@@ -0,0 +1,74 @@
+import { useState } from 'react'
+import { useNavigate } from 'react-router-dom'
+
+import { getToken } from '../../utils/auth'
+import { API_URL } from '../../config'
+import { isObject } from '../../utils/types'
+import { handleHTTPErrors } from '../../utils'
+
+type BookResponse = {
+    Success: boolean
+}
+
+const isBookResponse = (obj: unknown): obj is BookResponse => (
+    isObject(obj, {
+        'Success': 'boolean'
+    })
+)
+
+type BookStatus = '' | 'Загрузка...' | 'Забронировано' | 'Ошибка бронирования'
+
+function useBook(id: number) {
+    const navigate = useNavigate()
+
+    const [status, setStatus] = useState<BookStatus>('')
+
+    const handleBook = async () => {
+        const token = getToken()
+
+        if (token) {
+            setStatus('Загрузка...')
+
+            try {
+
+                const res = await fetch(API_URL + '/book', {
+                    method: 'POST',
+                    body: JSON.stringify({
+                        id: id
+                    }),
+                    headers: {
+                        'Authorization': 'Bearer ' + token,
+                        'Content-Type': 'application/json'
+                    }
+                })
+
+                handleHTTPErrors(res)
+
+                const data: unknown = await res.json()
+
+                if (!isBookResponse(data)) {
+                    throw new Error('Malformed server response')
+                }
+
+                if (data.Success === true) {
+                    setStatus('Забронировано')
+                } else {
+                    throw new Error('Server refused to book')
+                }
+            }
+            catch (err) {
+                setStatus('Ошибка бронирования')
+
+                if (import.meta.env.DEV) {
+                    console.log(err)
+                }
+            }
+        } else {
+            return navigate('/login')
+        }
+    }
+
+    return { handleBook, status }
+}
+
+export default useBook

front/src/hooks/api/useOsmAddress.ts

@@ -0,0 +1,18 @@
+import { LatLng } from 'leaflet'
+
+import { useFetch } from '../'
+import { composeOsmAddressURL, processOsmAddress } from '../../api/osmAddress'
+import { isOsmAddressResponse } from '../../api/osmAddress/types'
+
+const useOsmAddresses = (addressPosition: LatLng) => (
+    useFetch(
+        composeOsmAddressURL(addressPosition),
+        'GET',
+        false,
+        isOsmAddressResponse,
+        processOsmAddress,
+        ''
+    )
+)
+
+export default useOsmAddresses

front/src/hooks/api/useTrashboxes.ts

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

front/src/hooks/index.ts

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

front/src/hooks/useFetch.ts

@@ -0,0 +1,75 @@
+import { useEffect, useState } from 'react'
+
+import { SetState } from '../utils/types'
+import useSend from './useSend'
+
+type UseFetchShared = {
+    loading: boolean,
+    abort?: () => void,
+}
+
+type UseFetchSucced<T> = {
+    error: null,
+    data: T,
+} & UseFetchShared
+
+type UseFetchErrored = {
+    error: string,
+    data: undefined
+} & UseFetchShared
+
+const gotError = <T>(res: UseFetchErrored | UseFetchSucced<T>): res is UseFetchErrored => (
+    typeof res.error === 'string'
+)
+
+const fallbackError = <T>(res: UseFetchSucced<T> | UseFetchErrored) => (
+    gotError(res) ? res.error : res.data
+)
+
+type UseFetchReturn<T> = ({
+    error: null,
+    data: T
+} | {
+    error: string,
+    data: undefined
+}) & {
+    loading: boolean,
+    setData: SetState<T | undefined>
+    abort?: (() => void)
+}
+
+function useFetch<R, T>(
+    url: string,
+    method: RequestInit['method'],
+    needAuth: boolean,
+    guardResponse: (data: unknown) => data is R,
+    processResponse: (data: R) => T,
+    initialData?: T,
+    params?: Omit<RequestInit, 'method'>
+): UseFetchReturn<T> {
+    const [data, setData] = useState(initialData)
+
+    const { doSend, loading, error } = useSend(url, method, needAuth, guardResponse, processResponse, params)
+
+    useEffect(() => {
+        doSend().then(
+            data => { if (data !== undefined) setData(data) }
+        ).catch( // must never occur
+            err => import.meta.env.DEV && console.error('Failed to do fetch request', err)
+        )
+    }, [doSend])
+
+    return {
+        ...(
+            error === null ? ({
+                data: data!, error: null
+            }) : ({ data: undefined, error })
+        ),
+        loading,
+        setData
+    }
+}
+
+export default useFetch
+
+export { gotError, fallbackError }

front/src/hooks/useSend.ts

@@ -0,0 +1,95 @@
+import { useCallback, useEffect, useRef, useState } from 'react'
+import { useNavigate } from 'react-router-dom'
+
+import { getToken } from '../utils/auth'
+import { handleHTTPErrors, isAborted } from '../utils'
+
+function useSend<R, T>(
+    url: string,
+    method: RequestInit['method'],
+    needAuth: boolean,
+    guardResponse: (data: unknown) => data is R,
+    processResponse: (data: R) => T,
+    defaultParams?: Omit<RequestInit, 'method'>
+) {
+    const [loading, setLoading] = useState(false)
+    const [error, setError] = useState<string | null>(null)
+
+    const navigate = useNavigate()
+
+    const abortControllerRef = useRef<AbortController>()
+
+    useEffect(() => () => abortControllerRef.current?.abort(), [])
+
+    /** 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()
+        }
+
+        const abortController = new AbortController()
+        abortControllerRef.current = abortController
+
+        const headers = new Headers({
+            ...defaultParams?.headers,
+            ...params?.headers
+        })
+
+        if (needAuth) {
+            const token = getToken()
+
+            if (token === null) {
+                navigate('/login')
+
+                return undefined
+            }
+
+            headers.append('Auth', `Bearer ${token}`)
+        }
+
+        try {
+            const res = await fetch(url + new URLSearchParams(urlProps).toString(), {
+                method,
+                ...defaultParams,
+                ...params,
+                headers,
+                signal: abortControllerRef.current.signal,
+            })
+
+            handleHTTPErrors(res)
+
+            const data: unknown = await res.json()
+
+            if (!guardResponse(data)) {
+                throw new Error('Malformed server response')
+            }
+
+            setLoading(false)
+
+            return processResponse(data)
+
+        } catch (err) {
+            if (err instanceof Error && !isAborted(err)) {
+                setError('Ошибка сети')
+
+                if (import.meta.env.DEV) {
+                    console.log(url, params, err)
+                }
+            }
+
+            setLoading(false)
+
+            return undefined
+        }
+    }, [defaultParams, needAuth, navigate, url, method, guardResponse, processResponse])
+
+    return {
+        doSend, loading, error,
+        abort: abortControllerRef.current?.abort.bind(abortControllerRef.current)
+    }
+}
+
+export default useSend

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

@@ -1,15 +1,13 @@
 import { useState, useEffect } from 'react';
 
-function getWindowDimensions() {
-    const { innerWidth: width, innerHeight: height } = window;
+const getWindowDimensions = () => (
+    {
+        width: window.innerWidth,
+        height: window.innerHeight
+    }
+)
 
-    return {
-        width,
-        height
-    };
-}
-
-function useStoryDimensions(maxRatio = 16/9) {
+function useStoryDimensions(maxRatio = 16 / 9) {
     const [windowDimensions, setWindowDimensions] = useState(getWindowDimensions())
 
     useEffect(() => {
@@ -17,8 +15,8 @@ function useStoryDimensions(maxRatio = 16/9) {
             setWindowDimensions(getWindowDimensions());
         }
     
-        window.addEventListener("resize", handleResize);
-        return () => window.removeEventListener("resize", handleResize);
+        window.addEventListener('resize', handleResize);
+        return () => window.removeEventListener('resize', handleResize);
     }, []);
 
     const height = windowDimensions.height - 56
@@ -31,4 +29,4 @@ function useStoryDimensions(maxRatio = 16/9) {
     }
 }
 
-export default useStoryDimensions
+export default useStoryDimensions

front/src/index.css

@@ -2,4 +2,4 @@
   padding: 0;
   margin: 0;
   list-style: none;
-}
+}

front/src/main.tsx

@@ -1,11 +1,11 @@
 import React from 'react'
 import ReactDOM from 'react-dom/client'
 
-import App from './App.jsx'
-
+import App from './App.tsx'
 import './index.css'
+import 'bootstrap/dist/css/bootstrap.min.css'
 
-ReactDOM.createRoot(document.getElementById('root')).render(
+ReactDOM.createRoot(document.getElementById('root')!).render(
   <React.StrictMode>
     <App />
   </React.StrictMode>,

front/src/pages/AddPage.jsx

@@ -1,8 +0,0 @@
-function AddPage() {
-
-    // TODO
-
-    return <></>
-}
-
-export default AddPage

front/src/pages/AddPage.tsx

@@ -0,0 +1,186 @@
+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 { categories, categoryNames } from '../assets/category'
+import { stations, lines, lineNames } from '../assets/metro'
+import { fallbackError, gotError } from '../hooks/useFetch'
+import { useOsmAddresses } from '../hooks/api'
+
+const styles = {
+    modal: {
+        height: 'calc(100vh - 3rem)',
+    } as CSSProperties,
+    body: {
+        overflowY: 'auto',
+    } as CSSProperties,
+    map: {
+        width: '100%',
+        height: 400,
+    } as CSSProperties,
+}
+
+function AddPage() {
+    const [addressPosition, setAddressPosition] = useState(latLng(59.972, 30.3227))
+
+    const trashboxes = useTrashboxes(addressPosition)
+    const [selectedTrashbox, setSelectedTrashbox] = useState({ index: -1, category: '' })
+
+    const address = useOsmAddresses(addressPosition)
+
+    const { doSend, button } = useAddAnnouncement()
+
+    const handleSubmit: FormEventHandler<HTMLFormElement> = (event) => {
+        event.preventDefault()
+        event.stopPropagation()
+
+        const formData = new FormData(event.currentTarget)
+
+        formData.append('latitude', addressPosition.lat.toString())
+        formData.append('longtitude', addressPosition.lng.toString())
+        formData.append('address', address.data || '') // if address.error
+        formData.set('bestBy', new Date((formData.get('bestBy') as number | null) || 0).getTime().toString())
+
+        void doSend(formData)
+    }
+
+    return (
+        <Card className='m-4' style={styles.modal}>
+            <Card.Body style={styles.body} >
+                <Form onSubmit={handleSubmit}>
+                    <Form.Group className='mb-3' controlId='name'>
+                        <Form.Label>Заголовок объявления</Form.Label>
+                        <Form.Control type='text' required name='name' />
+                    </Form.Group>
+
+                    <Form.Group className='mb-3' controlId='category'>
+                        <Form.Label>Категория</Form.Label>
+                        <Form.Select required name='category'>
+                            <option value='' hidden>
+                                Выберите категорию
+                            </option>
+                            {categories.map(category =>
+                                <option key={category} value={category}>{categoryNames[category]}</option>
+                            )}
+                        </Form.Select>
+                    </Form.Group>
+
+                    <Form.Group className='mb-3' controlId='bestBy'>
+                        <Form.Label>Срок годности</Form.Label>
+                        <Form.Control type='date' required name='bestBy' />
+                    </Form.Group>
+
+                    <Form.Group className='mb-3' controlId='address'>
+                        <Form.Label>Адрес выдачи</Form.Label>
+                        <div className='mb-3'>
+                            <MapContainer
+                                scrollWheelZoom={false}
+                                style={styles.map}
+                                center={addressPosition}
+                                zoom={13}
+                            >
+                                <TileLayer
+                                    attribution='&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
+                                    url='https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'
+                                />
+                                <LocationMarker
+                                    address={fallbackError(address)}
+                                    position={addressPosition}
+                                    setPosition={setAddressPosition}
+                                />
+                                <ClickHandler
+                                    setPosition={setAddressPosition}
+                                />
+                            </MapContainer>
+                        </div>
+                        <p>Адрес: {fallbackError(address)}</p>
+                    </Form.Group>
+
+                    <Form.Group className='mb-3' controlId='description'>
+                        <Form.Label>Описание</Form.Label>
+                        <Form.Control as='textarea' name='description' rows={3} placeholder='Укажите свои контакты, а так же, когда вам будет удобно передать продукт' />
+                    </Form.Group>
+
+                    <Form.Group className='mb-3' controlId='src'>
+                        <Form.Label>Иллюстрация (фото или видео)</Form.Label>
+                        <Form.Control
+                            type='file'
+                            name='src'
+                            accept='video/mp4,video/mkv, video/x-m4v,video/*, image/*'
+                            capture='environment'
+                        />
+                    </Form.Group>
+                    <Form.Group className='mb-3' controlId='metro'>
+                        <Form.Label>
+                            Станция метро
+                        </Form.Label>
+                        <Form.Select name='metro'>
+                            <option value=''>
+                                Укажите ближайщую станцию метро
+                            </option>
+                            {lines.map(
+                                line =>
+                                    <optgroup key={line} label={lineNames[line]}>
+                                        {Array.from(stations[line]).map(metro =>
+                                            <option key={metro} value={metro}>{metro}</option>
+                                        )}
+                                    </optgroup>
+                            )}
+                        </Form.Select>
+                    </Form.Group>
+
+                    <Form.Group className='mb-3' controlId='trashbox'>
+                        <Form.Label>Пункт сбора мусора</Form.Label>
+                        <div className='mb-3'>
+                            {trashboxes.loading
+                                ? (
+                                    <div style={styles.map}>
+                                        <p>Загрузка...</p>
+                                    </div>
+                                ) : (
+                                    gotError(trashboxes) ? (
+                                        <p
+                                            style={styles.map}
+                                            className='text-danger'
+                                        >{trashboxes.error}</p>
+                                    ) : (
+                                        <MapContainer
+                                            scrollWheelZoom={false}
+                                            style={styles.map}
+                                            center={addressPosition}
+                                            zoom={13}
+                                            className=''
+                                        >
+                                            <TileLayer
+                                                attribution='&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
+                                                url='https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'
+                                            />
+                                            <TrashboxMarkers
+                                                trashboxes={trashboxes.data}
+                                                selectTrashbox={setSelectedTrashbox}
+                                            />
+                                        </MapContainer>
+                                    )
+                                )
+                            }
+                        </div>
+                        {!gotError(trashboxes) && selectedTrashbox.index > -1 ? (
+                            <p>Выбран пункт сбора мусора на {
+                                trashboxes.data[selectedTrashbox.index].Address
+                            } с категорией {selectedTrashbox.category}</p>
+                        ) : (
+                            <p>Выберите пунк сбора мусора и категорию</p>
+                        )}
+                    </Form.Group>
+
+                    <Button variant='success' type='submit' {...button} />
+                </Form>
+            </Card.Body>
+        </Card>
+    )
+}
+
+export default AddPage

front/src/pages/HomePage.jsx

@@ -1,101 +0,0 @@
-import Stories from 'react-insta-stories'
-import { useEffect, useState } from 'react'
-
-import BottomNavBar from '../components/BottomNavBar'
-import useStoryDimensions from '../utils/useStoryDimensions'
-
-import { API_URL } from '../config'
-
-import "./leafletStyles.css"
-import 'leaflet/dist/leaflet.css'
-
-import AnnouncementDetails from '../components/AnnouncementDetails'
-import { categoryGraphics } from '../assets/category'
-import Filters from '../components/Filters'
-import { removeNull } from '../utils'
-
-function generateStories(announcements) {
-    return announcements.map(announcement => {
-        return ({
-            id: announcement.id,
-            url: announcement.src || categoryGraphics.get(announcement.category),
-            type: announcement.src?.endsWith("mp4") ? "video" : undefined,
-            seeMore: ({ close }) => <AnnouncementDetails close={close} announcement={announcement} />
-        })
-    })
-}
-
-const mock = [
-    {
-        id: 5,
-        name: "Огурец",
-        category: "fruits_vegatables",
-        src: "https://upload.wikimedia.org/wikipedia/commons/thumb/2/24/Marketvegetables.jpg/800px-Marketvegetables.jpg",
-        bestBy: 10000,
-        description: "Очень вкусный огурец, прям, закачаешься",
-        lat: 59.9724,
-        lng: 30.3227,
-        address: "ул. Профессора Попова, дом 5 литера Ф",
-        metro: "Петроградская"
-    },
-    {
-        id: 9,
-        name: "Арбуз",
-        category: "soup",
-        src: "/static/watermelon.mp4",
-        bestBy: 20000,
-        description: "Очень вкусный арбуз, прям, закачаешься",
-        lat: 60.9724,
-        lng: 30.3227,
-        address: "ул. Профессора Попова, дом 50 литера Ф",
-        metro: "Горьковская"
-    }
-]
-
-const defaultFilters = { userId: null, category: null, metro: null, bookedBy: null }
-
-const PROD = true
-
-function HomePage() {
-    const { height, width } = useStoryDimensions(16 / 10)
-
-    const [announcements, setAnnouncements] = useState([])
-
-    const [filterShown, setFilterShown] = useState(false)
-
-    const [filter, setFilter] = useState(defaultFilters)
-
-    useEffect(() => {
-        (async () => {
-            try {
-                const res = PROD ? await fetch(API_URL + "/announcements?" + new URLSearchParams(removeNull(filter))) : null
-
-                const json = PROD ? (await res.json()).list_of_announcements : mock
-
-                setAnnouncements(json)
-            }
-            catch (err) {
-                console.error(err)
-            }
-        })()
-    }, [filter])
-
-    const toggleFilters = (toggle) => setFilterShown(toggle)
-
-    return (<>
-        <Filters filter={filter} setFilter={setFilter} filterShown={filterShown} setFilterShown={setFilterShown} />
-        <div style={{ display: "flex", justifyContent: "center", backgroundColor: "rgb(17, 17, 17)" }}>
-            {announcements.length && <Stories
-                stories={generateStories(announcements)}
-                defaultInterval={11000}
-                height={height}
-                width={width}
-                loop={true}
-                keyboardNavigation={true}
-            />}
-        </div>
-        <BottomNavBar toggleFilters={toggleFilters} width={width} />
-    </>)
-}
-
-export default HomePage

front/src/pages/HomePage.tsx

@@ -0,0 +1,91 @@
+import { CSSProperties, useEffect, 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 { useAnnouncements } from '../hooks/api'
+import { defaultFilters } from '../utils/filters'
+import { Announcement } from '../api/announcement/types'
+import { categoryGraphics } from '../assets/category'
+
+import puffSpinner from '../assets/puff.svg'
+import { gotError } from '../hooks/useFetch'
+
+function generateStories(announcements: Announcement[]): Story[] {
+    return announcements.map(announcement => {
+        return ({
+            id: announcement.id,
+            url: announcement.src || categoryGraphics[announcement.category],
+            type: announcement.src?.endsWith('mp4') ? 'video' : undefined,
+            seeMore: ({ close }: { close: () => void }) => <AnnouncementDetails close={close} announcement={announcement} />
+        })
+    })
+}
+
+function fallbackGenerateStories(announcementsFetch: ReturnType<typeof useAnnouncements>) {
+    if (announcementsFetch.loading)
+        return fallbackStory()
+
+    if (gotError(announcementsFetch))
+        return fallbackStory(announcementsFetch.error, true)
+
+    const stories = generateStories(announcementsFetch.data)
+
+    if (stories.length === 0)
+        return fallbackStory('Здесь пока пусто')
+
+    return stories
+}
+
+const fallbackStory = (text = '', isError = false): Story[] => [{
+    content: ({ action }) => {
+        // eslint-disable-next-line react-hooks/rules-of-hooks
+        useEffect(() => { action('pause') }, [action])
+
+        return (
+            <div style={styles.center} className={isError ? 'text-danger' : ''}>
+                {text || <img src={puffSpinner} />}
+            </div>
+        )
+    },
+}]
+
+const styles = {
+    container: {
+        display: 'flex',
+        justifyContent: 'center',
+        backgroundColor: 'rgb(17, 17, 17)',
+    } as CSSProperties,
+    center: {
+        margin: 'auto'
+    } as CSSProperties,
+}
+
+function HomePage() {
+    const { height, width } = useStoryDimensions(16 / 9)
+
+    const [filterShown, setFilterShown] = useState(false)
+    const [filter, setFilter] = useState(defaultFilters)
+
+    const announcementsFetch = useAnnouncements(filter)
+
+    const stories = fallbackGenerateStories(announcementsFetch)
+
+    return (<>
+        <Filters filter={filter} setFilter={setFilter} filterShown={filterShown} setFilterShown={setFilterShown} />
+        <div style={styles.container}>
+            <Stories
+                stories={stories}
+                defaultInterval={11000}
+                height={height}
+                width={width}
+                loop={true}
+                keyboardNavigation={true}
+            />
+        </div>
+        <BottomNavBar toggleFilters={setFilterShown} width={width} />
+    </>)
+}
+
+export default HomePage

front/src/pages/LoginPage.jsx

@@ -1,5 +0,0 @@
-function LoginPage() {
-    return <></>
-}
-
-export default LoginPage

front/src/pages/LoginPage.tsx

@@ -0,0 +1,51 @@
+import { FormEventHandler } from 'react'
+import { Card, Tabs, Tab } from 'react-bootstrap'
+import { useNavigate } from 'react-router-dom';
+
+import { useAuth } from '../hooks/api';
+import { setToken } from '../utils/auth';
+import { AuthForm } from '../components';
+
+function LoginPage() {
+    const navigate = useNavigate()
+
+    const { doAuth, loading, error } = useAuth()
+
+    const handleAuth = (newAccount: boolean): FormEventHandler<HTMLFormElement> => async (event) => {
+        event.preventDefault();
+        event.stopPropagation();
+
+        const formData = new FormData(event.currentTarget)
+
+        const data = {
+            email: formData.get('email') as string,
+            name: newAccount ? formData.get('name') as string : undefined,
+            surname: newAccount ? formData.get('surname') as string : undefined,
+            password: formData.get('password') as string
+        }
+
+        const token = import.meta.env.PROD ? await doAuth(data, newAccount) : 'a'
+
+        if (token) {
+            setToken(token)
+            navigate(-1 - Number(import.meta.env.DEV))
+        }
+    }
+
+    return (
+        <Card className='m-4'>
+            <Card.Body>
+                <Tabs defaultActiveKey='register' fill justify className='mb-3'>
+                    <Tab eventKey='register' title='Регистрация'>
+                        <AuthForm handleAuth={handleAuth(true)} register={true} loading={loading} error={error} />
+                    </Tab>
+                    <Tab eventKey='login' title='Вход'>
+                        <AuthForm handleAuth={handleAuth(false)} register={false} loading={loading} error={error} />
+                    </Tab>
+                </Tabs>
+            </Card.Body>
+        </Card>
+    )
+}
+
+export default LoginPage

front/src/pages/UserPage.jsx

@@ -1,7 +0,0 @@
-function UserPage() {
-    /* TODO */
-    
-    return <></>
-}
-
-export default UserPage

front/src/pages/UserPage.tsx

@@ -0,0 +1,9 @@
+import { Link } from 'react-router-dom'
+
+function UserPage() {
+    /* TODO */
+
+    return <h1>For Yet Go <Link to='/'>Home</Link></h1>
+}
+
+export default UserPage

front/src/pages/leafletStyles.css

@@ -1,5 +0,0 @@
-/* В связи со сложившейся политической обстановкой */
-.leaflet-attribution-flag {
-    position: absolute;
-    right: -100px;
-}

front/src/utils/auth.js

@@ -1,9 +0,0 @@
-const getToken = () => {
-    const token = localStorage.getItem("Token")
-
-    /* check expirity */
-
-    return token 
-}
-
-export { getToken }

front/src/utils/auth.ts

@@ -0,0 +1,13 @@
+const getToken = () => {
+    const token = localStorage.getItem('Token')
+
+    /* check expirity */
+
+    return token 
+}
+
+function setToken(token: string) {
+    localStorage.setItem('Token', token)
+}
+
+export { getToken, setToken }

front/src/utils/filters.ts

@@ -0,0 +1,19 @@
+import { Announcement } from '../api/announcement/types'
+
+const filterNames = ['userId', 'category', 'metro', 'bookedBy'] as const
+type FilterNames = typeof filterNames[number]
+
+type FiltersType = Partial<Pick<Announcement, FilterNames>>
+
+const defaultFilters: FiltersType = { userId: undefined, category: undefined, metro: undefined, bookedBy: undefined }
+
+const URLEncodeFilters = (filters: FiltersType) => (
+    Object.fromEntries(
+        filterNames.map(
+            fName => [fName, filters[fName]?.toString()]
+        ).filter((p): p is [string, string] => typeof p[1] !== 'undefined')
+    )
+)
+
+export type { FilterNames, FiltersType }
+export { defaultFilters, filterNames, URLEncodeFilters }

front/src/utils/index.js

@@ -1,10 +0,0 @@
-const removeNull = (obj) => Object.fromEntries(
-    Object.entries(obj)
-        .filter(([_, value]) => value != null)
-        .map(([key, value]) => [
-            key,
-            value === Object(value) ? removeNull(value) : value,
-        ]),
-);
-
-export { removeNull }

front/src/utils/index.ts

@@ -0,0 +1,19 @@
+const isAborted = (err: Error) => (
+    err.name === 'AbortError'
+)
+
+function handleHTTPErrors(res: Response) {
+    if (!res.ok) {
+        switch (res.status) {
+            case 401:
+                throw new Error('Ошибка авторизации')
+            case 404:
+                throw new Error('Объект не найден')
+            default: {
+                throw new Error('Ошибка ответа от сервера')
+            }
+        }
+    }
+}
+
+export { isAborted, handleHTTPErrors }

front/src/utils/markerIcons.ts

@@ -0,0 +1,20 @@
+import L from 'leaflet'
+
+import itemMarker from '../assets/itemMarker.png'
+import trashMarker from '../assets/trashMarker.png'
+
+const iconItem = new L.Icon({
+    iconUrl: itemMarker,
+    iconRetinaUrl: itemMarker,
+    popupAnchor: [0, 0],
+    iconSize: [41, 41],
+})
+
+const iconTrash = new L.Icon({
+    iconUrl: trashMarker,
+    iconRetinaUrl: trashMarker,
+    popupAnchor: [0, 0],
+    iconSize: [34, 41],
+})
+
+export { iconItem, iconTrash }

front/src/utils/types.ts

@@ -0,0 +1,67 @@
+const isRecord = <K extends string | number | symbol>(obj: unknown): obj is Record<K, unknown> => (
+    typeof obj === 'object' &&
+    !Array.isArray(obj) &&
+    Object.getOwnPropertySymbols(obj).length === 0 && // We don't like symbols as keys here
+    obj !== null
+)
+
+type Primitive = 'bigint' | 'boolean' | 'function' | 'number' | 'object' | 'string' | 'symbol' | 'undefined'
+
+type PropertyGuard = Primitive | `${Primitive}?` | ((obj: unknown) => boolean)
+
+type PropertiesGuards = Record<
+    string | number | symbol,
+    PropertyGuard>
+
+const isObject = <T>(obj: unknown, properties: PropertiesGuards): obj is T => (
+    typeof obj === 'object' &&
+    obj !== null &&
+    // Does not actually iterate over symbols. Hope, will not need to use them
+    Object.entries(properties).every(([name, guard]) => {
+        const param: unknown = Reflect.get(obj, name)
+
+        if (import.meta.env.DEV) {
+            console.debug('isObject', name, param, guard)
+        }
+
+        if (typeof guard === 'function') {
+            return guard(param)
+        }
+
+        if (guard[guard.length - 1] === '?')
+            return (
+                (param !== undefined && param !== null && typeof param === guard.slice(0, -1)) ||
+                param === undefined || param === null
+            )
+
+        return typeof param === guard
+    })
+)
+
+const isConst = <T>(val: T) => (obj: unknown): obj is T => (
+    obj === val ||
+    (
+        typeof obj === 'number' && isNaN(obj) &&
+        typeof val === 'number' && isNaN(val)
+    )
+)
+
+const isLiteralUnion = <T extends readonly string[]>(obj: unknown, list: T): obj is T[number] => (
+    typeof obj === 'string' &&
+    list.includes(obj as T[number])
+)
+
+const isArrayOf = <T>(obj: unknown, itemGuard: ((obj: unknown) => obj is T)): obj is T[] => (
+    Array.isArray(obj) &&
+    obj.every(itemGuard)
+)
+
+const isString = (obj: unknown): obj is string => (
+    typeof obj === 'string'
+)
+
+type SetState<T> = React.Dispatch<React.SetStateAction<T>>
+
+export type { SetState }
+
+export { isRecord, isObject, isConst, isLiteralUnion, isArrayOf, isString }

front/src/utils/useBook.js

@@ -1,18 +0,0 @@
-import { useNavigate } from "react-router-dom"
-import { getToken } from "./auth"
-
-function useBook(id) {
-    const navigate = useNavigate()
-
-    const handleBook = () => {
-        /* TODO */
-
-        if (!getToken()) {
-            return navigate("/login")
-        }
-    }
-
-    return handleBook
-}
-
-export default useBook