From 53f00f6d8125134016f82d94cb287f1a9bfc9b90 Mon Sep 17 00:00:00 2001
From: Reza Taghizadeh <95388378+srt207-reza@users.noreply.github.com>
Date: Sat, 18 Oct 2025 15:59:06 +0330
Subject: [PATCH 1/6] fix: resolve banner issue

---
 package.json                                  |  2 +-
 .../pages/BannerSwiper/BannerSwiper.tsx       | 60 +++++++++----------
 2 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/package.json b/package.json
index 3ddee62c..88f78dbd 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "app.salona",
   "private": true,
-  "version": "2.73.2",
+  "version": "2.73.3",
   "type": "module",
   "scripts": {
     "dev": "vite --host",
diff --git a/src/apps/new-ui/pages/BannerSwiper/BannerSwiper.tsx b/src/apps/new-ui/pages/BannerSwiper/BannerSwiper.tsx
index 78c5294c..7249a1d1 100644
--- a/src/apps/new-ui/pages/BannerSwiper/BannerSwiper.tsx
+++ b/src/apps/new-ui/pages/BannerSwiper/BannerSwiper.tsx
@@ -5,7 +5,6 @@ import { Autoplay } from "swiper/modules";
 import { Link, useNavigate } from "react-router-dom";
 import happyGirl from "../../assets/happyGirl.svg";
 import bgBanner from "../../assets/bg-banner.png";
-
 interface Banner {
   image: string;
   link: string;
@@ -14,11 +13,10 @@ interface Banner {
 const BannerSwiper = () => {
   const { data: banners, isLoading, isError } = useGetBannerEvents();
   const navigate = useNavigate();
-
   return (
-    <div className="banner-swiper-container overflow-visible relative max-w-2xl mx-auto -mt-8 z-20">
-      <div className="rounded-[16px] flex flex-row gap-4 sm:gap-12 items-center justify-center overflow-visible relative">
-        <div className="w-full max-w-2xl h-[160px] relative">
+    <div>
+      <div className=" mt-2 h-[160px] rounded-[16px] flex flex-row gap-4 sm:gap-12 items-center justify-center bg-cover bg-center bg-no-repeat">
+        <div className="w-full max-w-2xl">
           {isLoading ? (
             <div>در حال بارگذاری...</div>
           ) : isError ? (
@@ -32,6 +30,7 @@ const BannerSwiper = () => {
                 disableOnInteraction: false,
                 pauseOnMouseEnter: false,
               }}
+              className="py-5"
               spaceBetween={5}
               breakpoints={{
                 320: { slidesPerView: 1 },
@@ -46,38 +45,35 @@ const BannerSwiper = () => {
                 600: { slidesPerView: 1.75 },
                 650: { slidesPerView: 1.9 },
               }}
-              className="max-w-2xl"
             >
               {/* first slide-rose */}
               <SwiperSlide>
-                <div className="relative">
-                  <div
-                    className="mx-2 h-[160px] w-[calc(100%-16px)] sm:h-40 rounded-[16px] flex flex-row gap-4 sm:gap-12 items-center justify-start bg-cover bg-center bg-no-repeat"
-                    style={{ backgroundImage: `url(${bgBanner})` }}
-                  >
-                    <div className="pr-4 xs:pr-6 z-10">
-                      <p
-                        className="text-[#2D0A48] text-lg pr-3"
-                        data-aos="fade-down"
-                      >
-                        رُز در خدمت شما
-                      </p>
-                      <div className="xs:w-[150px] mt-4">
-                        <button
-                          className="border-2 p-0 xs:pl-2 text-sm text-[#2D0A48] border-[#F7EEFF] bg-[radial-gradient(circle_at_center,_var(--tw-gradient-stops))] from-[#F3E2FF80] to-[#F3E2FF] w-full h-9 rounded-2xl"
-                          onClick={() => navigate("/rose-assistant")}
-                        >
-                          دریافت گزارش کار
-                        </button>
-                      </div>
-                    </div>
-                    <img
-                      src={happyGirl}
-                      alt="happy girl"
-                      className="absolute h-[220px] w-[130px] z-30 -bottom-3 left-2 pointer-events-none"
+                <div
+                  className="mx-2 relative h-[160px] w-[calc(100%-16px)] sm:h-40 rounded-[16px] flex flex-row gap-4 sm:gap-12 items-center justify-start bg-cover bg-center bg-no-repeat"
+                  style={{ backgroundImage: `url(${bgBanner})` }}
+                >
+                  <div className="pr-4 xs:pr-6">
+                    <p
+                      className="text-[#2D0A48] text-lg pr-3"
                       data-aos="fade-down"
-                    />
+                    >
+                      رُز در خدمت شما
+                    </p>
+                    <div className="xs:w-[150px]  mt-4">
+                      <button
+                        className="border-2 p-0 xs:pl-2 text-sm text-[#2D0A48] border-[#F7EEFF] bg-[radial-gradient(circle_at_center,_var(--tw-gradient-stops))] from-[#F3E2FF80] to-[#F3E2FF] w-full h-9 rounded-2xl"
+                        onClick={() => navigate("/rose-assistant")}
+                      >
+                        دریافت گزارش کار
+                      </button>
+                    </div>
                   </div>
+                  <img
+                    src={happyGirl}
+                    alt="happy girl"
+                    className="h-[180px] absolute bottom-0 left-7 z-1000"
+                    data-aos="fade-down"
+                  />
                 </div>
               </SwiperSlide>
 

From 132cac92b7273d6b47c65d30039a97fa04cc0bba Mon Sep 17 00:00:00 2001
From: Reza Taghizadeh <95388378+srt207-reza@users.noreply.github.com>
Date: Sat, 18 Oct 2025 15:59:06 +0330
Subject: [PATCH 2/6] fix: resolve banner issue (v2.73.3)

---
 package.json                                  |  2 +-
 .../pages/BannerSwiper/BannerSwiper.tsx       | 60 +++++++++----------
 2 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/package.json b/package.json
index 3ddee62c..88f78dbd 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "app.salona",
   "private": true,
-  "version": "2.73.2",
+  "version": "2.73.3",
   "type": "module",
   "scripts": {
     "dev": "vite --host",
diff --git a/src/apps/new-ui/pages/BannerSwiper/BannerSwiper.tsx b/src/apps/new-ui/pages/BannerSwiper/BannerSwiper.tsx
index 78c5294c..7249a1d1 100644
--- a/src/apps/new-ui/pages/BannerSwiper/BannerSwiper.tsx
+++ b/src/apps/new-ui/pages/BannerSwiper/BannerSwiper.tsx
@@ -5,7 +5,6 @@ import { Autoplay } from "swiper/modules";
 import { Link, useNavigate } from "react-router-dom";
 import happyGirl from "../../assets/happyGirl.svg";
 import bgBanner from "../../assets/bg-banner.png";
-
 interface Banner {
   image: string;
   link: string;
@@ -14,11 +13,10 @@ interface Banner {
 const BannerSwiper = () => {
   const { data: banners, isLoading, isError } = useGetBannerEvents();
   const navigate = useNavigate();
-
   return (
-    <div className="banner-swiper-container overflow-visible relative max-w-2xl mx-auto -mt-8 z-20">
-      <div className="rounded-[16px] flex flex-row gap-4 sm:gap-12 items-center justify-center overflow-visible relative">
-        <div className="w-full max-w-2xl h-[160px] relative">
+    <div>
+      <div className=" mt-2 h-[160px] rounded-[16px] flex flex-row gap-4 sm:gap-12 items-center justify-center bg-cover bg-center bg-no-repeat">
+        <div className="w-full max-w-2xl">
           {isLoading ? (
             <div>در حال بارگذاری...</div>
           ) : isError ? (
@@ -32,6 +30,7 @@ const BannerSwiper = () => {
                 disableOnInteraction: false,
                 pauseOnMouseEnter: false,
               }}
+              className="py-5"
               spaceBetween={5}
               breakpoints={{
                 320: { slidesPerView: 1 },
@@ -46,38 +45,35 @@ const BannerSwiper = () => {
                 600: { slidesPerView: 1.75 },
                 650: { slidesPerView: 1.9 },
               }}
-              className="max-w-2xl"
             >
               {/* first slide-rose */}
               <SwiperSlide>
-                <div className="relative">
-                  <div
-                    className="mx-2 h-[160px] w-[calc(100%-16px)] sm:h-40 rounded-[16px] flex flex-row gap-4 sm:gap-12 items-center justify-start bg-cover bg-center bg-no-repeat"
-                    style={{ backgroundImage: `url(${bgBanner})` }}
-                  >
-                    <div className="pr-4 xs:pr-6 z-10">
-                      <p
-                        className="text-[#2D0A48] text-lg pr-3"
-                        data-aos="fade-down"
-                      >
-                        رُز در خدمت شما
-                      </p>
-                      <div className="xs:w-[150px] mt-4">
-                        <button
-                          className="border-2 p-0 xs:pl-2 text-sm text-[#2D0A48] border-[#F7EEFF] bg-[radial-gradient(circle_at_center,_var(--tw-gradient-stops))] from-[#F3E2FF80] to-[#F3E2FF] w-full h-9 rounded-2xl"
-                          onClick={() => navigate("/rose-assistant")}
-                        >
-                          دریافت گزارش کار
-                        </button>
-                      </div>
-                    </div>
-                    <img
-                      src={happyGirl}
-                      alt="happy girl"
-                      className="absolute h-[220px] w-[130px] z-30 -bottom-3 left-2 pointer-events-none"
+                <div
+                  className="mx-2 relative h-[160px] w-[calc(100%-16px)] sm:h-40 rounded-[16px] flex flex-row gap-4 sm:gap-12 items-center justify-start bg-cover bg-center bg-no-repeat"
+                  style={{ backgroundImage: `url(${bgBanner})` }}
+                >
+                  <div className="pr-4 xs:pr-6">
+                    <p
+                      className="text-[#2D0A48] text-lg pr-3"
                       data-aos="fade-down"
-                    />
+                    >
+                      رُز در خدمت شما
+                    </p>
+                    <div className="xs:w-[150px]  mt-4">
+                      <button
+                        className="border-2 p-0 xs:pl-2 text-sm text-[#2D0A48] border-[#F7EEFF] bg-[radial-gradient(circle_at_center,_var(--tw-gradient-stops))] from-[#F3E2FF80] to-[#F3E2FF] w-full h-9 rounded-2xl"
+                        onClick={() => navigate("/rose-assistant")}
+                      >
+                        دریافت گزارش کار
+                      </button>
+                    </div>
                   </div>
+                  <img
+                    src={happyGirl}
+                    alt="happy girl"
+                    className="h-[180px] absolute bottom-0 left-7 z-1000"
+                    data-aos="fade-down"
+                  />
                 </div>
               </SwiperSlide>
 

From bf818730338d22ee357b3ff7f18caaaea651192b Mon Sep 17 00:00:00 2001
From: farnoosh-krm <farnoosh.karimi99@gmail.com>
Date: Sat, 18 Oct 2025 17:05:47 +0330
Subject: [PATCH 3/6] (feat) - explore page modified (2.74.0) (fix) - error
 fixed

---
 src/apps/new-ui/components/Qr-code/QrCodeScanner.tsx |  6 +++---
 src/apps/new-ui/pages/explore/explore.css            | 12 ++++++++++++
 src/apps/new-ui/pages/explore/index.tsx              |  6 +++---
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/apps/new-ui/components/Qr-code/QrCodeScanner.tsx b/src/apps/new-ui/components/Qr-code/QrCodeScanner.tsx
index ea22f982..918aeecc 100644
--- a/src/apps/new-ui/components/Qr-code/QrCodeScanner.tsx
+++ b/src/apps/new-ui/components/Qr-code/QrCodeScanner.tsx
@@ -223,7 +223,7 @@ export default function QrUltimateStyled({ onResult }: { onResult?: (text: strin
     }, []);
 
     const galleryButton = (
-        <label style={{ display: "inline-flex", alignItems: "center", gap: 8, cursor: "pointer" }}>
+        <label style={{ display: "inline-flex", alignItems: "center", gap: 2, cursor: "pointer" }}>
             <input type="file" accept="image/*,video/*" capture style={{ display: "none" }} onChange={handleFile} />
             <FilePlus color="#ffffff" />
         </label>
@@ -256,8 +256,8 @@ export default function QrUltimateStyled({ onResult }: { onResult?: (text: strin
                         left: "50%",
                         top: "50%",
                         transform: "translate(-50%,-50%)",
-                        width: 300,
-                        height: 300,
+                        width: 290,
+                        height: 290,
                         border: "2px dashed rgba(255,255,255,0.6)",
                         borderRadius: 8,
                         pointerEvents: "none",
diff --git a/src/apps/new-ui/pages/explore/explore.css b/src/apps/new-ui/pages/explore/explore.css
index eee2b496..3a7bc17e 100644
--- a/src/apps/new-ui/pages/explore/explore.css
+++ b/src/apps/new-ui/pages/explore/explore.css
@@ -33,3 +33,15 @@
 .explore-page-wrapper > div {
   overflow: visible !important;
 }
+
+.explore-page-div {
+  max-width: 672px;
+}
+.explore-page-wrapper .absolute.px-8 {
+  z-index: 1000;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  backdrop-filter: blur(10px);
+}
diff --git a/src/apps/new-ui/pages/explore/index.tsx b/src/apps/new-ui/pages/explore/index.tsx
index 583702a5..08648bd6 100644
--- a/src/apps/new-ui/pages/explore/index.tsx
+++ b/src/apps/new-ui/pages/explore/index.tsx
@@ -30,9 +30,9 @@ const NewExplore = () => {
 
   return (
     <div className="explore-page-wrapper flex flex-col pb-32 relative overflow-visible">
-      <div className="bg-gradient-to-br from-[#DFB4FF] to-[#E6C4FF] overflow-visible relative z-[1] mb-10">
+      <div className="bg-gradient-to-br from-[#DFB4FF] to-[#E6C4FF] overflow-visible relative  mb-6">
         <AdsModal />
-        <div className="absolute flex items-center justify-between px-8 sm:px-28 top-0 left-0 right-0 z-[100]  py-3 gap-4 lg:gap-3">
+        <div className="absolute flex items-center justify-between px-8 sm:px-28 top-0 left-0 right-0  py-3 gap-4 lg:gap-3">
           <div className="flex gap-3">
             <img src={alertIcon} alt="alert icon" />
             <img
@@ -93,7 +93,7 @@ const NewExplore = () => {
       {/* =============================== */}
 
       <div className="w-full max-w-2xl mx-auto relative overflow-visible">
-        <div className="relative -mt-6 z-20 ">
+        <div className="explore-page-div relative -mt-6 z-20 ">
           <BannerSwiper />
         </div>
         <AppointmentExplore />

From 050ab0816c78d12a5d62ef1702eb84619c5cdbc7 Mon Sep 17 00:00:00 2001
From: farnoosh-krm <farnoosh.karimi99@gmail.com>
Date: Sat, 18 Oct 2025 17:10:55 +0330
Subject: [PATCH 4/6] 2.74.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 88f78dbd..9093b769 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "app.salona",
   "private": true,
-  "version": "2.73.3",
+  "version": "2.74.0",
   "type": "module",
   "scripts": {
     "dev": "vite --host",

From 860e8a28b938dc7b7025a9e3d9a80fb6f115fbc4 Mon Sep 17 00:00:00 2001
From: farnoosh-krm <farnoosh.karimi99@gmail.com>
Date: Sat, 18 Oct 2025 17:24:27 +0330
Subject: [PATCH 5/6] (fix) - bug fixed (2.74.1)

---
 src/apps/new-ui/pages/explore/explore.css | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/apps/new-ui/pages/explore/explore.css b/src/apps/new-ui/pages/explore/explore.css
index 3a7bc17e..beda52ad 100644
--- a/src/apps/new-ui/pages/explore/explore.css
+++ b/src/apps/new-ui/pages/explore/explore.css
@@ -38,10 +38,8 @@
   max-width: 672px;
 }
 .explore-page-wrapper .absolute.px-8 {
-  z-index: 1000;
-  position: fixed;
+  z-index: 100;
   top: 0;
   left: 0;
   right: 0;
-  backdrop-filter: blur(10px);
 }

From f152d00bed6ab13e638a0db02d918bdb6f87830e Mon Sep 17 00:00:00 2001
From: farnoosh-krm <farnoosh.karimi99@gmail.com>
Date: Sat, 18 Oct 2025 17:25:07 +0330
Subject: [PATCH 6/6] 2.74.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9093b769..a68a1a9e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "app.salona",
   "private": true,
-  "version": "2.74.0",
+  "version": "2.74.1",
   "type": "module",
   "scripts": {
     "dev": "vite --host",