diff --git a/ui/src/App.tsx b/ui/src/App.tsx index d588c5be7e2d2bedb83383332e7e0b852ca5022f..4c75a65cc9ff23e42a5b0a601e5f344946375715 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 72a4865d10cd67a82b650e3fb49a8c5137059bdd..39b9c641e74c0cec4b7b796e7f45d91d04d7589b 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 b2b8b7be2b31487a0da1118bdc837f37d27236c2..bedb720d82988ff41943be55414177b665377621 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 2efcfc7e453dacffd116e99ad83c38a5aa788607..8b82de329467030a8abe2e5111ae3ecc9a2fe347 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 7545bdd010ae595d36c1a0973e8c52891d29ef26..2b85977f95a8ccfa225267b8189808f88930e0c8 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 8c998007f848112a61c4c5132e1325614e24a402..7d28e9c6c47a50eff8a8cdcc211cc973256b03c3 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 663cad993bac45f3660000e55e585235bed369ce..adfc5cbecd69427680925912a3691fbd8ab99ff8 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 931187ded4854c848106b8c4ffad3c4583e0ae7d..c842e7fa6c753841737cbff5fcc6eba2b78c8da9 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 7649d588ceab63c4cc8744c03061f14f86145f59..e94f04c285eeb67edd6433d3fef43ddb5fc86c79 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 (