Skip to content

Commit

Permalink
Merge pull request #28 from CDC-IITDH/parikshit
Browse files Browse the repository at this point in the history
made changes in teams page
  • Loading branch information
JayaSurya-27 authored Jul 10, 2024
2 parents 5dade4f + 7d0e865 commit d4c9ec9
Show file tree
Hide file tree
Showing 6 changed files with 63 additions and 28 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/team/ankit_v_k.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 23 additions & 7 deletions src/component/Pages/menteacher/First.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import React from "react";
import { Link } from "react-router-dom";

import defaultProfileImage from "../../../assets/img/team/default-avatar-profile.jpg";
import facultyInChargeImage from "../../../assets/img/team/Satya_Priya_Image.jpeg";
import facultyInChargeImage1 from "../../../assets/img/team/Satya_Priya_Image.jpeg";
import facultyInChargeImage2 from "../../../assets/img/team/ankit_v_k.JPG";

import facultyAdvisorsImage1 from "../../../assets/img/team/Vandana_Bharti_Image.jpeg";
import facultyAdvisorsImage2 from "../../../assets/img/team/Sairam_Boggavarapu_Image.jpeg";
Expand All @@ -22,16 +23,24 @@ function First() {
name: "Prof. Satyapriya Gupta",
role: "Assistant Professor",
dept: "Dept. of Mechanical, Materials and Aerospace Engineering",
image: facultyInChargeImage,
image: facultyInChargeImage1,
phone: "+91 88268 24591",
mail: "cdcfic@iitdh.ac.in",
},
{
name: "Prof. Aniket Vasantrao Kataware",
role: "Assistant Professor",
dept: "Dept. of Civil & Infrastructure Engineering",
image: facultyInChargeImage2,
phone: "",
mail: "aniket.kataware@iitdh.ac.in",
},
];

const placementExecutive = [
{
name: "Sameer Joshi",
role: "",
role: "Placement Executive",
image: placementExecutiveImage,
phone: "+91 85533 16439",
mail: "sameerjoshi@iitdh.ac.in",
Expand Down Expand Up @@ -427,12 +436,12 @@ function First() {
}}
>
<div className="card col-md-6">
<div className="card-body">
<div className="card-body" style={{ height: "80vh" }}>
<h3 className="text-center">Senior Coordinators</h3>
<div className="row">
{seniorCoordinators.map((member, index) => (
<div key={index} className="row">
<div className="single-team">
<div key={index}>
<div className="single-team" style={{ height: "12vh" }}>
<div
className="team-info"
style={{
Expand All @@ -441,7 +450,14 @@ function First() {
justifyContent: " center",
}}
>
<h4 style={{ flex: 1 }}>
<h4
style={{
flex: 1,
display: "flex",
justifyContent: "center",
alignItems: "center",
}}
>
<Link to="#">{member.name}</Link>
</h4>
<div className="team-social" style={{ flex: 1 }}>
Expand Down
22 changes: 12 additions & 10 deletions src/component/TwitterTimeline/Main.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import React, { useEffect } from 'react';
import React, { useEffect } from "react";

const TwitterTimeline = () => {
useEffect(() => {
const script = document.createElement('script');
script.src = 'https://platform.twitter.com/widgets.js';
const script = document.createElement("script");
script.src = "https://platform.twitter.com/widgets.js";
script.async = true;
script.charset = 'utf-8';
script.charset = "utf-8";

// Append the script to the body to load it
document.body.appendChild(script);
Expand All @@ -17,12 +17,14 @@ const TwitterTimeline = () => {
}, []);

return (
<a
className="twitter-timeline"
href="https://twitter.com/cdc_iitdh?ref_src=twsrc%5Etfw"
>
Tweets by cdc_iitdh
</a>
<>
<a
className="twitter-timeline"
href="https://twitter.com/cdc_iitdh?ref_src=twsrc%5Etfw"
>
Tweets by cdc_iitdh
</a>
</>
);
};

Expand Down
16 changes: 13 additions & 3 deletions src/component/contact/Main.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import Form from "../mencontact/Form";
import { Link } from "react-router-dom";

import defaultProfileImage from "../../assets/img/team/default-avatar-profile.jpg";
import facultyInChargeImage from "../../assets/img/team/Satya_Priya_Image.jpeg";
import facultyInChargeImage1 from "../../assets/img/team/Satya_Priya_Image.jpeg";
import facultyInChargeImage2 from "../../assets/img/team/ankit_v_k.JPG";

import teamMemberImage1 from "../../assets/img/team/srihari.jpeg";
import teamMemberImage2 from "../../assets/img/team/agrim.jpeg";
Expand All @@ -20,11 +21,20 @@ function Main() {
name: "Prof. Satyapriya Gupta",
role: "Assistant Professor",
dept: "Dept. of Mechanical, Materials and Aerospace Engineering",
image: facultyInChargeImage,
image: facultyInChargeImage1,
phone: "+91 88268 24591",
mail: "cdcfic@iitdh.ac.in",
position: "Faculty In Charge",
},
{
name: "Prof. Aniket Vasantrao Kataware",
role: "Assistant Professor",
dept: "Dept. of Civil & Infrastructure Engineering",
image: facultyInChargeImage2,
phone: "",
mail: "aniket.kataware@iitdh.ac.in",
position: "Faculty In Charge",
},

{
name: "Sameer Joshi",
Expand Down Expand Up @@ -74,7 +84,7 @@ function Main() {
<div className="col">
<div className="row">
{facultyMembers.map((member, index) => (
<div key={index} className="col-md-6 col-12">
<div key={index} className="col-md-4 col-12">
<div
className="single-team mb-40"
style={{ minHeight: "350px" }}
Expand Down
23 changes: 15 additions & 8 deletions src/component/menhome/Blog.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React from "react";
import { Link } from "react-router-dom";
import blogs from "../../data/blogs.json";
import TwitterTimeline from "../TwitterTimeline/Main";
import TPO_ad from "../../assets/img/TPO/Advertisement_TPO_page-0001.jpg";
function Blog() {
const images = require.context("./../../assets/img/blogs/", true);
const sortedBlogs = blogs
Expand Down Expand Up @@ -54,7 +55,10 @@ function Blog() {
<i className="fal fa-calendar-alt" /> {blog.date}
</div>
</div>
<div className="blog-content2" style={{minHeight:"250px"}}>
<div
className="blog-content2"
style={{ minHeight: "250px" }}
>
<div className="b-meta">
<div className="meta-info">
<ul>
Expand All @@ -67,15 +71,18 @@ function Blog() {
</ul>
</div>
</div>
<h4 style={{height: '60px', overflow: 'hidden'}}>
<h4 style={{ height: "60px", overflow: "hidden" }}>
<Link to={`/blog-details/${blog.id}`}>
{blog.title}
</Link>
</h4>
<p style={{height: '70px', overflow: 'hidden'}}>
<p style={{ height: "70px", overflow: "hidden" }}>
{blog.description.split(" ").slice(0, 11).join(" ")}
</p>
<div className="blog-btn" style={{position: 'absolute', bottom: '10px'}}>
<div
className="blog-btn"
style={{ position: "absolute", bottom: "10px" }}
>
<Link to={`/blog-details/${blog.id}`}>
Read More <i className="fal fa-long-arrow-right" />
</Link>
Expand Down Expand Up @@ -166,13 +173,13 @@ function Blog() {
</div>
</div> */}
</div>
<TwitterTimeline/>
<TwitterTimeline />
<div className="container mt-40">
<img src={TPO_ad} alt="" />
</div>
</div>

</section>
</>
);
}
export default Blog;


0 comments on commit d4c9ec9

Please sign in to comment.