Code styling

Added brackets for const lambdas
Converted const lambdas with multiple instructions to functions

front/src/api/announcement/types.ts

@@ -17,7 +17,8 @@ type AnnouncementResponse = {
     booked_by: number
 }
 
-const isAnnouncementResponse = (obj: unknown): obj is AnnouncementResponse => isObject(obj, {
+const isAnnouncementResponse = (obj: unknown): obj is AnnouncementResponse => (
+    isObject(obj, {
         'id': 'number',
         'user_id': 'number',
         'name': 'string',
@@ -31,7 +32,8 @@ const isAnnouncementResponse = (obj: unknown): obj is AnnouncementResponse => is
         'metro': 'string',
         'trashId': 'number?',
         'booked_by': 'number'
-})
+    })
+)
 
 type Announcement = {
     id: number,

front/src/api/announcements/index.ts

@@ -5,8 +5,9 @@ import { AnnouncementsResponse } from './types'
 
 const initialAnnouncements: Announcement[] = []
 
-const composeAnnouncementsURL = (filters: FiltersType) =>
+const composeAnnouncementsURL = (filters: FiltersType) => (
     API_URL + '/announcements?' + new URLSearchParams(URLEncodeFilters(filters)).toString()
+)
 
 const processAnnouncements = (data: AnnouncementsResponse): Announcement[] => {
     const annList = data.list_of_announcements

front/src/api/announcements/types.ts

@@ -6,10 +6,12 @@ type AnnouncementsResponse = {
     Success: boolean
 }
 
-const isAnnouncementsResponse = (obj: unknown): obj is AnnouncementsResponse => isObject(obj, {
+const isAnnouncementsResponse = (obj: unknown): obj is AnnouncementsResponse => (
+    isObject(obj, {
         'list_of_announcements': obj => isArrayOf<AnnouncementResponse>(obj, isAnnouncementResponse),
         'Success': 'boolean'
-})
+    })
+)
 
 export type {
     AnnouncementsResponse,

front/src/api/osmAddress/index.ts

@@ -3,10 +3,12 @@ import { OsmAddressResponse } from './types'
 
 const initialOsmAddress = ''
 
-const composeOsmAddressURL = (addressPosition: LatLng) =>
+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 =>
+const processOsmAddress = (data: OsmAddressResponse): string => (
     data.display_name
+)
 
 export { initialOsmAddress, composeOsmAddressURL, processOsmAddress }

front/src/api/osmAddress/types.ts

@@ -4,9 +4,11 @@ type OsmAddressResponse = {
     display_name: string
 }
 
-const isOsmAddressResponse = (obj: unknown): obj is OsmAddressResponse => isObject(obj, {
+const isOsmAddressResponse = (obj: unknown): obj is OsmAddressResponse => (
+    isObject(obj, {
         'display_name': 'string',
-})
+    })
+)
 
 export type {
     OsmAddressResponse,

front/src/api/trashbox/index.ts

@@ -2,10 +2,11 @@ import { LatLng } from 'leaflet'
 
 import { API_URL } from '../../config'
 
-const composeTrashboxURL = (position: LatLng) =>
+const composeTrashboxURL = (position: LatLng) => (
     API_URL + '/trashbox?' + new URLSearchParams({
         lat: position.lat.toString(),
         lng: position.lng.toString()
     }).toString()
+)
 
 export { composeTrashboxURL }

front/src/api/trashbox/types.ts

@@ -7,16 +7,20 @@ type Trashbox = {
     Categories: string[]
 }
 
-const isTrashbox = (obj: unknown): obj is Trashbox => isObject(obj, {
+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)
+const isTrashboxResponse = (obj: unknown): obj is Trashbox[] => (
+    isArrayOf(obj, isTrashbox)
+)
 
 export type { Trashbox, TrashboxResponse }
 export { isTrashbox, isTrashboxResponse }

front/src/assets/category.ts

@@ -4,7 +4,9 @@ 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 isCategory = (obj: unknown): obj is Category => (
+    isLiteralUnion(obj, categories)
+)
 
 const categoryGraphics: Record<Category, string> = {
     'PORRIDGE': 'static/PORRIDGE.jpg',

front/src/assets/metro.ts

@@ -101,9 +101,9 @@ const lineNames: Record<Lines, string> = {
     violet: 'Фиолетовая',
 }
 
-const lineByName = (name: string) =>
+const lineByName = (name: string) => (
     lines.find(line => stations[line].has(name))
-
+)
 
 export type { Lines }
 export { lines, stations, colors, lineNames, lineByName }

front/src/components/AuthForm.tsx

@@ -8,8 +8,9 @@ type AuthFormProps = {
     error: string
 }
 
-const AuthForm = ({ handleAuth, register, loading, error }: AuthFormProps) => {
+function AuthForm ({ handleAuth, register, loading, error }: AuthFormProps) {
     const buttonText = loading ? 'Загрузка...' : (error || (register ? 'Зарегистрироваться' : 'Войти'))
+
     return (
         <Form onSubmit={handleAuth}>
             <Form.Group className='mb-3' controlId='email'>

front/src/components/LocationMarker.tsx

@@ -10,7 +10,7 @@ type LocationMarkerProps = {
     setPosition: SetState<LatLng>
 }
 
-const LocationMarker = ({ address, position, setPosition }: LocationMarkerProps) => {
+function LocationMarker({ address, position, setPosition }: LocationMarkerProps) {
 
     const map = useMapEvents({
         dragend: () => {

front/src/components/TrashboxMarkers.tsx

@@ -8,7 +8,7 @@ type TrashboxMarkersProps = {
     selectTrashbox: ({ index, category }: { index: number, category: string }) => void
 }
 
-const TrashboxMarkers = ({ trashboxes, selectTrashbox }: TrashboxMarkersProps) => {
+function TrashboxMarkers({ trashboxes, selectTrashbox }: TrashboxMarkersProps) {
     return (
         <>{trashboxes.map((trashbox, index) => (
             <Marker icon={iconTrash} key={`${trashbox.Lat}${trashbox.Lng}`} position={[trashbox.Lat, trashbox.Lng]}>

front/src/hooks/api/useAddAnnouncement.ts

@@ -7,7 +7,9 @@ import { handleHTTPErrors } from '../../utils'
 const addErrors = ['Не удалось опубликовать объявление', 'Неверный ответ от сервера', 'Неизвестная ошибка'] as const
 type AddError = typeof addErrors[number]
 
-const isAddError = (obj: unknown): obj is AddError => isLiteralUnion(obj, addErrors)
+const isAddError = (obj: unknown): obj is AddError => (
+    isLiteralUnion(obj, addErrors)
+)
 
 const buttonStates = ['Опубликовать', 'Загрузка...', 'Опубликовано', 'Отменено'] as const
 type ButtonState = typeof buttonStates[number] | AddError
@@ -16,9 +18,9 @@ type AddResponse = {
     Answer: boolean
 }
 
-const isAddResponse = (obj: unknown): obj is AddResponse =>
+const isAddResponse = (obj: unknown): obj is AddResponse => (
     typeof obj === 'object' && obj !== null && typeof Reflect.get(obj, 'Answer') === 'boolean'
-
+)
 
 const useAddAnnouncement = () => {
     const [status, setStatus] = useState<ButtonState>('Опубликовать')

front/src/hooks/api/useAnnouncements.ts

@@ -4,7 +4,7 @@ import { composeAnnouncementsURL, initialAnnouncements, processAnnouncements } f
 
 import { isAnnouncementsResponse } from '../../api/announcements/types'
 
-const useAnnouncements = (filters: FiltersType) =>
+const useAnnouncements = (filters: FiltersType) => (
     useFetch(
         composeAnnouncementsURL(filters),
         'GET',
@@ -13,6 +13,6 @@ const useAnnouncements = (filters: FiltersType) =>
         processAnnouncements,
         initialAnnouncements
     )
-
+)
 
 export default useAnnouncements

front/src/hooks/api/useAuth.ts

@@ -38,16 +38,18 @@ interface LogInResponse {
     token_type: 'bearer'
 }
 
-const isLogInResponse = (obj: unknown): obj is LogInResponse => isObject(obj, {
+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('')
 
-    const doAuth = async (data: AuthData, newAccount: boolean) => {
+    async function doAuth(data: AuthData, newAccount: boolean) {
         setLoading(true)
 
         if (newAccount) {

front/src/hooks/api/useBook.ts

@@ -10,9 +10,11 @@ type BookResponse = {
     Success: boolean
 }
 
-const isBookResponse = (obj: unknown): obj is BookResponse => isObject(obj, {
+const isBookResponse = (obj: unknown): obj is BookResponse => (
+    isObject(obj, {
         'Success': 'boolean'
-})
+    })
+)
 
 type BookStatus = '' | 'Загрузка...' | 'Забронировано' | 'Ошибка бронирования'
 

front/src/hooks/api/useFetch.ts

@@ -20,11 +20,13 @@ type UseFetchErrored = {
     data: undefined
 } & UseFetchShared
 
-const gotError = <T>(res: UseFetchErrored | UseFetchSucced<T>): res is UseFetchErrored =>
+const gotError = <T>(res: UseFetchErrored | UseFetchSucced<T>): res is UseFetchErrored => (
     typeof res.error === 'string'
+)
 
-const fallbackError = <T>(res: UseFetchSucced<T> | UseFetchErrored) =>
+const fallbackError = <T>(res: UseFetchSucced<T> | UseFetchErrored) => (
     gotError(res) ? res.error : res.data
+)
 
 type UseFetchReturn<T> = ({
     error: null,

front/src/hooks/api/useOsmAddress.ts

@@ -4,7 +4,7 @@ import useFetch from './useFetch'
 import { composeOsmAddressURL, processOsmAddress } from '../../api/osmAddress'
 import { isOsmAddressResponse } from '../../api/osmAddress/types'
 
-const useOsmAddresses = (addressPosition: LatLng) =>
+const useOsmAddresses = (addressPosition: LatLng) => (
     useFetch(
         composeOsmAddressURL(addressPosition),
         'GET',
@@ -13,5 +13,6 @@ const useOsmAddresses = (addressPosition: LatLng) =>
         processOsmAddress,
         ''
     )
+)
 
 export default useOsmAddresses

front/src/hooks/api/useTrashboxes.ts

@@ -4,7 +4,7 @@ import useFetch from './useFetch'
 import { composeTrashboxURL } from '../../api/trashbox'
 import { isTrashboxResponse } from '../../api/trashbox/types'
 
-const useTrashboxes = (position: LatLng) =>
+const useTrashboxes = (position: LatLng) => (
     useFetch(
         composeTrashboxURL(position),
         'GET',
@@ -13,6 +13,6 @@ const useTrashboxes = (position: LatLng) =>
         (data) => data,
         []
     )
-
+)
 
 export default useTrashboxes

front/src/utils/auth.ts

@@ -6,7 +6,7 @@ const getToken = () => {
     return token 
 }
 
-const setToken = (token: string) => {
+function setToken(token: string) {
     localStorage.setItem('Token', token)
 }
 

front/src/utils/filters.ts

@@ -7,10 +7,12 @@ type FiltersType = Partial<Pick<Announcement, FilterNames>>
 
 const defaultFilters: FiltersType = { userId: undefined, category: undefined, metro: undefined, bookedBy: undefined }
 
-const URLEncodeFilters = (filters: FiltersType) => Object.fromEntries(
+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 }

front/src/utils/index.ts

@@ -1,6 +1,8 @@
-const isAborted = (err: Error) => err.name === 'AbortError'
+const isAborted = (err: Error) => (
+    err.name === 'AbortError'
+)
 
-const handleHTTPErrors = (res: Response) => {
+function handleHTTPErrors(res: Response) {
     if (!res.ok) {
         switch (res.status) {
             case 401:

front/src/utils/types.ts

@@ -20,7 +20,9 @@ const isObject = <T>(obj: unknown, properties: PropertiesGuards): obj is T => (
     Object.entries(properties).every(([name, guard]) => {
         const param: unknown = Reflect.get(obj, name)
 
+        if (import.meta.env.DEV) {
             console.log(name, param, guard)
+        }
 
         if (typeof guard === 'function') {
             return guard(param)
@@ -54,7 +56,9 @@ const isArrayOf = <T>(obj: unknown, itemGuard: ((obj: unknown) => obj is T)): ob
     obj.every(itemGuard)
 )
 
-const isString = (obj: unknown): obj is string => typeof obj === 'string'
+const isString = (obj: unknown): obj is string => (
+    typeof obj === 'string'
+)
 
 type SetState<T> = React.Dispatch<React.SetStateAction<T>>
 

front/utils/addFetchApiRoute.sh

@@ -9,8 +9,9 @@ import { ${NAME}Response, ${NAME} } from './types'
 
 const initial${NAME}: ${NAME} = {}
 
-const compose${NAME}URL = () =>
+const compose${NAME}URL = () => (
     API_URL + '/${NAME,}?'
+)
 
 const process${NAME} = (data: ${NAME}Response): ${NAME} => {
     return data
@@ -26,19 +27,21 @@ type ${NAME}Response = {
     
 }
 
-const is${NAME}Response = (obj: unknown): obj is ${NAME}Response => 
+const is${NAME}Response = (obj: unknown): obj is ${NAME}Response => (
     isObject(obj, {
     
     })
+)
 
 type ${NAME} = {
 
 }
 
-const is${NAME} = (obj: unknown): obj is ${NAME} => 
+const is${NAME} = (obj: unknown): obj is ${NAME} => (
     isObject(obj, {
 
     })
+)
 
 export type { ${NAME}Response, ${NAME} }