-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
747e1a4
commit 644a239
Showing
33 changed files
with
192 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,6 @@ | ||
import { Catalogue } from "./ui/Catalogue"; | ||
import { loader } from "./api/loader"; | ||
import { CatalogueLoader } from "./api/loader"; | ||
import { fetchFavoriteInstrumentIds } from "./api/fetch-favorite-instrument-ids"; | ||
|
||
export { Catalogue, loader, fetchFavoriteInstrumentIds }; | ||
export { Catalogue, loader }; | ||
export type { CatalogueLoader }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
import { LoaderFunction } from "react-router-dom"; | ||
import { fetchFavoriteInstrumentIdsList } from "shared/api/fetch-favorite-instrument-ids.list"; | ||
import { Filters } from "widgets/catalogue-filter"; | ||
import { Instrument } from "domain/model/instrument"; | ||
import { getInstrumentsByCriteria } from "shared/api/instruments-by-criteria.list"; | ||
|
||
export interface FavoriteLoader { | ||
instruments: Instrument[]; | ||
} | ||
|
||
export const loader: LoaderFunction = async (): Promise<FavoriteLoader> => { | ||
const favoriteInstrumentIds = await fetchFavoriteInstrumentIdsList() | ||
const filter = { | ||
instrumentId: favoriteInstrumentIds, | ||
} as unknown as Filters; | ||
const instruments = await getInstrumentsByCriteria(filter) | ||
|
||
return { | ||
instruments: instruments, | ||
} | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
import {FavoritePage} from "./ui/FavoritePage"; | ||
import {loader, FavoriteLoader} from "./api/loader"; | ||
|
||
export { | ||
FavoritePage, | ||
loader | ||
}; | ||
export type { FavoriteLoader }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
import { Header } from "widgets/header"; | ||
import { InstrumentCard } from "shared/ui/instrument-card/InstrumentCard"; | ||
import { useEffect, useState } from "react"; | ||
import { Instruments } from "domain/model/instrument"; | ||
import { fetchFavoriteInstrumentIdsList } from "shared/api/fetch-favorite-instrument-ids.list"; | ||
import { Filters } from "widgets/catalogue-filter"; | ||
import { getInstrumentsByCriteria } from "shared/api/instruments-by-criteria.list"; | ||
|
||
export const FavoritePage = () => { | ||
// const loader = useLoaderData() as FavoriteLoader; | ||
const [instruments, setInstruments] = useState<Instruments>([]); | ||
|
||
useEffect(() => { | ||
const kek = async () => { | ||
const favoriteInstrumentIds = await fetchFavoriteInstrumentIdsList() | ||
const filter = { | ||
instrumentIds: favoriteInstrumentIds, | ||
} as unknown as Filters; | ||
const instruments = await getInstrumentsByCriteria(filter) | ||
return instruments; | ||
} | ||
|
||
kek().then(instruments => setInstruments(instruments)); | ||
}, []); | ||
|
||
return ( | ||
<> | ||
<Header/> | ||
|
||
<h1>Favorite</h1> | ||
{instruments.map(instrument => ( | ||
<InstrumentCard | ||
key={instrument.id.toString()} | ||
instrument={instrument} | ||
favorite={true} | ||
/> | ||
))} | ||
</> | ||
) | ||
} |
2 changes: 1 addition & 1 deletion
2
...ogue/api/fetch-favorite-instrument-ids.ts → ...api/fetch-favorite-instrument-ids.list.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
client/src/shared/api/instruments-by-criteria-paginated.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
import { Filters } from "@widgets/catalogue-filter"; | ||
import { Page, PageRequest } from "@domain/model/page"; | ||
import axios from "axios"; | ||
import { API_INSTRUMENTS, SERVER_URL } from "shared/config"; | ||
|
||
export const getInstrumentsByCriteriaPaginated = async ( | ||
filters: Filters, | ||
pageRequest: PageRequest, | ||
) => { | ||
const getInstrumentsByCriteriaRequestBody = JSON.stringify(filters, null, 2); | ||
|
||
const { data, status } = await axios.post<Page>( | ||
`${SERVER_URL}${API_INSTRUMENTS}`, | ||
getInstrumentsByCriteriaRequestBody, | ||
{ | ||
headers: { | ||
"Content-Type": "application/json", | ||
}, | ||
params: { | ||
pageNumber: pageRequest.pageNumber, | ||
pageSize: pageRequest.pageSize, | ||
}, | ||
}, | ||
); | ||
|
||
if (status !== 200) { | ||
console.log(data); | ||
console.log(status); | ||
throw new Error("Failed to fetch instruments"); | ||
} | ||
|
||
return data; | ||
}; |
16 changes: 8 additions & 8 deletions
16
...hared/api/list-instruments-by-criteria.ts → ...hared/api/instruments-by-criteria.list.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,26 +1,26 @@ | ||
import axios from "axios"; | ||
import { Page } from "domain/model/page"; | ||
import { API_INSTRUMENTS, SERVER_URL } from "shared/config"; | ||
import { Filters } from "widgets/catalogue-filter"; | ||
import { Instrument, Instruments } from "domain/model/instrument"; | ||
|
||
export const getInstrumentsByCriteria = async ( | ||
filters: Filters, | ||
page: Page, | ||
) => { | ||
const getInstrumentsByCriteriaRequestBody = JSON.stringify(filters, null, 2); | ||
const { data } = await axios.post<Page>( | ||
|
||
const { data, status } = await axios.post<Instruments>( | ||
`${SERVER_URL}${API_INSTRUMENTS}`, | ||
getInstrumentsByCriteriaRequestBody, | ||
{ | ||
headers: { | ||
"Content-Type": "application/json", | ||
}, | ||
params: { | ||
pageNumber: page.pageNumber, | ||
pageSize: page.pageSize, | ||
}, | ||
}, | ||
); | ||
) | ||
|
||
if (status !== 200) { | ||
throw new Error("Failed to fetch instruments"); | ||
} | ||
|
||
return data; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
.instrument-card { | ||
display: flex; | ||
flex-direction: column; | ||
background-color: darkslateblue; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
import { InstrumentDetails } from "./InstrumentDetails"; | ||
import { InstrumentActions } from "./actions/InstrumentActions"; | ||
import React from "react"; | ||
import { Instrument } from "domain/model/instrument"; | ||
import "./InstrumentCard.css"; | ||
|
||
interface Props { | ||
instrument: Instrument; | ||
favorite: boolean; | ||
} | ||
|
||
export const InstrumentCard = (props: Props) => { | ||
return ( | ||
<div className="instrument-card"> | ||
<InstrumentDetails instrument={props.instrument} /> | ||
<InstrumentActions | ||
instrument={props.instrument} | ||
favorite={props.favorite} | ||
/> | ||
</div> | ||
) | ||
} |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.