Skip to content
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

Some improvemets by Anshuman Arya on Home page #2

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Some improvemets by Anshuman Arya on Home page #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
452abb8
Some improvemets by Anshuman Arya on Home page
Jan 18, 2024
a9e61cd
Merge branch 'master' into master
Anshuman125 Jan 20, 2024
677ba66
Merge branch 'master' into master
Anshuman125 Feb 16, 2024
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
2 changes: 1 addition & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<link href="/src/assets/img/apple-touch-icon.png" rel="apple-touch-icon">
<link href='https://unpkg.com/[email protected]/css/boxicons.min.css' rel='stylesheet'>

</head>

</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.jsx"></script>
Expand Down
6 changes: 6 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"@reduxjs/toolkit": "^2.1.0",
"aos": "^2.3.4",
"bootstrap": "^5.3.2",
"gsap": "^3.12.4",
"framer-motion": "^10.18.0",
"react": "^18.2.0",
"react-bootstrap-icons": "^1.10.3",
Expand Down
23 changes: 20 additions & 3 deletions src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { BrowserRouter as Router, Routes, Route } from "react-router-dom"
import React, { useEffect } from 'react';
import gsap from 'gsap';
import { ScrollTrigger } from 'gsap/ScrollTrigger';
import { BrowserRouter as Router, Routes, Route } from 'react-router-dom';
import Devmate from "./Pages/Devmate";
import Aos from "aos";
import "aos/dist/aos.css"
import React from "react";
import Header from "./Components/Header";
import Hero from "./Components/Hero";
import About from "./Components/About";
Expand All @@ -13,6 +15,10 @@ import Team from "./Components/Team";
import FAQs from "./Components/FAQs";
import ContactUs from "./Components/ContactUs";
import Footer from "./Components/Footer";
import Circle from "./Components/Circle";

gsap.registerPlugin(ScrollTrigger);

import useScript from "./Hooks/useScript";
import SignIn from "./Components/SignIn";
import { useDispatch, useSelector } from "react-redux";
Expand All @@ -24,6 +30,15 @@ function App() {
const dispatch = useDispatch()
const user = useSelector(state => state.user.user)
React.useEffect(() => {
gsap.to('body', {
backgroundColor: '#E2A9FF',
scrollTrigger: {
trigger: 'body',
start: 'top top',
end: 'bottom bottom',
scrub: true,
},
});
Aos.init()
}, [])
useScript("/js/main.js")
Expand Down Expand Up @@ -58,6 +73,7 @@ function Home() {
<>
<Hero />
<section className="main">
<Circle />
<About />
<Features />
<Counts />
Expand All @@ -71,4 +87,5 @@ function Home() {
)
}

export default App
export default App

78 changes: 78 additions & 0 deletions src/Components/Circle.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
import React, { useState, useEffect, useRef } from "react";
import gsap from "gsap";

const Circle = () => {
const [position, setPosition] = useState({ x: 0, y: 0 });
const circleRef = useRef(null);

useEffect(() => {
const updateMousePosition = (e) => {
setTimeout(() => {
setPosition({ x: e.clientX, y: e.clientY });
}, 100);
};

const onMouseEnterNavbar = () => {
gsap.to(circleRef.current, {
scale: 3,
backgroundColor: "#B98BD0"
});

gsap.to(".navbar a:hover", {
color: "#3C0982",
fontWeight: "900",
fontSize: "1.4vw",
zIndex: 100,
duration: 0.1,
});

gsap.to(".navbar a:hover", {
x: gsap.utils.lerp(-20, 20, val),
duration: 0.2,
scale: 1
});
};

const onMouseLeaveNavbar = () => {
gsap.to(circleRef.current, {
scale: 1,
backgroundColor: "#ff0000",
});

gsap.to(".navbar a", {
color: "#010483",
fontWeight: 500,
duration: 0.1,
fontSize:"1vw",
scale: 1
});
};

window.addEventListener("mousemove", updateMousePosition);

const navbarLinks = document.querySelectorAll(".navbar a");
navbarLinks.forEach(link => {
link.addEventListener("mouseenter", onMouseEnterNavbar);
link.addEventListener("mouseleave", onMouseLeaveNavbar);
});

return () => {
window.removeEventListener("mousemove", updateMousePosition);
navbarLinks.forEach(link => {
link.removeEventListener("mouseenter", onMouseEnterNavbar);
link.removeEventListener("mouseleave", onMouseLeaveNavbar);
});
};
}, []);


return (
<div
ref={circleRef}
className="Circle"
style={{ left: `${position.x}px`, top: `${position.y}px` }}
></div>
);
};

export default Circle;
2 changes: 1 addition & 1 deletion src/Components/ContactUs.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export default function ContactUs() {
<form action="/contact" method="post">
<div className="row">
<div className="col-md-6 form-group">
<input type="text" name="name" className="form-control" id="name" placeholder="Your Name" required />
<input type="text" name="name" className="form-control" id="name" placeholder="Your Name" required/>
</div>
<div className="col-md-6 form-group mt-3 mt-md-0">
<input type="email" className="form-control" name="email" id="email" placeholder="Your Email" required />
Expand Down
44 changes: 27 additions & 17 deletions src/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,18 @@
@tailwind utilities;


/* Just trying */
.Circle{
position: fixed;
width: 1.5vw;
height: 1.5vw;
background-color: #ff0000;
border-radius: 50%;
transform: translate(-50%, -50%);
pointer-events: none;
z-index: 99;
}

/* width */
::-webkit-scrollbar {
width: 5px;
Expand Down Expand Up @@ -221,12 +233,6 @@ h6 {
transition: all 0.5s;
background: rgba(1, 4, 136, 0.9);

}

#header.header-transparent {
background: transparent;
}

#header.header-scrolled {
/* background: rgba(1, 4, 136, 0.9); */
height: 80px;
Expand Down Expand Up @@ -276,7 +282,8 @@ h6 {
/**
* Desktop Navigation
*/
.navbar {
.navbar {
z-index: 100;
padding: 0;
}

Expand Down Expand Up @@ -331,7 +338,7 @@ h6 {
.navbar .active:before {
visibility: visible;
width: 25px;
}
}

.navbar a:hover,
.navbar .active,
Expand Down Expand Up @@ -912,7 +919,7 @@ section {
margin: 0 0 5px 0;
letter-spacing: 2px;
text-transform: uppercase;
color: #aaaaaa;
color: #040249;
font-family: "Poppins", sans-serif;
}

Expand Down Expand Up @@ -1174,9 +1181,11 @@ section {
display: flex;
align-items: center;
padding: 20px;
background: #f5f5ff;
background: none;
box-shadow: -1px -1px 5px;
transition: ease-in-out 0.3s;
}
border-radius: 20px;
}

.features .icon-box div.icon {
font-size: 32px;
Expand Down Expand Up @@ -1219,8 +1228,9 @@ section {
width: 100%;
position: relative;
text-align: center;
background: #fff;
}
background: #4f3498;
color: white;
}

.counts .count-box div.icon {
position: absolute;
Expand Down Expand Up @@ -1696,10 +1706,10 @@ section {
--------------------------------------------------------------*/
.contact .info {
width: 100%;
background: #fff;
}

}

.contact .info div.icon {
background: #fff;
font-size: 20px;
color: #3f43fd;
float: left;
Expand Down Expand Up @@ -1837,7 +1847,7 @@ section {
100% {
transform: rotate(360deg);
}
}
}

/*--------------------------------------------------------------
# Footer
Expand Down
1 change: 0 additions & 1 deletion src/main.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import ReactDOM from 'react-dom/client'
import App from './App.jsx'
import './index.css'
import { Provider } from 'react-redux'
import { store } from './redux/store'

ReactDOM.createRoot(document.getElementById('root')).render(
<React.StrictMode>
Expand Down
23 changes: 11 additions & 12 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@
"@babel/helper-validator-identifier" "^7.22.20"
to-fast-properties "^2.0.0"

"@esbuild/[email protected]":
"@emotion/is-prop-valid@^0.8.2":
version "0.8.8"
resolved "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz"
Expand All @@ -232,8 +233,6 @@

"@esbuild/[email protected]":
version "0.19.11"
resolved "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.11.tgz"
integrity sha512-grbyMlVCvJSfxFQUndw5mCtWs5LO1gUlwP4CDi4iJBbVpZcqLVT29FxgGuBJGSzyOxotFG4LoO5X+M1350zmPA==

"@eslint-community/eslint-utils@^4.2.0":
version "4.4.0"
Expand Down Expand Up @@ -376,16 +375,6 @@
resolved "https://registry.npmjs.org/@remix-run/router/-/router-1.14.2.tgz"
integrity sha512-ACXpdMM9hmKZww21yEqWwiLws/UPLhNKvimN8RrYSqPSvB3ov7sLvAcfvaxePeLvccTQKGdkDIhLYApZVDFuKg==

"@rollup/[email protected]":
version "4.9.5"
resolved "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.9.5.tgz"
integrity sha512-Dq1bqBdLaZ1Gb/l2e5/+o3B18+8TI9ANlA1SkejZqDgdU/jK/ThYaMPMJpVMMXy2uRHvGKbkz9vheVGdq3cJfA==

"@rollup/[email protected]":
version "4.9.5"
resolved "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.9.5.tgz"
integrity sha512-ezyFUOwldYpj7AbkwyW9AJ203peub81CaAIVvckdkyH8EvhEIoKzaMFJj0G4qYJ5sw3BpqhFrsCc30t54HV8vg==

"@types/babel__core@^7.20.5":
version "7.20.5"
resolved "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz"
Expand Down Expand Up @@ -1245,6 +1234,11 @@ fs.realpath@^1.0.0:
resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==

fsevents@~2.3.2, fsevents@~2.3.3:
version "2.3.3"
resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz"
integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==

function-bind@^1.1.1, function-bind@^1.1.2:
version "1.1.2"
resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz"
Expand Down Expand Up @@ -1363,6 +1357,11 @@ graphemer@^1.4.0:
resolved "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz"
integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==

gsap@^3.12.4:
version "3.12.4"
resolved "https://registry.npmjs.org/gsap/-/gsap-3.12.4.tgz"
integrity sha512-1ByAq8dD0W4aBZ/JArgaQvc0gyUfkGkP8mgAQa0qZGdpOKlSOhOf+WNXjoLimKaKG3Z4Iu6DKZtnyszqQeyqWQ==

has-bigints@^1.0.1, has-bigints@^1.0.2:
version "1.0.2"
resolved "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz"
Expand Down