Merge branch 'master' of https://git.sitenevis.com/Danovin/application

src/views/Blog/index.js

@@ -48,14 +48,15 @@ export const Blog = ({
         />
         <div className="flex flex-col justify-end bg-gradient-to-t from-black absolute top-0 left-0 z-10 w-full h-full pb-2 px-2">
           <div className="w-full flex justify-between">
-            <div className="flex">
+            <div className="flex items-center">
               <Avatar
+                rounded={"rounded-full"}
                 source={
                   blog?.author?.picFileId
                     ? `https://dnvn.ir/api/v1/file/${blog?.author?.picFileId}`
                     : null
                 }
-                size={40}
+                size={60}
               />
 
               <div className="flex flex-col py-2 mr-2 justify-center">
@@ -95,13 +96,13 @@ export const Blog = ({
         }}
       ></div>
 
-      <div className="flex lg:my-5 gap-5">
+      <div className="flex lg:my-5 gap-5 mt-5">
         <strong className="flex-1 lg:text-5xl lg:font-black dark:text-gray-200">
           {blog?.title}
         </strong>
         {/* desktop */}
         <div className="hidden lg:flex flex-col">
-          <div className="flex items-start">
+          <div className="flex items-center">
             <Avatar
               rounded={"rounded-full"}
               source={
@@ -109,13 +110,13 @@ export const Blog = ({
                   ? `https://dnvn.ir/api/v1/file/${blog?.author?.picFileId}`
                   : null
               }
-              size={40}
-            />{" "}
+              size={60}
+            />
             <div className="flex flex-col py-2 mr-2 justify-center">
               <strong className="lg:text-base lg:font-black text-gray1">
                 {window.t("نوشته از:") + " " + blog?.author?.name}
               </strong>
-              <p className="lg:text-sm lg:font-semibold text-gray70 mt-2">
+              <p className="lg:text-sm lg:font-semibold text-gray70 mt-4">
                 {blog?.author.role}
               </p>
             </div>

src/views/Blogs/layouts/New.js

@@ -24,24 +24,24 @@ export const New = ({ blog, isMobile, setActive }) => {
           minWidth: isMobile ? "calc(100vh / 5 * 4.5 / 3)" : "",
         }}
       />
-      <strong className="text-base lg:text-lg lg:my-4 my-2 leading-6 lg:leading-7 dark:text-gray-200">
+      <strong className="text-base lg:text-lg lg:my-4 my-2 leading-6 lg:leading-7 dark:text-gray-200 p-2">
         {blog?.title}
       </strong>
-
       <div
         className="text-tiny leading-5 lg:leading-7 mb-3 dark:text-gray-200 p-2 line-clamp-3"
         dangerouslySetInnerHTML={{ __html: blog?.text }}
       />
       <div className="w-full hidden lg;flex justify-between">
-        <div className="flex">
-          {!blog?.author.picFileId && <Avatar size={60} />}
-          {blog?.author.picFileId && (
-            <img
-              src={`https://dnvn.ir/api/v1/file${blog?.author.picFileId}`}
-              alt="author"
-              className="w-20 rounded"
+        <div className="flex items-center">
+          <Avatar
+            rounded={"rounded-full"}
+            source={
+              blog?.author?.picFileId
+                ? `https://dnvn.ir/api/v1/file/${blog?.author?.picFileId}`
+                : null
+            }
+            size={60}
           />
-          )}
           <div className="flex flex-col py-2 mr-2 justify-center">
             <strong className="lg:text-tiny lg:font-black text-gray1">
               {`{window.t("نوشته از:")}` + " " + `${blog?.author.name}`}

src/views/Blogs/layouts/Single.js

@@ -24,15 +24,16 @@ export const Single = ({ blog, isMobile }) => {
         />
         <div className="flex flex-col justify-end bg-gradient-to-t from-black lg:hidden absolute top-0 left-0 z-10 w-full h-full pb-2 px-2">
           <div className="w-full flex justify-between">
-            <div className="flex">
-              {!blog?.author.picFileId && <Avatar size={40} />}
-              {blog?.author.picFileId && (
-                <img
-                  alt="author"
-                  className="w-20 rounded"
-                  src={`https://dnvn.ir/api/v1/file/${blog?.author.picFileId}`}
+            <div className="flex items-center">
+              <Avatar
+                rounded={"rounded-full"}
+                source={
+                  blog?.author?.picFileId
+                    ? `https://dnvn.ir/api/v1/file/${blog?.author?.picFileId}`
+                    : null
+                }
+                size={60}
               />
-              )}
               <div className="flex flex-col py-2 mr-2 justify-center">
                 <strong className="text-gray-300 text-tiny font-bold">
                   {window.t("نوشته از:")}
@@ -67,15 +68,16 @@ export const Single = ({ blog, isMobile }) => {
         </div>
         {!isMobile && (
           <div className="w-full flex justify-between">
-            <div className="flex">
-              {!blog?.author.picFileId && <Avatar size={40} />}
-              {blog?.author.picFileId && (
-                <img
-                  src={`https://dnvn.ir/api/v1/file/${blog?.author.picFileId}`}
-                  alt="author"
-                  className="w-20 rounded"
+            <div className="flex items-center">
+              <Avatar
+                rounded={"rounded-full"}
+                source={
+                  blog?.author?.picFileId
+                    ? `https://dnvn.ir/api/v1/file/${blog?.author?.picFileId}`
+                    : null
+                }
+                size={60}
               />
-              )}
               <div className="flex flex-col py-2 mr-2 justify-center">
                 <strong className="lg:text-xl lg:font-black text-gray1">
                   {window.t("نوشته از:")}

src/views/Blogs/layouts/Target.js

@@ -23,15 +23,16 @@ export const Target = ({ blogs, isMobile }) => {
           {blog?.title}
         </strong>
         <div className="w-full flex justify-between">
-          <div className="flex">
-            {!blog?.author.picFileId && <Avatar size={60} />}
-            {blog?.author.picFileId && (
-              <img
-                src={`https://dnvn.ir/api/v1/file/${blog?.author.picFileId}`}
-                alt="author"
-                className="w-20 rounded"
+          <div className="flex items-center">
+            <Avatar
+              rounded={"rounded-full"}
+              source={
+                blog?.author?.picFileId
+                  ? `https://dnvn.ir/api/v1/file/${blog?.author?.picFileId}`
+                  : null
+              }
+              size={60}
             />
-            )}
             <div className="flex flex-col py-1 mr-1 justify-center">
               <strong className="text-opacity-75 text-tiny  text-black dark:text-gray-200">
                 {window.t("نوشته از:" + " " + `${blog?.author.name}`)}
@@ -41,15 +42,15 @@ export const Target = ({ blogs, isMobile }) => {
               </p>
             </div>
           </div>
-          <div className="flex flex-col i justify-center items-end">
-            <span className="lg:text-tiny text-gray1 lg:font-black">
+          <div className="flex flex-col gap-y-3 justify-center items-end">
+            <span className="text-tiny text-black">
               {window.t("زمان مطالعه:") +
                 " " +
                 `${blog?.duration}` +
                 " " +
                 window.t("دقیقه")}
             </span>
-            <span className="mt-3 lg:text-tiny text-gray1 lg:font-black">
+            <span className="text-tiny text-black">
               {moment(blog?.updatedAt).locale("fa").format("YYYY/MM/DD")}
             </span>
           </div>
@@ -71,15 +72,16 @@ export const Target = ({ blogs, isMobile }) => {
             {blog?.title}
           </strong>
           <div className="w-full flex justify-between">
-            <div className="flex">
-              {!blog?.author.picFileId && <Avatar size={60} />}
-              {blog?.author.picFileId && (
-                <img
-                  src={`https://dnvn.ir/api/v1/file/${blog?.author.picFileId}`}
-                  alt="author"
-                  className="w-20 rounded"
+            <div className="flex items-center">
+              <Avatar
+                rounded={"rounded-full"}
+                source={
+                  blog?.author?.picFileId
+                    ? `https://dnvn.ir/api/v1/file/${blog?.author?.picFileId}`
+                    : null
+                }
+                size={60}
               />
-              )}
               <div className="flex flex-col py-2 mr-2 justify-center">
                 <strong className="lg:text-tiny lg:font-black text-opacity-75 text-white">
                   {window.t("نوشته از:" + " " + `${blog?.author.name}`)}

src/views/Dashboard/layouts/Mobile/Trophy.js

@@ -39,7 +39,7 @@ const Trophy = ({}) => {
           </g>
         </svg>
         <strong className="text-sm mr-2.5 text-green4F">
-          {`{window.t("امتیاز شما")}` + " " + 14560}
+          {`${window.t("امتیاز شما")}` + " " + 14560}
         </strong>
       </div>
       <Link to="#" className="text-sm text-green4F">

src/views/ShoppingCart/index.js

@@ -232,7 +232,7 @@ function ShoppingCart({
                 </p>
               </div>
               <Button
-                text={window.t("ادامه فرایند خرید")}
+                title={window.t("ادامه فرایند خرید")}
                 backgroundColor="bg-blueC0"
                 border={{ color: "#196EC055", width: "0px" }}
                 width="100%"