Skip to content

Commit eb80a06

Browse files
committed
Misc PR adjustments; refactor + cleanup.
1 parent 16912ae commit eb80a06

File tree

9 files changed

+17
-34
lines changed

9 files changed

+17
-34
lines changed

src/app/[locale]/seller/sale-items/[id]/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ export default function Page({ params }: { params: { id: string } }) {
142142
</div>
143143
<div className="flex items-center justify-between">
144144
<p className="text-sm">
145-
{t('SCREEN.BUY_FROM_SELLER.REVIEWS_SCORE_MESSAGE', {seller_review_rating: sellerSettings?.trust_meter_rating})}
145+
{t('SCREEN.BUY_FROM_SELLER.REVIEWS_SCORE_MESSAGE', {seller_review_rating: sellerShopInfo.average_rating.$numberDecimal})}
146146
</p>
147147
<Link href={`/seller/reviews/${sellerId}?buyer=true&seller_name=${sellerShopInfo.name}`}>
148148
<OutlineBtn label={t('SHARED.CHECK_REVIEWS')} />

src/components/shared/Review/TrustMeter.tsx

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,37 @@
1-
import React, {useEffect, useState} from 'react';
21
import Image from 'next/image';
2+
import React, {useEffect, useState} from 'react';
33

44
type TrustMeterProps = {
55
ratings: number;
66
hideLabel?: boolean;
77
};
88

99
const TrustMeter: React.FC<TrustMeterProps> = ({ ratings, hideLabel}) => {
10-
const average = 50; // this can be adjusted
1110
const [ratingImage, setRatingImage] = useState<string>('')
1211

1312
useEffect(() => {
14-
if (ratings===0){
15-
setRatingImage(`/review_ratings/trust-o-meter_0${ratings}0.PNG`);
16-
}if (ratings===50 || ratings===80) {
17-
setRatingImage(`/review_ratings/trust-o-meter_0${ratings}.PNG`);
13+
if (ratings === 0) {
14+
setRatingImage(`/images/shared/review_ratings/trust-o-meter_0${ratings}0.PNG`);
15+
} else if (ratings === 50 || ratings === 80) {
16+
setRatingImage(`/images/shared/review_ratings/trust-o-meter_0${ratings}.PNG`);
1817
} else {
19-
setRatingImage(`/review_ratings/trust-o-meter_${ratings}.PNG`);
18+
setRatingImage(`/images/shared/review_ratings/trust-o-meter_${ratings}.PNG`);
2019
}
21-
}, [ratings]);
20+
}, [ratings]);
2221

2322
return (
2423
<div className='w-full flex items-center mb-3'>
2524
<h3 className={`font-bold text-sm text-nowrap pe-2 ${hideLabel? 'hidden': 'block'}`}>Trust-o-meter</h3>
2625
<div className='flex-1'>
27-
2826
<div className="flex w-full">
2927
<Image
30-
src={ratingImage}
31-
alt='100% ratings'
32-
width={400}
33-
height={3}
34-
className="w-full max-w-xs md:max-w-md lg:max-w-lg"
28+
src={ratingImage}
29+
alt='100% ratings'
30+
width={400}
31+
height={3}
32+
className="w-full max-w-xs md:max-w-md lg:max-w-lg"
3533
/>
3634
</div>
37-
3835
</div>
3936
</div>
4037
);

src/components/shared/map/Map.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@ import { MapContainer, Marker, Popup, TileLayer, useMapEvents } from 'react-leaf
55
import L, { LatLngExpression, LatLngBounds, LatLngTuple } from 'leaflet';
66
import _ from 'lodash';
77

8+
import { ISeller, ISellerWithSettings } from '@/constants/types';
89
import { fetchSellers } from '@/services/sellerApi';
9-
import { ISeller } from '@/constants/types';
1010
import { toLatLngLiteral } from '@/util/map';
11-
import { ISellerWithSettings } from '@/constants/types';
1211

1312
import MapMarkerPopup from './MapMarkerPopup'
1413

src/components/shared/sidebar/sidebar.tsx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,6 @@ function Sidebar(props: any) {
116116
...prevFormData,
117117
[name]: value,
118118
}));
119-
120-
// enable or disable save button based on form inputs
121-
const isFormFilled = Object.values(formData).some(v => v !== '');
122119
};
123120

124121
const handlePhoneNumberChange = (value: string | undefined) => {
@@ -455,10 +452,7 @@ function Sidebar(props: any) {
455452
))}
456453
</ToggleCollapse>
457454
</div>
458-
459455
</div>
460-
461-
462456
<div ref={bottomRef}></div>
463457
</div>
464458
</div>

src/constants/types.ts

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,8 @@ export interface IReviewFeedback {
4343
review_date: string;
4444
}
4545

46-
47-
// Interface representing the selected fields from IUserSettings
48-
export interface PartialUserSettings {
49-
set_name: string;
50-
email?: string;
51-
phone_number?: string;
52-
findme: string;
53-
trust_meter_rating: number;
54-
}
46+
// Select specific fields from IUserSettings
47+
export type PartialUserSettings = Pick<IUserSettings, 'user_name' | 'email' | 'phone_number' | 'findme' | 'trust_meter_rating'>;
5548

5649
// Combined interface representing a seller with selected user settings
57-
export interface ISellerWithSettings extends ISeller, PartialUserSettings {}
50+
export interface ISellerWithSettings extends ISeller, PartialUserSettings {}

0 commit comments

Comments
 (0)