From 585d647974b08f89832fe2d51c4b33f5b5184f81 Mon Sep 17 00:00:00 2001 From: Mastan Sayyad Date: Sat, 13 Jul 2024 13:35:33 +0530 Subject: [PATCH 1/8] Update Footer.jsx --- src/components/Footer.jsx | 49 +++++++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 7 deletions(-) diff --git a/src/components/Footer.jsx b/src/components/Footer.jsx index 12f85b5..8ef00a2 100644 --- a/src/components/Footer.jsx +++ b/src/components/Footer.jsx @@ -13,10 +13,11 @@ const quotes = [ ]; const Footer = () => { - const [footerStyle, setFooterStyle] = useState({ - color: 'black' - }); + const [footerStyle, setFooterStyle] = useState({ color: 'black' }); const [quote, setQuote] = useState(quotes[Math.floor(Math.random() * quotes.length)]); + const [isModalOpen, setIsModalOpen] = useState(false); + const [email, setEmail] = useState(''); + const [error, setError] = useState(''); useEffect(() => { let savedTheme = localStorage.getItem('theme') || 'light'; @@ -52,6 +53,19 @@ const Footer = () => { return () => clearInterval(intervalId); // cleanup interval on component unmount }, []); + const handleSubscribe = () => { + if (!email) { + setError('Please enter your email ⚠️.'); + return; + } + setIsModalOpen(true); + setTimeout(() => { + setIsModalOpen(false); + }, 9000); + setEmail(''); + setError(''); + }; + return ( ); }; -export default Footer; \ No newline at end of file +export default Footer; From f640cbe3c5b5811fddcfc53183436b33fd99f740 Mon Sep 17 00:00:00 2001 From: Mastan Sayyad Date: Sat, 13 Jul 2024 13:35:43 +0530 Subject: [PATCH 2/8] Update Footer.css --- src/components/Footer.css | 64 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/src/components/Footer.css b/src/components/Footer.css index ae8ec54..c92214f 100644 --- a/src/components/Footer.css +++ b/src/components/Footer.css @@ -290,3 +290,67 @@ a:hover { } + .modal { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; + background: rgba(0, 0, 0, 0.5); + display: flex; + justify-content: center; + align-items: center; + animation: fadeIn 0.5s; + } + + .modal-content { + background: rgb(255, 255, 255); + padding: 20px; + border-radius: 8px; + text-align: center; + animation: fadeIn 0.5s; + } + + .modal-content h2 { + margin-top: 0; + color: #072183; + font-weight: bold; + } + + .modal-content p { + color: #000000; + } + + + .modal-content button { + background: #093eba; + color: white; + border: none; + padding: 10px 20px; + border-radius: 5px; + cursor: pointer; + margin-top: 20px; + } + + .modal-content button:hover { + background: #05286f; + } + + @keyframes fadeIn { + from { + opacity: 0; + } + to { + opacity: 1; + } + } + + @keyframes fadeOut { + from { + opacity: 1; + } + to { + opacity: 0; + } + } + \ No newline at end of file From 636b067e3f0e13f0b313e18831c4bbd1974f4595 Mon Sep 17 00:00:00 2001 From: pani2004 Date: Sat, 13 Jul 2024 15:05:44 +0530 Subject: [PATCH 3/8] Changed the position --- src/components/BottomToTop.jsx | 33 +++++++-------------------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/src/components/BottomToTop.jsx b/src/components/BottomToTop.jsx index fd5c0d8..41a2783 100644 --- a/src/components/BottomToTop.jsx +++ b/src/components/BottomToTop.jsx @@ -1,5 +1,4 @@ import React, { useState, useEffect } from "react"; -import styled from "styled-components"; import { FaArrowUp } from "react-icons/fa"; const GoToTop = () => { @@ -25,34 +24,16 @@ const GoToTop = () => { return ( <> {isVisible && ( - - - +
+ +
)} ); }; -const Wrapper = styled.div` - display: flex; - justify-content: center; - align-items: center; - position: fixed; - bottom: 17px; - right: 10px; - color: white; - background-color: rgb(59 130 246); - width: 48px; - height: 48px; - z-index: 9999; - border-radius: 50%; - cursor: pointer; - transition: transform 0.3s ease, background-color 0.3s ease; - - &:hover { - background-color: #003a79; - transform: translateY(-5px); - } -`; - export default GoToTop; + From cbc8929215b406591aa0275ae4aa021d825caf8d Mon Sep 17 00:00:00 2001 From: Ayush Deb Date: Thu, 18 Jul 2024 23:30:18 +0530 Subject: [PATCH 4/8] made the footer section items aligned --- src/components/Footer.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/Footer.css b/src/components/Footer.css index c92214f..a99abe2 100644 --- a/src/components/Footer.css +++ b/src/components/Footer.css @@ -19,7 +19,7 @@ a:hover { .footer-content { display: flex; flex-direction: column; - align-items: center; + align-items: flex-start; justify-content: space-around; max-width: 1200px; margin: auto; @@ -154,8 +154,9 @@ a:hover { .footer-section ul li a:hover, .footer-section p a:hover { - color: #90a9bb; - transform: scale(1.1); + color: #90d0fe; + text-decoration:solid; + transform: scale(1.3); } .smedia { From b9c4139adf3e124bd3b99b7cfa99a48fa203e04d Mon Sep 17 00:00:00 2001 From: Mastan Sayyad Date: Sun, 21 Jul 2024 09:00:25 +0530 Subject: [PATCH 5/8] Update index.html --- index.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/index.html b/index.html index 7bcbf13..8f43fc1 100644 --- a/index.html +++ b/index.html @@ -43,6 +43,12 @@ pointer-events: none; z-index: 9999; } + + @media (max-width: 780px) { + .circle-container{ + display: none; + } + } From de78ff9087924dbd4555c39f303f5bb4d7e01fc4 Mon Sep 17 00:00:00 2001 From: Yogesh Choudhary Date: Sun, 21 Jul 2024 17:38:10 +0530 Subject: [PATCH 6/8] about us page toggle fix of theme --- src/components/AboutUs.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/AboutUs.css b/src/components/AboutUs.css index a52b1e9..b919cf2 100644 --- a/src/components/AboutUs.css +++ b/src/components/AboutUs.css @@ -1,6 +1,6 @@ body { - background-color: #000; - color: #fff; + /* background-color: #000; + color: #fff; */ margin: 0; padding: 0; overflow-x: hidden; From be47b3a023b56b8accdd954460b3a8c2d08e77d2 Mon Sep 17 00:00:00 2001 From: Dev Date: Thu, 25 Jul 2024 19:42:33 +0530 Subject: [PATCH 7/8] about page fixed --- src/components/AboutUs.jsx | 97 +++++++++++++++++++++++++------------- 1 file changed, 63 insertions(+), 34 deletions(-) diff --git a/src/components/AboutUs.jsx b/src/components/AboutUs.jsx index 1da43ae..21e6fe4 100644 --- a/src/components/AboutUs.jsx +++ b/src/components/AboutUs.jsx @@ -1,21 +1,21 @@ -import React, { useEffect, useState, useMemo } from "react"; -import axios from "axios"; +import { faGithub, faLinkedin } from "@fortawesome/free-brands-svg-icons"; +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import Particles, { initParticlesEngine } from "@tsparticles/react"; -import { loadFull } from "tsparticles"; +import axios from "axios"; +import React, { useEffect, useMemo, useState } from "react"; import Tilty from "react-tilty"; -import "../components/AboutUs.css"; -import aboutImage from "../assets/cartoon.png"; +import { loadFull } from "tsparticles"; import carImage from "../assets/1 1.png"; -import Himank from "../assets/Himank.jpg"; import Akshat from "../assets/Akshat.jpg"; -import Shreya from "../assets/Shreya.jpg"; +import aboutImage from "../assets/cartoon.png"; +import Himank from "../assets/Himank.jpg"; import Naman from "../assets/Naman.jpg"; -import Footer from './Footer'; -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; -import { faLinkedin, faGithub } from '@fortawesome/free-brands-svg-icons'; +import Shreya from "../assets/Shreya.jpg"; +import "../components/AboutUs.css"; +import Footer from "./Footer"; // import Tilty from "react-tilty"; -import { particles } from "./Particles.jsx"; import BackToTop from "./BottomToTop"; +import { particles } from "./Particles.jsx"; const AboutUs = () => { const [contributors, setContributors] = useState([]); @@ -29,7 +29,9 @@ const AboutUs = () => { useEffect(() => { const fetchContributors = async () => { try { - const response = await axios.get('https://api.github.com/repos/Akshatchaube01/TimeWarp/contributors'); + const response = await axios.get( + "https://api.github.com/repos/Akshatchaube01/TimeWarp/contributors" + ); setContributors(response.data); } catch (error) { console.error("Error fetching contributors:", error); @@ -75,18 +77,18 @@ const AboutUs = () => { bottomTxt: "Through our passion for exploration and discovery, we seek to inspire curiosity and ignite imaginations, inviting individuals to embark on a journey through time where they can uncover hidden treasures, explore diverse cultures, and witness the remarkable tapestry of human experience.", }; - const handlehover=(e)=>{ - e.currentTarget.querySelector(".hovereffect").style.transform="scale(1)"; - } - const hanleleave=(e)=>{ - e.currentTarget.querySelector(".hovereffect").style.transform="scale(0)"; - } + const handlehover = (e) => { + e.currentTarget.querySelector(".hovereffect").style.transform = "scale(1)"; + }; + const hanleleave = (e) => { + e.currentTarget.querySelector(".hovereffect").style.transform = "scale(0)"; + }; return (
particles, [])} />
- + {

About Us

- -

+ +

{about.topTxt}

-

+

{about.bottomTxt}

-
@@ -124,10 +125,10 @@ const AboutUs = () => {

Our Vision

-

+

{vision.topTxt}

-

+

{vision.bottomTxt}

@@ -142,23 +143,51 @@ const AboutUs = () => {
{teamMembers.map((member, index) => ( - +
-

{member.memberName}

+

+ {member.memberName} +

Member

-

Tech Stack

+

+ Tech Stack +

- {member.alt} -
-
+ {member.alt}
+
))}
@@ -207,4 +236,4 @@ const AboutUs = () => { ); }; -export default AboutUs; \ No newline at end of file +export default AboutUs; From 38eee64aa7fcf541a9bb148fbaf51088a247385f Mon Sep 17 00:00:00 2001 From: nagalakshmi08 Date: Thu, 8 Aug 2024 08:17:31 +0530 Subject: [PATCH 8/8] Top arrow --- package-lock.json | 21 --------------------- src/components/BottomToTop.jsx | 2 +- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index b1d6b59..5a0c4a5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3205,20 +3205,6 @@ "resolved": "https://registry.npmjs.org/@types/stylis/-/stylis-4.2.5.tgz", "integrity": "sha512-1Xve+NMN7FWjY14vLoY5tL3BVEQ/n42YLwaqJIPYhotZ9uBHt87VceMwWQpzmdEt2TNXIorIFG+YeCUUW7RInw==" }, - "node_modules/@types/three": { - "version": "0.165.0", - "resolved": "https://registry.npmjs.org/@types/three/-/three-0.165.0.tgz", - "integrity": "sha512-AJK8JZAFNBF0kBXiAIl5pggYlzAGGA8geVYQXAcPCEDRbyA+oEjkpUBcJJrtNz6IiALwzGexFJGZG2yV3WsYBw==", - "license": "MIT", - "peer": true, - "dependencies": { - "@tweenjs/tween.js": "~23.1.1", - "@types/stats.js": "*", - "@types/webxr": "*", - "fflate": "~0.8.2", - "meshoptimizer": "~0.18.1" - } - }, "node_modules/@types/webxr": { "version": "0.5.16", "resolved": "https://registry.npmjs.org/@types/webxr/-/webxr-0.5.16.tgz", @@ -5762,13 +5748,6 @@ "jiti": "bin/jiti.js" } }, - "node_modules/jquery": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", - "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==", - "license": "MIT", - "peer": true - }, "node_modules/js-cookie": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.1.tgz", diff --git a/src/components/BottomToTop.jsx b/src/components/BottomToTop.jsx index 41a2783..7fb46ec 100644 --- a/src/components/BottomToTop.jsx +++ b/src/components/BottomToTop.jsx @@ -27,6 +27,7 @@ const GoToTop = () => {
@@ -36,4 +37,3 @@ const GoToTop = () => { }; export default GoToTop; -