Skip to content

Commit

Permalink
Committing before modifying architeture
Browse files Browse the repository at this point in the history
  • Loading branch information
@jaison080
jaison080 committed Dec 31, 2022
1 parent bc0130d commit 2e7eff4
Show file tree
Hide file tree
Showing 3 changed files with 103 additions and 105 deletions.
42 changes: 23 additions & 19 deletions src/Components/Team/Team.js
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,40 @@
import "./Team.scss";
import TeamCard from "./TeamCard";
import animation from "../../animations/test.json";
import Lottie from "react-lottie";
// import animation from "../../animations/test.json";
// import Lottie from "react-lottie";
import bubble4 from "../../assets/bubble_4.svg";
import bubble5 from "../../assets/bubble_5.svg";
import { useHistory } from "react-router-dom";
import core from "../../data/core";
const Team = () => {
const history = useHistory();
const defaultOptions = {
loop: true,
autoplay: true,
animationData: animation,
rendererSettings: { preserveAspectRatio: "xMidYMid slice" },
};
// const defaultOptions = {
// loop: true,
// autoplay: true,
// animationData: animation,
// rendererSettings: { preserveAspectRatio: "xMidYMid slice" },
// };
return (
<>
<div className="team_main">
<div className="tech_team_info">
<div
className="heading_team"
data-aos="fade-up"
data-aos-duration="2000"
>
OUR TEAM
</div>
<img src={bubble4} alt="" className="bubble_4" />
<div className="team" data-aos="fade-up" data-aos-duration="2000">
<div
className="members__div"
data-aos="fade-up"
data-aos-duration="2000"
>
<img src={bubble4} alt="" className="bubble_4" />
<TeamCard data={core} />
</div>

<img src={bubble5} alt="" className="bubble_5" />
<div
{/* <div
className="team__anime"
data-aos="fade-up"
data-aos-duration="2000"
Expand All @@ -40,18 +45,17 @@ const Team = () => {
autoPlay={true}
options={defaultOptions}
/>
</div>
<button
</div> */}
<div
onClick={() => {
history.push("/team");
}}
type="button"
style={{ marginBottom: "2rem" }}
style={{ marginBottom: "2rem", marginTop: "2rem", cursor: "pointer" }}
className="btn btn-danger"
>
View All
</button>
<div
</div>
{/* <div
className="team__anime-1"
data-aos="fade-up"
data-aos-duration="2000"
Expand All @@ -62,7 +66,7 @@ const Team = () => {
autoPlay={true}
options={defaultOptions}
/>
</div>
</div> */}
</div>
</>
);
Expand Down
2 changes: 0 additions & 2 deletions src/Components/Team/Team.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@
justify-content: center;
text-align: center;
flex-wrap: wrap;
padding-right: 18%;
padding-bottom: 3%;
width: 80%;
column-gap: 5rem;
row-gap: 3rem;
}
Expand Down
164 changes: 80 additions & 84 deletions src/Pages/DeveloperDetail/DeveloperDetails.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,114 +63,110 @@ function DeveloperDetails() {
}}
/>
<div className="developer_details_navbar_1">
<div className="developer_image_div">
<img
className="developer_image"
src={
selectedUser.profilePhoto ||
"https://sabt.center/wp-content/uploads/2014/08/avatar-1.png"
}
alt=""
/>
</div>
<div className="developer_details">
<div className="developer_details_header">
<div className="developer_name">{selectedUser.name}</div>
<div className="developer_icons">
{selectedUser.website ? (
<a
href={selectedUser.website}
target="_blank"
rel="noreferrer"
>
<TbNetwork size={33} color="#9e0000" />
</a>
) : (
""
)}
{currentUser ? (
selectedUser.contact ? (
<div className="developer_image_div">
<img
className="developer_image"
src={
selectedUser.profilePhoto ||
"https://sabt.center/wp-content/uploads/2014/08/avatar-1.png"
}
alt=""
/>
</div>
<div className="developer_details">
<div className="developer_details_header">
<div className="developer_name">{selectedUser.name}</div>
<div className="developer_icons">
{selectedUser.website ? (
<a
href={`tel:+91${selectedUser?.contact}`}
href={selectedUser.website}
target="_blank"
rel="noreferrer"
>
<FaPhoneAlt
color="#deb8b8"
size={35}
style={{
backgroundColor: "#9e0000",
borderRadius: "50%",
padding: "8px",
}}
/>
<TbNetwork size={33} color="#9e0000" />
</a>
) : (
""
)
) : (
null
)}
{currentUser ? (
selectedUser.email ? (
)}
{currentUser ? (
selectedUser.contact ? (
<a
href={`tel:+91${selectedUser?.contact}`}
target="_blank"
rel="noreferrer"
>
<FaPhoneAlt
color="#deb8b8"
size={35}
style={{
backgroundColor: "#9e0000",
borderRadius: "50%",
padding: "8px",
}}
/>
</a>
) : (
""
)
) : null}
{currentUser ? (
selectedUser.email ? (
<a
href={`mailto:${selectedUser?.email}`}
target="_blank"
rel="noreferrer"
>
<IoMdMail color="#9e0000" size={45} />
</a>
) : (
""
)
) : null}

{selectedUser.linkedin ? (
<a
href={`mailto:${selectedUser?.email}`}
href={selectedUser?.linkedin}
target="_blank"
rel="noreferrer"
>
<IoMdMail color="#9e0000" size={45} />
<FaLinkedin color="#9e0000" size={35} />
</a>
) : (
""
)
) : (
null
)}

{selectedUser.linkedin ? (
<a
href={selectedUser?.linkedin}
target="_blank"
rel="noreferrer"
>
<FaLinkedin color="#9e0000" size={35} />
</a>
)}
{selectedUser.github ? (
<a
href={selectedUser?.github}
target="_blank"
rel="noreferrer"
>
<GoMarkGithub color="#9e0000" size={35} />
</a>
) : (
" "
)}
</div>
</div>
<div className="developer_class">
{selectedUser.branch || selectedUser.year ? (
<>
<FaGraduationCap size={28} />
<div>
{selectedUser.branch} {selectedUser.year}
</div>
</>
) : (
""
)}
{selectedUser.github ? (
<a
href={selectedUser?.github}
target="_blank"
rel="noreferrer"
>
<GoMarkGithub color="#9e0000" size={35} />
</a>
) : (
" "
)}
</div>
</div>
<div className="developer_class">
{selectedUser.branch || selectedUser.year ? (
<>
<FaGraduationCap size={28} />
<div>
{selectedUser.branch} {selectedUser.year}
</div>
</>
{selectedUser.about ? (
<div className="developer_bio">{selectedUser.about}</div>
) : (
""
)}
</div>
{selectedUser.about ? (
<div className="developer_bio">{selectedUser.about}</div>
) : (
""
)}
</div>
</div>
</div>
<div className="developer_details_body">
<div className="developer_details_body_left">
<Lottie
Expand Down

0 comments on commit 2e7eff4

Please sign in to comment.