From dab382141ecefb37f5b5ead47d3050d47369fc55 Mon Sep 17 00:00:00 2001
From: HAPPY YADAV
Date: Wed, 19 Jun 2024 20:30:04 +0530
Subject: [PATCH 1/3] 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 = () => {
-
+
+
-
+
+
+
-
+
Our Vision
@@ -115,12 +132,24 @@ const AboutUs = () => {
{teamMembers.map((member, index) => (
-
+
-
+
-
{member.memberName}
+
+ {member.memberName}
+
))}
@@ -128,6 +157,43 @@ const AboutUs = () => {
+ {/* OUR CONTRIBUTORS */}
+
+
+
+
+ Our Contributors
+
+
+
+
+ {contributors.map((contributor, index) => (
+
+
+
+
+
+
+ {contributor.login}
+
+
+
+ ))}
+
+
+
+
+
);
From c671af04da25b58a8b134ef491f2167fd1070517 Mon Sep 17 00:00:00 2001
From: HAPPY YADAV
Date: Fri, 21 Jun 2024 22:19:10 +0530
Subject: [PATCH 2/3] 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.topTxt}
@@ -89,24 +99,16 @@ const AboutUs = () => {
{about.bottomTxt}
-
-
-
-
-
+
-
-
+
+
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 3/3] 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 = () => {
+
+
+
+ />
+
@@ -121,20 +126,24 @@ const Privacy = () => {
+
+
+
+
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 = () => {
-
+
+
+
+
+
Usage of Service
@@ -67,20 +73,24 @@ const Terms = () => {
+
+
+
+
Changes to Terms