Skip to content

Commit

Permalink
merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
marcelherr committed Aug 23, 2024
2 parents ef0d5d8 + b66fc32 commit 6c4bcc2
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 27 deletions.
28 changes: 6 additions & 22 deletions frontend/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {useEffect, useState} from "react";
import {Route, Routes} from "react-router-dom";
import BookDetailsPage from "./pages/BookDetailsPage/bookDetailsPage/BookDetailsPage.tsx";
import BookGalleryPage from "./pages/BookGalleryPage/bookGalleryPage/BookGalleryPage.tsx";
import AddBookForm from "./pages/BookGalleryPage/components/addBookForm/AddBookForm.tsx";
import AddBookPage from "./pages/AddBookPage/addBookPage/AddBookPage.tsx";
import Header from "./components/header/Header.tsx";
import Navigation from "./components/navigation/Navigation.tsx";
import Dashboard from "./pages/DashboardPage/dashboard/Dashboard.tsx";
Expand All @@ -25,7 +25,7 @@ export default function App() {
alert(error)
})
}

const fetchUser = () => {
axios.get("/api/users/1")
.then((response) => {
Expand All @@ -51,7 +51,6 @@ export default function App() {
.then((response) => response.status === 200 && fetchUser())
}


useEffect(() => {
fetchBooks()
fetchUser()
Expand All @@ -70,25 +69,10 @@ export default function App() {
<main>
<Routes>
<Route path={"/"} element={<Dashboard user={user}/>}/>
<Route path={"/books"} element={<BookGalleryPage
filteredBooks={filteredBooks}
setSearchInput={setSearchInput}
/>}/>
<Route path={"/books/add"}
element={<AddBookForm fetchBooks={fetchBooks}
user={user}
updateUser={updateUser}
/>}/>
<Route path={"/books/:id"}
element={<BookDetailsPage deleteBook={deleteBook}
updateBook={updateBook}
user={user}
updateUser={updateUser}
/>}/>
<Route path={"/settings"} element={<SettingsPage
user={user}
updateUser={updateUser}
/>}/>
<Route path={"/books"} element={<BookGalleryPage filteredBooks={filteredBooks} setSearchInput={setSearchInput}/>}/>
<Route path={"/books/add"} element={<AddBookPage fetchBooks={fetchBooks} user={user} updateUser={updateUser}/>}/>
<Route path={"/books/:id"} element={<BookDetailsPage deleteBook={deleteBook} updateBook={updateBook} user={user} updateUser={updateUser}/>}/>
<Route path={"/settings"} element={<SettingsPage user={user} updateUser={updateUser}/>}/>
</Routes>
</main>
</>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import { FormEvent, useState} from "react";
import {BookWithoutId, User} from "../../../../types/types.ts";
import {BookWithoutId, User} from "../../../types/types.ts";
import axios from "axios";
import {useNavigate} from "react-router-dom";
import "./AddBookForm.css";
import BookForm from "../../../../components/bookForm/BookForm.tsx";
import "./AddBookPage.css";
import BookForm from "../../../components/bookForm/BookForm.tsx";

type FetchProps = {
fetchBooks: () => void,
user: User,
updateUser: (updatedProperty : string, updatedValue: string | number ) => void
}

export default function AddBookForm({fetchBooks, user, updateUser}: Readonly<FetchProps>) {
export default function AddBookPage({fetchBooks, user, updateUser}: Readonly<FetchProps>) {
const [book, setBook] = useState<BookWithoutId>({
title: "",
author: "",
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/DashboardPage/dashboard/Dashboard.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

import {User} from "../../../types/types.ts"
import ReadingGoal from "../readingGoal/ReadingGoal.tsx";
import ReadingGoal from "../components/readingGoal/ReadingGoal.tsx";

type DashboardProps = {
user: User
Expand Down

0 comments on commit 6c4bcc2

Please sign in to comment.