Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
93c5758
Merge pull request #158 from MicrosoftStudentChapter/pre-final
MankiratSingh1315 Aug 27, 2024
e1bab27
Merge pull request #160 from MicrosoftStudentChapter/pre-final
MankiratSingh1315 Aug 27, 2024
d6165cb
changes
vishnu1345 Aug 27, 2024
2651fdd
Merge pull request #161 from vishnu1345/pre-final
MankiratSingh1315 Aug 27, 2024
275d113
Update index.html
MankiratSingh1315 Aug 27, 2024
8e8c986
changes in about and team
Sep 3, 2024
e6c3dd1
Merge pull request #1 from divitdua/divit
divitdua Sep 3, 2024
78edf4d
bg fixed to 1e1e1e
Sep 3, 2024
8e6808f
Merge pull request #2 from divitdua/divit
divitdua Sep 3, 2024
6006efc
edited core list
Sep 14, 2024
ac2a570
Updated Executive Members list
Sep 14, 2024
a146d1b
Merge pull request #3 from divitdua/divit
divitdua Sep 14, 2024
3344a65
Merge pull request #167 from divitdua/main
Lakshay229 Sep 17, 2024
3df7214
Updated Executive member list 2.0
Sep 19, 2024
d5f678a
Merge pull request #168 from divitdua/divit
JeevantVerma Sep 19, 2024
5f05449
Fixed Alumni page
JeevantVerma Oct 13, 2024
8b07c56
Merge pull request #169 from JeevantVerma/main
SanyamWadhwa07 Oct 14, 2024
076eab8
alumni navigation fixed
vishnu1345 Oct 30, 2024
ead92de
projectheading color fixed
vishnu1345 Oct 30, 2024
d1c5567
sponsors animation fixed
vishnu1345 Oct 30, 2024
4ef9e5c
team list updated
vishnu1345 Oct 30, 2024
e810324
Merge pull request #170 from vishnu1345/main
JeevantVerma Oct 30, 2024
cedf197
changed Preksha di's pic
JeevantVerma Oct 30, 2024
96b8a44
Merge pull request #171 from JeevantVerma/main
JeevantVerma Oct 30, 2024
6e43817
Website Updated
Lakshay229 Jan 22, 2025
ba91537
Merge branch 'main' into pre-final
Lakshay229 Jan 22, 2025
77cb0b1
Merge pull request #174 from Lakshay229/pre-final
JeevantVerma Jan 22, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions components/NavbarI/NavbarI.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ const NavbarI = () => {
<Link data-tooltip-content="About" className={`my-anchor-element ${location.pathname === "/about" && 'active'}`} to={'/about'}>
<AiOutlineInfoCircle size={25} />
</Link>
{/* <Link data-tooltip-content="Community" className={`my-anchor-element ${location.pathname === "/community" && 'active'}`} to={'/community'}>
<Link data-tooltip-content="Alumni" className={`my-anchor-element ${location.pathname === "/alumni" && 'active'}`} to={'/alumni'}>
<RiCommunityLine size={25} />
</Link> */}
</Link>
<a className='show-on-phone dropup' ref={closeRef} href="#">
<div id="drop-up-icon">
<IoIosArrowDropup onClick={checkClosingDropUp} size={25} />
Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Vite + React</title>
<title>MLSC TIET</title>
</head>
<body>
<div id="root"></div>
Expand Down
535 changes: 117 additions & 418 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,9 @@
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react-refresh": "^0.4.7",
"vite": "^5.3.1"
},
"optionalDependencies": {
"@rollup/rollup-linux-x64-gnu": "^4.21.1",
"@rollup/rollup-linux-x64-musl": "^4.21.1"
}
}
Binary file modified public/EB-Photos/Preksha_Jain.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/EB-Photos/Tanmay_Mann.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Events from "./Pages/Events";
import Gallery from "./Pages/Gallery";
import LandingPage from "./Pages/LandingPage";
import OurTeam from "./Pages/OurTeam";
// import Alumni from "./Pages/Alumni";
import Alumni from "./Pages/Alumni";
import React from "react";
import { BrowserRouter as Router, Route, Routes } from "react-router-dom";
import AboutUs from "./Pages/AboutUs";
Expand All @@ -19,7 +19,7 @@ function App() {
<Route exact path="/" element={<LandingPage />} />
<Route path="/events" element={<Events />} />
<Route path="/gallery" element={<Gallery />} />
{/* <Route path="/alumni" element={<Alumni />} /> */}
<Route path="/alumni" element={<Alumni />} />
<Route path="/team" element={<OurTeam />} />
<Route path="/about" element={<AboutUs />} />
<Route path="/sponsors" element={<Sponsors/>} />
Expand Down
4 changes: 2 additions & 2 deletions src/Components/NavbarI/NavbarI.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ const NavbarI = () => {
<Link data-tooltip-content="About" className={`my-anchor-element ${location.pathname === "/about" && 'active'}`} to={'/about'}>
<AiOutlineInfoCircle size={25} />
</Link>
{/* <Link data-tooltip-content="Alumni" className={`my-anchor-element ${location.pathname === "/alumni" && 'active'}`} to={'/alumni'}>
<Link data-tooltip-content="Alumni" className={`my-anchor-element ${location.pathname === "/alumni" && 'active'}`} to={'/alumni'}>
<RiCommunityLine size={25} />
</Link> */}
</Link>
<a className='show-on-phone dropup' ref={closeRef} href="#">
<div id="drop-up-icon">
<IoIosArrowDropup onClick={checkClosingDropUp} size={25} />
Expand Down
2 changes: 1 addition & 1 deletion src/Pages/AboutUs/components/bg.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
width:100vw;
grid-area:1/1;
z-index:10;
background-color:black;
background-color:#1e1e1e;
clip-path: polygon(0 0, 100% 0, 100% 100%, 0% 100%);

top:0;
Expand Down
17 changes: 12 additions & 5 deletions src/Pages/AboutUs/components/projects.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const Projects = (props) => {
, "An app designed for Makeathon 6, featuring a mentor calling system that connects participants with domain-specific mentors, ensuring expert guidance and streamlined support during the 24-hour hackathon."
, "The Recruitment Quiz Portal is a specialized platform used during the MLSC recruitment process. It administers quizzes to assess candidates' knowledge and skills, streamlining the evaluation and selection process."
];
const links = ["https://github.com/MicrosoftStudentChapter/Linky.git", "https://github.com/MicrosoftStudentChapter/IRC-Server.git", "https://github.com/MicrosoftStudentChapter/MLSC-ChatBot.git", "https://github.com/MicrosoftStudentChapter/makeathon6-app.git", ""];
const links = ["https://generate.mlsctiet.com/", "https://github.com/MicrosoftStudentChapter/IRC-Server.git", "https://github.com/MicrosoftStudentChapter/MLSC-ChatBot.git", "https://github.com/MicrosoftStudentChapter/makeathon6-app.git", ""];

const [activeIndex, setActiveIndex] = useState(0);
const [hoveredIndex, setHoveredIndex] = useState(0);
Expand Down Expand Up @@ -123,7 +123,7 @@ const Projects = (props) => {
handleClick(index);
onMouseEnter(index);
}}
className={clickedIndex === index ? style.whiteText : ""}
className={clickedIndex === index ? style.whiteText : style.grayText}
>
{title[index]}
</p>
Expand All @@ -143,16 +143,23 @@ const Projects = (props) => {
onClick={() => handleAccordionClick(index)}
style={{ height: activeIndex === index ? contentHeight + 40 : 40 }}
>
<p ref={el => (paraRef.current[index] = el)}>
<p ref={el => (paraRef.current[index] = el)}
className={clickedIndex === index ? style.whiteText : style.grayText}
>
{title[index]}
</p>
<div
ref={el => (contentRef.current[index] = el)}
className={style.accordionContent}
>
<div className={style.accordianDiv}>
<div className={style.projectimage}>
<img src={Images[index]} alt="error" className={style.accordianimg} />
<div className={style.linksection}>
<div className={style.projectimage}>
<img src={Images[index]} alt="error" className={style.accordianimg} />
</div>
<a href={links[index]} target="_blank" rel="noopener noreferrer">
<button className={style.redirectButton}>Link</button>
</a>
</div>
<span> {description[index]}</span>
</div>
Expand Down
22 changes: 20 additions & 2 deletions src/Pages/AboutUs/components/projects.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
width:100vw;
position:absolute;
z-index:10;
background-color:black;
background-color:#1e1e1e;
clip-path: polygon(0 0, 100% 0, 100% 100%, 0% 100%);

top:0;
Expand Down Expand Up @@ -47,20 +47,24 @@
margin-left: 75px;
cursor: pointer;
}
.grayText{
color: gray;
}
.projectHeading p{
font-size: 2.5rem;
margin-top: 31px;
margin-left: 32px;
/* color: gray; */

}
.projectHeading p:active{
color: white;
}
.projectHeading p:hover{

color: white;
}
.whiteText{
/* color: red; */
color: white;
}
.projecth{
Expand Down Expand Up @@ -197,4 +201,18 @@
justify-content: center;
align-items: center;
}
.redirectButton{
/* margin-left: 40px; */
padding: 5px;
background-color: #0078D4;
color: white;
border: none;
border-radius: 5px;
}
.linksection{
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}
}
2 changes: 1 addition & 1 deletion src/Pages/AboutUs/index.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ html,
body{
height: 100%;
width: 100%;
background-color: black;
background-color: #1E1E1E;
}

.wrapper{
Expand Down
Binary file added src/Pages/Alumni/Assets/2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/Pages/Alumni/Components/ScrollCenter.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import styles from "../Style/scroll.module.css";
import ProfileCards from './ProfileCards';
import YearSelector from './YearSelector';
import AlumniSvg from "../Assets/alumni_vector.svg";
import MeetVector from "../Assets/meet_vector.svg";
import MeetVector from "../Assets/2.png";

const imageData = [
{
Expand Down
68 changes: 34 additions & 34 deletions src/Pages/Alumni/Style/card.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@

.box {
position: relative;
width: 30rem;
height: 40rem;
margin: 4rem;
width: 20rem;
height: 27rem;
margin: 3rem;
/* font-size: 62.5%; */

}
Expand All @@ -49,8 +49,8 @@
}

.imgBox img {
width: 30rem;
height: 40rem;
width: 20rem;
height: 27rem;
object-fit: cover;
resize: both;
}
Expand All @@ -61,7 +61,7 @@
left: 0;
width: 100%;
height: 100%;
padding: 1.5rem;
padding: 1rem;
display: flex;
justify-content: center;
background-color: #fff;
Expand All @@ -75,7 +75,7 @@

.content h2 {
display: block;
font-size: 2rem;
font-size: 1.3rem;
color: #111;
font-weight: 1000;
line-height: 2rem;
Expand All @@ -84,7 +84,7 @@

.content span {
color: #555;
font-size: 1.4rem;
font-size: 0.9rem;
font-weight: 300;
letter-spacing: 2px;
}
Expand Down Expand Up @@ -112,14 +112,14 @@
@media (max-width: 1500px) {
.content span {
color: #555;
font-size: 1rem;
font-size: 0.6rem;
font-weight: 300;
letter-spacing: 2px;
}

.content h2 {
display: block;
font-size: 1.5rem;
font-size: 1rem;
color: #111;
font-weight: 1000;
line-height: 2rem;
Expand All @@ -139,9 +139,9 @@

.box {
position: relative;
width: 25rem;
height: 35rem;
margin: 4rem;
width: 17rem;
height: 23rem;
margin: 3rem;
}

.box:hover .imgBox {
Expand All @@ -163,8 +163,8 @@
}

.imgBox img {
width: 25rem;
height: 35rem;
width: 17rem;
height: 23rem;
object-fit: cover;
resize: both;
}
Expand Down Expand Up @@ -192,7 +192,7 @@
@media (max-width: 1200px) {
.content span {
color: #555;
font-size: 1rem;
font-size: 0.6rem;
font-weight: 200;
letter-spacing: 2px;
}
Expand All @@ -203,15 +203,15 @@

.content span {
color: #555;
font-size: 1rem;
font-size: 0.6rem;
font-weight: 200;
letter-spacing: 2px;
}


.content h2 {
display: block;
font-size: 1.2rem;
font-size: 0.8rem;
color: #111;
font-weight: 1000;
line-height: 2rem;
Expand Down Expand Up @@ -242,9 +242,9 @@

.box {
position: relative;
width: 25rem;
height: 35rem;
margin: 4rem;
width: 17rem;
height: 23rem;
margin: 3rem;
}

.box:hover .imgBox {
Expand All @@ -266,8 +266,8 @@
}

.imgBox img {
width: 25rem;
height: 35rem;
width: 17rem;
height: 23rem;
object-fit: cover;
resize: both;
}
Expand All @@ -276,8 +276,8 @@
position: absolute;
top: 0;
left: 0;
width: 25rem;
height: 35rem;
width: 17rem;
height: 23rem;
padding: 1.5rem;
display: flex;
justify-content: center;
Expand All @@ -294,14 +294,14 @@
@media (max-width: 400px) {
.content span {
color: #555;
font-size: 0.7rem;
font-size: 0.45rem;
font-weight: 200;
letter-spacing: 2px;
}

.content h2 {
display: block;
font-size: 1rem;
font-size: 0.6rem;
color: #111;
font-weight: 1000;
line-height: 2rem;
Expand Down Expand Up @@ -332,9 +332,9 @@

.box {
position: relative;
width: 20rem;
height: 30rem;
margin: 4rem;
width: 13rem;
height: 20rem;
margin: 3rem;
}

.box:hover .imgBox {
Expand All @@ -356,8 +356,8 @@
}

.imgBox img {
width: 20rem;
height: 30rem;
width: 13rem;
height: 20rem;
object-fit: cover;
resize: both;
}
Expand All @@ -366,8 +366,8 @@
position: absolute;
top: 0;
left: 0;
width: 20rem;
height: 30rem;
width: 13rem;
height: 20rem;
padding: 1.5rem;
display: flex;
justify-content: center;
Expand Down
Loading
Loading