Skip to content

Commit 188777e

Browse files
Geeta259Geeta259
authored
Merge branch 'main' into geeta_issue#406
2 parents 144c253 + 54165fa commit 188777e

File tree

13 files changed

+61
-116
lines changed

13 files changed

+61
-116
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ typings/
7171
# dotenv environment variables file
7272
.env
7373
.env.test
74+
.env.local
7475

7576
# parcel-bundler cache (https://parceljs.org/)
7677
.cache

‎src/components/HeroSection/index.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const HeroSection = () => {
77
<div className="flex items-center justify-center text-center md:items-start md:text-left md:justify-start px-7">
88
<div className="flex flex-col items-center md:items-start gap-8 md:w-2/3 w-full">
99
<h1 className="md:text-6xl sm:text-7xl text-4xl font-primary font-bold text-transparent bg-clip-text bg-gradient-to-r from-[#AF7AF2] via-[#A5F7A8] to-[#AF7AF2]">
10-
Devs In Tech Community
10+
DevsInTech Community
1111
</h1>
1212
<p className="text-left md:text-xl font-secondary sm:text-xl text-lg text-white">
1313
Welcome to DevsInTech, an all inclusive community where developers come to learn, grow, and create together. Whether you&apos;re a beginner or an experienced developer, you&apos;ll find a place here to connect, collaborate, and build new skills. With weekly coffee chats, movie nights, expert sessions, and more, we offer endless opportunities to improve your craft and connect with like-minded individuals. Join us today and become a part of a community that&apos;s all about helping you succeed.

‎src/components/ScrollToTop.jsx‎

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ const ScrollToTop = () => {
1717
const handleScroll = () => {
1818
let height = 580;
1919
const scrollCheck =
20-
window.pageYOffset ||
2120
document.documentElement.scrollTop ||
2221
document.body.scrollTop;
2322
if (scrollCheck > height) {
@@ -35,7 +34,7 @@ const ScrollToTop = () => {
3534
return (
3635
scroll && (
3736
<div
38-
className="fixed cursor-pointer bg-[#13161B] bottom-20 right-10 p-4 rounded-full shadow-lg text-white hover:bg-gradient-to-br from-[#FF008A] to-[#6100FF] transition duration-300 ease-in-out transform hover:-translate-y-1 hover:scale-110 hover:shadow-xl"
37+
className="fixed cursor-pointer bg-[#13161B] bottom-10 left-10 p-4 rounded-full shadow-lg text-white hover:bg-gradient-to-br from-[#FF008A] to-[#6100FF] transition duration-300 ease-in-out transform hover:-translate-y-1 hover:scale-110 hover:shadow-xl"
3938
onClick={scrollToTop}
4039
>
4140
<FiArrowUp size={28} />
@@ -45,43 +44,3 @@ const ScrollToTop = () => {
4544
};
4645

4746
export default ScrollToTop;
48-
// =======
49-
// import { useEffect, useState } from "react";
50-
// import { FiArrowUp } from "react-icons/fi";
51-
52-
// const ScrollToTop = () => {
53-
// const [scroll, setScroll] = useState(false);
54-
// const scrollToTop = () => {
55-
// window.scrollTo({
56-
// top: 0,
57-
// behavior: "smooth",
58-
// });
59-
// };
60-
61-
// useEffect(() => {
62-
// window.addEventListener("scroll", () => {
63-
// let height = 580;
64-
// const scrollCheck =
65-
// document.documentElement.scrollTop || document.body.scrollTop;
66-
// if (scrollCheck > height) {
67-
// setScroll(true);
68-
// } else {
69-
// setScroll(false);
70-
// }
71-
// });
72-
// }, []);
73-
74-
// return (
75-
// scroll && (
76-
// <div
77-
// className="fixed cursor-pointer bg-[#13161B] bottom-14 right-5 md:bottom-5 p-2 rounded-full shadow-lg text-white hover:bg-gradient-to-br from-[#FF008A] to-[#6100FF] transition duration-300 ease-in-out transform hover:-translate-y-1 hover:scale-110 hover:shadow-xl"
78-
// onClick={scrollToTop}
79-
// >
80-
// <FiArrowUp size={28} />
81-
// </div>
82-
// )
83-
// );
84-
// };
85-
86-
// export default ScrollToTop;
87-
// >>>>>>> ca2392dd00b671896d5180ea6af8eb94167e6bd2

‎src/pages/Contributors.js‎

Lines changed: 19 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import Footer from "@/components/Footer";
22
import Navbar from "@/components/Navbar";
33
import axios from "axios";
44
import { useEffect, useState } from "react";
5+
import { BsGithub } from "react-icons/bs";
56

67
const Contributors = () => {
78
const [contributors, setContributors] = useState([]);
@@ -28,42 +29,27 @@ const Contributors = () => {
2829
<h1 className="text-5xl font-bold text-white text-center">
2930
Our Contributors
3031
</h1>
31-
<div className="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-8 mt-8 justify-center">
32+
<div className="contributor-container relative z-[1] flex justify-center items-center flex-wrap p-[1em]">
3233
{contributors.map((i) => (
33-
<div
34-
className="flex justify-center items-center flex-col border border-white p-8 h-110 w-110 rounded-[0.7cm] transition duration-300 shadow-md hover:scale-105 hover:cursor-pointer hover:shadow-xl hover:border-white hover:border-opacity-60 hover:shadow-lg"
35-
key={i.id}
36-
>
37-
<div className="w-36 h-36 rounded-full overflow-hidden transition duration-300 border-2 border-white">
38-
<img
39-
className="w-full h-full object-cover transition duration-300 hover:scale-110 hover:cursor-pointer hover:border-pink-200"
40-
src={i.avatar_url}
41-
alt=""
42-
/>
43-
</div>
44-
<div className="mt-5">
45-
<h1 className="text-white text-2xl sm:text-3xl text-center">
46-
{i.login}
47-
</h1>
48-
</div>
49-
<div className="mt-2">
50-
<h3 className="text-white text-xl sm:text-2xl text-center">
51-
Commits: {i.contributions}
52-
</h3>
53-
</div>
34+
<div className="contributor-card relative w-[300px] h-[400px] shadow-[0_15px_35px_rgba(0,0,0,0.9)] flex justify-center items-center flex-col backdrop-blur-2xl bg-clip-padding shadow-[0px_10px_10px_rgba(46,54,68,0.03)] m-[1em] rounded-[15px] border-[solid] border-transparent bg-gray-900 cursor-auto" key={i.login}>
35+
<div className="contributor-content relative flex justify-center items-center flex-col opacity-50 transition duration-[0.5s]">
36+
<div class="relative w-[150px] h-[150px] overflow-hidden rounded-[50%] border-[10px] border-solid border-[rgba(0,0,0,0.25)]">
37+
<img className="absolute w-full h-full object-cover left-0 top-0" src={i.avatar_url} alt={i.login} />
38+
</div>
5439

55-
<div className="mt-4">
56-
<button className="border-2 border-white w-40 md:w-56 py-2 rounded transition duration-300 hover:scale-105 hover:border-pink-100 relative overflow-hidden mx-auto my-2 sm:my-0 sm:mx-2">
57-
<a
58-
className="text-white text-2xl sm:text-3xl"
59-
href={i.html_url}
60-
target="_blank"
61-
rel="noopener noreferrer"
62-
>
63-
View
64-
</a>
65-
</button>
40+
<div class="contributor-details">
41+
<h3 className="text-white uppercase tracking-[2px] font-medium text-lg text-center leading-[1.1em] mt-5 mb-2.5 mx-0">
42+
{i.login}<br />
43+
<span className="text-xs font-light">Commits: {i.contributions}</span>
44+
</h3>
45+
</div>
6646
</div>
47+
48+
<ul className="contributor-social-icons absolute flex justify-center items-center bottom-[50px]">
49+
<li className="translate-y-10 opacity-0 transition duration-[0.5s] mx-2.5 my-0">
50+
<a href={i.html_url} target="_blank" rel="noopener noreferrer" className="text-2xl text-white"><BsGithub /></a>
51+
</li>
52+
</ul>
6753
</div>
6854
))}
6955
</div>

‎src/pages/alan.js‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,24 @@
1-
// alan-ai-setup.js
2-
import { useEffect } from "react";
1+
import React, { useEffect } from "react";
32

4-
const AlanAIProjectKey =
5-
"f9b22abe4b61e7c364a5a62bdae65be32e956eca572e1d8b807a3e2338fdd0dc/stage";
3+
const AlanAIProjectKey = `${process.env.NEXT_PUBLIC_ALAN_AI_CHATBOT}/stage`;
64

75
function AlanAIComponent() {
86
useEffect(() => {
97
// Load Alan AI script asynchronously when the component mounts on the client side
8+
// const additionalStyles = `
9+
// .alanBtn-root {
10+
// right: 2rem !important;
11+
// bottom: 2rem !important;
12+
// }
13+
// `;
1014

11-
const additionalStyles = `
12-
.alanBtn-root {
13-
right: 46px !important;
14-
bottom: 150px !important;
15-
}
16-
`;
17-
18-
const styleTag = document.createElement("style");
19-
styleTag.innerHTML = additionalStyles;
20-
document.head.appendChild(styleTag);
15+
// const styleTag = document.createElement("style");
16+
// styleTag.innerHTML = additionalStyles;
17+
// document.head.appendChild(styleTag);
2118

2219
// Initialize Alan AI and handle commands once the script is loaded
2320
/* global alanBtn */
24-
var alanBtnInstance = alanBtn({
21+
const alanBtnInstance = alanBtn({
2522
key: AlanAIProjectKey,
2623
onCommand: function (commandData) {
2724
if (commandData && commandData.command === "openURL") {
@@ -36,9 +33,14 @@ function AlanAIComponent() {
3633
}
3734
},
3835
});
36+
37+
// Clean up the Alan AI instance when the component unmounts
38+
return () => {
39+
alanBtnInstance.deactivate();
40+
};
3941
}, []);
4042

41-
return <div id="alan-btn" />; // This div will serve as the mount point for the Alan AI button
43+
return <div id="alan-btn" className="fixed cursor-pointer bg-[#13161B] bottom-16 left-10 p-4"></div>; // This div will serve as the mount point for the Alan AI button
4244
}
4345

4446
export default AlanAIComponent;

‎src/pages/events/blogathon/index.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const BlogAThons = () => {
1111
<div className='w-[100%] flex flex-wrap mx-auto justify-center items-center mt-26 py-8 mb-5 max-w-screen-2xl format-card'>
1212
<div className="md:w-2/3 ml-5" data-aos="fade-left" data-aos-duration="500">
1313
<p className="team-description font-bold text-2xl text-center">
14-
Join our DevsinTech community for an array of exciting online tech events. Attend insightful webinars featuring industry experts, dive deep into practical workshops to enhance your skills, and unleash your creativity in our competitive hackathons. Engage with fellow developers, expand your network, and stay updated on cutting-edge technologies and industry trends.
14+
Join our DevsInTech community for an array of exciting online tech events. Attend insightful webinars featuring industry experts, dive deep into practical workshops to enhance your skills, and unleash your creativity in our competitive hackathons. Engage with fellow developers, expand your network, and stay updated on cutting-edge technologies and industry trends.
1515
</p>
1616
</div>
1717
</div>

‎src/pages/events/coffee/index.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const BlogAThons = () => {
1111
<div className='w-[100%] flex flex-wrap mx-auto justify-center items-center mt-26 py-8 mb-5 max-w-screen-2xl format-card'>
1212
<div className="md:w-2/3 ml-5" data-aos="fade-left" data-aos-duration="500">
1313
<p className="team-description font-bold text-2xl text-center">
14-
Join our DevsinTech community for an array of exciting online tech events. Attend insightful webinars featuring industry experts, dive deep into practical workshops to enhance your skills, and unleash your creativity in our competitive hackathons. Engage with fellow developers, expand your network, and stay updated on cutting-edge technologies and industry trends.
14+
Join our DevsInTech community for an array of exciting online tech events. Attend insightful webinars featuring industry experts, dive deep into practical workshops to enhance your skills, and unleash your creativity in our competitive hackathons. Engage with fellow developers, expand your network, and stay updated on cutting-edge technologies and industry trends.
1515
</p>
1616
</div>
1717
</div>

‎src/pages/events/index.jsx‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -59,23 +59,12 @@ const Events = () => {
5959
return (
6060
<>
6161
<Navbar />
62-
<div style={{ marginTop: 100, color: "white", alignItems: "center" }}>
63-
<h1 className="text-5xl font-bold text-center text-blue-500">
64-
Welcome to the DevsinTech Community Events Page!
65-
</h1>
66-
<div className="w-[100%] flex flex-wrap mx-auto justify-center items-center mt-26 py-8 mb-5 max-w-screen-2xl format-card">
67-
<div
68-
className="md:w-2/3 ml-5"
69-
data-aos="fade-left"
70-
data-aos-duration="500"
71-
>
62+
<div style={{ marginTop: 100, color: 'white', alignItems: 'center' }}>
63+
<h1 className="text-5xl font-bold text-center text-blue-500">Welcome to the DevsInTech Community Events Page!</h1>
64+
<div className='w-[100%] flex flex-wrap mx-auto justify-center items-center mt-26 py-8 mb-5 max-w-screen-2xl format-card'>
65+
<div className="md:w-2/3 ml-5" data-aos="fade-left" data-aos-duration="500">
7266
<p className="team-description font-bold text-2xl text-center">
73-
At DevsinTech, we believe in fostering a vibrant and inclusive
74-
community of tech enthusiasts, developers, and industry
75-
professionals. Our events are designed to bring together
76-
like-minded individuals to learn, share knowledge, and network.
77-
<br></br> Join our community to stay updated on the latest tech
78-
trends, expand your skillset, and connect with fellow developers.
67+
At DevsInTech, we believe in fostering a vibrant and inclusive community of tech enthusiasts, developers, and industry professionals. Our events are designed to bring together like-minded individuals to learn, share knowledge, and network.<br></br> Join our community to stay updated on the latest tech trends, expand your skillset, and connect with fellow developers.
7968
</p>
8069
</div>
8170
</div>
@@ -124,7 +113,7 @@ const Events = () => {
124113
>
125114
Search
126115
</label>
127-
<div className="relative w-[87vw] mx-auto mb-[8rem] mr-[7.5rem] mt-[3rem] ">
116+
<div className="relative w-[87vw] mx-auto mb-[8rem] mr-[7.5rem] mt-[3rem] ">
128117
<div className="absolute inset-y-0 left-0 flex items-center pl-3 pointer-events-none">
129118
<svg
130119
className="w-4 h-4 text-gray-500 dark:text-gray-400"

‎src/pages/events/quiz/index.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const Quiz = () => {
1111
<div className='w-[100%] flex flex-wrap mx-auto justify-center items-center mt-26 py-8 mb-5 max-w-screen-2xl format-card'>
1212
<div className="md:w-2/3 ml-5" data-aos="fade-left" data-aos-duration="500">
1313
<p className="team-description font-bold text-2xl text-center">
14-
Join our DevsinTech community for an array of exciting online tech events. Attend insightful webinars featuring industry experts, dive deep into practical workshops to enhance your skills, and unleash your creativity in our competitive hackathons. Engage with fellow developers, expand your network, and stay updated on cutting-edge technologies and industry trends.
14+
Join our DevsInTech community for an array of exciting online tech events. Attend insightful webinars featuring industry experts, dive deep into practical workshops to enhance your skills, and unleash your creativity in our competitive hackathons. Engage with fellow developers, expand your network, and stay updated on cutting-edge technologies and industry trends.
1515
</p>
1616
</div>
1717
</div>

‎src/pages/events/spaces/index.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const Spaces = () => {
1111
<div className='w-[100%] flex flex-wrap mx-auto justify-center items-center mt-26 py-8 mb-5 max-w-screen-2xl format-card'>
1212
<div className="md:w-2/3 ml-5" data-aos="fade-left" data-aos-duration="500">
1313
<p className="team-description font-bold text-2xl text-center">
14-
Join our DevsinTech community for an array of exciting online tech events. Attend insightful webinars featuring industry experts, dive deep into practical workshops to enhance your skills, and unleash your creativity in our competitive hackathons. Engage with fellow developers, expand your network, and stay updated on cutting-edge technologies and industry trends.
14+
Join our DevsInTech community for an array of exciting online tech events. Attend insightful webinars featuring industry experts, dive deep into practical workshops to enhance your skills, and unleash your creativity in our competitive hackathons. Engage with fellow developers, expand your network, and stay updated on cutting-edge technologies and industry trends.
1515
</p>
1616
</div>
1717
</div>

0 commit comments

Comments
 (0)