Skip to content

Commit b3aa540

Browse files
NishidhJain20NishidhJain20
committed
Resolved conflicts
2 parents 4a0f051 + 81fb0cf commit b3aa540

17 files changed

+383
-221
lines changed

‎.all-contributorsrc

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,72 @@
258258
"code",
259259
"design"
260260
]
261+
},
262+
{
263+
"login": "malik-vishu",
264+
"name": "Vishwas Malik",
265+
"avatar_url": "https://avatars.githubusercontent.com/u/127117253?v=4",
266+
"profile": "https://github.com/malik-vishu",
267+
"contributions": [
268+
"design",
269+
"code"
270+
]
271+
},
272+
{
273+
"login": "priyankarpal",
274+
"name": "Priyankar Pal",
275+
"avatar_url": "https://avatars.githubusercontent.com/u/88102392?v=4",
276+
"profile": "http://priyank.live",
277+
"contributions": [
278+
"code"
279+
]
280+
},
281+
{
282+
"login": "LynxSumit",
283+
"name": "Sumit Upadhyay",
284+
"avatar_url": "https://avatars.githubusercontent.com/u/114245865?v=4",
285+
"profile": "https://lynxsumit.vercel.app",
286+
"contributions": [
287+
"design"
288+
]
289+
},
290+
{
291+
"login": "p7uverma",
292+
"name": "Priyanshu Verma",
293+
"avatar_url": "https://avatars.githubusercontent.com/u/112266318?v=4",
294+
"profile": "https://p7u.tech",
295+
"contributions": [
296+
"design",
297+
"bug"
298+
]
299+
},
300+
{
301+
"login": "snehafarkya",
302+
"name": "Sneha Farkya",
303+
"avatar_url": "https://avatars.githubusercontent.com/u/63949465?v=4",
304+
"profile": "https://snehafarkya.vercel.app",
305+
"contributions": [
306+
"design"
307+
]
308+
},
309+
{
310+
"login": "sadiksaifi",
311+
"name": "Sadik Saifi",
312+
"avatar_url": "https://avatars.githubusercontent.com/u/86684667?v=4",
313+
"profile": "http://www.sadiksaifi.dev",
314+
"contributions": [
315+
"design",
316+
"code"
317+
]
318+
},
319+
{
320+
"login": "donno2048",
321+
"name": "Elisha Hollander",
322+
"avatar_url": "https://avatars.githubusercontent.com/u/61805754?v=4",
323+
"profile": "https://donno2048.github.io/Portfolio/",
324+
"contributions": [
325+
"code"
326+
]
261327
}
262328
],
263329
"contributorsPerLine": 7,

‎.github/workflows/check-linting-and-format.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Set up Node.js
2323
uses: actions/setup-node@v1
2424
with:
25-
node-version: 12
25+
node-version: 18
2626

2727
# ESLint and Prettier must be in `package.json`
2828
- name: Install Node.js dependencies

‎README.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
A Web app which lets you find eligible repositories for Hacktoberfest 2022!
44

55
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
6-
[![All Contributors](https://img.shields.io/badge/all_contributors-26-orange.svg?style=flat-square)](#contributors-)
6+
[![All Contributors](https://img.shields.io/badge/all_contributors-33-orange.svg?style=flat-square)](#contributors-)
77
<!-- ALL-CONTRIBUTORS-BADGE:END -->
88
<a href="https://gitmoji.dev">
99
<img src="https://img.shields.io/badge/gitmoji-%20😜%20😍-FFDD67.svg?style=flat-square" alt="Gitmoji">
@@ -107,6 +107,15 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
107107
<td align="center" valign="top" width="14.28%"><a href="https://github.com/ur5us"><img src="https://avatars.githubusercontent.com/u/453776?v=4?s=100" width="100px;" alt="Juri Hahn"/><br /><sub><b>Juri Hahn</b></sub></a><br /><a href="#content-ur5us" title="Content">🖋</a> <a href="https://github.com/max-programming/hacktoberfest-projects/commits?author=ur5us" title="Code">💻</a> <a href="#ideas-ur5us" title="Ideas, Planning, & Feedback">🤔</a> <a href="#design-ur5us" title="Design">🎨</a></td>
108108
<td align="center" valign="top" width="14.28%"><a href="http://marcopollivier.dev"><img src="https://avatars.githubusercontent.com/u/697445?v=4?s=100" width="100px;" alt="Marco Ollivier"/><br /><sub><b>Marco Ollivier</b></sub></a><br /><a href="#ideas-marcopollivier" title="Ideas, Planning, & Feedback">🤔</a></td>
109109
<td align="center" valign="top" width="14.28%"><a href="http://deveesh.vercel.app"><img src="https://avatars.githubusercontent.com/u/89470104?v=4?s=100" width="100px;" alt="Deveesh Shetty"/><br /><sub><b>Deveesh Shetty</b></sub></a><br /><a href="https://github.com/max-programming/hacktoberfest-projects/commits?author=Deveesh-Shetty" title="Code">💻</a> <a href="#design-Deveesh-Shetty" title="Design">🎨</a></td>
110+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/malik-vishu"><img src="https://avatars.githubusercontent.com/u/127117253?v=4?s=100" width="100px;" alt="Vishwas Malik"/><br /><sub><b>Vishwas Malik</b></sub></a><br /><a href="#design-malik-vishu" title="Design">🎨</a> <a href="https://github.com/max-programming/hacktoberfest-projects/commits?author=malik-vishu" title="Code">💻</a></td>
111+
<td align="center" valign="top" width="14.28%"><a href="http://priyank.live"><img src="https://avatars.githubusercontent.com/u/88102392?v=4?s=100" width="100px;" alt="Priyankar Pal"/><br /><sub><b>Priyankar Pal</b></sub></a><br /><a href="https://github.com/max-programming/hacktoberfest-projects/commits?author=priyankarpal" title="Code">💻</a></td>
112+
</tr>
113+
<tr>
114+
<td align="center" valign="top" width="14.28%"><a href="https://lynxsumit.vercel.app"><img src="https://avatars.githubusercontent.com/u/114245865?v=4?s=100" width="100px;" alt="Sumit Upadhyay"/><br /><sub><b>Sumit Upadhyay</b></sub></a><br /><a href="#design-LynxSumit" title="Design">🎨</a></td>
115+
<td align="center" valign="top" width="14.28%"><a href="https://p7u.tech"><img src="https://avatars.githubusercontent.com/u/112266318?v=4?s=100" width="100px;" alt="Priyanshu Verma"/><br /><sub><b>Priyanshu Verma</b></sub></a><br /><a href="#design-p7uverma" title="Design">🎨</a> <a href="https://github.com/max-programming/hacktoberfest-projects/issues?q=author%3Ap7uverma" title="Bug reports">🐛</a></td>
116+
<td align="center" valign="top" width="14.28%"><a href="https://snehafarkya.vercel.app"><img src="https://avatars.githubusercontent.com/u/63949465?v=4?s=100" width="100px;" alt="Sneha Farkya"/><br /><sub><b>Sneha Farkya</b></sub></a><br /><a href="#design-snehafarkya" title="Design">🎨</a></td>
117+
<td align="center" valign="top" width="14.28%"><a href="http://www.sadiksaifi.dev"><img src="https://avatars.githubusercontent.com/u/86684667?v=4?s=100" width="100px;" alt="Sadik Saifi"/><br /><sub><b>Sadik Saifi</b></sub></a><br /><a href="#design-sadiksaifi" title="Design">🎨</a> <a href="https://github.com/max-programming/hacktoberfest-projects/commits?author=sadiksaifi" title="Code">💻</a></td>
118+
<td align="center" valign="top" width="14.28%"><a href="https://donno2048.github.io/Portfolio/"><img src="https://avatars.githubusercontent.com/u/61805754?v=4?s=100" width="100px;" alt="Elisha Hollander"/><br /><sub><b>Elisha Hollander</b></sub></a><br /><a href="https://github.com/max-programming/hacktoberfest-projects/commits?author=donno2048" title="Code">💻</a></td>
110119
</tr>
111120
</tbody>
112121
</table>

‎assets/languages.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"Sql",
3030
"Perl",
3131
"Groovy",
32+
"Assembly",
3233
"WebAssembly",
3334
"Pascal",
3435
"CoffeeScript",
@@ -70,6 +71,7 @@
7071
"Sql",
7172
"Perl",
7273
"Groovy",
74+
"Assembly",
7375
"WebAssembly",
7476
"Pascal",
7577
"CoffeeScript",

‎components/Card.tsx

Lines changed: 58 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -10,36 +10,32 @@ function Card({ repo }: Props) {
1010
return (
1111
<div className="shadow-sm card bg-2023-void-2 ring-1 ring-2023-manga-3">
1212
<div className="relative card-body">
13-
<div className="avatar">
14-
<div className="w-10 h-10 mb-2 rounded-full">
15-
<a
16-
href={repo.owner.html_url}
17-
title={repo.owner.login}
18-
target="_blank"
19-
rel="noreferrer"
20-
>
21-
<img
22-
src={repo.owner.avatar_url}
23-
width={50}
24-
height={50}
25-
alt={repo.owner.login}
26-
className="rounded-xl"
27-
/>
28-
</a>
29-
</div>
13+
<div className="flex gap-4 items-center justify-start">
14+
<a
15+
className="border-2 rounded-full h-14 aspect-square p-1 border-neutral-100"
16+
href={repo.owner.html_url}
17+
title={repo.owner.login}
18+
target="_blank"
19+
rel="noreferrer"
20+
>
21+
<img
22+
src={repo.owner.avatar_url}
23+
alt={repo.owner.login}
24+
className="rounded-full"
25+
/>
26+
</a>
27+
<a
28+
href={repo.html_url}
29+
title={repo.name}
30+
target="_blank"
31+
rel="noreferrer"
32+
className="text-3xl cursor-pointer hover:underline text-2023-bavarian-gold-2 whitespace-nowrap overflow-hidden text-ellipsis max-w-full"
33+
>
34+
{repo.name}
35+
</a>
3036
</div>
3137

32-
<a
33-
href={repo.html_url}
34-
title={repo.name}
35-
target="_blank"
36-
rel="noreferrer"
37-
className={`text-3xl card-title link link-hover text-2023-bavarian-gold-2`}
38-
>
39-
{repo.name}
40-
</a>
41-
42-
<p className="mb-2">{emojify(repo.description)}</p>
38+
<p className="my-2 text-neutral-300">{emojify(repo.description)}</p>
4339

4440
<div className="card-actions">
4541
{repo.topics.map((topic: string) => (
@@ -59,25 +55,44 @@ function Card({ repo }: Props) {
5955
))}
6056
</div>
6157

62-
<div className="items-end justify-center h-full card-actions">
63-
<div className="shadow stats bg-transparent ring-1 ring-2023-manga-2">
64-
<div className="stat">
65-
<div className="text-center stat-title items-center inline-flex">
66-
<GoStar /> <span className="ml-0.5">Stars</span>
67-
</div>
68-
<div className="text-center stat-value">
58+
{/* stars and forks cards */}
59+
<div className="w-full flex gap-3 xl:gap-5 text-neutral-100 cursor-pointer mt-6">
60+
<a
61+
href={`${repo.html_url}/stargazers`}
62+
target="_blank"
63+
className="group w-full border rounded-xl p-3 xl:px-4 flex items-center gap-2 xl:gap-3 relative"
64+
>
65+
<GoStar className="text-yellow-200 text-2xl" />
66+
<div className="flex flex-col">
67+
<div className="xl:text-2xl text-lg font-semibold">
6968
{repo.stargazers_count}
7069
</div>
70+
<div className="text-neutral-400 text-xs lg:text-sm">Stars</div>
7171
</div>
72-
</div>
73-
<div className="shadow stats bg-transparent ring-1 ring-2023-manga-2">
74-
<div className="stat">
75-
<div className="text-center stat-title items-center inline-flex">
76-
<GoRepoForked /> <span className="ml-0.5">Forks</span>
77-
</div>
78-
<div className="text-center stat-value">{repo.forks}</div>
72+
<div
73+
id="tooltip"
74+
className="hidden group-hover:block absolute bg-2023-void-2 text-2023-bavarian-gold-2 px-2 py-1 rounded-md"
75+
>
76+
Checkout all the stars here!
77+
</div>
78+
</a>
79+
<a
80+
href={`${repo.html_url}/forks`}
81+
target="_blank"
82+
className="group w-full border rounded-xl p-3 flex items-center gap-3 relative"
83+
>
84+
<GoRepoForked className="text-yellow-200 text-2xl" />
85+
<div className="flex flex-col">
86+
<div className="text-2xl font-semibold">{repo.forks}</div>
87+
<div className="text-neutral-400 text-xs lg:text-sm">Forks</div>
88+
</div>
89+
<div
90+
id="tooltip"
91+
className="hidden group-hover:block absolute bg-2023-void-2 text-2023-bavarian-gold-2 px-2 py-1 rounded-md"
92+
>
93+
Checkout all the forks here!
7994
</div>
80-
</div>
95+
</a>
8196
</div>
8297
</div>
8398
</div>

‎components/ContributorCard.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ export default function ContributorCard({ contributor }: Props) {
2929
</figure>
3030
</a>
3131
<div className="card-body items-center text-center">
32-
<h2 className="card-title">{contributor.name}</h2>
33-
<a href={contributor.profile} className="link hover:text-[#dbe8d9]">
32+
<h2 className="card-title text-neutral-100">{contributor.name}</h2>
33+
<a href={contributor.profile} className="link text-neutral-100 hover:text-[#dbe8d9]">
3434
{contributor.profile}
3535
</a>
3636
<div className="justify-center card-actions">

‎components/Header.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ function Header() {
3333
href="/contributors"
3434
className="btn btn-square btn-ghost umami--click--contributors-button"
3535
>
36-
<BsPeopleFill size="1.5rem" title="Contributors" />
36+
<BsPeopleFill size="1.5rem" color='white' title="Contributors" />
3737
</Link>
3838

3939
<a

‎components/Hero.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ function Hero() {
2222
<div className="hero-overlay w-0 bg-opacity-60"></div>
2323
<div className="text-center hero-content">
2424
<div className="max-w-md">
25-
<h1 className="mb-5 text-5xl font-bold uppercase">
25+
<h1 className="mb-5 text-2023-manga-3 text-5xl font-bold uppercase">
2626
Select your language
2727
</h1>
28-
<p className="mb-5 uppercase">
28+
<p className="mb-5 text-2023-manga-3 font-semibold uppercase">
2929
Select the programming language you would like to find repositories
3030
for.
3131
</p>
@@ -57,13 +57,13 @@ function Hero() {
5757
onSubmit={handleSubmit}
5858
>
5959
<label className="label">
60-
<span className="label-text">Can&apos;t find your language?</span>
60+
<span className="label-text text-2023-manga-3">Can&apos;t find your language?</span>
6161
</label>
6262
<div className="flex">
6363
<input
6464
type="text"
6565
placeholder="Search for your language"
66-
className="input input-bordered w-full border-2023-bavarian-gold-2 focus:outline-2023-bavarian-gold-2 max-w-xs rounded-tr-none rounded-br-none bg-transparent"
66+
className="input input-bordered w-full text-neutral-100 border-2023-bavarian-gold-2 focus:outline-2023-bavarian-gold-2 max-w-xs rounded-tr-none rounded-br-none bg-transparent"
6767
name="search"
6868
/>
6969
<button

‎components/Search.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default function Search({ searchBarWrapperStyles }: SearchProps) {
3131
<div className="relative">
3232
<input
3333
placeholder="Search"
34-
className="w-full pr-16 input input-bordered border-2023-bavarian-gold-2 focus:outline-2023-bavarian-gold-2 bg-transparent"
34+
className="w-full text-neutral-100 pr-16 input input-bordered border-2023-bavarian-gold-2 focus:outline-2023-bavarian-gold-2 bg-transparent"
3535
type="text"
3636
{...register('searchQuery', { required: true })}
3737
/>

0 commit comments

Comments
 (0)