diff --git a/src/3_widgets/results/api/GetPlaces.ts b/src/3_widgets/results/api/GetPlaces.ts
index d3441ed..dd82624 100644
--- a/src/3_widgets/results/api/GetPlaces.ts
+++ b/src/3_widgets/results/api/GetPlaces.ts
@@ -7,9 +7,9 @@ export async function GetPlaces(searchText: string, nextPageToken?: string): Pro
const baseURL = import.meta.env.VITE_BASE_URL
- const requestURL = nextPageToken && nextPageToken != ''
- ? `${baseURL}/api/places?searchText=${searchText}&nextPageToken=${nextPageToken}`
- : `${baseURL}/api/places?searchText=${searchText}`
+ const requestURL = nextPageToken && nextPageToken != ''
+ ? `${baseURL}/api/places?searchText=${searchText}&nextPageToken=${nextPageToken}`
+ : `${baseURL}/api/places?searchText=${searchText}`
const response = await fetch(requestURL, {
method: 'GET'
@@ -21,17 +21,21 @@ export async function GetPlaces(searchText: string, nextPageToken?: string): Pro
const data = await response.json()
+ console.log(data)
+
return {
places: data.places.map((place: any): PlaceDTO => {
const surchargeStatus = () => {
switch (place.surchargeStatus) {
- case "UNKNOWN":
- return SurchargesStatusDTO.UNKNOWN
case "REPORTED":
return SurchargesStatusDTO.REPORTED
case "CONFIRMED":
return SurchargesStatusDTO.CONFIRMED
+ case "AUTO_GENERATED":
+ return SurchargesStatusDTO.AUTO_GENERATED
+ case "REJECTED":
+ return SurchargesStatusDTO.REJECTED
default:
return SurchargesStatusDTO.UNKNOWN
}
diff --git a/src/3_widgets/results/model/usePlaceListViewModel.ts b/src/3_widgets/results/model/usePlaceListViewModel.ts
index 108a836..006610e 100644
--- a/src/3_widgets/results/model/usePlaceListViewModel.ts
+++ b/src/3_widgets/results/model/usePlaceListViewModel.ts
@@ -17,11 +17,13 @@ export const usePlaceListViewModel = (searchText: string, nextPageToken?: string
const status = () => {
switch (place.status) {
- case SurchargesStatusDTO.CONFIRMED:
- return SurchargesStatusUI.Confirmed
case SurchargesStatusDTO.REPORTED:
return SurchargesStatusUI.Reported
- case SurchargesStatusDTO.UNKNOWN:
+ case SurchargesStatusDTO.CONFIRMED:
+ return SurchargesStatusUI.Confirmed
+ case SurchargesStatusDTO.AUTO_GENERATED:
+ return SurchargesStatusUI.AutoGenerated
+ default:
return SurchargesStatusUI.Unknown
}
}
@@ -41,9 +43,9 @@ export const usePlaceListViewModel = (searchText: string, nextPageToken?: string
}
}
}) ?? []
- },
- [useGetPlacesQueryData]
- )
+ },
+ [useGetPlacesQueryData]
+ )
return { places, isFetching }
}
\ No newline at end of file
diff --git a/src/3_widgets/results/ui/Results.tsx b/src/3_widgets/results/ui/Results.tsx
index 9526735..7aefc77 100644
--- a/src/3_widgets/results/ui/Results.tsx
+++ b/src/3_widgets/results/ui/Results.tsx
@@ -3,7 +3,7 @@ import { Link, useLocation, useNavigate } from 'react-router-dom'
import { SearchBox } from '@features/searchBox'
import { Footer, StatusHelp } from '@shared/ui'
import { WrongAccess } from '@shared/ui'
-import { Confirmed, Reported } from '@shared/ui'
+import { Confirmed, Reported, AutoGenerated } from '@shared/ui'
import { usePlaceListViewModel } from '../model/usePlaceListViewModel'
import PlacesList from './placelist/PlaceList'
@@ -43,6 +43,7 @@ export function Results() {
diff --git a/src/3_widgets/results/ui/placelist/PlaceItem.tsx b/src/3_widgets/results/ui/placelist/PlaceItem.tsx
index 84d406f..d42e08e 100644
--- a/src/3_widgets/results/ui/placelist/PlaceItem.tsx
+++ b/src/3_widgets/results/ui/placelist/PlaceItem.tsx
@@ -32,14 +32,18 @@ function SurchargesBadge({ status, rate }: { status: SurchargesStatusUI, rate?:
return null
}
+ if (status === SurchargesStatusUI.Unknown) {
+ return null
+ }
+
const backgroundColor = () => {
switch (status) {
case SurchargesStatusUI.Confirmed:
return 'bg-green-300'
case SurchargesStatusUI.Reported:
return 'bg-blue-300'
- case SurchargesStatusUI.Unknown:
- return 'bg-red-300'
+ case SurchargesStatusUI.AutoGenerated:
+ return 'bg-yellow-300'
}
}
@@ -49,8 +53,8 @@ function SurchargesBadge({ status, rate }: { status: SurchargesStatusUI, rate?:
return 'text-green-800'
case SurchargesStatusUI.Reported:
return 'text-blue-800'
- case SurchargesStatusUI.Unknown:
- return 'text-red-800'
+ case SurchargesStatusUI.AutoGenerated:
+ return 'text-yellow-800'
}
}
diff --git a/src/3_widgets/support/index.ts b/src/3_widgets/support/index.ts
new file mode 100644
index 0000000..68570f6
--- /dev/null
+++ b/src/3_widgets/support/index.ts
@@ -0,0 +1 @@
+export { Support } from "./ui/Support"
\ No newline at end of file
diff --git a/src/3_widgets/support/ui/Support.tsx b/src/3_widgets/support/ui/Support.tsx
new file mode 100644
index 0000000..ee46b09
--- /dev/null
+++ b/src/3_widgets/support/ui/Support.tsx
@@ -0,0 +1,17 @@
+import { Footer } from "@shared/ui"
+import { Link } from "react-router-dom"
+
+export function Support() {
+ return (
+
+
Surcharges
+
We are here for hearing from you.
+
+
Any kind of suggestion or inquery, click
+
Here
+
to mail us!
+
+
+
+ )
+}
\ No newline at end of file
diff --git a/src/5_entities/surcharges/api/SurchargesStatusDTO.ts b/src/5_entities/surcharges/api/SurchargesStatusDTO.ts
index 3593feb..7263a7e 100644
--- a/src/5_entities/surcharges/api/SurchargesStatusDTO.ts
+++ b/src/5_entities/surcharges/api/SurchargesStatusDTO.ts
@@ -1,5 +1,7 @@
export enum SurchargesStatusDTO {
CONFIRMED = 'CONFIRMED',
REPORTED = 'REPORTED',
- UNKNOWN = 'UNKNOWN'
+ UNKNOWN = 'UNKNOWN',
+ AUTO_GENERATED = 'AUTO_GENERATED',
+ REJECTED = 'REJECTED'
}
\ No newline at end of file
diff --git a/src/5_entities/surcharges/model/SurchargesStatusModel.ts b/src/5_entities/surcharges/model/SurchargesStatusModel.ts
index 193a661..d5792c4 100644
--- a/src/5_entities/surcharges/model/SurchargesStatusModel.ts
+++ b/src/5_entities/surcharges/model/SurchargesStatusModel.ts
@@ -1,5 +1,7 @@
export enum SurchargesStatusModel {
Confirmed,
Reported,
+ AutoGenerated,
+ Rejected,
Unknown,
}
\ No newline at end of file
diff --git a/src/5_entities/surcharges/ui/SurchargesStatusUI.ts b/src/5_entities/surcharges/ui/SurchargesStatusUI.ts
index 38c6806..1c79841 100644
--- a/src/5_entities/surcharges/ui/SurchargesStatusUI.ts
+++ b/src/5_entities/surcharges/ui/SurchargesStatusUI.ts
@@ -1,5 +1,6 @@
export enum SurchargesStatusUI {
Confirmed,
Reported,
+ AutoGenerated,
Unknown,
}
\ No newline at end of file
diff --git a/src/6_shared/ui/footer/bonsung/Bonsung.tsx b/src/6_shared/ui/footer/bonsung/Bonsung.tsx
index 0fb9f84..7d0f495 100644
--- a/src/6_shared/ui/footer/bonsung/Bonsung.tsx
+++ b/src/6_shared/ui/footer/bonsung/Bonsung.tsx
@@ -4,11 +4,11 @@ export function Bonsung() {
return (
- Bonsung Koo
-
+ to='https://bonsung.me'
+ className='mr-2 underline'
+ >
+ Bonsung Koo
+

-
-

-
)
}
\ No newline at end of file
diff --git a/src/6_shared/ui/footer/petr/Petr.tsx b/src/6_shared/ui/footer/petr/Petr.tsx
index fdeec2e..772755c 100644
--- a/src/6_shared/ui/footer/petr/Petr.tsx
+++ b/src/6_shared/ui/footer/petr/Petr.tsx
@@ -1,7 +1,28 @@
+import { Link } from "react-router-dom";
+
export function Petr() {
return (
-
Petr Utkin
+
+ Petr Utkin
+
+
+

+
+
+

+
)
}
\ No newline at end of file
diff --git a/src/6_shared/ui/index.ts b/src/6_shared/ui/index.ts
index fa4470d..deb29a2 100644
--- a/src/6_shared/ui/index.ts
+++ b/src/6_shared/ui/index.ts
@@ -4,5 +4,6 @@ export { WrongAccess } from "./wrongAccess/WrongAccess"
export { ErrorAlert } from "./errorAlert/ErrorAlert"
export { Confirmed } from "./surchargeStatus/Confirmed"
export { Reported } from "./surchargeStatus/Reported"
+export { AutoGenerated } from "./surchargeStatus/AutoGenerated"
export { Unknown } from "./surchargeStatus/Unknown"
export { StatusHelp } from "./surchargeStatus/help/StatusHelp"
\ No newline at end of file
diff --git a/src/6_shared/ui/surchargeStatus/AutoGenerated.tsx b/src/6_shared/ui/surchargeStatus/AutoGenerated.tsx
new file mode 100644
index 0000000..2bc8930
--- /dev/null
+++ b/src/6_shared/ui/surchargeStatus/AutoGenerated.tsx
@@ -0,0 +1,9 @@
+export function AutoGenerated() {
+ return (
+
+ )
+}
\ No newline at end of file
diff --git a/src/6_shared/ui/surchargeStatus/help/StatusHelp.tsx b/src/6_shared/ui/surchargeStatus/help/StatusHelp.tsx
index 548753d..d8a683e 100644
--- a/src/6_shared/ui/surchargeStatus/help/StatusHelp.tsx
+++ b/src/6_shared/ui/surchargeStatus/help/StatusHelp.tsx
@@ -3,6 +3,7 @@ import { useMediaQuery } from "@mui/material"
import { Tooltip } from "@mui/material"
import { Confirmed } from "../Confirmed"
import { Reported } from "../Reported"
+import { AutoGenerated } from "../AutoGenerated"
import { Unknown } from "../Unknown"
import HelpIcon from '@mui/icons-material/Help'
@@ -41,6 +42,10 @@ export function StatusHelp(props: StatusHelpProps) {
The surcharge rate is reported by someone but not confirmed, It may not be accurate.