diff --git a/src/components/UserProfileInfo/index.js b/src/components/Avatar/UserProfileInfo/index.js similarity index 56% rename from src/components/UserProfileInfo/index.js rename to src/components/Avatar/UserProfileInfo/index.js index 76360eb..8ed6c0c 100644 --- a/src/components/UserProfileInfo/index.js +++ b/src/components/Avatar/UserProfileInfo/index.js @@ -1,8 +1,6 @@ import React from "react"; -import DistributedData from "../DistributedData"; - import ProfileInfo from "../ProfileInfo"; -import DateTime from "../DateTime"; +import DateTime from "../../CurrentDateTime/DateTime"; const UserProfileInfo = () => { return ( @@ -18,15 +16,3 @@ const UserProfileInfo = () => { }; export default UserProfileInfo; - -// , -// number: null, -// }, -// { name: , number: null }, -// ], -// ]} -// /> diff --git a/src/components/Avatar/index.js b/src/components/Avatar/index.js index 9b55278..5e3a929 100644 --- a/src/components/Avatar/index.js +++ b/src/components/Avatar/index.js @@ -2,11 +2,13 @@ import React, { useState } from "react"; import ProfileInfo from "./ProfileInfo"; import ProfilePicNextToEachOther from "./ProfilePicNextToEachOther"; +import UserProfileInfo from "./UserProfileInfo"; function Avatar() { const list = { 1: , 2: , + 3: , }; const [type, setType] = useState(1); return ( diff --git a/src/components/TestComponentNew/index.js b/src/components/TestComponentNew/index.js deleted file mode 100644 index c4bee1c..0000000 --- a/src/components/TestComponentNew/index.js +++ /dev/null @@ -1,7 +0,0 @@ -import React from "react"; - -const TestComponentNew = () => { - return
TestComponentNew
; -}; - -export default TestComponentNew; diff --git a/src/components/TestComponentNew/index.scss b/src/components/TestComponentNew/index.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/components/Timeline/TimeLine1/TimeLineItem.js b/src/components/Timeline/TimeLine1/TimeLineItem.js index ee9de91..6168730 100644 --- a/src/components/Timeline/TimeLine1/TimeLineItem.js +++ b/src/components/Timeline/TimeLine1/TimeLineItem.js @@ -1,5 +1,5 @@ -import CircleInCircle from "../../"; -import ProfilePicNextToEachOther from "../ProfilePicNextToEachOther"; +import CircleInCircle from "../../MiniComponents/CircleInCircle"; +import ProfilePicNextToEachOther from "../../Avatar/ProfilePicNextToEachOther"; const TimeLineItem = ({ data }) => (
timeLineData.length > 0 && ( -
+
{timeLineData.slice(0, 6).map((data, idx) => ( ))} diff --git a/src/components/Timeline/TimeLine1/data.js b/src/components/Timeline/TimeLine1/data.js index c89b9ad..ea7426e 100644 --- a/src/components/Timeline/TimeLine1/data.js +++ b/src/components/Timeline/TimeLine1/data.js @@ -1,6 +1,3 @@ -import profilePic1 from "./profilePic1.svg"; -import profilePic2 from "./profilePic2.svg"; - const data = [ { date: "1400/12/28", @@ -15,32 +12,32 @@ const data = [ { name: "علی", lname: "علوی", - profilePic: profilePic2, + profilePic: "images/TimeLine1profilePic1.svg", }, { name: "غلام", lname: "قلی نژاد", - profilePic: profilePic1, + profilePic: "images/TimeLine1profilePic2.svg", }, { name: "علی", lname: "علوی", - profilePic: profilePic2, + profilePic: "images/TimeLine1profilePic1.svg", }, { name: "غلام", lname: "قلی نژاد", - profilePic: profilePic1, + profilePic: "images/TimeLine1profilePic2.svg", }, { name: "علی", lname: "علوی", - profilePic: profilePic2, + profilePic: "images/TimeLine1profilePic1.svg", }, { name: "غلام", lname: "قلی نژاد", - profilePic: profilePic1, + profilePic: "images/TimeLine1profilePic2.svg", }, ], }, @@ -57,22 +54,22 @@ const data = [ { name: "غلام", lname: "قلی نژاد", - profilePic: profilePic1, + profilePic: "images/TimeLine1profilePic2.svg", }, { name: "علی", lname: "علوی", - profilePic: profilePic2, + profilePic: "images/TimeLine1profilePic1.svg", }, { name: "غلام", lname: "قلی نژاد", - profilePic: profilePic1, + profilePic: "images/TimeLine1profilePic2.svg", }, { name: "علی", lname: "علوی", - profilePic: profilePic2, + profilePic: "images/TimeLine1profilePic1.svg", }, ], }, @@ -89,32 +86,32 @@ const data = [ { name: "علی", lname: "علوی", - profilePic: profilePic2, + profilePic: "images/TimeLine1profilePic1.svg", }, { name: "غلام", lname: "قلی نژاد", - profilePic: profilePic1, + profilePic: "images/TimeLine1profilePic2.svg", }, { name: "علی", lname: "علوی", - profilePic: profilePic2, + profilePic: "images/TimeLine1profilePic1.svg", }, { name: "غلام", lname: "قلی نژاد", - profilePic: profilePic1, + profilePic: "images/TimeLine1profilePic2.svg", }, { name: "علی", lname: "علوی", - profilePic: profilePic2, + profilePic: "images/TimeLine1profilePic1.svg", }, { name: "غلام", lname: "قلی نژاد", - profilePic: profilePic1, + profilePic: "images/TimeLine1profilePic2.svg", }, ], }, @@ -131,22 +128,22 @@ const data = [ { name: "غلام", lname: "قلی نژاد", - profilePic: profilePic1, + profilePic: "images/TimeLine1profilePic2.svg", }, { name: "علی", lname: "علوی", - profilePic: profilePic2, + profilePic: "images/TimeLine1profilePic1.svg", }, { name: "غلام", lname: "قلی نژاد", - profilePic: profilePic1, + profilePic: "images/TimeLine1profilePic2.svg", }, { name: "علی", lname: "علوی", - profilePic: profilePic2, + profilePic: "images/TimeLine1profilePic1.svg", }, ], }, diff --git a/src/components/Timeline/TimeLine1/index.js b/src/components/Timeline/TimeLine1/index.js index 2ec791b..e0a050e 100644 --- a/src/components/Timeline/TimeLine1/index.js +++ b/src/components/Timeline/TimeLine1/index.js @@ -2,17 +2,16 @@ import React from "react"; -import SearchBox from "../SearchBox"; -import TitleSubtitle from "../TitleSubtitle"; +import SearchBox from "../../SearchDesign/SearchBox"; +import TitleSubtitle from "../../MiniComponents/TitleSubtitle"; import Timeline from "./Timeline.js"; -import search from "./gray-search-icon.svg"; -import SelectYear from "../SelectYear"; +import SelectYear from "../../MiniComponents/SelectYear"; const TimeLineComponent = ({ data }) => { return ( -
+
@@ -22,7 +21,6 @@ const TimeLineComponent = ({ data }) => {