Skip to content

Jnc #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Savio629 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Jnc #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79e576c
ps page simplified change
jayesnc2512 Dec 18, 2023
7698a5c
Merge pull request #25 from jayesnc2512/main
Savio629 Dec 19, 2023
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
17 changes: 9 additions & 8 deletions build/asset-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
{
"files": {
"main.css": "/static/css/main.239df178.css",
"main.js": "/static/js/main.fafb9ad0.js",
"main.css": "/static/css/main.0ee06ba5.css",
"main.js": "/static/js/main.a69e9fa2.js",
"static/media/clg.jpg": "/static/media/clg.7ad148cfab5e629b1aed.jpg",
"static/media/csi-comp.JPG": "/static/media/csi-comp.f85f59bd803d3a4150ba.JPG",
"static/media/College.png": "/static/media/College.509c1e76693a76d208a9.png",
"static/media/bg-sound.mp3": "/static/media/bg-sound.156eb62c988807ef5800.mp3",
"static/media/waves.png": "/static/media/waves.03485d4dea5e11e359d8.png",
"static/media/csi-it.png": "/static/media/csi-it.bffd603148fced92d5ec.png",
"static/media/AboutTextBg.png": "/static/media/AboutTextBg.3164020a5f07dad37727.png",
"static/media/TimelineBg.png": "/static/media/TimelineBg.3164020a5f07dad37727.png",
"static/media/Rectangle 24.svg": "/static/media/Rectangle 24.d7f425f586ac615784ae81db16308952.svg",
"static/media/csilogo.png": "/static/media/csilogo.f60f0888a3530dc2a82a.png",
"static/media/logo.png": "/static/media/logo.3e87f7546c89f3f897f1.png",
"static/media/thumb1.jpg": "/static/media/thumb1.7e6242062209e1f0cd29.jpg",
"static/media/toggle.png": "/static/media/toggle.5aa66b42e5e4c6d32352.png",
"index.html": "/index.html",
"static/media/cancel_FILL0_wght400_GRAD0_opsz24.svg": "/static/media/cancel_FILL0_wght400_GRAD0_opsz24.1ff57ce6780d039fcce3508f0763e1b8.svg",
"main.239df178.css.map": "/static/css/main.239df178.css.map",
"main.fafb9ad0.js.map": "/static/js/main.fafb9ad0.js.map"
"main.0ee06ba5.css.map": "/static/css/main.0ee06ba5.css.map",
"main.a69e9fa2.js.map": "/static/js/main.a69e9fa2.js.map"
},
"entrypoints": [
"static/css/main.239df178.css",
"static/js/main.fafb9ad0.js"
"static/css/main.0ee06ba5.css",
"static/js/main.a69e9fa2.js"
]
}
2 changes: 1 addition & 1 deletion build/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous"><link rel="manifest" href="/manifest.json"><link rel="shortcut icon" href="/favicon.ico"><script src="https://kit.fontawesome.com/0a95f6b081.js" crossorigin="anonymous"></script><title>AGNETHON 1.0</title><script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.8/dist/umd/popper.min.js" integrity="sha384-I7E8VVD/ismYTF4hNIPjVp/Zjvgyol6VFvRkX/vR+Vc4jQkC+hVqc2pM8ODewa9r" crossorigin="anonymous"></script><script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.min.js" integrity="sha384-BBtl+eGJRgqQAUMxJ7pMwbEyER4l1g+O15P+16Ep7Q9Q+zqX6gSbd85u4mG4QzX+" crossorigin="anonymous"></script><link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@20..48,100..700,0..1,-50..200"/><script defer="defer" src="/static/js/main.fafb9ad0.js"></script><link href="/static/css/main.239df178.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous"><link rel="manifest" href="./site.webmanifest"><link rel="icon" href="./favicon.ico"><script src="https://kit.fontawesome.com/0a95f6b081.js" crossorigin="anonymous"></script><title>AGNETHON 1.0</title><script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.8/dist/umd/popper.min.js" integrity="sha384-I7E8VVD/ismYTF4hNIPjVp/Zjvgyol6VFvRkX/vR+Vc4jQkC+hVqc2pM8ODewa9r" crossorigin="anonymous"></script><script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.min.js" integrity="sha384-BBtl+eGJRgqQAUMxJ7pMwbEyER4l1g+O15P+16Ep7Q9Q+zqX6gSbd85u4mG4QzX+" crossorigin="anonymous"></script><link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@20..48,100..700,0..1,-50..200"/><script defer="defer" src="/static/js/main.a69e9fa2.js"></script><link href="/static/css/main.0ee06ba5.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
Binary file removed build/static/media/thumb1.7e6242062209e1f0cd29.jpg
View file
Open in desktop
Binary file not shown.
96 changes: 38 additions & 58 deletions src/components/PS/PS.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,73 +1,55 @@

h1.ps-title{
font-size: 56px;
/* color: #fff; */
font-size: 45px;
position: fixed;
left: 100%;
right: 0vw;
left:90vw;
width: 10vw;
height: 100vh;
margin:auto;
text-align: center;
writing-mode: vertical-lr;
/* transform: rotate(180deg); */
z-index: 2;
}
.center {
width: 100%;
height: fit-content;
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
}
.stack-area {
width: 100%;
height: 300vh;
position: relative;
font-family: 'Syne', sans-serif;
text-decoration: underline;
color:white;
background-color: #020213;

}
.right{

.container{
margin:0;
right:0;
width: 100vw;
left:90vw;
background-color:#020213;
background: url("../About/images/AboutTextBg.png");

height: 100vh;
display: flex;
flex-direction: row-reverse;
align-items: center;
justify-content: center;
position: sticky;
top: 0;
box-sizing: border-box;
flex-basis: 50%;
}

.cards {
width: 100%;
height: 100%;
position: relative;
}
.card {
width: 100%;
height: 80%;
box-sizing: border-box;
padding: 35px;
border-radius: 6mm;
display: flex;
justify-content: space-between;
flex-direction: column;
position: absolute;
top: 50%;
left: 50%;
transition: 0.5s ease-in-out;
}
flex-direction: row-reverse;
overflow-x: auto;
margin:0;
width:90vw;
padding-top: 5vh;
background-color:#020213;
background: url("../About/images/AboutTextBg.png");
height: 100vh;

.card:nth-child(1) {
z-index: 4;
}
.card {
width: 70vw;
height: 80vh;
flex: 0 0 auto;
margin-right: 5vw;

.card:nth-child(2) {
z-index: 3;
}

.card:nth-child(3) {
z-index: 2;
.card :nth-child(3){
margin-left: 5vw;
}

.card:nth-child(4) {
z-index: 1;
}

.sub {
font-family: poppins;
Expand All @@ -87,10 +69,9 @@ h1.ps-title{
}



.close-div {
position: fixed;
bottom: 50px;
top: 95vh;
width: 100%;
z-index: 111111;
text-align: center;
Expand All @@ -103,10 +84,9 @@ h1.ps-title{
cursor: pointer;
transition: transform 0.35s ease;
font-weight: bold;
border: 2px solid red;
}
.close:hover {
font-weight: bold;
transform: translateY(-5px);
transform: translateY(-15px);
color: #7b8085;
}
63 changes: 3 additions & 60 deletions src/components/PS/PS.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useState, useEffect } from "react";
import React, { useState, useEffect, useRef } from "react";
import { useNavigate } from "react-router-dom";
import { motion as m } from "framer-motion";
import "./PS.css";
Expand All @@ -11,66 +11,15 @@ const cyber = ps.filter(statement => statement.title === "cyber");
const PS = () => {
const [closed, setClosed] = useState(false);
const navigate = useNavigate();
useEffect(() => {
const cards = document.querySelectorAll(".card");
const stackArea = document.querySelector(".stack-area");

if (!stackArea) {
// Check if stackArea is null
return;
}

function displaceCards() {
let x=-50;
cards.forEach((card) => {
if (card.classList.contains("active")) {
card.style.transform = `translate(100vw, -50%)`;
} else {
card.style.transform = `translate(${x}%, -50%)`;
x=x-10;
}
});
}

displaceCards();

const scrollHandler = () => {
if (!stackArea) {
return;
}

let proportion = stackArea.getBoundingClientRect().top / window.innerHeight;
if (proportion <= 0) {
let n = cards.length;
let index = Math.ceil((proportion * n) / 2);
index = Math.abs(index) - 1;
for (let i = 0; i < n; i++) {
if (i <= index) {
cards[i].classList.add("active");
} else {
cards[i].classList.remove("active");
}
}
displaceCards();
}
};

window.addEventListener("scroll", scrollHandler);

// Cleanup event listener on component unmount
return () => {
window.removeEventListener("scroll", scrollHandler);
};
}, []);

const handleButtonClick = () => {
setClosed(true);
setTimeout(() => {
navigate("/");
}, 900);
};



return (
<div className="container-ps">
<m.div
Expand All @@ -83,9 +32,6 @@ const PS = () => {

<h1 className="ps-title">Problem Statements</h1>

<div className="center">
<div className="stack-area">
<div className="right">
<div className="cards">

<div className="card">
Expand All @@ -112,7 +58,7 @@ const PS = () => {
</div>


<div className="card">
<div className="card" style={{'marginLeft':"5vw"}}>
<h2 className="title">Cybersecurity</h2>
{cyber.map((statement)=>(
<div className="content">
Expand All @@ -124,9 +70,6 @@ const PS = () => {
</div>

</div>
</div>
</div>
</div>

<div className="close-div">
<button className="close" onClick={handleButtonClick}>
Expand Down
25 changes: 15 additions & 10 deletions src/components/Timeline/Timeline.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
::-webkit-scrollbar{
display: none;
}
*{
.main *{
margin: 0;
padding: 0;
box-sizing: border-box;
Expand All @@ -16,7 +16,7 @@
background-color: #020213;
height: max-content;
width: 100vw;
background-size: cover;
/* background-size: cover; */
}
h1.timeline-title{
font-size: 56px;
Expand Down Expand Up @@ -48,9 +48,11 @@
align-items: center;
justify-content: center;
height: 100%;
border-right: 5px solid white;
/* border-left: 5px solid white; */
}
.day-1{
border-right: 5px solid white;
}
h2.title-day{
font-family: 'Syne', sans-serif;
position: absolute;
Expand Down Expand Up @@ -147,22 +149,22 @@



.close-div {
.main .close-div {
position: absolute;
bottom: 50px;
width: 100%;
z-index: 111111;
text-align: center;
}
.close {
.main .close {
color: rgb(151, 151, 151);
background: none;
border: none;
cursor: pointer;
transition: transform 0.35s ease;
font-weight: bold;
}
.close:hover {
.main .close:hover {
font-weight: bold;
transform: translateY(-5px);
color: #7b8085;
Expand All @@ -189,11 +191,14 @@
flex-direction: column;
border-right: unset;
border-left: unset;
border-bottom: 5px solid white;
padding: 10px 0;
position: relative;
/* background-color: black; */
}
.day-1{
border-bottom: 5px solid white;
}

h2.title-day{
position: absolute;
right: 0;
Expand Down Expand Up @@ -238,13 +243,13 @@
transform: translate(-125%, -75%);
}
}
.close-div {
.main .close-div {
bottom: 92%;
right: 10px;
right: 5%;
width: unset;
font-size: 24px;
}
.close>span{
.main .close>span{
display: none;
}
}
2 changes: 1 addition & 1 deletion src/components/Timeline/Timeline.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const Timeline = () => {
onWheel={handleWheel}
style={{ overflowX: 'auto', whiteSpace: 'nowrap', width: '100%' }}
>
<div className="day">
<div className="day day-1">
<h2 className="title-day">Day 1</h2>
{day1.map((timestamp) => (
<div className="timeline-content" key={timestamp.id}>
Expand Down
Loading