From dab382141ecefb37f5b5ead47d3050d47369fc55 Mon Sep 17 00:00:00 2001 From: HAPPY YADAV Date: Wed, 19 Jun 2024 20:30:04 +0530 Subject: [PATCH 01/16] addded my contributors --- package-lock.json | 1 + src/components/AboutUs.css | 19 +++++++ src/components/AboutUs.jsx | 100 ++++++++++++++++++++++++++++++------- 3 files changed, 103 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index b5a0a2a..65fcaaa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3509,6 +3509,7 @@ "version": "1.7.2", "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz", "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==", + "license": "MIT", "dependencies": { "follow-redirects": "^1.15.6", "form-data": "^4.0.0", diff --git a/src/components/AboutUs.css b/src/components/AboutUs.css index c659652..93a4168 100644 --- a/src/components/AboutUs.css +++ b/src/components/AboutUs.css @@ -224,3 +224,22 @@ h1::before { } +.marquee { + overflow: hidden; + white-space: nowrap; + } + + .marquee-content { + display: flex; + animation: marquee 15s linear infinite; + } + + @keyframes marquee { + from { + transform: translateX(100%); + } + to { + transform: translateX(-100%); + } + } + \ No newline at end of file diff --git a/src/components/AboutUs.jsx b/src/components/AboutUs.jsx index 61301c3..4808538 100644 --- a/src/components/AboutUs.jsx +++ b/src/components/AboutUs.jsx @@ -1,4 +1,5 @@ -import React, { useEffect, useMemo } from "react"; +import React, { useEffect, useState, useMemo } from "react"; +import axios from "axios"; import Particles, { initParticlesEngine } from "@tsparticles/react"; import { loadFull } from "tsparticles"; import Tilty from "react-tilty"; @@ -9,12 +10,12 @@ import Himank from "../assets/Himank.jpg"; import Akshat from "../assets/Akshat.jpg"; import Shreya from "../assets/Shreya.jpg"; import Naman from "../assets/Naman.jpg"; -import Footer from './Footer'; -// import Tilty from "react-tilty"; +import Footer from "./Footer"; import { particles } from "./Particles.jsx"; import BackToTop from "./BottomToTop"; const AboutUs = () => { + const [contributors, setContributors] = useState([]); useEffect(() => { initParticlesEngine(async (engine) => { @@ -22,6 +23,19 @@ const AboutUs = () => { }); }, []); + useEffect(() => { + const fetchContributors = async () => { + try { + const response = await axios.get('https://api.github.com/repos/Akshatchaube01/TimeWarp/contributors'); + setContributors(response.data); + } catch (error) { + console.error("Error fetching contributors:", error); + } + }; + + fetchContributors(); + }, []); + const teamMembers = [ { memberName: "Akshat Chaube", @@ -76,25 +90,28 @@ const AboutUs = () => {

- About us + + About us
- About us + + About us +
-

+

Our Vision

@@ -115,12 +132,24 @@ const AboutUs = () => {

{teamMembers.map((member, index) => ( - +
- {member.alt} + {member.alt}
-

{member.memberName}

+

+ {member.memberName} +

))} @@ -128,6 +157,43 @@ const AboutUs = () => {
+ {/* OUR CONTRIBUTORS */} +
+
+
+

+ Our Contributors +

+
+
+
+ {contributors.map((contributor, index) => ( + +
+ {contributor.login} +
+
+

+ {contributor.login} +

+
+ + ))} +
+
+
+
+
); From f760590d2fa21c2d4033083370317755f3273cc4 Mon Sep 17 00:00:00 2001 From: Aditya Raj Date: Fri, 21 Jun 2024 21:52:14 +0530 Subject: [PATCH 02/16] worked on issue #101 -Linking our Team cards to Linkedin- created hover effect --- package-lock.json | 39 ++++++++++++++++++++++++++++++++++---- package.json | 4 +++- src/components/AboutUs.jsx | 25 ++++++++++++++++++++---- 3 files changed, 59 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index b5a0a2a..330f64e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,8 +10,10 @@ "dependencies": { "@emailjs/browser": "^4.3.3", "@fortawesome/fontawesome-svg-core": "^6.5.2", + "@fortawesome/free-brands-svg-icons": "^6.5.2", + "@fortawesome/free-regular-svg-icons": "^6.5.2", "@fortawesome/free-solid-svg-icons": "^6.5.2", - "@fortawesome/react-fontawesome": "^0.2.0", + "@fortawesome/react-fontawesome": "^0.2.2", "@fullcalendar/core": "^6.1.13", "@fullcalendar/daygrid": "^6.1.13", "@fullcalendar/react": "^6.1.13", @@ -892,6 +894,33 @@ "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.5.2.tgz", "integrity": "sha512-5CdaCBGl8Rh9ohNdxeeTMxIj8oc3KNBgIeLMvJosBMdslK/UnEB8rzyDRrbKdL1kDweqBPo4GT9wvnakHWucZw==", "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "@fortawesome/fontawesome-common-types": "6.5.2" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/free-brands-svg-icons": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.5.2.tgz", + "integrity": "sha512-zi5FNYdmKLnEc0jc0uuHH17kz/hfYTg4Uei0wMGzcoCL/4d3WM3u1VMc0iGGa31HuhV5i7ZK8ZlTCQrHqRHSGQ==", + "hasInstallScript": true, + "license": "(CC-BY-4.0 AND MIT)", + "dependencies": { + "@fortawesome/fontawesome-common-types": "6.5.2" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/free-regular-svg-icons": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.5.2.tgz", + "integrity": "sha512-iabw/f5f8Uy2nTRtJ13XZTS1O5+t+anvlamJ3zJGLEVE2pKsAWhPv2lq01uQlfgCX7VaveT3EVs515cCN9jRbw==", + "hasInstallScript": true, + "license": "(CC-BY-4.0 AND MIT)", "dependencies": { "@fortawesome/fontawesome-common-types": "6.5.2" }, @@ -904,6 +933,7 @@ "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.5.2.tgz", "integrity": "sha512-QWFZYXFE7O1Gr1dTIp+D6UcFUF0qElOnZptpi7PBUMylJh+vFmIedVe1Ir6RM1t2tEQLLSV1k7bR4o92M+uqlw==", "hasInstallScript": true, + "license": "(CC-BY-4.0 AND MIT)", "dependencies": { "@fortawesome/fontawesome-common-types": "6.5.2" }, @@ -912,9 +942,10 @@ } }, "node_modules/@fortawesome/react-fontawesome": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.2.0.tgz", - "integrity": "sha512-uHg75Rb/XORTtVt7OS9WoK8uM276Ufi7gCzshVWkUJbHhh3svsUUeqXerrM96Wm7fRiDzfKRwSoahhMIkGAYHw==", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.2.2.tgz", + "integrity": "sha512-EnkrprPNqI6SXJl//m29hpaNzOp1bruISWaOiRtkMi/xSvHJlzc2j2JAYS7egxt/EbjSNV/k6Xy0AQI6vB2+1g==", + "license": "MIT", "dependencies": { "prop-types": "^15.8.1" }, diff --git a/package.json b/package.json index 5c5ecc7..5d80355 100644 --- a/package.json +++ b/package.json @@ -13,8 +13,10 @@ "dependencies": { "@emailjs/browser": "^4.3.3", "@fortawesome/fontawesome-svg-core": "^6.5.2", + "@fortawesome/free-brands-svg-icons": "^6.5.2", + "@fortawesome/free-regular-svg-icons": "^6.5.2", "@fortawesome/free-solid-svg-icons": "^6.5.2", - "@fortawesome/react-fontawesome": "^0.2.0", + "@fortawesome/react-fontawesome": "^0.2.2", "@fullcalendar/core": "^6.1.13", "@fullcalendar/daygrid": "^6.1.13", "@fullcalendar/react": "^6.1.13", diff --git a/src/components/AboutUs.jsx b/src/components/AboutUs.jsx index 61301c3..565c2ad 100644 --- a/src/components/AboutUs.jsx +++ b/src/components/AboutUs.jsx @@ -10,6 +10,8 @@ import Akshat from "../assets/Akshat.jpg"; import Shreya from "../assets/Shreya.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 Tilty from "react-tilty"; import { particles } from "./Particles.jsx"; import BackToTop from "./BottomToTop"; @@ -58,7 +60,12 @@ 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)"; + } return (
particles, [])} /> @@ -115,12 +122,22 @@ const AboutUs = () => {
{teamMembers.map((member, index) => ( - + +
+
+

{member.memberName}

+

Member

+
+

Tech Stack

+
+ + +
+
- {member.alt} + {member.alt}
-

{member.memberName}

 ))} From c671af04da25b58a8b134ef491f2167fd1070517 Mon Sep 17 00:00:00 2001 From: HAPPY YADAV Date: Fri, 21 Jun 2024 22:19:10 +0530 Subject: [PATCH 03/16] fixed about us and contact us ui --- src/components/AboutUs.jsx | 30 ++++++++++++++++-------------- src/components/ContactUs.jsx | 2 +- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/components/AboutUs.jsx b/src/components/AboutUs.jsx index 4808538..5049a26 100644 --- a/src/components/AboutUs.jsx +++ b/src/components/AboutUs.jsx @@ -74,14 +74,24 @@ const AboutUs = () => { }; return ( -
+
particles, [])} /> -
+
+ + + About us + +

About Us

+

{about.topTxt}

@@ -89,24 +99,16 @@ const AboutUs = () => { {about.bottomTxt}

-
- - About us - -
+
-
-
+
+
About us
diff --git a/src/components/ContactUs.jsx b/src/components/ContactUs.jsx index 09a2c19..a9366c9 100644 --- a/src/components/ContactUs.jsx +++ b/src/components/ContactUs.jsx @@ -93,7 +93,7 @@ const Contact = () => {

Date: Fri, 21 Jun 2024 22:57:25 +0530 Subject: [PATCH 04/16] added tilty effect to privacy policy page & terms and conditions --- src/components/Privacy.jsx | 11 ++++++++++- src/components/Terms.jsx | 12 +++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/components/Privacy.jsx b/src/components/Privacy.jsx index bd108fe..4778302 100644 --- a/src/components/Privacy.jsx +++ b/src/components/Privacy.jsx @@ -1,5 +1,6 @@ import React from "react"; import "./privacy.css"; +import Tilty from "react-tilty"; const Privacy = () => { return ( @@ -32,20 +33,24 @@ const Privacy = () => {

+ Privacy +
+ Data Protection + /> +

@@ -121,20 +126,24 @@ const Privacy = () => {

+ Information Sharing +
+ User Rights +

diff --git a/src/components/Terms.jsx b/src/components/Terms.jsx index fd4adf7..0f630dc 100644 --- a/src/components/Terms.jsx +++ b/src/components/Terms.jsx @@ -1,5 +1,6 @@ import React from "react"; import './terms.css'; +import Tilty from "react-tilty"; import termsImage from '../assets/terms.png' @@ -22,20 +23,25 @@ const Terms = () => {

- Terms + + +
+ Usage +

Usage of Service

@@ -67,20 +73,24 @@ const Terms = () => {
+ User Responsibilities +
+ Changes to Policy +

Changes to Terms

From 615e39cf572d7400477ef4aa4782a11301e4e8ef Mon Sep 17 00:00:00 2001 From: Hishita Gupta <159264060+HishitaGupta@users.noreply.github.com> Date: Sat, 22 Jun 2024 10:15:58 +0530 Subject: [PATCH 05/16] added translator in footer --- index.html | 13 ++++++ src/components/Footer.jsx | 96 +++++++++++++++++++++------------------ 2 files changed, 65 insertions(+), 44 deletions(-) diff --git a/index.html b/index.html index 78359a8..3b36bbc 100644 --- a/index.html +++ b/index.html @@ -15,6 +15,19 @@ + + + diff --git a/src/components/Footer.jsx b/src/components/Footer.jsx index a48d3e0..3abdf60 100644 --- a/src/components/Footer.jsx +++ b/src/components/Footer.jsx @@ -2,31 +2,24 @@ import { useEffect, useState } from 'react'; import React from 'react'; import './Footer.css'; - const quotes = [ "Innovation distinguishes between a leader and a follower.", - "Simplicity is the ultimate sophistication. ", + "Simplicity is the ultimate sophistication.", "The secret of getting ahead is getting started.", "All limitations are self-imposed.", - "Tough times never last but tough people do. ", + "Tough times never last but tough people do.", "Strive for greatness.", // Add more quotes as needed ]; - const Footer = () => { - - - const [footerStyle, setFooterStyle] = useState({ - color: 'black' + color: 'black' }); - const [quote, setQuote] = useState(quotes[Math.floor(Math.random() * quotes.length)]); - - let savedTheme; - + const [quote, setQuote] = useState(quotes[Math.floor(Math.random() * quotes.length)]); + useEffect(() => { - savedTheme = localStorage.getItem('theme') || 'light'; + let savedTheme = localStorage.getItem('theme') || 'light'; setFooterStyle({ color: savedTheme === 'light' ? 'white' : 'white', backgroundColor: savedTheme === 'light' ? '#0ea5e9' : '', @@ -39,8 +32,25 @@ const Footer = () => { }); }, 10000); // changes every 10 seconds + // Add Google Translate script + const addGoogleTranslateScript = () => { + const script = document.createElement('script'); + script.type = 'text/javascript'; + script.src = "//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"; + document.body.appendChild(script); + }; + + window.googleTranslateElementInit = () => { + new window.google.translate.TranslateElement( + { pageLanguage: 'en' }, + 'google_translate_element' + ); + }; + + addGoogleTranslateScript(); + return () => clearInterval(intervalId); // cleanup interval on component unmount - }, [savedTheme]); + }, []); return (

Follow Us

@@ -122,33 +133,30 @@ const Footer = () => {

Company

-
-
-
-

© 2024 TimeWarp. All rights reserved.

-
- - ); - }; - - - export default Footer; - +
  • + + Privacy Policy + +
    • +
  • + + Terms & Conditions + +
    • +
  • + +
    • +
  • + +
    • + +
    +
    +
    +

    © 2024 TimeWarp. All rights reserved.

    +
    + + ); +}; +export default Footer; \ No newline at end of file From 49f0500908f214ac3759bd5baabdba3fef163475 Mon Sep 17 00:00:00 2001 From: Mastan Sayyad Date: Sun, 23 Jun 2024 05:13:38 +0530 Subject: [PATCH 06/16] Create licensing.jsx --- src/components/licensing.jsx | 50 ++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 src/components/licensing.jsx diff --git a/src/components/licensing.jsx b/src/components/licensing.jsx new file mode 100644 index 0000000..993b7a3 --- /dev/null +++ b/src/components/licensing.jsx @@ -0,0 +1,50 @@ +import React from 'react' +import './licensing.css' +import Footer from './Footer'; + + +const Licensing = () => { + + return ( + <> +
    +

    Licensing

    +

    Welcome to Timewarp. The project is licensed under the MIT License. This page outlines the terms of the license and provides details on how you can use, modify, and distribute our software.

    + +

    MIT License

    +

    The MIT License is a permissive free software license originating at the Massachusetts Institute of Technology (MIT). Below is the full text of the MIT License:

    + 
    +                    {`
+
+Copyright (c) 2024 Akshat Chaube
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.`}
+
    + +

    Usage

    +

    You are free to use our software in your own projects, whether they are commercial or non-commercial. You can modify the code to suit your needs, distribute it to others, and even sell products based on our software, as long as you include the original copyright notice and this permission notice in any substantial portions of the software.

    +

    Contributions

    +

    We welcome contributions from the community! If you have improvements or fixes, feel free to submit a pull request on our GitHub repository. By contributing, you agree that your contributions will be licensed under the MIT License as well.

    +

    Contact Us

    +

    If you have any questions about this License, please contact us at: Email: akshatchaube22@gmail.com

    +
    +