@@ -85,4 +85,4 @@ function Filters({ filter, setFilter, filterShown, setFilterShown }: FiltersProp
)
}
-export default Filters
\ No newline at end of file
+export default Filters
diff --git a/front/src/components/LocationMarker.tsx b/front/src/components/LocationMarker.tsx
index 2ad60f7..d159613 100644
--- a/front/src/components/LocationMarker.tsx
+++ b/front/src/components/LocationMarker.tsx
@@ -1,6 +1,7 @@
-import { Marker, Popup, useMapEvents } from "react-leaflet"
+import { Marker, Popup, useMapEvents } from 'react-leaflet'
import { LatLng } from 'leaflet'
-import { SetState } from "../utils/types"
+
+import { SetState } from '../utils/types'
type LocationMarkerProps = {
address: string,
@@ -32,4 +33,4 @@ const LocationMarker = ({ address, position, setPosition }: LocationMarkerProps)
)
}
-export default LocationMarker
\ No newline at end of file
+export default LocationMarker
diff --git a/front/src/components/TrashboxMarkers.tsx b/front/src/components/TrashboxMarkers.tsx
index 0a0688a..3da7cd1 100644
--- a/front/src/components/TrashboxMarkers.tsx
+++ b/front/src/components/TrashboxMarkers.tsx
@@ -1,5 +1,6 @@
-import { Marker, Popup } from "react-leaflet"
-import { Trashbox } from "../hooks/api/useTrashboxes"
+import { Marker, Popup } from 'react-leaflet'
+
+import { Trashbox } from '../hooks/api/useTrashboxes'
type TrashboxMarkersProps = {
trashboxes: Trashbox[],
@@ -15,7 +16,7 @@ const TrashboxMarkers = ({ trashboxes, selectTrashbox }: TrashboxMarkersProps) =
Тип мусора: <>
{trashbox.Categories.map((category, j) =>
- selectTrashbox({ index, category })}>
+ selectTrashbox({ index, category })}>
{category}
{(j < trashbox.Categories.length - 1) ? ', ' : ''}
diff --git a/front/src/components/WithToken.tsx b/front/src/components/WithToken.tsx
index c3f7477..61aae58 100644
--- a/front/src/components/WithToken.tsx
+++ b/front/src/components/WithToken.tsx
@@ -1,13 +1,14 @@
-import { PropsWithChildren, useEffect } from "react"
-import { getToken } from "../utils/auth"
-import { useNavigate } from "react-router-dom"
+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")
+ return navigate('/login')
}
}, [navigate])
diff --git a/front/src/components/index.ts b/front/src/components/index.ts
index 8dec666..aa92c4b 100644
--- a/front/src/components/index.ts
+++ b/front/src/components/index.ts
@@ -1,21 +1,9 @@
-import AnnouncementDetails from "./AnnouncementDetails"
-import BottomNavBar from "./BottomNavBar"
-import Filters from "./Filters"
-import LineDot from "./LineDot"
-import LocationMarker from './LocationMarker'
-import TrashboxMarkers from './TrashboxMarkers'
-import WithToken from './WithToken'
-import ClickHandler from './ClickHandler'
-import AuthForm from "./AuthForm"
-
-export {
- AnnouncementDetails,
- BottomNavBar,
- Filters,
- LineDot,
- LocationMarker,
- TrashboxMarkers,
- WithToken,
- ClickHandler,
- AuthForm,
-}
+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'
diff --git a/front/src/config.ts b/front/src/config.ts
index 4555d0a..2802649 100644
--- a/front/src/config.ts
+++ b/front/src/config.ts
@@ -1,3 +1,3 @@
-const API_URL = "/api"
+const API_URL = '/api'
-export { API_URL }
\ No newline at end of file
+export { API_URL }
diff --git a/front/src/hooks/api/useAddAnnouncement.ts b/front/src/hooks/api/useAddAnnouncement.ts
index 84416ae..805cf04 100644
--- a/front/src/hooks/api/useAddAnnouncement.ts
+++ b/front/src/hooks/api/useAddAnnouncement.ts
@@ -1,15 +1,15 @@
-import { useEffect, useRef, useState } from "react"
+import { useEffect, useRef, useState } from 'react'
-import { API_URL } from "../../config"
-import { isLiteralUnion } from "../../utils/types"
-import { handleHTTPErrors } from "../../utils"
+import { API_URL } from '../../config'
+import { isLiteralUnion } from '../../utils/types'
+import { handleHTTPErrors } from '../../utils'
-const addErrors = ["Не удалось опубликовать объявление", 'Неверный ответ от сервера', 'Неизвестная ошибка'] as const
+const addErrors = ['Не удалось опубликовать объявление', 'Неверный ответ от сервера', 'Неизвестная ошибка'] as const
type AddError = typeof addErrors[number]
const isAddError = (obj: unknown): obj is AddError => isLiteralUnion(obj, addErrors)
-const buttonStates = ["Опубликовать", "Загрузка...", "Опубликовано", "Отменено"] as const
+const buttonStates = ['Опубликовать', 'Загрузка...', 'Опубликовано', 'Отменено'] as const
type ButtonState = typeof buttonStates[number] | AddError
type AddResponse = {
@@ -21,26 +21,26 @@ const isAddResponse = (obj: unknown): obj is AddResponse =>
const useAddAnnouncement = () => {
- const [status, setStatus] = useState("Опубликовать")
+ const [status, setStatus] = useState('Опубликовать')
const timerIdRef = useRef()
const abortControllerRef = useRef()
const doAdd = async (formData: FormData) => {
- if (status === "Загрузка...") {
+ if (status === 'Загрузка...') {
abortControllerRef.current?.abort()
- setStatus("Отменено")
- timerIdRef.current = setTimeout(() => setStatus("Опубликовать"), 3000)
+ setStatus('Отменено')
+ timerIdRef.current = setTimeout(() => setStatus('Опубликовать'), 3000)
return
}
- setStatus("Загрузка...")
+ setStatus('Загрузка...')
const abortController = new AbortController()
abortControllerRef.current = abortController
try {
- const res = await fetch(API_URL + "/announcement", {
+ const res = await fetch(API_URL + '/announcement', {
method: 'PUT',
body: formData,
signal: abortController.signal
@@ -53,13 +53,13 @@ const useAddAnnouncement = () => {
if (!isAddResponse(data)) throw new Error('Неверный ответ от сервера')
if (!data.Answer) {
- throw new Error("Не удалось опубликовать объявление")
+ throw new Error('Не удалось опубликовать объявление')
}
- setStatus("Опубликовано")
+ setStatus('Опубликовано')
} catch (err) {
- setStatus(isAddError(err) ? err : "Неизвестная ошибка")
- timerIdRef.current = setTimeout(() => setStatus("Опубликовать"), 10000)
+ setStatus(isAddError(err) ? err : 'Неизвестная ошибка')
+ timerIdRef.current = setTimeout(() => setStatus('Опубликовать'), 10000)
}
}
diff --git a/front/src/hooks/api/useAuth.ts b/front/src/hooks/api/useAuth.ts
index 90c6acc..c6f40af 100644
--- a/front/src/hooks/api/useAuth.ts
+++ b/front/src/hooks/api/useAuth.ts
@@ -1,7 +1,8 @@
-import { useState } from "react"
-import { API_URL } from "../../config"
-import { isConst, isObject } from "../../utils/types"
-import { handleHTTPErrors } from "../../utils"
+import { useState } from 'react'
+
+import { API_URL } from '../../config'
+import { isConst, isObject } from '../../utils/types'
+import { handleHTTPErrors } from '../../utils'
interface AuthData {
email: string,
@@ -24,11 +25,11 @@ type SignUpResponse = {
const isSignUpResponse = (obj: unknown): obj is SignUpResponse => (
isObject(obj, {
- "Success": isConst(true)
+ 'Success': isConst(true)
}) ||
isObject(obj, {
- "Success": isConst(false),
- "Message": "string"
+ 'Success': isConst(false),
+ 'Message': 'string'
})
)
@@ -38,8 +39,8 @@ interface LogInResponse {
}
const isLogInResponse = (obj: unknown): obj is LogInResponse => isObject(obj, {
- "access_token": "string",
- "token_type": isConst("bearer")
+ 'access_token': 'string',
+ 'token_type': isConst('bearer')
})
function useAuth() {
@@ -51,8 +52,8 @@ function useAuth() {
if (newAccount) {
try {
- const res = await fetch(API_URL + "/signup", {
- method: "POST",
+ const res = await fetch(API_URL + '/signup', {
+ method: 'POST',
body: JSON.stringify(data),
headers: {
'Content-Type': 'application/json'
@@ -64,7 +65,7 @@ function useAuth() {
const signupData: unknown = await res.json()
if (!isSignUpResponse(signupData)) {
- throw new Error("Malformed server response")
+ throw new Error('Malformed server response')
}
if (signupData.Success === false) {
@@ -83,7 +84,7 @@ function useAuth() {
username: data.email,
password: data.password
}).toString(), {
- method: "POST",
+ method: 'POST',
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
@@ -92,7 +93,7 @@ function useAuth() {
const logInData: unknown = await res.json()
if (!isLogInResponse(logInData)) {
- throw new Error("Malformed server response")
+ throw new Error('Malformed server response')
}
const token = logInData.access_token
@@ -111,4 +112,4 @@ function useAuth() {
return { doAuth, loading, error }
}
-export default useAuth
\ No newline at end of file
+export default useAuth
diff --git a/front/src/hooks/api/useBook.ts b/front/src/hooks/api/useBook.ts
index e5d153b..9c4dc5b 100644
--- a/front/src/hooks/api/useBook.ts
+++ b/front/src/hooks/api/useBook.ts
@@ -1,20 +1,20 @@
-import { useState } from "react"
-import { useNavigate } from "react-router-dom"
+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"
+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"
+ 'Success': 'boolean'
})
-type BookStatus = "" | "Загрузка..." | "Забронировано" | "Ошибка бронирования"
+type BookStatus = '' | 'Загрузка...' | 'Забронировано' | 'Ошибка бронирования'
function useBook(id: number) {
const navigate = useNavigate()
@@ -25,7 +25,7 @@ function useBook(id: number) {
const token = getToken()
if (token) {
- setStatus("Загрузка...")
+ setStatus('Загрузка...')
try {
@@ -45,24 +45,24 @@ function useBook(id: number) {
const data: unknown = await res.json()
if (!isBookResponse(data)) {
- throw new Error("Malformed server response")
+ throw new Error('Malformed server response')
}
if (data.Success === true) {
setStatus('Забронировано')
} else {
- throw new Error("Server refused to book")
+ throw new Error('Server refused to book')
}
}
catch (err) {
- setStatus("Ошибка бронирования")
+ setStatus('Ошибка бронирования')
if (import.meta.env.DEV) {
console.log(err)
}
}
} else {
- return navigate("/login")
+ return navigate('/login')
}
}
diff --git a/front/src/hooks/api/useFetch.ts b/front/src/hooks/api/useFetch.ts
index 385331c..0568dc8 100644
--- a/front/src/hooks/api/useFetch.ts
+++ b/front/src/hooks/api/useFetch.ts
@@ -1,11 +1,11 @@
-import { useEffect, useRef, useState } from "react"
+import { useEffect, useRef, useState } from 'react'
import { handleHTTPErrors, isAborted } from '../../utils'
const useFetch = (url: string, params: RequestInit | undefined, initialData: T, dataGuard: (obj: unknown) => obj is T) => {
const [data, setData] = useState(initialData)
const [loading, setLoading] = useState(true)
- const [error, setError] = useState("")
+ const [error, setError] = useState('')
const abortControllerRef = useRef()
@@ -25,7 +25,7 @@ const useFetch = (url: string, params: RequestInit | undefined, initialData:
})
.then(data => {
if (!dataGuard(data)) {
- throw new Error("Неверный ответ от сервера")
+ throw new Error('Неверный ответ от сервера')
}
setData(data)
@@ -33,7 +33,7 @@ const useFetch = (url: string, params: RequestInit | undefined, initialData:
})
.catch(err => {
if (err instanceof Error && !isAborted(err)) {
- setError("Ошибка сети")
+ setError('Ошибка сети')
}
setLoading(false)
diff --git a/front/src/hooks/api/useHomeAnnouncementList.ts b/front/src/hooks/api/useHomeAnnouncementList.ts
index ee1ba8f..ca1aa26 100644
--- a/front/src/hooks/api/useHomeAnnouncementList.ts
+++ b/front/src/hooks/api/useHomeAnnouncementList.ts
@@ -1,7 +1,7 @@
import useFetch from './useFetch'
-import { API_URL } from '../../config'
import { FiltersType, filterNames } from '../../utils/filters'
import { isArrayOf, isObject } from '../../utils/types'
+import { API_URL } from '../../config'
import { Category, isCategory } from '../../assets/category'
const initialAnnouncements = { list_of_announcements: [], Success: true }
@@ -12,8 +12,8 @@ type AnnouncementsListResponse = {
}
const isAnnouncementsListResponse = (obj: unknown): obj is AnnouncementsListResponse => isObject(obj, {
- "list_of_announcements": obj => isArrayOf(obj, isAnnouncementResponse),
- "Success": "boolean"
+ 'list_of_announcements': obj => isArrayOf(obj, isAnnouncementResponse),
+ 'Success': 'boolean'
})
type AnnouncementResponse = {
@@ -33,19 +33,19 @@ type AnnouncementResponse = {
}
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"
+ '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 = {
diff --git a/front/src/hooks/api/useTrashboxes.ts b/front/src/hooks/api/useTrashboxes.ts
index a984857..6c87488 100644
--- a/front/src/hooks/api/useTrashboxes.ts
+++ b/front/src/hooks/api/useTrashboxes.ts
@@ -1,9 +1,9 @@
-import { LatLng } from "leaflet"
+import { LatLng } from 'leaflet'
-import { API_URL } from "../../config"
-import { isArrayOf, isObject } from "../../utils/types"
-import useFetch from "./useFetch"
-import { isString } from "../../utils/types"
+import { API_URL } from '../../config'
+import { isArrayOf, isObject } from '../../utils/types'
+import useFetch from './useFetch'
+import { isString } from '../../utils/types'
type Trashbox = {
Lat: number,
@@ -13,15 +13,15 @@ type Trashbox = {
}
const isTrashbox = (obj: unknown): obj is Trashbox => isObject(obj, {
- "Lat": "number",
- "Lng": "number",
- "Address": "string",
- "Categories": obj => isArrayOf(obj, isString)
+ 'Lat': 'number',
+ 'Lng': 'number',
+ 'Address': 'string',
+ 'Categories': obj => isArrayOf(obj, isString)
})
const useTrashboxes = (position: LatLng) => {
return useFetch(
- API_URL + "/trashbox?" + new URLSearchParams({
+ API_URL + '/trashbox?' + new URLSearchParams({
lat: position.lat.toString(),
lng: position.lng.toString()
}).toString(),
@@ -32,4 +32,4 @@ const useTrashboxes = (position: LatLng) => {
}
export type { Trashbox }
-export default useTrashboxes
\ No newline at end of file
+export default useTrashboxes
diff --git a/front/src/hooks/index.ts b/front/src/hooks/index.ts
index 7f558fd..37c3f5c 100644
--- a/front/src/hooks/index.ts
+++ b/front/src/hooks/index.ts
@@ -1,5 +1 @@
-import useStoryDimensions from "./useStoryDimensions"
-
-export {
- useStoryDimensions,
-}
+export { default as useStoryDimensions } from './useStoryDimensions'
diff --git a/front/src/hooks/useStoryDimensions.ts b/front/src/hooks/useStoryDimensions.ts
index ef5638e..96eac52 100644
--- a/front/src/hooks/useStoryDimensions.ts
+++ b/front/src/hooks/useStoryDimensions.ts
@@ -17,8 +17,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 +31,4 @@ function useStoryDimensions(maxRatio = 16/9) {
}
}
-export default useStoryDimensions
\ No newline at end of file
+export default useStoryDimensions
diff --git a/front/src/index.css b/front/src/index.css
index 3c1a6d7..d85d960 100644
--- a/front/src/index.css
+++ b/front/src/index.css
@@ -2,4 +2,4 @@
padding: 0;
margin: 0;
list-style: none;
-}
\ No newline at end of file
+}
diff --git a/front/src/main.tsx b/front/src/main.tsx
index 3d7150d..a3955bf 100644
--- a/front/src/main.tsx
+++ b/front/src/main.tsx
@@ -1,5 +1,6 @@
import React from 'react'
import ReactDOM from 'react-dom/client'
+
import App from './App.tsx'
import './index.css'
diff --git a/front/src/pages/AddPage.tsx b/front/src/pages/AddPage.tsx
index 4a7b162..5ec6602 100644
--- a/front/src/pages/AddPage.tsx
+++ b/front/src/pages/AddPage.tsx
@@ -1,15 +1,14 @@
-import { FormEventHandler, useEffect, useState } from "react"
-import { Form, Button, Card } from "react-bootstrap"
+import { FormEventHandler, useEffect, useState } from 'react'
+import { Form, Button, Card } from 'react-bootstrap'
import { MapContainer, TileLayer } from 'react-leaflet'
-import { latLng } from "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 { isObject } from "../utils/types"
-import { handleHTTPErrors } from "../utils"
+import { ClickHandler, LocationMarker, TrashboxMarkers } from '../components'
+import { useAddAnnouncement, useTrashboxes } from '../hooks/api'
+import { isObject } from '../utils/types'
+import { handleHTTPErrors } from '../utils'
+import { categories, categoryNames } from '../assets/category'
+import { stations, lines, lineNames } from '../assets/metro'
function AddPage() {
const [addressPosition, setAddressPosition] = useState(latLng(59.972, 30.3227))
@@ -21,13 +20,13 @@ function AddPage() {
useEffect(() => {
void (async () => {
try {
- const res = await fetch(location.protocol + "//nominatim.openstreetmap.org/search?format=json&q=" + address)
+ const res = await fetch(location.protocol + '//nominatim.openstreetmap.org/search?format=json&q=' + address)
handleHTTPErrors(res)
const fetchData: unknown = await res.json()
- console.log("f", fetchData)
+ console.log('f', fetchData)
} catch (err) {
console.error(err)
@@ -44,8 +43,8 @@ function AddPage() {
const fetchData: unknown = await res.json()
- if (!isObject<{ display_name: string }>(fetchData, { "display_name": "string" })) {
- throw new Error("Malformed server response")
+ if (!isObject<{ display_name: string }>(fetchData, { 'display_name': 'string' })) {
+ throw new Error('Malformed server response')
}
setAddress(fetchData.display_name)
@@ -64,27 +63,27 @@ function AddPage() {
const formData = new FormData(event.currentTarget)
- formData.append("latitude", addressPosition.lat.toString())
- formData.append("longtitude", addressPosition.lng.toString())
- formData.append("address", address)
- formData.set("bestBy", new Date((formData.get("bestBy") as number | null) || 0).getTime().toString())
+ formData.append('latitude', addressPosition.lat.toString())
+ formData.append('longtitude', addressPosition.lng.toString())
+ formData.append('address', address)
+ formData.set('bestBy', new Date((formData.get('bestBy') as number | null) || 0).getTime().toString())
void doAdd(formData)
}
return (
-
-
+
+