Skip to content

Commit 63eecbe

Browse files
swoocnswoocn
committed
Misc PR adjustments; language translation; pathname condtiion; cleanup.
1 parent 7618817 commit 63eecbe

File tree

8 files changed

+91
-90
lines changed

8 files changed

+91
-90
lines changed

‎.env.development

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ NEXT_PUBLIC_API_URL=http://localhost:8001/api/v1
88
NEXT_PUBLIC_PI_SDK_URL=https://sdk.minepi.com/pi-sdk.js
99

1010
NEXT_PUBLIC_SENTRY_DSN="ADD YOUR SENTRY DSN"
11-
NEXT_PUBLIC_IMAGE_PLACEHOLDER_URL="/path/to/default/image.png"
11+
NEXT_PUBLIC_IMAGE_PLACEHOLDER_URL="ADD YOUR IMAGE PLACEHOLDER URL"

‎context/AppContextProvider.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@ interface IAppContextProps {
2323
currentUser: IUser | null;
2424
setCurrentUser: React.Dispatch<SetStateAction<IUser | null>>;
2525
registerUser: () => void;
26-
autoLoginUser:()=> void,
27-
isSigningInUser: boolean
28-
reload: boolean
26+
autoLoginUser: ()=> void;
27+
isSigningInUser: boolean;
28+
reload: boolean;
2929
setReload: React.Dispatch<SetStateAction<boolean>>;
3030
}
3131

3232
const initialState: IAppContextProps = {
3333
currentUser: null,
3434
setCurrentUser: () => {},
3535
registerUser: () => { },
36-
autoLoginUser:()=> {},
37-
isSigningInUser:false,
36+
autoLoginUser: ()=> {},
37+
isSigningInUser: false,
3838
reload: false,
3939
setReload: () => {},
4040
};

‎messages/es.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
"FEEDBACK_PHOTO_UPLOAD_LABEL": "Subir foto de retroalimentación",
105105
"VALIDATION": {
106106
"LOADING_REVIEW_FAILURE": "Error al cargar la reseña",
107-
"SELF_REVIEW_NOT_POSSIBLE": "La autoevaluación está prohibida"
107+
"SELF_REVIEW_NOT_POSSIBLE": "No es posible autoevaluarse"
108108
}
109109
}
110110
},

‎messages/ewe-BJ.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
"FEEDBACK_PHOTO_UPLOAD_LABEL": "Photo na vovɔ",
105105
"VALIDATION": {
106106
"LOADING_REVIEW_FAILURE": "Dzudzɔmenyã meyinaa nuwò dzi o",
107-
"SELF_REVIEW_PROHIBITED": "Wòdzɔ wò nɔnɔ kple wòkplɔ míaɖu o"
107+
"SELF_REVIEW_NOT_POSSIBLE": "Metsɔ eme eŋu srɔ ŋgɔmetɔ ƒe yiwo"
108108
}
109109
}
110110
},

‎messages/hau-NG.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
"FEEDBACK_PHOTO_UPLOAD_LABEL": "Loda Hoto Martani",
105105
"VALIDATION": {
106106
"LOADING_REVIEW_FAILURE": "Kuskure wajen ɗaukar bita",
107-
"SELF_REVIEW_PROHIBITED": "Binciken kai an hana"
107+
"SELF_REVIEW_NOT_POSSIBLE": "Ba zai yiwu ka duba kanka ba"
108108
}
109109
}
110110
},

‎messages/ko.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
"FEEDBACK_PHOTO_UPLOAD_LABEL": "피드백 사진 업로드",
105105
"VALIDATION": {
106106
"LOADING_REVIEW_FAILURE": "리뷰 로딩 오류",
107-
"SELF_REVIEW_PROHIBITED": "자기 평가는 금지되어 있습니다"
107+
"SELF_REVIEW_NOT_POSSIBLE": "자기 평가가 불가능합니다"
108108
}
109109
}
110110
},

‎src/app/[locale]/seller/reviews/[id]/page.tsx

Lines changed: 77 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ function SellerReviews({
4343
const userId = params.id;
4444

4545
const [giverReviews, setGiverReviews] = useState<ReviewInt[] | null>(null);
46-
const [receiverReviews, setReciverReviews] = useState<ReviewInt[] | null>(null);
46+
const [receiverReviews, setReceiverReviews] = useState<ReviewInt[] | null>(null);
4747
const [loading, setLoading] = useState<boolean>(true);
4848
const [error, setError] = useState<string | null>(null);
4949
const [isSaveEnabled, setIsSaveEnabled] = useState(false);
@@ -94,11 +94,11 @@ function SellerReviews({
9494
logger.info(`Fetched ${data.length} reviews for seller ID: ${userId}`);
9595
const { giverReviews, receiverReviews } = processReviews(data, userId);
9696
setGiverReviews(giverReviews);
97-
setReciverReviews(receiverReviews);
97+
setReceiverReviews(receiverReviews);
9898
} else {
9999
logger.warn(`No reviews found for seller ID: ${userId}`);
100100
setGiverReviews([]);
101-
setReciverReviews([]);
101+
setReceiverReviews([]);
102102
}
103103
} catch (error) {
104104
logger.error(`Error fetching reviews for seller ID: ${userId}`, { error });
@@ -123,11 +123,11 @@ function SellerReviews({
123123
logger.info(`Found ${data.length} reviews for seller ID: ${userId}`);
124124
const { giverReviews, receiverReviews } = processReviews(data, userId);
125125
setGiverReviews(giverReviews);
126-
setReciverReviews(receiverReviews);
126+
setReceiverReviews(receiverReviews);
127127
} else {
128128
logger.warn(`No reviews found for seller ID: ${userId} with query: ${searchBarValue}`);
129129
setGiverReviews([]);
130-
setReciverReviews([]);
130+
setReceiverReviews([]);
131131
}
132132
} catch (error) {
133133
logger.error(`Error searching reviews for seller ID: ${userId}`, { error });
@@ -186,93 +186,93 @@ function SellerReviews({
186186
<EmojiPicker sellerId={userId} setIsSaveEnabled={setIsSaveEnabled} currentUser={currentUser} setReload={setReload} />
187187
</div>
188188
</ToggleCollapse>
189-
<ToggleCollapse header={t('SCREEN.REVIEWS.REVIEWS_GIVEN_SECTION_HEADER')}>
190-
{reload
191-
? <Skeleton type='seller_review' />
192-
: giverReviews && giverReviews.map((review, index) => (
193-
<div key={index} className="seller_item_container mb-5">
194-
<div className="flex justify-between items-start mb-3">
195-
{/* Left content */}
196-
<div className="flex-grow">
197-
<p className="text-primary text-sm">
198-
{review.giver} {' -> '}
199-
<span className="text-primary text-sm">{review.receiver}</span>
189+
<ToggleCollapse header={t('SCREEN.REVIEWS.REVIEWS_GIVEN_SECTION_HEADER')}>
190+
{reload
191+
? <Skeleton type='seller_review' />
192+
: giverReviews && giverReviews.map((review, index) => (
193+
<div key={index} className="seller_item_container mb-5">
194+
<div className="flex justify-between items-start mb-3">
195+
{/* Left content */}
196+
<div className="flex-grow">
197+
<p className="text-primary text-sm">
198+
{review.giver} {' -> '}
199+
<span className="text-primary text-sm">{review.receiver}</span>
200+
</p>
201+
<p className="text-md break-words">{review.heading}</p>
202+
</div>
203+
204+
{/* Right content */}
205+
<div className="flex flex-col items-end space-y-2">
206+
<div className="text-[#828282] text-sm text-right whitespace-nowrap">
207+
<p>{review.date}</p>
208+
<p>{review.time}</p>
209+
</div>
210+
<div className="flex gap-2 items-center">
211+
<Image
212+
src={review.image}
213+
alt="emoji image"
214+
width={50}
215+
height={50}
216+
className="object-cover rounded-md"
217+
/>
218+
<p className="text-xl max-w-[50px]" title={review.reaction}>
219+
{review.unicode}
200220
</p>
201-
<p className="text-md break-words">{review.heading}</p>
202221
</div>
203-
204-
{/* Right content */}
205-
<div className="flex flex-col items-end space-y-2">
206-
<div className="text-[#828282] text-sm text-right whitespace-nowrap">
207-
<p>{review.date}</p>
208-
<p>{review.time}</p>
209-
</div>
210-
<div className="flex gap-2 items-center">
211-
<Image
212-
src={review.image}
213-
alt="emoji image"
214-
width={50}
215-
height={50}
216-
className="object-cover rounded-md"
217-
/>
218-
<p className="text-xl max-w-[50px]" title={review.reaction}>
219-
{review.unicode}
220-
</p>
221-
</div>
222-
<div className="flex justify-between items-center">
223-
<Link href={`/seller/reviews/feedback/${review.reviewId}?seller_name=${review.giver}`}>
224-
<OutlineBtn label={t('SHARED.REPLY')} />
225-
</Link>
226-
</div>
222+
<div className="flex justify-between items-center">
223+
<Link href={`/seller/reviews/feedback/${review.reviewId}?seller_name=${review.giver}`}>
224+
<OutlineBtn label={t('SHARED.REPLY')} />
225+
</Link>
227226
</div>
228227
</div>
229228
</div>
230-
))
231-
}
232-
</ToggleCollapse>
229+
</div>
230+
))
231+
}
232+
</ToggleCollapse>
233233

234234
<ToggleCollapse header={t('SCREEN.REVIEWS.REVIEWS_RECEIVED_SECTION_HEADER')} open={true}>
235235
{reload
236236
? <Skeleton type='seller_review' />
237237
: receiverReviews && receiverReviews.map((review, index) => (
238238
<div key={index} className="seller_item_container mb-5">
239239
<div className="flex justify-between items-start mb-3">
240-
{/* Left content */}
241-
<div className="flex-grow">
242-
<p className="text-primary text-sm">
243-
{review.giver} {' -> '}
244-
<span className="text-primary text-sm">{review.receiver}</span>
245-
</p>
246-
<p className="text-md break-words">{review.heading}</p>
247-
</div>
240+
{/* Left content */}
241+
<div className="flex-grow">
242+
<p className="text-primary text-sm">
243+
{review.giver} {' -> '}
244+
<span className="text-primary text-sm">{review.receiver}</span>
245+
</p>
246+
<p className="text-md break-words">{review.heading}</p>
247+
</div>
248248

249-
{/* Right content */}
250-
<div className="flex flex-col items-end space-y-2">
251-
<div className="text-[#828282] text-sm text-right whitespace-nowrap">
252-
<p>{review.date}</p>
253-
<p>{review.time}</p>
254-
</div>
255-
<div className="flex gap-2 items-center">
256-
<Image
257-
src={review.image}
258-
alt="emoji image"
259-
width={50}
260-
height={50}
261-
className="object-cover rounded-md"
262-
/>
263-
<p className="text-xl max-w-[50px]" title={review.reaction}>
264-
{review.unicode}
265-
</p>
266-
</div>
267-
<div className="flex justify-between items-center">
268-
<Link href={`/seller/reviews/feedback/${review.reviewId}?seller_name=${review.giver}`}>
269-
<OutlineBtn label={t('SHARED.REPLY')} />
270-
</Link>
271-
</div>
272-
</div>
249+
{/* Right content */}
250+
<div className="flex flex-col items-end space-y-2">
251+
<div className="text-[#828282] text-sm text-right whitespace-nowrap">
252+
<p>{review.date}</p>
253+
<p>{review.time}</p>
254+
</div>
255+
<div className="flex gap-2 items-center">
256+
<Image
257+
src={review.image}
258+
alt="emoji image"
259+
width={50}
260+
height={50}
261+
className="object-cover rounded-md"
262+
/>
263+
<p className="text-xl max-w-[50px]" title={review.reaction}>
264+
{review.unicode}
265+
</p>
273266
</div>
267+
<div className="flex justify-between items-center">
268+
<Link href={`/seller/reviews/feedback/${review.reviewId}?seller_name=${review.giver}`}>
269+
<OutlineBtn label={t('SHARED.REPLY')} />
270+
</Link>
271+
</div>
272+
</div>
273+
</div>
274274
</div>
275-
))
275+
))
276276
}
277277
</ToggleCollapse>
278278
</div>

‎src/components/shared/navbar/Navbar.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { MdHome } from 'react-icons/md';
1212
import Sidebar from '../sidebar/sidebar';
1313
import styles from './Navbar.module.css';
1414
import { AppContext } from '../../../../context/AppContextProvider';
15+
import logger from '../../../../logger.config.mjs';
1516

1617
function Navbar() {
1718
const router = useRouter();
@@ -26,15 +27,15 @@ function Navbar() {
2627
// check if the current page is the homepage
2728
useEffect(() => {
2829
const checkHomePage = () => {
29-
if (pathname === `/`) {
30+
if (pathname === '/' || pathname === `/${local}`) {
3031
setIsHomePage(true);
3132
} else {
33+
logger.info(`HomePage Pathname is ${pathname}`);
3234
setIsHomePage(false);
3335
}
3436
};
35-
3637
checkHomePage();
37-
});
38+
}, [pathname]);
3839

3940
const handleBackBtn = () => {
4041
router.back();

0 commit comments

Comments
 (0)