From 18b2f8661261b4ec8a5838cbe6f6e1366ae1fd20 Mon Sep 17 00:00:00 2001 From: Janne Mareike Koschinski <janne@kuschku.de> Date: Thu, 5 Aug 2021 17:57:53 +0200 Subject: [PATCH] Cleanup imports --- ui/src/App.tsx | 10 ++++------ ui/src/components/AlbumImageView.tsx | 2 +- ui/src/components/AlbumList.tsx | 4 ++-- ui/src/components/AlbumView.tsx | 4 ++-- ui/src/components/ImageMetadataView.tsx | 2 +- ui/src/components/UploadView.tsx | 2 +- ui/src/index.tsx | 2 +- ui/src/pages/ImageDetailPage.tsx | 4 ++-- ui/src/pages/ImageListPage.tsx | 2 +- 9 files changed, 15 insertions(+), 17 deletions(-) diff --git a/ui/src/App.tsx b/ui/src/App.tsx index d588c5b..4c75a65 100644 --- a/ui/src/App.tsx +++ b/ui/src/App.tsx @@ -1,17 +1,17 @@ import './App.css'; import {BaseUrlProvider} from './api/baseUrlContext'; import {QueryClient, QueryClientProvider} from "react-query"; -import UploadView from "./components/UploadView"; import {BrowserRouter, Link, Route} from "react-router-dom"; -import ImageListPage from "./pages/ImageListPage"; import {Redirect, Switch} from "react-router"; -import ImageDetailPage from "./pages/ImageDetailPage"; import {AppBar, Button, Toolbar, Typography} from "@material-ui/core"; import {useErrorDisplay} from "./components/ErrorContext"; +import {ImageDetailPage} from './pages/ImageDetailPage'; +import {ImageListPage} from "./pages/ImageListPage"; +import {UploadView} from "./components/UploadView"; const queryClient = new QueryClient(); -function App() { +export function App() { const [ErrorDisplay, ErrorWrapper] = useErrorDisplay(); return ( @@ -59,5 +59,3 @@ function App() { </BaseUrlProvider> ); } - -export default App; diff --git a/ui/src/components/AlbumImageView.tsx b/ui/src/components/AlbumImageView.tsx index 72a4865..39b9c64 100644 --- a/ui/src/components/AlbumImageView.tsx +++ b/ui/src/components/AlbumImageView.tsx @@ -4,7 +4,7 @@ export interface AlbumImageProps { image: AlbumImage } -export default function AlbumImageView({image}: AlbumImageProps) { +export function AlbumImageView({image}: AlbumImageProps) { return ( <div> <p>{image.image}</p> diff --git a/ui/src/components/AlbumList.tsx b/ui/src/components/AlbumList.tsx index b2b8b7b..bedb720 100644 --- a/ui/src/components/AlbumList.tsx +++ b/ui/src/components/AlbumList.tsx @@ -1,8 +1,8 @@ import '../App.css'; import {useListAlbums} from "../api/useListAlbums"; -import AlbumView from "./AlbumView"; +import {AlbumView} from "./AlbumView"; -export default function AlbumList() { +export function AlbumList() { const {status, data, error} = useListAlbums(); return ( <div> diff --git a/ui/src/components/AlbumView.tsx b/ui/src/components/AlbumView.tsx index 2efcfc7..8b82de3 100644 --- a/ui/src/components/AlbumView.tsx +++ b/ui/src/components/AlbumView.tsx @@ -1,11 +1,11 @@ -import AlbumImageView from "./AlbumImageView"; import {Album} from "../api/model/Album"; +import {AlbumImageView} from "./AlbumImageView"; export interface AlbumProps { album: Album } -export default function AlbumView({album}: AlbumProps) { +export function AlbumView({album}: AlbumProps) { return ( <div> <p>{album.id}</p> diff --git a/ui/src/components/ImageMetadataView.tsx b/ui/src/components/ImageMetadataView.tsx index 7545bdd..2b85977 100644 --- a/ui/src/components/ImageMetadataView.tsx +++ b/ui/src/components/ImageMetadataView.tsx @@ -19,7 +19,7 @@ export interface ImageMetadataViewProps { metadata: ImageMetadata } -export default function ImageMetadataView({metadata}: ImageMetadataViewProps) { +export function ImageMetadataView({metadata}: ImageMetadataViewProps) { return ( <Fragment> {metadata.make !== undefined && ( diff --git a/ui/src/components/UploadView.tsx b/ui/src/components/UploadView.tsx index 8c99800..7d28e9c 100644 --- a/ui/src/components/UploadView.tsx +++ b/ui/src/components/UploadView.tsx @@ -3,7 +3,7 @@ import {ErrorPortal} from "./ErrorContext"; import {ErrorAlert} from "./ErrorAlert"; import {LinearProgress} from "@material-ui/core"; -export default function UploadView() { +export function UploadView() { const {mutate: upload, error, isLoading} = useUploadImage(); return ( diff --git a/ui/src/index.tsx b/ui/src/index.tsx index 663cad9..adfc5cb 100644 --- a/ui/src/index.tsx +++ b/ui/src/index.tsx @@ -1,8 +1,8 @@ import {render} from 'react-dom'; import './index.css'; -import App from './App'; import reportWebVitals from './reportWebVitals'; import {StrictMode} from 'react'; +import {App} from './App'; render( <StrictMode> diff --git a/ui/src/pages/ImageDetailPage.tsx b/ui/src/pages/ImageDetailPage.tsx index 931187d..c842e7f 100644 --- a/ui/src/pages/ImageDetailPage.tsx +++ b/ui/src/pages/ImageDetailPage.tsx @@ -15,7 +15,7 @@ import { } from "@material-ui/core"; import {Delete, Event, Info, Save} from "@material-ui/icons"; import {File, Tag} from "mdi-material-ui"; -import ImageMetadataView from "../components/ImageMetadataView"; +import {ImageMetadataView} from "../components/ImageMetadataView"; import {useGetImage} from "../api/useGetImage"; import {useParams} from "react-router"; import {ErrorPortal} from "../components/ErrorContext"; @@ -25,7 +25,7 @@ export interface ImageDetailPageParams { imageId: string } -export default function ImageDetailPage() { +export function ImageDetailPage() { const {imageId} = useParams<ImageDetailPageParams>(); const {data: image, error: imageError, isLoading: imageLoading} = useGetImage(imageId); const {mutate: update, error: updateError, isLoading: updateLoading} = useUpdateImage(); diff --git a/ui/src/pages/ImageListPage.tsx b/ui/src/pages/ImageListPage.tsx index 7649d58..e94f04c 100644 --- a/ui/src/pages/ImageListPage.tsx +++ b/ui/src/pages/ImageListPage.tsx @@ -5,7 +5,7 @@ import {Link} from "react-router-dom"; import {ErrorPortal} from "../components/ErrorContext"; import {ErrorAlert} from "../components/ErrorAlert"; -export default function ImageListPage() { +export function ImageListPage() { const {data: images, error, isLoading} = useListImages(); return ( -- GitLab