From 9eb30d2066984462ef3d8d4a43036a6d57667dc4 Mon Sep 17 00:00:00 2001 From: dm1sh Date: Sun, 30 Jul 2023 15:01:31 +0300 Subject: [PATCH] Fixed imports styling --- front/src/api/osmAddress/index.ts | 1 + front/src/api/token/index.ts | 3 +-- front/src/components/AnnouncementDetails.tsx | 2 +- front/src/components/AuthForm.tsx | 1 + front/src/components/BackHeader.tsx | 2 +- front/src/components/BottomNavBar.tsx | 2 +- front/src/hooks/api/useAnnouncements.ts | 1 - front/src/hooks/api/useBook.ts | 1 + front/src/hooks/useFilters.ts | 1 + front/src/hooks/useId.ts | 1 + front/src/hooks/useSendWithButton.ts | 1 + front/src/hooks/useStoryIndex.ts | 1 + front/src/main.tsx | 1 + 13 files changed, 12 insertions(+), 6 deletions(-) diff --git a/front/src/api/osmAddress/index.ts b/front/src/api/osmAddress/index.ts index ec7ef9e..7933676 100644 --- a/front/src/api/osmAddress/index.ts +++ b/front/src/api/osmAddress/index.ts @@ -1,4 +1,5 @@ import { LatLng } from 'leaflet' + import { OsmAddressResponse } from './types' const initialOsmAddress = '' diff --git a/front/src/api/token/index.ts b/front/src/api/token/index.ts index 370dfe4..01072d2 100644 --- a/front/src/api/token/index.ts +++ b/front/src/api/token/index.ts @@ -1,6 +1,5 @@ -import { isString } from 'react-bootstrap-typeahead/types/utils' import { API_URL } from '../../config' -import { fallbackTo } from '../../utils/types' +import { fallbackTo, isString } from '../../utils/types' import { Token, TokenResponse } from './types' const composeTokenURL = () => ( diff --git a/front/src/components/AnnouncementDetails.tsx b/front/src/components/AnnouncementDetails.tsx index 164f755..b3947ca 100644 --- a/front/src/components/AnnouncementDetails.tsx +++ b/front/src/components/AnnouncementDetails.tsx @@ -1,12 +1,12 @@ import { Modal, Button } from 'react-bootstrap' import { MapContainer, Marker, Popup, TileLayer } from 'react-leaflet' +import { CSSProperties } from 'react' import LineDot from './LineDot' import { categoryNames } from '../assets/category' import { useBook, useRemoveAnnouncement } from '../hooks/api' import { Announcement } from '../api/announcement/types' import { iconItem } from '../utils/markerIcons' -import { CSSProperties } from 'react' import { useId } from '../hooks' type AnnouncementDetailsProps = { diff --git a/front/src/components/AuthForm.tsx b/front/src/components/AuthForm.tsx index 92bff78..52c4f47 100644 --- a/front/src/components/AuthForm.tsx +++ b/front/src/components/AuthForm.tsx @@ -1,5 +1,6 @@ import { FormEventHandler, useCallback } from 'react' import { Button, Form } from 'react-bootstrap' + import { useSignIn, useSignUp } from '../hooks/api' import { composeSignUpBody } from '../api/signup' import { composeSignInBody } from '../api/token' diff --git a/front/src/components/BackHeader.tsx b/front/src/components/BackHeader.tsx index dca8c0b..6fb0484 100644 --- a/front/src/components/BackHeader.tsx +++ b/front/src/components/BackHeader.tsx @@ -1,8 +1,8 @@ import { Link } from 'react-router-dom' import { Navbar } from 'react-bootstrap' +import { PropsWithChildren } from 'react' import BackButton from '../assets/backArrow.svg' -import { PropsWithChildren } from 'react' type BackHeaderProps = { text: string diff --git a/front/src/components/BottomNavBar.tsx b/front/src/components/BottomNavBar.tsx index 03c8d7f..e164dc8 100644 --- a/front/src/components/BottomNavBar.tsx +++ b/front/src/components/BottomNavBar.tsx @@ -1,9 +1,9 @@ import { Link } from 'react-router-dom' +import { CSSProperties } from 'react' 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: { diff --git a/front/src/hooks/api/useAnnouncements.ts b/front/src/hooks/api/useAnnouncements.ts index 1e8dbc2..1828fc6 100644 --- a/front/src/hooks/api/useAnnouncements.ts +++ b/front/src/hooks/api/useAnnouncements.ts @@ -1,7 +1,6 @@ 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) => ( diff --git a/front/src/hooks/api/useBook.ts b/front/src/hooks/api/useBook.ts index e427e9b..baa8e05 100644 --- a/front/src/hooks/api/useBook.ts +++ b/front/src/hooks/api/useBook.ts @@ -1,4 +1,5 @@ import { useCallback } from 'react' + import { isObject } from '../../utils/types' import { useSendWithButton } from '..' import { composeBookURL, processBook } from '../../api/book' diff --git a/front/src/hooks/useFilters.ts b/front/src/hooks/useFilters.ts index e6238c6..412840a 100644 --- a/front/src/hooks/useFilters.ts +++ b/front/src/hooks/useFilters.ts @@ -1,5 +1,6 @@ import { useEffect, useState } from 'react' import { useSearchParams } from 'react-router-dom' + import { FiltersType, URLDecoreFilters, URLEncodeFilters, defaultFilters } from '../utils/filters' import { SetState } from '../utils/types' diff --git a/front/src/hooks/useId.ts b/front/src/hooks/useId.ts index f3f2e0a..4145876 100644 --- a/front/src/hooks/useId.ts +++ b/front/src/hooks/useId.ts @@ -1,4 +1,5 @@ import { useNavigate } from 'react-router-dom' + import { getId } from '../utils/auth' function useId() { diff --git a/front/src/hooks/useSendWithButton.ts b/front/src/hooks/useSendWithButton.ts index efdbe3f..8730664 100644 --- a/front/src/hooks/useSendWithButton.ts +++ b/front/src/hooks/useSendWithButton.ts @@ -1,4 +1,5 @@ import { useCallback } from 'react' + import { useSend } from '.' import useSendButtonCaption from './useSendButtonCaption' diff --git a/front/src/hooks/useStoryIndex.ts b/front/src/hooks/useStoryIndex.ts index c15cc6d..dd640ed 100644 --- a/front/src/hooks/useStoryIndex.ts +++ b/front/src/hooks/useStoryIndex.ts @@ -1,5 +1,6 @@ import { useEffect, useState } from 'react' import { useSearchParams } from 'react-router-dom' + import { SetState } from '../utils/types' function useStoryIndex(annLength: number | undefined) { diff --git a/front/src/main.tsx b/front/src/main.tsx index 20632c1..79cbf0e 100644 --- a/front/src/main.tsx +++ b/front/src/main.tsx @@ -2,6 +2,7 @@ import React from 'react' import ReactDOM from 'react-dom/client' import App from './App.tsx' + import './index.css' import 'bootstrap/dist/css/bootstrap.min.css'