update 6 files

master
mahdi 2 years ago
parent 177b740199
commit 5c6825b053
  1. 4
      src/App.js
  2. 4
      src/components/CardDesign1/index.js
  3. 20
      src/components/CustomToast/index.js
  4. 9
      src/components/IconText/index.js
  5. 16
      src/components/TimeLineComponent/TimeLineItem.js

@ -221,9 +221,9 @@ function App() {
{/* <SelectYear /> */} {/* <SelectYear /> */}
{/* ----------------------------$$$ end---------------------------- */} {/* ----------------------------$$$ end---------------------------- */}
<TimeLineComponent /> {/* <TimeLineComponent /> */}
<CardTrelloDesign /> {/* <CardTrelloDesign /> */}
{/* <ReligiousTimes /> */} {/* <ReligiousTimes /> */}

@ -5,11 +5,11 @@ import TitleSubtitle from "../TitleSubtitle";
const CardDesign1 = () => { const CardDesign1 = () => {
return ( return (
<div className="flex flex-col bg-white shadow-sm rounded max-w-[375px] mr-20 my-20 p-4"> <div className="w-fit flex flex-col p-4 bg-white shadow-sm rounded">
<TitleSubtitle <TitleSubtitle
subTitle={false} subTitle={false}
title={"طبقه سوم"} title={"طبقه سوم"}
titleClassName={"font-sansbold text-[#0F0543]"} titleClassName={"font-sansbold text-[#0F0543]"}
titleBorderClassName={"w-1 h-5 bg-[#F8EA1F] ml-1"} titleBorderClassName={"w-1 h-5 bg-[#F8EA1F] ml-1"}
/> />
<IconText /> <IconText />

@ -2,19 +2,11 @@ import React from "react";
import penIcon from "./pen-icon.svg"; import penIcon from "./pen-icon.svg";
const CustomToast = ({ const CustomToast = ({ className, icon }) => {
backgroundColor,
borderColor,
textColor,
padding,
icon,
}) => {
return ( return (
<div <div className={`flex flex-row items-center text-sm rounded ${className} `}>
className={`flex flex-row items-center border-2 rounded mt-4 font-sansbold text-sm ${backgroundColor} ${borderColor} ${textColor} ${padding} `}
>
<p className="flex-1">ترسیم نقشه سالن</p> <p className="flex-1">ترسیم نقشه سالن</p>
<img src={icon} alt="pen" /> {icon && <img src={icon} alt="pen" />}
</div> </div>
); );
}; };
@ -22,9 +14,7 @@ const CustomToast = ({
export default CustomToast; export default CustomToast;
CustomToast.defaultProps = { CustomToast.defaultProps = {
backgroundColor: "bg-[#489BEC33]", className:
borderColor: "border-[#489BEC]", "p-4 bg-[#489BEC33] border-[#489BEC] text-[#0555A4] mt-4 border-2 font-sansbold",
textColor: "text-[#0555A4]",
padding: "p-4",
icon: penIcon, icon: penIcon,
}; };

@ -2,11 +2,11 @@ import React from "react";
import infoIcon from "./info-icon.svg"; import infoIcon from "./info-icon.svg";
const IconText = ({ textColor, textSize }) => { const IconText = ({ contentClassname }) => {
return ( return (
<div className="flex flex-row items-start mt-4"> <div className="flex flex-row items-start mt-2">
<img src={infoIcon} alt="info" /> <img src={infoIcon} alt="info" />
<p className={`${textColor} ${textSize} text-justify mr-3 leading-5`}> <p className={`${contentClassname} text-xs text-justify mr-3 leading-5`}>
ابتدا باید دیوار ها به صورت حدودی ترسیم شوند و تمامی نقاط به یگ دیگر وصل ابتدا باید دیوار ها به صورت حدودی ترسیم شوند و تمامی نقاط به یگ دیگر وصل
شوند تا طرح برای جایگذاری وسایل آماده شود شوند تا طرح برای جایگذاری وسایل آماده شود
</p> </p>
@ -18,6 +18,5 @@ export default IconText;
IconText.defaultProps = { IconText.defaultProps = {
icon: infoIcon, icon: infoIcon,
textColor: "text-[#2E2E2E]", contentClassname: "text-[#2E2E2E]",
textSize: "text-xs",
}; };

@ -1,5 +1,5 @@
import CircleInCircle from "../CircleInCircle"; import CircleInCircle from "../CircleInCircle";
import "./index.scss"; import ProfilePicNextToEachOther from "../ProfilePicNextToEachOther";
const TimeLineItem = ({ data }) => ( const TimeLineItem = ({ data }) => (
<div <div
@ -64,14 +64,12 @@ const TimeLineItem = ({ data }) => (
</div> </div>
{/* profilePic */} {/* profilePic */}
<div className="flex flex-row items-center"> <div className="flex flex-row items-center">
{data.users.slice(0, 3).map((user, i) => ( <ProfilePicNextToEachOther
<img holderClass={"-m-1"}
key={i} circleClass={"w-8"}
src={user.profilePic} showRest={false}
className="w-10" num={3}
style={{ marginLeft: "-10px" }} />
/>
))}
</div> </div>
</div> </div>
<span className="circle"></span> <span className="circle"></span>

Loading…
Cancel
Save