Hackathon finished

.gitignore

@@ -0,0 +1,31 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+
+.venv
+
+*.db
+.env
+
+__pycache__

app/utils.py

@@ -0,0 +1,161 @@
+# 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

front/.eslintrc.cjs

@@ -0,0 +1,15 @@
+module.exports = {
+  env: { browser: true, es2020: true },
+  extends: [
+    'eslint:recommended',
+    'plugin:react/recommended',
+    'plugin:react/jsx-runtime',
+    'plugin:react-hooks/recommended',
+  ],
+  parserOptions: { ecmaVersion: 'latest', sourceType: 'module' },
+  settings: { react: { version: '18.2' } },
+  plugins: ['react-refresh'],
+  rules: {
+    'react-refresh/only-export-components': 'warn',
+  },
+}

front/index.html

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html lang="en" data-bs-theme="dark">
+  <head>
+    <meta charset="UTF-8" />
+    <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>
+  </body>
+</html>

front/package.json

@@ -0,0 +1,32 @@
+{
+  "name": "v2",
+  "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"
+  },
+  "dependencies": {
+    "bootstrap": "^5.2.3",
+    "leaflet": "^1.9.3",
+    "react": "^18.2.0",
+    "react-bootstrap": "^2.7.4",
+    "react-dom": "^18.2.0",
+    "react-insta-stories": "^2.5.9",
+    "react-leaflet": "^4.2.1",
+    "react-router-dom": "^6.11.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",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-react-refresh": "^0.3.4",
+    "vite": "^4.3.2"
+  }
+}

front/src/App.css

@@ -0,0 +1,10 @@
+body {
+    height: 100vh;
+    overflow: hidden;
+    color: white;
+    font-family: sans-serif;
+}
+
+.modal-content, .form-select {
+    background-color: rgb(17, 17, 17) !important;
+}

front/src/App.jsx

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

front/src/assets/addIcon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" style="fill: rgb(17, 17, 17); --darkreader-inline-fill: #e8e6e3;" data-darkreader-inline-fill=""><path d="M20 2H4c-1.103 0-2 .897-2 2v18l4-4h14c1.103 0 2-.897 2-2V4c0-1.103-.897-2-2-2zm-3 9h-4v4h-2v-4H7V9h4V5h2v4h4v2z"></path></svg>

front/src/assets/category.js

@@ -0,0 +1,32 @@
+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/filterIcon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" style="fill: rgb(17, 17, 17); --darkreader-inline-fill: #e8e6e3;" data-darkreader-inline-fill=""><path d="M13 20v-4.586L20.414 8c.375-.375.586-.884.586-1.415V4a1 1 0 0 0-1-1H4a1 1 0 0 0-1 1v2.585c0 .531.211 1.04.586 1.415L11 15.414V22l2-2z"></path></svg>

front/src/assets/handIcon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" style="fill: rgb(17, 17, 17); --darkreader-inline-fill: #e8e6e3;" data-darkreader-inline-fill=""><path d="M20.5 5A1.5 1.5 0 0 0 19 6.5V11h-1V4.5a1.5 1.5 0 0 0-3 0V11h-1V3.5a1.5 1.5 0 0 0-3 0V11h-1V5.5a1.5 1.5 0 0 0-3 0v10.81l-2.22-3.6a1.5 1.5 0 0 0-2.56 1.58l3.31 5.34A5 5 0 0 0 9.78 22H17a5 5 0 0 0 5-5V6.5A1.5 1.5 0 0 0 20.5 5z"></path></svg>

front/src/assets/licence.txt

@@ -0,0 +1,11 @@
+License
+
+The MIT License (MIT)
+
+Copyright (c) 2015-2021 Aniket Suvarna
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

front/src/assets/metro.js

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

front/src/assets/userIcon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" style="fill: rgb(17, 17, 17); --darkreader-inline-fill: #e8e6e3;" data-darkreader-inline-fill=""><path d="M7.5 6.5C7.5 8.981 9.519 11 12 11s4.5-2.019 4.5-4.5S14.481 2 12 2 7.5 4.019 7.5 6.5zM20 21h1v-1c0-3.859-3.141-7-7-7h-4c-3.86 0-7 3.141-7 7v1h17z"></path></svg>

front/src/components/AnnouncementDetails.jsx

@@ -0,0 +1,54 @@
+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/BottomNavBar.jsx

@@ -0,0 +1,50 @@
+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/Filters.jsx

@@ -0,0 +1,74 @@
+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/WithToken.jsx

@@ -0,0 +1,19 @@
+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/config.js

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

front/src/index.css

@@ -0,0 +1,5 @@
+* {
+  padding: 0;
+  margin: 0;
+  list-style: none;
+}

front/src/main.jsx

@@ -0,0 +1,12 @@
+import React from 'react'
+import ReactDOM from 'react-dom/client'
+
+import App from './App.jsx'
+
+import './index.css'
+
+ReactDOM.createRoot(document.getElementById('root')).render(
+  <React.StrictMode>
+    <App />
+  </React.StrictMode>,
+)

front/src/pages/AddPage.jsx

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

front/src/pages/HomePage.jsx

@@ -0,0 +1,101 @@
+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: null,
+        bestBy: 10000,
+        description: "Очень вкусный огурец, прям, закачаешься",
+        lat: 59.9724,
+        lng: 30.3227,
+        address: "ул. Профессора Попова, дом 5 литера Ф",
+        metro: "Петроградская"
+    },
+    {
+        id: 9,
+        name: "Арбуз",
+        category: "soup",
+        src: "https://samplelib.com/lib/preview/mp4/sample-5s.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/LoginPage.jsx

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

front/src/pages/UserPage.jsx

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

front/src/pages/index.js

@@ -0,0 +1,4 @@
+export { default as HomePage } from './HomePage'
+export { default as AddPage } from './AddPage'
+export { default as LoginPage } from './LoginPage'
+export { default as UserPage } from './UserPage'

front/src/pages/leafletStyles.css

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

front/src/utils/auth.js

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

front/src/utils/index.js

@@ -0,0 +1,10 @@
+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/useBook.js

@@ -0,0 +1,18 @@
+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

front/src/utils/useStoryDimensions.js

@@ -0,0 +1,34 @@
+import { useState, useEffect } from 'react';
+
+function getWindowDimensions() {
+    const { innerWidth: width, innerHeight: height } = window;
+
+    return {
+        width,
+        height
+    };
+}
+
+function useStoryDimensions(maxRatio = 16/9) {
+    const [windowDimensions, setWindowDimensions] = useState(getWindowDimensions())
+
+    useEffect(() => {
+        function handleResize() {
+            setWindowDimensions(getWindowDimensions());
+        }
+    
+        window.addEventListener("resize", handleResize);
+        return () => window.removeEventListener("resize", handleResize);
+    }, []);
+
+    const height = windowDimensions.height - 56
+
+    const ratio = Math.max(maxRatio, height / windowDimensions.width)
+
+    return {
+        height: height,
+        width: Math.round(height / ratio)
+    }
+}
+
+export default useStoryDimensions

front/vite.config.js

@@ -0,0 +1,8 @@
+import { defineConfig } from 'vite'
+import react from '@vitejs/plugin-react'
+
+// https://vitejs.dev/config/
+export default defineConfig({
+  base: "/static",
+  plugins: [react()],
+})

main.py

@@ -0,0 +1,270 @@
+#подключение библиотек
+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 })

requirements.txt

@@ -0,0 +1,31 @@
+anyio==3.6.2
+certifi==2023.5.7
+charset-normalizer==3.1.0
+click==8.1.3
+ecdsa==0.18.0
+fastapi==0.95.1
+greenlet==2.0.2
+h11==0.14.0
+httptools==0.5.0
+idna==3.4
+Jinja2==3.1.2
+MarkupSafe==2.1.2
+passlib==1.7.4
+pyasn1==0.5.0
+pydantic==1.10.7
+python-dotenv==1.0.0
+python-jose==3.3.0
+python-multipart==0.0.6
+PyYAML==6.0
+requests==2.30.0
+rsa==4.9
+six==1.16.0
+sniffio==1.3.0
+SQLAlchemy==2.0.13
+starlette==0.26.1
+typing_extensions==4.5.0
+urllib3==2.0.2
+uvicorn==0.22.0
+uvloop==0.17.0
+watchfiles==0.19.0
+websockets==11.0.3