From 979ceaecd1d92e345b34bbc2f89032b22c35235c Mon Sep 17 00:00:00 2001
From: Pkpedram <pkpedram80@gmail.com>
Date: Tue, 5 Apr 2022 17:47:05 +0430
Subject: [PATCH] Some Changes  + Charge Wallet 3 digits separating

---
 .../Calendar/CalendarComponents/Calendar.js    |  4 ++--
 src/components/Product/index.js                |  2 +-
 src/components/ShoppingCart/index.js           |  2 +-
 src/components/exam/Carousel/index.css         |  4 ++--
 src/components/exam/Carousel/index.js          |  8 ++++----
 src/view/addExam/views/OkExam.js               |  2 +-
 src/view/chatPage/index.js                     |  2 +-
 src/view/services/index.js                     | 18 +++++++++++-------
 src/view/services/service/index.js             |  2 +-
 9 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/components/Calendar/CalendarComponents/Calendar.js b/src/components/Calendar/CalendarComponents/Calendar.js
index 185b81a..8d45e53 100644
--- a/src/components/Calendar/CalendarComponents/Calendar.js
+++ b/src/components/Calendar/CalendarComponents/Calendar.js
@@ -249,7 +249,7 @@ let active_list;
         type={type}
       /> */}
       <div className="date-box-p1">
-        <div className="date-box-p1-year-and-month">
+        <div className="date-box-p1-year-and-month font-bold">
           <div className="dbp1-month">{month}</div>،
           <div className="dbp1-year">{year}</div>
         </div>
@@ -312,7 +312,7 @@ let active_list;
         { eventInFooter !== null && eventInFooter !== undefined &&
           <div className={`footer__Events ${type}`}>
           {
-            type == 'dashboard' ? <><div className='text-lg font-bold text-red52'>رویداد ها: </div><p className='text-red26 text-sm '>{eventInFooter ? eventInFooter : 'رویدادی در این روز وجود ندارد!'}</p></> : eventInFooter
+            type == 'dashboard' ? <><div className='text-lg text-red52'>رویدادها: </div><p className='text-red26 text-sm '>{eventInFooter ? eventInFooter : 'رویدادی در این روز وجود ندارد!'}</p></> : eventInFooter
           }
           
           
diff --git a/src/components/Product/index.js b/src/components/Product/index.js
index 482dde2..f36e91d 100644
--- a/src/components/Product/index.js
+++ b/src/components/Product/index.js
@@ -270,7 +270,7 @@ const ProductDesign = ({
         <h1 className={`font-black text-xl py-4 text-red52 ${isMobile && 'w-1/2 border-l border-red82OP text-center'}`}>{productPrice} تومان</h1>
         
         <div
-          className={`bg-${isMobile ? 'blueFF border-blueDF rounded-lg py-3' : 'pinkF5 border-red52 py-2'} rounded-md text-red26 w-32 border-2  px-1  text-xs flex justify-center hover:bg-red52 hover:text-white
+          className={`bg-${isMobile ? 'blueFF border-blueDF rounded-lg py-3 hover:bg-blueDF' : 'pinkF5 border-red52 py-2 hover:bg-red52'} rounded-md text-red26 w-32 border-2  px-1  text-xs flex justify-center  hover:text-white
                 `}
         >
           <button onClick={btnOnClick}>افزودن به سبد خرید</button>
diff --git a/src/components/ShoppingCart/index.js b/src/components/ShoppingCart/index.js
index 1d7908b..af7c00c 100644
--- a/src/components/ShoppingCart/index.js
+++ b/src/components/ShoppingCart/index.js
@@ -259,7 +259,7 @@ function ShoppingCart({
     :
     
   <div className="flex flex-col justify-between items-center  bg-gray-100  left-0 pt-24" style={{height: '100vh'}}>
-   <div className={`w-full flex items-center flex-col ${list?.length > 3 && 'overflow-x-hidden overflow-scroll'}`} style={{height: '42%'}}>
+   <div className={`w-full flex items-center flex-col ${list?.length > 3 && 'overflow-x-hidden overflow-scroll'}`} style={{height: '60%'}}>
     
     {list.map((product, index) => (
             <Product key={index} product={product} />
diff --git a/src/components/exam/Carousel/index.css b/src/components/exam/Carousel/index.css
index e9a0a73..b1404ea 100644
--- a/src/components/exam/Carousel/index.css
+++ b/src/components/exam/Carousel/index.css
@@ -34,7 +34,7 @@
     font-size: 17px;
     font-family: IRANSans;
     color: #B1B1B1;
-    margin-right: 35px;
+    /* margin-right: 35px; */
     position: relative;
     cursor: pointer;
   }
@@ -99,7 +99,7 @@
     /* height: 280px; */
     margin: 30px 0;
     /* margin-top: 30px; */
-    margin-right: 35px;
+    /* margin-right: 35px; */
     display: flex;
     position: absolute;
     top: 0;
diff --git a/src/components/exam/Carousel/index.js b/src/components/exam/Carousel/index.js
index 4bf1232..efacb03 100644
--- a/src/components/exam/Carousel/index.js
+++ b/src/components/exam/Carousel/index.js
@@ -399,7 +399,7 @@ const MyExamList = ({isMobile}) => {
           <div
             style={item.isActive ? { color: "white", background: '#df1452', minWidth: '125px' } : {minWidth: '125px', color: '#df1452'}}
             key={item.id || i}
-            className="w-72 flex items-center h-12 bg-gray-200 mx-2 rounded-lg justify-center font-bold text-sm"
+            className="w-72 flex items-center h-12 bg-gray-100 mx-2 rounded-lg justify-center font-bold text-sm"
             onClick={() => change_tab(item.id)}
           >
             {item.tab_name}
@@ -411,10 +411,10 @@ const MyExamList = ({isMobile}) => {
         </ ScrollContainer >
       
       <ScrollContainer className="melc-content">
-        {data.map((item) => (
-          <div key={item.id}>
+        {data.map((item, index) => (
+          <div key={item.id} className={index == 0 && '-mr-10'}>
             {item.isActive && (
-              <div className="melc-content-item">
+              <div className={`melc-content-item ${index == 0 && '-mr-10'}`}>
                 {item.isActive &&
                   item.tab_content.map((item) => (
                     <Link to={`/azmoon_list/enter_exam/${item.id}`}
diff --git a/src/view/addExam/views/OkExam.js b/src/view/addExam/views/OkExam.js
index 8aca275..3d82e9f 100644
--- a/src/view/addExam/views/OkExam.js
+++ b/src/view/addExam/views/OkExam.js
@@ -48,7 +48,7 @@ const OkExam = ({ addExamState, stepClick, backStep }) => {
                 <Link to='/adminpanel' className="text-red52 w-full py-4 flex justify-center ml-2">
         بازگشت به پنل ادمین
                     </Link>
-                    <button className="text-white rounded-xl w-full py-4 flex justify-center bg-green-400 mr-2">
+                    <button className="text-white rounded-xl w-full py-4 flex justify-center bg-green-400 mr-2" onClick={() => window.location.reload()}>
                         ساخت آزمون دیگر
                     </button>
                     
diff --git a/src/view/chatPage/index.js b/src/view/chatPage/index.js
index e4b6980..d98919d 100644
--- a/src/view/chatPage/index.js
+++ b/src/view/chatPage/index.js
@@ -30,7 +30,7 @@ const ChatPage = ({
             {
                 messages.map((message) => (
                     <div className={`w-full p-5 flex ${message.userId == user.id && 'rtl'}`}>
-                        <img src={message.userId == contact.id ? contact.avatar : user.avatar} className={`w-16 h-16 rounded-full ${message.userId == user.id ? 'ml-2' : 'mr-2'}`}/>
+                        {message.userId == contact.id && <img src={message.userId == contact.id ? contact.avatar : user.avatar} className={`w-12 h-12 rounded-full ${message.userId == user.id ? 'ml-2' : 'mr-2'}`}/>}
                         <div className={`${message.userId == user.id ? 'bg-blue-200 text-gray-500 text-sm rounded-tr-none' : 'bg-blue-400 text-gray-100 text-sm rounded-tl-none'} p-3 rounded-xl text-right flex flex-col `}>
                             <p>{message.value}</p>
                             <div className={` mt-2 w-full flex items-center ${message.userId == user.id ?'justify-end' : 'justify-start'} text-xs`}>
diff --git a/src/view/services/index.js b/src/view/services/index.js
index 57b1452..5d48bc0 100644
--- a/src/view/services/index.js
+++ b/src/view/services/index.js
@@ -54,7 +54,7 @@ const Services = ({
     classHour: "",
     classMinute: "",
   });
-
+  const [sharzhVal, setSharzhVal] = useState('');
   // const onChange = (name, value) => {
   //   setFilter({ ...filter, [name]: value });
   // };
@@ -407,6 +407,8 @@ const Services = ({
                   <input
                     placeholder="شارژ حساب"
                     className="border border-red52 rounded-lg h-12 w-60 text-center rounded-r-none border-r-0 px-4 outline-none"
+                    value={(separate(sharzhVal))}
+                  onChange={e => setSharzhVal(e.target.value)}
                   />
                 </div>
                 <button className="cursor-pointer text-red26 border border-red52 rounded-lg bg-red82OP font-bold text-sm px-6 h-12">افزودن به اعتبار</button>
@@ -494,16 +496,16 @@ const Services = ({
             <div
               className={`flex w-32 border-2 p-2 mx-2 justify-center items-center rounded-md cursor-pointer
                            hover:border-red52 hover:text-red52 hover:bg-pinkF5 
-                          ${filterCheck == ''
+                          ${filterCheck == 'Online'
                   ? "border-red52 text-red52 bg-pinkF5"
                   : "border-gray200 text-gray-400"
                 }`}
               onClick={(prevState) =>
-                setFilterCheck('')
+                setFilterCheck('Online')
               }
             >
               <h3>آنلاین</h3>
-              {filterCheck == '' && (
+              {filterCheck == 'Online' && (
                 <div className="flex w-full" style={{ direction: "ltr" }}>
                   <div className="w-4 h-4 text-white text-sm rounded-full flex justify-center items-center bg-red52">
                     <svg
@@ -530,16 +532,16 @@ const Services = ({
             <div
               className={`flex w-32 border-2 p-2 mx-2 justify-center items-center rounded-md cursor-pointer
                            hover:border-red52 hover:text-red52 hover:bg-pinkF5 
-                          ${filterCheck == ''
+                          ${filterCheck == 'offLine'
                   ? "border-red52 text-red52 bg-pinkF5"
                   : "border-gray200 text-gray-400"
                 }`}
               onClick={(prevState) =>
-                setFilterCheck('')
+                setFilterCheck('offLine')
               }
             >
               <h3>حضوری</h3>
-              {filterCheck == '' && (
+              {filterCheck == 'offLine' && (
                 <div className="flex w-full" style={{ direction: "ltr" }}>
                   <div className="w-4 h-4 text-white text-sm rounded-full flex justify-center items-center bg-red52">
                     <svg
@@ -661,6 +663,8 @@ const Services = ({
                 <input
                   placeholder="شارژ حساب"
                   className="border border-red52 rounded-lg h-14 w-4/5 text-center rounded-r-none border-r-0 px-4 outline-none"
+                  value={(separate(sharzhVal))}
+                  onChange={e => setSharzhVal(e.target.value)}
                 />
               </div>
               <button className="cursor-pointer text-blue52 border border-blueDF w-full rounded-lg font-bold text-sm px-6 h-14"
diff --git a/src/view/services/service/index.js b/src/view/services/service/index.js
index c8742c4..fe09975 100644
--- a/src/view/services/service/index.js
+++ b/src/view/services/service/index.js
@@ -72,7 +72,7 @@ const servicePopUp = ({
                                         (item, index) => (
                                             <div className="flex w-full items-center justify-between border-b border-red82OP font-bold text-red26 text-xs py-3 px-6 " style={{direction : 'rtl'}}>
                                                 <div className="flex items-center font-bold">
-                                                <Checkbox />
+                                                <Checkbox name={`examPackage_${item.id}_${index}`} />
                                                 <p>{item.title}</p>
                                                 </div>
                                                 <p>تاریخ : {item.date}</p>