pedram
/
Andishmand
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Some Changes + Charge Wallet 3 digits separating

Browse Source
main
Pedram Keshavarzi 3 years ago
parent 381de2e01a
commit 979ceaecd1
9 changed files with 24 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/components/Calendar/CalendarComponents/Calendar.js
  2. 2
      src/components/Product/index.js
  3. 2
      src/components/ShoppingCart/index.js
  4. 4
      src/components/exam/Carousel/index.css
  5. 8
      src/components/exam/Carousel/index.js
  6. 2
      src/view/addExam/views/OkExam.js
  7. 2
      src/view/chatPage/index.js
  8. 18
      src/view/services/index.js
  9. 2
      src/view/services/service/index.js

4
src/components/Calendar/CalendarComponents/Calendar.js
Unescape View File

@ -249,7 +249,7 @@ let active_list;
type={type} type={type}
/> */} /> */}
<div className="date-box-p1"> <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-month">{month}</div>،
<div className="dbp1-year">{year}</div> <div className="dbp1-year">{year}</div>
</div> </div>
@ -312,7 +312,7 @@ let active_list;
{ eventInFooter !== null && eventInFooter !== undefined && { eventInFooter !== null && eventInFooter !== undefined &&
<div className={`footer__Events ${type}`}> <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
} }

2
src/components/Product/index.js
Unescape View File

@ -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> <h1 className={`font-black text-xl py-4 text-red52 ${isMobile && 'w-1/2 border-l border-red82OP text-center'}`}>{productPrice} تومان</h1>
<div <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> <button onClick={btnOnClick}>افزودن به سبد خرید</button>

2
src/components/ShoppingCart/index.js
Unescape View File

@ -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="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) => ( {list.map((product, index) => (
<Product key={index} product={product} /> <Product key={index} product={product} />

4
src/components/exam/Carousel/index.css
Unescape View File

@ -34,7 +34,7 @@
font-size: 17px; font-size: 17px;
font-family: IRANSans; font-family: IRANSans;
color: #B1B1B1; color: #B1B1B1;
margin-right: 35px; /* margin-right: 35px; */
position: relative; position: relative;
cursor: pointer; cursor: pointer;
} }
@ -99,7 +99,7 @@
/* height: 280px; */ /* height: 280px; */
margin: 30px 0; margin: 30px 0;
/* margin-top: 30px; */ /* margin-top: 30px; */
margin-right: 35px; /* margin-right: 35px; */
display: flex; display: flex;
position: absolute; position: absolute;
top: 0; top: 0;

8
src/components/exam/Carousel/index.js
Unescape View File

@ -399,7 +399,7 @@ const MyExamList = ({isMobile}) => {
<div <div
style={item.isActive ? { color: "white", background: '#df1452', minWidth: '125px' } : {minWidth: '125px', color: '#df1452'}} style={item.isActive ? { color: "white", background: '#df1452', minWidth: '125px' } : {minWidth: '125px', color: '#df1452'}}
key={item.id || i} 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)} onClick={() => change_tab(item.id)}
> >
{item.tab_name} {item.tab_name}
@ -411,10 +411,10 @@ const MyExamList = ({isMobile}) => {
</ ScrollContainer > </ ScrollContainer >
<ScrollContainer className="melc-content"> <ScrollContainer className="melc-content">
{data.map((item) => ( {data.map((item, index) => (
<div key={item.id}> <div key={item.id} className={index == 0 && '-mr-10'}>
{item.isActive && ( {item.isActive && (
<div className="melc-content-item"> <div className={`melc-content-item ${index == 0 && '-mr-10'}`}>
{item.isActive && {item.isActive &&
item.tab_content.map((item) => ( item.tab_content.map((item) => (
<Link to={`/azmoon_list/enter_exam/${item.id}`} <Link to={`/azmoon_list/enter_exam/${item.id}`}

2
src/view/addExam/views/OkExam.js
Unescape View File

@ -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 to='/adminpanel' className="text-red52 w-full py-4 flex justify-center ml-2">
بازگشت به پنل ادمین بازگشت به پنل ادمین
</Link> </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> </button>

2
src/view/chatPage/index.js
Unescape View File

@ -30,7 +30,7 @@ const ChatPage = ({
{ {
messages.map((message) => ( messages.map((message) => (
<div className={`w-full p-5 flex ${message.userId == user.id && 'rtl'}`}> <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 `}> <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> <p>{message.value}</p>
<div className={` mt-2 w-full flex items-center ${message.userId == user.id ?'justify-end' : 'justify-start'} text-xs`}> <div className={` mt-2 w-full flex items-center ${message.userId == user.id ?'justify-end' : 'justify-start'} text-xs`}>

18
src/view/services/index.js
Unescape View File

@ -54,7 +54,7 @@ const Services = ({
classHour: "", classHour: "",
classMinute: "", classMinute: "",
}); });
const [sharzhVal, setSharzhVal] = useState('');
// const onChange = (name, value) => { // const onChange = (name, value) => {
// setFilter({ ...filter, [name]: value }); // setFilter({ ...filter, [name]: value });
// }; // };
@ -407,6 +407,8 @@ const Services = ({
<input <input
placeholder="شارژ حساب" placeholder="شارژ حساب"
className="border border-red52 rounded-lg h-12 w-60 text-center rounded-r-none border-r-0 px-4 outline-none" 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> </div>
<button className="cursor-pointer text-red26 border border-red52 rounded-lg bg-red82OP font-bold text-sm px-6 h-12">افزودن به اعتبار</button> <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 <div
className={`flex w-32 border-2 p-2 mx-2 justify-center items-center rounded-md cursor-pointer 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 hover:border-red52 hover:text-red52 hover:bg-pinkF5
${filterCheck == '' ${filterCheck == 'Online'
? "border-red52 text-red52 bg-pinkF5" ? "border-red52 text-red52 bg-pinkF5"
: "border-gray200 text-gray-400" : "border-gray200 text-gray-400"
}`} }`}
onClick={(prevState) => onClick={(prevState) =>
setFilterCheck('') setFilterCheck('Online')
} }
> >
<h3>آنلاین</h3> <h3>آنلاین</h3>
{filterCheck == '' && ( {filterCheck == 'Online' && (
<div className="flex w-full" style={{ direction: "ltr" }}> <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"> <div className="w-4 h-4 text-white text-sm rounded-full flex justify-center items-center bg-red52">
<svg <svg
@ -530,16 +532,16 @@ const Services = ({
<div <div
className={`flex w-32 border-2 p-2 mx-2 justify-center items-center rounded-md cursor-pointer 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 hover:border-red52 hover:text-red52 hover:bg-pinkF5
${filterCheck == '' ${filterCheck == 'offLine'
? "border-red52 text-red52 bg-pinkF5" ? "border-red52 text-red52 bg-pinkF5"
: "border-gray200 text-gray-400" : "border-gray200 text-gray-400"
}`} }`}
onClick={(prevState) => onClick={(prevState) =>
setFilterCheck('') setFilterCheck('offLine')
} }
> >
<h3>حضوری</h3> <h3>حضوری</h3>
{filterCheck == '' && ( {filterCheck == 'offLine' && (
<div className="flex w-full" style={{ direction: "ltr" }}> <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"> <div className="w-4 h-4 text-white text-sm rounded-full flex justify-center items-center bg-red52">
<svg <svg
@ -661,6 +663,8 @@ const Services = ({
<input <input
placeholder="شارژ حساب" placeholder="شارژ حساب"
className="border border-red52 rounded-lg h-14 w-4/5 text-center rounded-r-none border-r-0 px-4 outline-none" 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> </div>
<button className="cursor-pointer text-blue52 border border-blueDF w-full rounded-lg font-bold text-sm px-6 h-14" <button className="cursor-pointer text-blue52 border border-blueDF w-full rounded-lg font-bold text-sm px-6 h-14"

2
src/view/services/service/index.js
Unescape View File

@ -72,7 +72,7 @@ const servicePopUp = ({
(item, index) => ( (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 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"> <div className="flex items-center font-bold">
<Checkbox /> <Checkbox name={`examPackage_${item.id}_${index}`} />
<p>{item.title}</p> <p>{item.title}</p>
</div> </div>
<p>تاریخ : {item.date}</p> <p>تاریخ : {item.date}</p>

Write Preview
Loading…
Cancel
Save