update 6 files

master
mahdi 3 years ago
parent 0f568e8a3b
commit 3054f61a1a
  1. 2
      src/App.js
  2. 20
      src/components/CardTrelloDesign/index.js
  3. 23
      src/components/CircleInCircle/index.js
  4. 49
      src/components/PopupCard/index.js
  5. 2
      src/components/TimeLineComponent/index.js

@ -213,7 +213,7 @@ function App() {
{/* <GridListTable /> */} {/* <GridListTable /> */}
<PopupCard /> {/* <PopupCard /> */}
{/* ----------------------------$$$ start---------------------------- */} {/* ----------------------------$$$ start---------------------------- */}
{/* <CircleInCircle /> */} {/* <CircleInCircle /> */}

@ -31,12 +31,8 @@ const CardTrelloDesign = ({
{/* right */} {/* right */}
{circle && ( {circle && (
<CircleInCircle <CircleInCircle
parentWidth={"w-5"} parentClassName={"bg-[#FF000044]"}
parentHeight={"h-5"} childClassName={"bg-[#FF0000]"}
chidlWidth={"w-2"}
chidlHeight={"h-2"}
parentBg={"bg-[#FF000044]"}
childBg={"bg-[#FF0000]"}
/> />
)} )}
{/* left */} {/* left */}
@ -58,10 +54,7 @@ const CardTrelloDesign = ({
</div> </div>
</div> </div>
{/* middle */} {/* middle */}
<p <p className="text-sm leading-6 text-justify mt-3 text-[#00253A]">
style={{ color: "#00253A" }}
className="text-sm leading-6 text-justify mt-3"
>
طراحی رابط کاربری و تجربه کاربر پروژه اندیشمند به همراه موارد اطلاحی طراحی رابط کاربری و تجربه کاربر پروژه اندیشمند به همراه موارد اطلاحی
پروژه دانوین پروژه دانوین
</p> </p>
@ -69,11 +62,7 @@ const CardTrelloDesign = ({
<div className="flex flex-row justify-between items-center mt-3"> <div className="flex flex-row justify-between items-center mt-3">
{/* right */} {/* right */}
<div className="flex flex-row items-center gap-x-1"> <div className="flex flex-row items-center gap-x-1">
<ProfilePicNextToEachOther <ProfilePicNextToEachOther num={3} />
num={3}
marginLeft={"3px"}
width={"w-10"}
/>
</div> </div>
{/* left */} {/* left */}
<div className="flex flex-row items-center gap-x-1"> <div className="flex flex-row items-center gap-x-1">
@ -93,7 +82,6 @@ const CardTrelloDesign = ({
</div> </div>
</div> </div>
)} )}
{showTag && {showTag &&
tags.map((tag) => ( tags.map((tag) => (
<NewTagDesign <NewTagDesign

@ -1,19 +1,10 @@
import React from "react"; import React from "react";
const CircleInCircle = ({ const CircleInCircle = ({ parentClassName, childClassName }) => {
parentWidth,
parentHeight,
chidlWidth,
chidlHeight,
parentBg,
childBg,
}) => {
return ( return (
<div <div className={` ${parentClassName} w-5 h-5 rounded-full relative `}>
className={` ${parentBg} ${parentWidth} ${parentHeight} rounded-full relative `}
>
<div <div
className={`${childBg} ${chidlWidth} ${chidlHeight} rounded-full absolute left-1/2 bottom-1/2 transform -translate-x-1/2 translate-y-1/2`} className={`${childClassName} w-2 h-2 rounded-full absolute left-1/2 bottom-1/2 transform -translate-x-1/2 translate-y-1/2`}
></div> ></div>
</div> </div>
); );
@ -22,10 +13,6 @@ const CircleInCircle = ({
export default CircleInCircle; export default CircleInCircle;
CircleInCircle.defaultProps = { CircleInCircle.defaultProps = {
parentWidth: "w-5", parentClassName: "bg-red-200",
parentHeight: "h-5", childClassName: "bg-red-600",
chidlWidth: "w-2",
chidlHeight: "h-2",
parentBg: "bg-red-200",
childBg: "bg-red-600",
}; };

@ -97,7 +97,7 @@ const PopupCard = ({ selectedChecklist, buttons }) => {
<span className="text-sm mr-2">چک لیست ها</span> <span className="text-sm mr-2">چک لیست ها</span>
</div> </div>
{/* progress bar */} {/* progress bar */}
<div className="flex flex-row items-center mt-3"> <div className="flex flex-row items-center my-3">
<div className="bg-[#DBDBDB77] h-2 w-full rounded"> <div className="bg-[#DBDBDB77] h-2 w-full rounded">
<div <div
className="bg-[#06BACE] h-2 rounded transition delay-150" className="bg-[#06BACE] h-2 rounded transition delay-150"
@ -116,22 +116,24 @@ const PopupCard = ({ selectedChecklist, buttons }) => {
borderClassname={`border-2 border-[#06BACE] `} borderClassname={`border-2 border-[#06BACE] `}
inputClassname={`px-4 py-2 text-[#0F0543] focus:bg-white`} inputClassname={`px-4 py-2 text-[#0F0543] focus:bg-white`}
activePlaceholderClass={"text-[#06BACE] bg-white"} activePlaceholderClass={"text-[#06BACE] bg-white"}
/>{" "} />
{selectedChecklist.slice(0, 3).map((item, index) => ( <div className="mt-3">
<div key={index} className=""> {selectedChecklist.slice(0, 3).map((item, index) => (
<input <div key={index} className="">
disabled={checklist >= 100} <input
type="checkbox" disabled={checklist >= 100}
className="form-checkbox text-blue-500" type="checkbox"
onClick={(e) => className="form-checkbox text-blue-500"
e.target.checked onClick={(e) =>
? setChecklist(checklist + 10) e.target.checked
: setChecklist(checklist - 10) ? setChecklist(checklist + 10)
} : setChecklist(checklist - 10)
/> }
<span className="text-sm mr-2">{item.title}</span> />
</div> <span className="text-sm mr-2">{item.title}</span>
))} </div>
))}
</div>
</div> </div>
</div> </div>
{/* left */} {/* left */}
@ -169,10 +171,13 @@ const PopupCard = ({ selectedChecklist, buttons }) => {
</div> </div>
{/* divider */} {/* divider */}
<div className="border border-[#DBDBDB77] rounded my-5 w-full"></div> <div className="border border-[#DBDBDB77] rounded my-5 w-full"></div>
<span className="text-xs text-[#B3B3B3] mb-3 text-light "> <TitleSubtitle
پیوست ها title={false}
</span> subTitle={"پیوست ها"}
<div className="relative flex flex-row items-center justify-around border-2 border-dashed border-[#65A9FF] w-full p-4 rounded-md"> subtitleBorderClassName={""}
subtitleClassName={"text-[#B3B3B3]"}
/>
<div className="mt-3 relative flex flex-row items-center justify-around border-2 border-dashed border-[#65A9FF] w-full p-4 rounded-md">
<img src={documentCloud} alt="" /> <img src={documentCloud} alt="" />
<input <input
type="file" type="file"
@ -186,8 +191,6 @@ const PopupCard = ({ selectedChecklist, buttons }) => {
</span> </span>
</p> </p>
</div> </div>
{/* divider */}
<div className="border border-[#DBDBDB77] rounded my-5 w-full"></div>
</div> </div>
</div> </div>
</div> </div>

@ -15,7 +15,7 @@ const TimeLineComponent = ({ data }) => {
<div className="px-10 py-4 mx-auto bg-white"> <div className="px-10 py-4 mx-auto bg-white">
<div className="flex flex-row items-start justify-between"> <div className="flex flex-row items-start justify-between">
<div> <div>
<TitleSubtitle subTitle={false} titleBorderClassName={"ml-2"} /> <TitleSubtitle subTitle={false} />
<SelectYear /> <SelectYear />
</div> </div>
<div className="flex-1"> <div className="flex-1">

Loading…
Cancel
Save