Skip to content

Commit 20f4a46

Browse files
theAwmintheAwmin
committed
fix litle ui bugs
1 parent aa2af71 commit 20f4a46

5 files changed

Lines changed: 35 additions & 34 deletions

File tree

‎src/app/[lang]/news/categories/[category]/[slug]/components/NewsGallery.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ export default function NewsGallerySimple({ gallery, mainImage , params }: NewsG
234234
src={allImages[currentIndex]}
235235
alt={`تصویر ${currentIndex + 1}`}
236236
fill
237-
className=" p-4 md:p-8 object-contain mx-auto rounded-3xl !h-max !w-max !max-h-full !max-w-full"
237+
className=" p-4 md:p-8 object-contain mx-auto my-auto lg:my-0 rounded-3xl !h-max !w-max !max-h-full !max-w-full"
238238
sizes="100vw"
239239
priority
240240
unoptimized={true}
@@ -272,7 +272,7 @@ export default function NewsGallerySimple({ gallery, mainImage , params }: NewsG
272272
{allImages.length > 1 && (
273273
<div className="absolute bottom-0 left-0 right-0 z-20 pb-4 md:pb-6 bg-gradient-to-t from-black/70 to-transparent pt-8">
274274
<div className="flex justify-center items-center px-4">
275-
<div className="flex gap-2 md:gap-3 mb-5 lg:mb-0 py-5 overflow-x-auto w-full scrollbar-hide justify-center">
275+
<div className="flex gap-2 md:gap-3 mb-[60px] lg:mb-0 py-5 overflow-x-auto w-full scrollbar-hide justify-center">
276276
{allImages.map((img, idx) => (
277277
<button
278278
key={idx}

‎src/app/[lang]/news/categories/[category]/[slug]/components/NewsStats.tsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ interface NewsStatsProps {
1212
category?: string | null;
1313
categorySlug?: string | null;
1414
date?: string | null;
15-
readingTime?: string | number | null;
15+
// readingTime?: string | number | null;
1616
mainData: any;
1717
lang?: string;
1818
className?: string;
@@ -24,8 +24,8 @@ export default function NewsStats({
2424
category,
2525
categorySlug,
2626
date,
27-
readingTime,
28-
mainData,
27+
// readingTime,
28+
// mainData,
2929
lang,
3030
className = "",
3131
showIcons = true,
@@ -72,7 +72,7 @@ categorySlug,
7272
</div>
7373
)}
7474

75-
{/* زمان مطالعه */}
75+
{/* زمان مطالعه
7676
{readingTime && (
7777
<div className="flex items-center gap-1.5">
7878
{showIcons && (
@@ -95,13 +95,13 @@ categorySlug,
9595
{findByUniqueId(mainData, 33) || "دقیقه"}
9696
</span>
9797
</div>
98-
)}
98+
)} */}
9999

100100
{/* جداساز */}
101101

102102

103103
{/* بازدیدها */}
104-
<div className="flex items-center gap-1.5">
104+
<div className="flex items-center gap-3">
105105
{showIcons && <View className="stroke-textGray dark:stroke-[#888888] size-[14px] md:size-[20px]" />}
106106
<span>{views.toLocaleString("fa-IR")}</span>
107107
</div>

‎src/app/[lang]/news/categories/[category]/[slug]/components/PrevNextNews.tsx‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -92,18 +92,16 @@ const PrevNextNews = ({ params, news: propNews, mainData }: PrevNextNewsProps) =
9292

9393
return (
9494
<section className="w-full my-10 2xl:px-20">
95-
96-
9795
<div className="grid grid-cols-1 md:grid-cols-2 gap-6 w-full md:gap-10 3xl:gap-[100px]">
9896
{/* ======================= */}
9997
{/* 📌 کارت مقاله قبلی */}
10098
{/* ======================= */}
10199
<div className="flex flex-col items-center w-full">
102100
{prevNews ? (
103-
<h3 className="text-center font-bold mb-3 dark:text-white">
104-
{findByUniqueId(mainData, 1506) || "مطلب قبلی"}
105-
</h3>
106-
) : ( <div></div>)}
101+
<h3 className="text-center font-bold mb-3 dark:text-white">
102+
{findByUniqueId(mainData, 1506) || "مطلب قبلی"}
103+
</h3>
104+
) : (<div></div>)}
107105
<div className="w-full">
108106
{prevNews ? (
109107
<NewsNavCard
@@ -113,8 +111,8 @@ const PrevNextNews = ({ params, news: propNews, mainData }: PrevNextNewsProps) =
113111
setActiveLoadingId={setActiveLoadingId}
114112
/>
115113
) : (
116-
<div className="w-full h-[200px] bg-gray-100 dark:bg-gray-800 rounded-2xl flex items-center justify-center">
117-
114+
<div className="w-full h-[200px] rounded-2xl flex items-center justify-center">
115+
118116
</div>
119117
)}
120118
</div>
@@ -124,11 +122,11 @@ const PrevNextNews = ({ params, news: propNews, mainData }: PrevNextNewsProps) =
124122
{/* 📌 کارت مقاله بعدی */}
125123
{/* ======================= */}
126124
<div className="flex flex-col items-center w-full">
127-
128-
<h3 className="text-center font-bold mb-3 dark:text-white">
129-
{findByUniqueId(mainData, 1507) || "مطلب بعدی"}
130-
</h3>
131-
125+
{nextNews ? (
126+
<h3 className="text-center font-bold mb-3 dark:text-white">
127+
{findByUniqueId(mainData, 1507) || "مطلب بعدی"}
128+
</h3>
129+
) : (<div></div>)}
132130
<div className="w-full">
133131
{nextNews ? (
134132
<NewsNavCard
@@ -138,8 +136,7 @@ const PrevNextNews = ({ params, news: propNews, mainData }: PrevNextNewsProps) =
138136
setActiveLoadingId={setActiveLoadingId}
139137
/>
140138
) : (
141-
<div className="w-full h-[200px] bg-gray-100 dark:bg-gray-800 rounded-2xl flex items-center justify-center">
142-
139+
<div className="w-full h-[200px] rounded-2xl flex items-center justify-center">
143140
</div>
144141
)}
145142
</div>

‎src/app/[lang]/news/categories/[category]/[slug]/components/WindowsNews.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import Image from 'next/image';
44

55
const WindowsNews = () => {
66
return (
7-
<div className=" mx-auto w-full bg-gradient-to-r to-light-primary from-blue-400 dark:to-dark-yellow dark:from-yellow-600 rounded-xl overflow-hidden my-10 p-5">
7+
<div className=" mx-auto w-full bg-gradient-to-r to-light-primary from-blue-400 dark:to-dark-yellow dark:from-yellow-600 lg:rounded-xl overflow-hidden my-10 p-5">
88
<div className="p-6 flex flex-col md:flex-row justify-between" dir="rtl">
9-
<div className='w-[300px] mx-auto lg:mx-0 relative'>
9+
<div className='w-[300px] mx-auto lg:mx-0 relative mt-[-60px] lg:mt-0 mb-5 lg:mb-0'>
1010
<div className='bg-[#5d9eff80] dark:bg-[#d8a90054] w-[240px] h-[240px] rounded-full relative z-0' />
11-
<Image src={'/adNews.png'} fill unoptimized={true} alt={'ad pic'} className=' w-full max-w-[270px] !h-auto z-10 my-auto ms-[-15px]' />
11+
<Image src={'/adNews.png'} fill unoptimized={true} alt={'ad pic'} className=' w-full max-w-[270px] !h-auto z-10 my-auto lg:ms-[-15px]' />
1212
</div>
1313
<div className=" flex flex-col gap-4">
1414
<p className="text-xl lg:text-3xl font-rokh font-bold text-white dark:text-black">
@@ -22,7 +22,7 @@ const WindowsNews = () => {
2222
</p>
2323
</div>
2424

25-
<div className=" flex items-center lg:items-end lg:pe-10">
25+
<div className=" flex items-center justify-center lg:justify-normal mt-5 lg:mt-1 lg:items-end lg:pe-10">
2626
<button className="bg-black w-max text-light-primary dark:text-dark-yellow font-bold py-3 px-6 rounded-lg transition duration-300 shadow-md flex items-center gap-2">
2727
آموزش نصب
2828
</button>

‎src/app/[lang]/news/categories/[category]/[slug]/page.tsx‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -398,14 +398,14 @@ export default async function NewsPage({ params }: NewsPageProps) {
398398
dangerouslySetInnerHTML={{ __html: JSON.stringify(schema) }}
399399
/>
400400
<div className="fixed z-[1000] end-10 bottom-[100px]">
401-
<Link href={"#em"} className="bg-light-primary dark:bg-dark-yellow rounded-full w-[60px] h-[60px] flex items-center justify-center">
401+
<Link href={"#em"} className="bg-light-primary dark:bg-dark-yellow rounded-full w-[60px] h-[60px] flex items-center justify-center">
402402

403403
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
404-
<path className="stroke-white dark:stroke-black" d="M22 11.5V15.5C22 19 20 20.5 17 20.5H7C4 20.5 2 19 2 15.5V8.5C2 5 4 3.5 7 3.5H12" stroke-width="1.5" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round" />
405-
<path className="stroke-white dark:stroke-black" d="M7 9L11 11.5C12.048 12.2897 13.952 11.2897 15 10.5" stroke-width="1.5" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round" />
404+
<path className="stroke-white dark:stroke-black" d="M22 11.5V15.5C22 19 20 20.5 17 20.5H7C4 20.5 2 19 2 15.5V8.5C2 5 4 3.5 7 3.5H12" stroke-width="1.5" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round" />
405+
<path className="stroke-white dark:stroke-black" d="M7 9L11 11.5C12.048 12.2897 13.952 11.2897 15 10.5" stroke-width="1.5" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round" />
406406
<path d="M19.0062 1.96875C17.9029 1.96875 17.0062 2.86542 17.0062 3.96875V4.93208C17.0062 5.13542 16.9195 5.44542 16.8162 5.61875L16.4329 6.25542C16.1962 6.64875 16.3595 7.08542 16.7929 7.23208C18.2295 7.71208 19.7795 7.71208 21.2162 7.23208C21.6195 7.09875 21.7962 6.62208 21.5762 6.25542L21.1929 5.61875C21.0929 5.44542 21.0062 5.13542 21.0062 4.93208V3.96875C21.0062 2.86875 20.1062 1.96875 19.0062 1.96875Z" stroke="#18C08F" stroke-miterlimit="10" stroke-linecap="round" />
407-
<path className="stroke-white dark:stroke-black" d="M19.623 2.06844C19.5196 2.03844 19.413 2.0151 19.303 2.00177C18.983 1.96177 18.6763 1.9851 18.3896 2.06844C18.4863 1.82177 18.7263 1.64844 19.0063 1.64844C19.2863 1.64844 19.5263 1.82177 19.623 2.06844Z" stroke-width="0.8" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round" />
408-
<path className="stroke-white dark:stroke-black" d="M20.0068 7.35156C20.0068 7.90156 19.5568 8.35156 19.0068 8.35156C18.7335 8.35156 18.4802 8.23823 18.3002 8.05823C18.1202 7.87823 18.0068 7.6249 18.0068 7.35156" stroke-miterlimit="10" />
407+
<path className="stroke-white dark:stroke-black" d="M19.623 2.06844C19.5196 2.03844 19.413 2.0151 19.303 2.00177C18.983 1.96177 18.6763 1.9851 18.3896 2.06844C18.4863 1.82177 18.7263 1.64844 19.0063 1.64844C19.2863 1.64844 19.5263 1.82177 19.623 2.06844Z" stroke-width="0.8" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round" />
408+
<path className="stroke-white dark:stroke-black" d="M20.0068 7.35156C20.0068 7.90156 19.5568 8.35156 19.0068 8.35156C18.7335 8.35156 18.4802 8.23823 18.3002 8.05823C18.1202 7.87823 18.0068 7.6249 18.0068 7.35156" stroke-miterlimit="10" />
409409
</svg>
410410

411411
</Link>
@@ -452,7 +452,7 @@ export default async function NewsPage({ params }: NewsPageProps) {
452452
category={news.category}
453453
categorySlug={news.categorySlug}
454454
date={news.date}
455-
readingTime={news.readingTime}
455+
// readingTime={news.readingTime}
456456
mainData={mainData}
457457
lang={lang}
458458
className="mb-4"
@@ -466,13 +466,17 @@ export default async function NewsPage({ params }: NewsPageProps) {
466466
<div className="w-full mt-10 space-y-28">
467467
<ShowSocialWrapper params={resolvedParams} mainData={mainData} news={news} />
468468
<PrevNextNews params={resolvedParams} news={categoryNews || []} mainData={mainData} />
469-
<WindowsNews />
469+
470470
</div>
471471
</div>
472+
472473
<div className="w-full hidden lg:block lg:w-[30%] 3xl:w-[20%] sticky top-5">
473474
<SideCard params={resolvedParams} mainData={mainData} />
474475
</div>
475476
</div>
477+
<div className="lg:w-[70%] 3xl:w-[80%] lg:px-10 mb-10 mt-20">
478+
<WindowsNews />
479+
</div>
476480
<div className="ps-5 lg:ps-10 w-full flex items-center mt-14 lg:mt-20 flex-col gap-14">
477481

478482
<PopularNews params={resolvedParams} mainData={mainData} initialNews={[]} />

0 commit comments

Comments
 (0)