update 5 files and delete 3 files

master
mahdi 2 years ago
parent 0993531ebf
commit a9fb3cfb4c
  1. 16
      src/components/Avatar/UserProfileInfo/index.js
  2. 2
      src/components/Avatar/index.js
  3. 7
      src/components/TestComponentNew/index.js
  4. 0
      src/components/TestComponentNew/index.scss
  5. 4
      src/components/Timeline/TimeLine1/TimeLineItem.js
  6. 2
      src/components/Timeline/TimeLine1/Timeline.js
  7. 43
      src/components/Timeline/TimeLine1/data.js
  8. 10
      src/components/Timeline/TimeLine1/index.js

@ -1,8 +1,6 @@
import React from "react"; import React from "react";
import DistributedData from "../DistributedData";
import ProfileInfo from "../ProfileInfo"; import ProfileInfo from "../ProfileInfo";
import DateTime from "../DateTime"; import DateTime from "../../CurrentDateTime/DateTime";
const UserProfileInfo = () => { const UserProfileInfo = () => {
return ( return (
@ -18,15 +16,3 @@ const UserProfileInfo = () => {
}; };
export default UserProfileInfo; export default UserProfileInfo;
// <DistributedData
// items={[
// [
// {
// name: <DateTime />,
// number: null,
// },
// { name: <ProfileInfo />, number: null },
// ],
// ]}
// />

@ -2,11 +2,13 @@ import React, { useState } from "react";
import ProfileInfo from "./ProfileInfo"; import ProfileInfo from "./ProfileInfo";
import ProfilePicNextToEachOther from "./ProfilePicNextToEachOther"; import ProfilePicNextToEachOther from "./ProfilePicNextToEachOther";
import UserProfileInfo from "./UserProfileInfo";
function Avatar() { function Avatar() {
const list = { const list = {
1: <ProfileInfo />, 1: <ProfileInfo />,
2: <ProfilePicNextToEachOther />, 2: <ProfilePicNextToEachOther />,
3: <UserProfileInfo />,
}; };
const [type, setType] = useState(1); const [type, setType] = useState(1);
return ( return (

@ -1,7 +0,0 @@
import React from "react";
const TestComponentNew = () => {
return <div>TestComponentNew</div>;
};
export default TestComponentNew;

@ -1,5 +1,5 @@
import CircleInCircle from "../../"; import CircleInCircle from "../../MiniComponents/CircleInCircle";
import ProfilePicNextToEachOther from "../ProfilePicNextToEachOther"; import ProfilePicNextToEachOther from "../../Avatar/ProfilePicNextToEachOther";
const TimeLineItem = ({ data }) => ( const TimeLineItem = ({ data }) => (
<div <div

@ -5,7 +5,7 @@ import TimeLineItem from "./TimeLineItem.js";
const TimeLine1 = () => const TimeLine1 = () =>
timeLineData.length > 0 && ( timeLineData.length > 0 && (
<div className="timeline-container flex flex-col relative my-10"> <div className="timeline-container flex flex-col relative my-10">
{timeLineData.slice(0, 6).map((data, idx) => ( {timeLineData.slice(0, 6).map((data, idx) => (
<TimeLineItem data={data} key={idx} /> <TimeLineItem data={data} key={idx} />
))} ))}

@ -1,6 +1,3 @@
import profilePic1 from "./profilePic1.svg";
import profilePic2 from "./profilePic2.svg";
const data = [ const data = [
{ {
date: "1400/12/28", date: "1400/12/28",
@ -15,32 +12,32 @@ const data = [
{ {
name: "علی", name: "علی",
lname: "علوی", lname: "علوی",
profilePic: profilePic2, profilePic: "images/TimeLine1profilePic1.svg",
}, },
{ {
name: "غلام", name: "غلام",
lname: "قلی نژاد", lname: "قلی نژاد",
profilePic: profilePic1, profilePic: "images/TimeLine1profilePic2.svg",
}, },
{ {
name: "علی", name: "علی",
lname: "علوی", lname: "علوی",
profilePic: profilePic2, profilePic: "images/TimeLine1profilePic1.svg",
}, },
{ {
name: "غلام", name: "غلام",
lname: "قلی نژاد", lname: "قلی نژاد",
profilePic: profilePic1, profilePic: "images/TimeLine1profilePic2.svg",
}, },
{ {
name: "علی", name: "علی",
lname: "علوی", lname: "علوی",
profilePic: profilePic2, profilePic: "images/TimeLine1profilePic1.svg",
}, },
{ {
name: "غلام", name: "غلام",
lname: "قلی نژاد", lname: "قلی نژاد",
profilePic: profilePic1, profilePic: "images/TimeLine1profilePic2.svg",
}, },
], ],
}, },
@ -57,22 +54,22 @@ const data = [
{ {
name: "غلام", name: "غلام",
lname: "قلی نژاد", lname: "قلی نژاد",
profilePic: profilePic1, profilePic: "images/TimeLine1profilePic2.svg",
}, },
{ {
name: "علی", name: "علی",
lname: "علوی", lname: "علوی",
profilePic: profilePic2, profilePic: "images/TimeLine1profilePic1.svg",
}, },
{ {
name: "غلام", name: "غلام",
lname: "قلی نژاد", lname: "قلی نژاد",
profilePic: profilePic1, profilePic: "images/TimeLine1profilePic2.svg",
}, },
{ {
name: "علی", name: "علی",
lname: "علوی", lname: "علوی",
profilePic: profilePic2, profilePic: "images/TimeLine1profilePic1.svg",
}, },
], ],
}, },
@ -89,32 +86,32 @@ const data = [
{ {
name: "علی", name: "علی",
lname: "علوی", lname: "علوی",
profilePic: profilePic2, profilePic: "images/TimeLine1profilePic1.svg",
}, },
{ {
name: "غلام", name: "غلام",
lname: "قلی نژاد", lname: "قلی نژاد",
profilePic: profilePic1, profilePic: "images/TimeLine1profilePic2.svg",
}, },
{ {
name: "علی", name: "علی",
lname: "علوی", lname: "علوی",
profilePic: profilePic2, profilePic: "images/TimeLine1profilePic1.svg",
}, },
{ {
name: "غلام", name: "غلام",
lname: "قلی نژاد", lname: "قلی نژاد",
profilePic: profilePic1, profilePic: "images/TimeLine1profilePic2.svg",
}, },
{ {
name: "علی", name: "علی",
lname: "علوی", lname: "علوی",
profilePic: profilePic2, profilePic: "images/TimeLine1profilePic1.svg",
}, },
{ {
name: "غلام", name: "غلام",
lname: "قلی نژاد", lname: "قلی نژاد",
profilePic: profilePic1, profilePic: "images/TimeLine1profilePic2.svg",
}, },
], ],
}, },
@ -131,22 +128,22 @@ const data = [
{ {
name: "غلام", name: "غلام",
lname: "قلی نژاد", lname: "قلی نژاد",
profilePic: profilePic1, profilePic: "images/TimeLine1profilePic2.svg",
}, },
{ {
name: "علی", name: "علی",
lname: "علوی", lname: "علوی",
profilePic: profilePic2, profilePic: "images/TimeLine1profilePic1.svg",
}, },
{ {
name: "غلام", name: "غلام",
lname: "قلی نژاد", lname: "قلی نژاد",
profilePic: profilePic1, profilePic: "images/TimeLine1profilePic2.svg",
}, },
{ {
name: "علی", name: "علی",
lname: "علوی", lname: "علوی",
profilePic: profilePic2, profilePic: "images/TimeLine1profilePic1.svg",
}, },
], ],
}, },

@ -2,17 +2,16 @@
import React from "react"; import React from "react";
import SearchBox from "../SearchBox"; import SearchBox from "../../SearchDesign/SearchBox";
import TitleSubtitle from "../TitleSubtitle"; import TitleSubtitle from "../../MiniComponents/TitleSubtitle";
import Timeline from "./Timeline.js"; import Timeline from "./Timeline.js";
import search from "./gray-search-icon.svg"; import SelectYear from "../../MiniComponents/SelectYear";
import SelectYear from "../SelectYear";
const TimeLineComponent = ({ data }) => { const TimeLineComponent = ({ data }) => {
return ( return (
<div className="px-10 py-4 mx-auto bg-white"> <div className="w-full 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} /> <TitleSubtitle subTitle={false} />
@ -22,7 +21,6 @@ const TimeLineComponent = ({ data }) => {
<Timeline /> <Timeline />
</div> </div>
<SearchBox <SearchBox
searchIcon={search}
className={"border-[#ddd] focus:border-gray-200 focus:ring-gray-200"} className={"border-[#ddd] focus:border-gray-200 focus:ring-gray-200"}
/> />
</div> </div>

Loading…
Cancel
Save