Skip to content

Commit d01ca34

Browse files
authored
Merge pull request #261 from Sawan-Kushwah/add/animation
Added animation through out the website
2 parents ca85ca7 + 416b435 commit d01ca34

9 files changed

Lines changed: 74 additions & 34 deletions

File tree

client/package-lock.json

Lines changed: 24 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"@splinetool/runtime": "^1.0.67",
2626
"@splinetool/viewer": "^1.0.67",
2727
"antd": "^5.21.3",
28+
"aos": "^3.0.0-beta.6",
2829
"axios": "^1.6.8",
2930
"bootstrap": "^5.3.3",
3031
"bootstrap-icons": "^1.11.3",

client/src/App.jsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ import NotFound from "./component/NotFound";
3838
// import MiniChatbot from "./component/MiniChatbot";
3939
import ProgressBar from "./component/ProgressBar/ProgressBar";
4040
import ProtectedRoute from '../../client/src/component/ProtectedRoute'
41+
import AOS from 'aos';
42+
import 'aos/dist/aos.css';
4143

4244
// Main Layout Component
4345

@@ -125,6 +127,10 @@ function App() {
125127
}
126128
};
127129

130+
useEffect(() => {
131+
AOS.init();
132+
}, [])
133+
128134
return (
129135
<div className="h-full w-screen">
130136
<ProjectState>

client/src/component/About.jsx

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ export default function About(props) {
3131

3232
return (
3333
<div>
34-
<div
35-
className="about-content container h-[100vh] px-[2rem] mt-[10vh]"
36-
style={{
37-
background: props.mode === "dark" ? "#121212" : "#ffffff",
38-
color: props.mode === "dark" ? "white" : "black",
39-
}}
40-
>
34+
<div
35+
className="about-content container h-[100vh] px-[2rem] mt-[10vh]"
36+
style={{
37+
background: props.mode === "dark" ? "#121212" : "#ffffff",
38+
color: props.mode === "dark" ? "white" : "black",
39+
}}
40+
>
4141
<section className="about-main-section">
42-
<div className="about-content-left">
42+
<div className="about-content-left" data-aos="fade-right" data-aos-duration="1300">
4343
<h2 className="Heading-Page !bg-gradient-to-r from-cyan-500 to-blue-500 !bg-clip-text !text-transparent ">About Us</h2>
4444
<div className="about-section-desc w-[70%] text-sm leading-relaxed mx-auto fs-4">
4545
Bitbox is like a friendly community where people working on
@@ -83,7 +83,7 @@ export default function About(props) {
8383
<div className="tracker tr-23"></div>
8484
<div className="tracker tr-24"></div>
8585
<div className="tracker tr-25"></div>
86-
<div id="card">
86+
<div id="card" data-aos="fade-left" data-aos-duration="1300">
8787
<img src={AboutImgHero} id="propmpt" alt="aboutVectorImg" />
8888
</div>
8989
</div>
@@ -97,12 +97,12 @@ export default function About(props) {
9797
<div className="Team-Sec">
9898
<div className="px-[2.5rem] m-0 text-center">
9999
<div className="team-content">
100-
<h2 className="Heading-Page">
100+
<h2 className="Heading-Page" data-aos="zoom-in" data-aos-duration="1400">
101101
Our <span className="!bg-gradient-to-r from-cyan-500 to-blue-500 !bg-clip-text !text-transparent ">Team</span>
102102
</h2>
103103
<div className="team-grid container ">
104104
{/* card 1 */}
105-
<div className="team-card">
105+
<div className="team-card" data-aos="fade-up" data-aos-duration="1700" data-aos-delay="100">
106106
<div className="team-text" style={{ color: props.mode === 'dark' ? 'white' : 'black' }}>
107107
<b>Anuj Verma</b> is a tech-savvy person who loves working with AI and building websites. He&apos;s gained experience through internships and projects, showing that he&apos;s ready to do great things in the tech world.
108108
</div>
@@ -127,7 +127,7 @@ export default function About(props) {
127127
</div>
128128
</div>
129129
{/* card 2 */}
130-
<div className="team-card">
130+
<div className="team-card" data-aos="fade-up" data-aos-duration="1700" data-aos-delay="300">
131131
<div className="team-text" style={{ color: props.mode === 'dark' ? 'white' : 'black' }}>
132132
<b>Jitendra Kumar</b>: Tech enthusiast skilled in web development and database management, showcasing expertise in projects like weather app and algorithm analyzer, poised for impactful contributions in the tech industry.
133133
</div>
@@ -152,7 +152,7 @@ export default function About(props) {
152152
</div>
153153
</div>
154154
{/* card 3 */}
155-
<div className="team-card">
155+
<div className="team-card" data-aos="fade-up" data-aos-duration="1700" data-aos-delay="500">
156156
<div className="team-text" style={{ color: props.mode === 'dark' ? 'white' : 'black' }}>
157157
<b>Harshit Singh</b>: Entry-level software engineer skilled in C, C++, Python, HTML, CSS, and JavaScript. Eager to leverage abilities in problem-solving and project development for organizational growth.
158158
</div>
@@ -186,12 +186,12 @@ export default function About(props) {
186186
<div className="Team-Sec">
187187
<div className="visitors-container">
188188
<div className="visitors-content">
189-
<h2 className="Heading-Page">
189+
<h2 className="Heading-Page" data-aos='zoom-in'>
190190
Visitors
191191
</h2>
192192
<div className="container">
193193
<div className="row">
194-
<div className="col-md-3 col-sm-6">
194+
<div className="col-md-3 col-sm-6" data-aos="fade-up" data-aos-duration="1700" data-aos-delay="100">
195195
<div className="counter">
196196
<div className="counter-icon">
197197
<FontAwesomeIcon icon={faUser} />
@@ -200,7 +200,7 @@ export default function About(props) {
200200
<h3>VisitorCount</h3>
201201
</div>
202202
</div>
203-
<div className="col-md-3 col-sm-6">
203+
<div className="col-md-3 col-sm-6" data-aos="fade-up" data-aos-duration="1700" data-aos-delay="300">
204204
<div className="counter blue">
205205
<div className="counter-icon" style={{ color: props.mode === 'dark' ? 'white' : '#4accdb' }}>
206206
{/* <i className="fa fa-youtube"></i> */}
@@ -210,7 +210,7 @@ export default function About(props) {
210210
<h3 style={{ color: props.mode === 'dark' ? 'white' : '#4accdb' }}>Registrations</h3>
211211
</div>
212212
</div>
213-
<div className="col-md-3 col-sm-6">
213+
<div className="col-md-3 col-sm-6" data-aos="fade-up" data-aos-duration="1700" data-aos-delay="500">
214214
<div className="counter">
215215
<div className="counter-icon">
216216
<i className="fa-solid fa-user-group"></i>
@@ -219,7 +219,7 @@ export default function About(props) {
219219
<h3>Participants</h3>
220220
</div>
221221
</div>
222-
<div className="col-md-3 col-sm-6">
222+
<div className="col-md-3 col-sm-6" data-aos="fade-up" data-aos-duration="1700" data-aos-delay="700">
223223
<div className="counter blue">
224224
<div className="counter-icon" style={{ color: props.mode === 'dark' ? 'white' : '#4accdb' }}>
225225
{/* <i className="fa fa-rocket"></i> */}
@@ -237,14 +237,14 @@ export default function About(props) {
237237
{/* FAQ */}
238238
<div className="accordion-container">
239239

240-
<div className="faq-section">
240+
<div className="faq-section" data-aos="fade-up" data-aos-duration="1700">
241241
<div className="container">
242242
<h2 className="Heading-Page mb-7">Frequently Asked <span className="!bg-gradient-to-r from-cyan-500 to-blue-500 !bg-clip-text !text-transparent ">Questions</span></h2>
243243
<section>
244244
<div className="accordion" id="accordionExample">
245245
<div className="accordion-item">
246246
<h2 className="accordion-header flex justify-center">
247-
<button className="accordion-button collapsed fs-3" type="button" data-bs-toggle="collapse" data-bs-target="#collapseOne" aria-expanded="false" aria-controls="collapseOne" style={{background: props.mode === 'dark' ? 'black' : 'white', color: props.mode === 'dark' ? 'white' : 'black' }}>
247+
<button className="accordion-button collapsed fs-3" type="button" data-bs-toggle="collapse" data-bs-target="#collapseOne" aria-expanded="false" aria-controls="collapseOne" style={{ background: props.mode === 'dark' ? 'black' : 'white', color: props.mode === 'dark' ? 'white' : 'black' }}>
248248
Will a beginner, with absolutely no knowledge of github, gain
249249
anything fruitful?
250250
</button>

client/src/component/Footer.jsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ const Footer = (props) => {
8888
{/* Footer container with dynamic background color */}
8989
<div className="Footer" style={{ backgroundColor: props.mode === 'dark' ? '#0B192C' : 'white' }}>
9090
<div className="container">
91-
<div className='mb-4'>
91+
<div className='mb-4' data-aos="fade-up" data-aos-duration='1500'>
9292
<h4 className="text-3xl font-semibold text-center text-black mb-4">Subscribe to our Newsletter</h4>
9393
<form
9494
className="flex flex-col items-center gap-4 md:flex-row md:justify-center"
@@ -117,7 +117,7 @@ const Footer = (props) => {
117117
</div>
118118
<div className="row">
119119
{/* Left section with branding and social icons */}
120-
<div className="col-md-6 col-lg-5 col-12 ft-1">
120+
<div className="col-md-6 col-lg-5 col-12 ft-1" data-aos="fade-up" data-aos-delay="100" data-aos-duration="1800">
121121
<h3 style={{ fontFamily: "medium", fontSize: "2.5rem" }}>
122122
BIT<span className='code' style={{ color: "#0D92F4" }}>BOX</span>
123123
</h3>
@@ -143,7 +143,7 @@ const Footer = (props) => {
143143
</div>
144144

145145
{/* Middle section with About links */}
146-
<div className="col-md-6 col-lg-3 col-12 ft-2">
146+
<div className="col-md-6 col-lg-3 col-12 ft-2" data-aos="fade-up" data-aos-delay="300" data-aos-duration="1800">
147147
<h5>About</h5>
148148
<ul>
149149
<li className="nav-item">
@@ -156,7 +156,7 @@ const Footer = (props) => {
156156
</div>
157157

158158
{/* Right section with Legal links */}
159-
<div className="col-md-7 col-lg-4 col-13 ft-3">
159+
<div className="col-md-7 col-lg-4 col-13 ft-3" data-aos="fade-up" data-aos-delay='500' data-aos-duration="1800">
160160
<h5>Legals</h5>
161161
<ul>
162162
<li className="nav-item">
@@ -176,7 +176,7 @@ const Footer = (props) => {
176176

177177
{/* Last footer section with copyright info */}
178178
<div className='Last-footer'>
179-
<p className='copy-content'>
179+
<p className='copy-content' data-aos="fade-up" data-aos-offset="30">
180180
© 2024 Bitbox.&nbsp; Made with 🤍 by Bitbox India.&nbsp; All rights reserved.
181181
</p>
182182
</div>

client/src/component/Home.jsx

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ const Home = (props) => {
213213
<CardsPage />
214214

215215
{/* Service Section */}
216-
<div className="service-section" style={{ marginTop: "5rem", background: props.mode === 'dark' ? 'black' : 'white', color: props.mode === 'dark' ? 'white' : 'black' }}>
216+
<div className="service-section" style={{ marginTop: "5rem", background: props.mode === 'dark' ? 'black' : 'white', color: props.mode === 'dark' ? 'white' : 'black' }} data-aos="fade-up" data-aos-duration='1600'>
217217
<div className='text-center' style={{ background: props.mode === 'dark' ? 'black' : 'white', color: props.mode === 'dark' ? 'white' : 'black' }}>We&apos;re Still</div>
218218
<h1 className="service-heading text-center" style={{ background: props.mode === 'dark' ? 'black' : 'white', color: props.mode === 'dark' ? 'white' : 'black' }}>Cooking Our Service</h1>
219219
<div className="service-description text-center" style={{ background: props.mode === 'dark' ? 'black' : 'white', color: props.mode === 'dark' ? 'white' : 'black' }}>We are going to launch our service Very Soon,</div>
@@ -224,7 +224,7 @@ const Home = (props) => {
224224
</div>
225225
{/* Works Section */}
226226
<div className="work-Sec mb-2" style={{ background: props.mode === 'dark' ? 'black' : '#f7f7f7', color: props.mode === 'dark' ? 'white' : 'black' }}>
227-
<h2 className='work-heading' style={{ textAlign: 'center', marginBottom: '1rem', fontWeight: 'bold', textTransform: 'uppercase' }}>
227+
<h2 className='work-heading' style={{ textAlign: 'center', marginBottom: '1rem', fontWeight: 'bold', textTransform: 'uppercase' }} data-aos="zoom-out">
228228
What We Work On
229229
</h2>
230230

@@ -236,6 +236,9 @@ const Home = (props) => {
236236
<div
237237
key={index}
238238
className="py-16 px-3 rounded-2xl border-blue-main border-2 space-y-3 transition-transform duration-300 ease-in-out transform hover:scale-105 hover:bg-blue-main hover:shadow-lg group"
239+
data-aos='zoom-in'
240+
data-aos-delay={100 * index}
241+
data-aos-duration='1700'
239242
>
240243
<h3 className="font-semibold text-[28px] text-center text-blue-main group-hover:text-white">
241244
{word.title}
@@ -278,8 +281,8 @@ const Home = (props) => {
278281
{/* Technology Section */}
279282
<div className='Technology-Sec' style={{ background: props.mode === 'dark' ? 'black' : 'white', color: props.mode === 'dark' ? 'white' : 'black' }}>
280283
<div className="Technology-Container">
281-
<h2 className='Heading-Page mb-4' style={{ background: props.mode === 'dark' ? 'black' : 'white', color: props.mode === 'dark' ? 'white' : 'black' }}>Project Technology</h2>
282-
<div className="content">
284+
<h2 className='Heading-Page mb-4' style={{ background: props.mode === 'dark' ? 'black' : 'white', color: props.mode === 'dark' ? 'white' : 'black' }} data-aos="zoom-out">Project Technology</h2>
285+
<div className="content" data-aos="zoom-in" data-aos-duration="1700">
283286
<div className="benefits">
284287
<div className="basic-marquee basic-marquee-1">
285288
<a className="social-media-link" href="#">

client/src/component/HomePage/Card.jsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ const CardsPage = (props) => {
2828
<h2
2929
className="font-bold text-blue-main text-4xl md:text-5xl lg:text-[3.5rem] pt-16"
3030
style={{ color: props.mode === "dark" ? "white" : "" }}
31+
data-aos='zoom-out'
3132
>
3233
Be a part of Bitbox Community
3334
</h2>
@@ -37,6 +38,9 @@ const CardsPage = (props) => {
3738
<div
3839
key={index}
3940
className="py-16 px-5 rounded-2xl border-blue-main border-2 space-y-3 transition-transform duration-300 ease-in-out transform hover:scale-105 hover:bg-blue-main hover:shadow-lg group"
41+
data-aos='zoom-in'
42+
data-aos-delay={100 * index}
43+
data-aos-duration='1700'
4044
>
4145
<h3 className="font-semibold text-[28px] text-center text-blue-main group-hover:text-white">
4246
{card.title}

client/src/component/Login.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ const Login = ({ mode, showAlert, isloggedin, setloggedin }) => {
7272
}
7373

7474
return (
75-
<div className="h-screen flex items-center justify-center">
75+
<div className="h-screen flex items-center justify-center" data-aos="zoom-in" data-aos-duration="1800">
7676
{userLoggedIn && navigate('/')}
7777
<div
7878
className="wrapper h-3/4 mt-10"
@@ -136,7 +136,7 @@ const Login = ({ mode, showAlert, isloggedin, setloggedin }) => {
136136

137137
<button className="submit" type="submit" disabled={loading}>
138138
{loading ? <Spin size="small" /> : "Login"}
139-
</Button>
139+
</button>
140140
<button
141141
disabled={isloggedin}
142142
onClick={(e) => { onGoogleSignIn(e) }}
@@ -155,7 +155,7 @@ const Login = ({ mode, showAlert, isloggedin, setloggedin }) => {
155155
</defs>
156156
</svg>
157157
{isloggedin ? 'Signing In...' : 'Continue with Google'}
158-
158+
159159
</button>
160160

161161
<p

client/src/component/Testimonial.jsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,13 @@ const Testimonial = () => {
8585

8686
return (
8787
<div>
88-
<h1 className='text-center text-5xl'>
88+
<h1 className='text-center text-5xl' data-aos="zoom-out">
8989
See What our client say&apos;s about us !
9090
</h1>
9191

92-
<div className="slider" style={{ position: 'relative', marginTop: '100px', width: '100%', height: '550px', overflow: 'hidden' }}>
92+
<div className="slider" style={{ position: 'relative', marginTop: '100px', width: '100%', height: '550px', overflow: 'hidden' }}
93+
data-aos='zoom-in'
94+
data-aos-duration='1700'>
9395
{items.map((item, index) => (
9496
<div className="item max-sm:!w-[300px] max-sm:!h-[430px] bg-blue-700 text-white" key={index} style={{
9597
position: 'absolute',

0 commit comments

Comments
 (0)