Skip to content

Commit 3caff02

Browse files
authored
Merge branch 'main' into bharti
2 parents adcf1e2 + 54165fa commit 3caff02

File tree

18 files changed

+140
-134
lines changed

18 files changed

+140
-134
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

README.md

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ DevsInTech offers a wide range of resources and opportunities for developers and
5454
>
5555
> - Before getting into it, make sure you have [pnpm](https://nodejs.org/download) installed.
5656
57-
5857
### Let's jump right in🌟
5958

6059
1. Fork the project
@@ -114,19 +113,17 @@ DevsInTech offers a wide range of resources and opportunities for developers and
114113
115114
### Setup using Docker
116115
117-
* Enter the root directory
116+
- Enter the root directory
118117
119-
```sh
120-
docker build .
118+
```sh
119+
docker build .
121120
122-
```
121+
```
123122
124-
125-
```sh
126-
docker run -p 3000:80 <Image>
127-
```
123+
```sh
124+
docker run -p 3000:80 <Image>
125+
```
128126
129-
130127
# Contribute
131128
132129
We welcome contributions in our community. Learn how to start contributing, from installing the project on your device to submitting a pull request with our<Link href="https://github.com/devs-in-tech/DevsInTech/blob/main/CONTRIBUTING.md"> Contribution guide.<Link/>

package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,17 @@
1515
"prepare": "husky install"
1616
},
1717
"dependencies": {
18+
"@alan-ai/alan-sdk-web": "^1.8.48",
1819
"@commitlint/cli": "^17.6.6",
1920
"@commitlint/config-conventional": "^17.6.6",
2021
"autoprefixer": "10.4.14",
2122
"axios": "^1.4.0",
2223
"eslint": "8.44.0",
23-
"eslint-config-next": "13.4.8",
24+
"eslint-config-next": "13.4.12",
2425
"framer-motion": "^10.12.18",
2526
"husky": "^8.0.3",
2627
"next": "13.4.8",
27-
"pnpm": "^8.6.6",
28+
"pnpm": "^8.6.10",
2829
"postcss": "8.4.24",
2930
"react": "18.2.0",
3031
"react-dom": "18.2.0",
@@ -34,6 +35,6 @@
3435
"tailwindcss": "3.3.2"
3536
},
3637
"devDependencies": {
37-
"prettier": "2.8.8"
38+
"prettier": "3.0.0"
3839
}
39-
}
40+
}

pnpm-lock.yaml

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

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/_app.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
import "@/styles/globals.css";
2+
import AlanAIComponent from "./alan";
23

34
export default function App({ Component, pageProps }) {
4-
return <Component {...pageProps} />;
5+
return (
6+
<>
7+
{/* <AlanAIComponent/> */}
8+
<AlanAIComponent />
9+
<Component {...pageProps} />
10+
</>
11+
);
512
}

src/pages/_document.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ class MyDocument extends Document {
1414
href="https://fonts.googleapis.com/css2?family=Inter:wght@400;700&display=swap"
1515
rel="stylesheet"
1616
/>
17+
<script
18+
type="text/javascript"
19+
src="https://studio.alan.app/web/lib/alan_lib.min.js"
20+
async
21+
></script>
1722
</Head>
1823
<body>
1924
<Main />

0 commit comments

Comments
 (0)