Skip to content

Commit ff797f9

Browse files
RoshanjosseyRoshanjossey
authored
Merge branch 'source' into add_matplotlib_project
2 parents 2fb4579 + 81d5438 commit ff797f9

21 files changed

+8060
-9216
lines changed

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"devDependencies": {
77
"enzyme": "^3.0.0",
88
"gh-pages": "^3.1.0",
9-
"react-scripts": "^4.0.3",
9+
"react-scripts": "^5.0.1",
1010
"react-test-renderer": "^15.0.0",
1111
"sw-precache": "^5.2.0"
1212
},
@@ -18,7 +18,7 @@
1818
},
1919
"scripts": {
2020
"start": "react-scripts start",
21-
"build": "react-scripts build && sw-precache --config=sw-precache-config.js",
21+
"build": "react-scripts build",
2222
"test": "react-scripts test --env=jsdom",
2323
"eject": "react-scripts eject",
2424
"deploy": "npm run build&&gh-pages -b master -d build"

‎public/funding.json

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
{
2+
"version": "v1.0.0",
3+
"entity": {
4+
"type": "organisation",
5+
"role": "owner",
6+
"name": "firstcontributions",
7+
"email": "[email protected]",
8+
"phone": "",
9+
"description": "Improve accessibility with enhanced documentation tailored for beginners and create opportunities for first-time contributors to get involved. Focus on building great software while inspiring a thriving, collaborative community around open source projects.",
10+
"webpageUrl": {
11+
"url": "https://firstcontributions.github.io/"
12+
}
13+
},
14+
"projects": [
15+
{
16+
"guid": "first-contributions",
17+
"name": "First contributions",
18+
"description": "Help beginners learn how to contribute to open-source projects. It provides a simple and beginner-friendly way for users to understand the contribution workflow using Git and GitHub. We've had over 90,000 users since we started in 2016",
19+
"webpageUrl": {
20+
"url": "https://firstcontributions.github.io/",
21+
"wellKnown": ""
22+
},
23+
"repositoryUrl": {
24+
"url": "https://github.com/firstcontributions/first-contributions",
25+
"wellKnown": ""
26+
},
27+
"licenses": ["spdx:MIT"],
28+
"tags": ["tutorial", "beginner", "open-source", "contribution"]
29+
}
30+
],
31+
"funding": {
32+
"channels": [
33+
{
34+
"guid": "opencollective",
35+
"type": "payment-provider",
36+
"address": "https://opencollective.com/firstcontributions",
37+
"description": "Fiscal host is Open Source Collective. Payment methods can be found in https://docs.opencollective.com/help/financial-contributors/payments#select-a-payment-method"
38+
},
39+
{
40+
"guid": "github-sponsors",
41+
"type": "payment-provider",
42+
"address": "https://github.com/sponsors/firstcontributions",
43+
"description": "Uses open collective"
44+
}
45+
],
46+
"plans": [
47+
{
48+
"guid": "maintainer-time",
49+
"status": "active",
50+
"name": "Maintainer compensation",
51+
"description": "This will compensate the effort of one maintainer working part-time on the projects.",
52+
"amount": 30000,
53+
"currency": "USD",
54+
"frequency": "yearly",
55+
"channels": ["opencollective", "github-sponsors"]
56+
},
57+
{
58+
"guid": "hosting-monthly",
59+
"status": "active",
60+
"name": "Hosting support",
61+
"description": "This will cover the monthly server hosting costs for the projects.",
62+
"amount": 30,
63+
"currency": "USD",
64+
"frequency": "monthly",
65+
"channels": ["opencollective", "github-sponsors"]
66+
}
67+
],
68+
"history": [
69+
{
70+
"year": 2024,
71+
"income": 3,
72+
"expenses": 0,
73+
"taxes": 0,
74+
"currency": "USD",
75+
"description": ""
76+
},
77+
{
78+
"year": 2023,
79+
"income": 5,
80+
"expenses": 0,
81+
"taxes": 0,
82+
"currency": "USD",
83+
"description": ""
84+
}
85+
]
86+
}
87+
}

‎src/App.css

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.App {
22
/* height: 500px; */
3-
background-color: #007EE5;
3+
background-color: #0a0a0a;
44
text-align: center;
55
display: flex;
66
justify-content: center;
@@ -13,6 +13,23 @@
1313
}
1414

1515
.App-header > h1 {
16-
padding-top: 10%;
17-
font-size: 2.5em;
16+
/* padding-top: 6%; */
17+
font-size: 5.1rem;
18+
letter-spacing: -0.05em;
19+
font-weight: 700;
1820
}
21+
22+
.App-header > h1 span{
23+
background: linear-gradient(to right, #60a5fa, #1d4ed8);
24+
-webkit-background-clip: text;
25+
-webkit-text-fill-color: transparent;
26+
}
27+
28+
@media (max-width: 700px) {
29+
.App-header > h1 {
30+
font-size: 3.1rem;
31+
letter-spacing: -0.05em;
32+
font-weight: 700;
33+
}
34+
35+
}

‎src/App.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const App = () => {
1111
<div className="App">
1212
<Navbar />
1313
<div className="App-header">
14-
<h1>Make your first open source contribution in 5 minutes</h1>
14+
<h1>Make your first <br/> open source <span>contribution</span> <br/> in 5 minutes</h1>
1515
</div>
1616
<ScrollUpButton />
1717
<LinkButton />

‎src/components/LinkButton/LinkButton.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
.LinkButton {
2-
padding: 10px 15px;
2+
padding: 16px 20px;
33
text-decoration: none;
44
margin: 20px auto;
55

66
overflow: hidden;
77

88
border-width: 0;
9-
border-radius: 2px;
9+
border-radius: 8px;
1010
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2);
1111

12-
background-color: #2ecc71;
12+
background-color: #2563eb;
1313
color: #fff;
1414

1515
-webkit-transition: background-color 0.3s;
@@ -19,7 +19,7 @@
1919
}
2020

2121
.LinkButton:hover {
22-
background-color: #26a65b;
22+
background-color: #3b82f6;
2323
}
2424

2525
.LinkButton > span {

‎src/components/LinkButton/LinkButton.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class LinkButton extends Component {
88
<div className="LinkButton-Wrapper">
99
<a
1010
className="LinkButton"
11-
href="https://github.com/firstcontributions/first-contributions/blob/master/README.md"
11+
href="https://github.com/firstcontributions/first-contributions/blob/main/README.md"
1212
>
1313
<span> Get started </span>
1414
</a>

‎src/components/LinkButton/__snapshots__/LinkButton.test.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
exports[`renders a project card 1`] = `
44
<a
55
className="LinkButton"
6-
href="https://github.com/firstcontributions/first-contributions/blob/master/README.md"
6+
href="https://github.com/firstcontributions/first-contributions/blob/main/README.md"
77
>
88
<span>
99
Get started

‎src/components/Navbar/Navbar.css

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,40 @@
11
.topnav {
2-
background-color:#007EE5;
2+
background-color: #1f293726;
33
overflow: hidden;
44
text-align: right;
5+
backdrop-filter: blur(16px);
6+
border: 1px solid #f9fafb1a;
7+
padding: 1.1rem;
8+
display: flex;
9+
justify-content:flex-end;
10+
gap: 16px;
511
}
612
@media (max-width: 700px) {
713
.topnav {
814
text-align: center;
15+
overflow: auto;
16+
justify-content: flex-start;
917
}
1018
}
1119

1220
.topnav a {
13-
display: inline-block;
21+
display: flex;
22+
align-items: center;
23+
gap: 8px;
1424
color: #f2f2f2;
1525
text-align: center;
16-
padding: 20px 15px;
26+
padding: 0px 15px;
1727
text-decoration: none;
18-
font-size: 20px;
28+
border: 1px solid transparent;
29+
/* font-size: 20px; */
1930
}
2031

2132
.topnav a:hover {
22-
background-color: #72B1E4;
33+
background-color: #2c2e2fb3;
2334
color: #f2f2f2;
24-
border-radius: 25px;
25-
border: #72B1E4;
26-
block-size: auto;
27-
display: inline;
35+
border-radius: 12px;
36+
border:1px solid #b6b6b94a;
37+
/* display: inline; */
2838
}
2939

3040
.topnav a.active {
@@ -34,8 +44,8 @@
3444

3545
.logo{
3646
margin-top: 10px;
37-
width: 70px;
47+
width: 52px;
3848
vertical-align:middle;
39-
height: 50px;
49+
height: 42px;
4050
display: inline-block;
4151
}

‎src/components/Navbar/Navbar.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import github from './github.svg';
88
const Navbar = () => {
99
return (
1010
<div className="topnav">
11-
<a href="https://join.slack.com/t/firstcontributors/shared_invite/zt-1hg51qkgm-Xc7HxhsiPYNN3ofX2_I8FA" target="_blank" rel="noopener noreferrer">
11+
<a href="https://join.slack.com/t/firstcontributors/shared_invite/zt-1n4y7xnk0-DnLVTaN6U9xLU79H5Hi62w" target="_blank" rel="noopener noreferrer">
1212
<img src={slack} className="logo" alt="slack logo" />
1313
<span>Slack</span>
1414
</a>
@@ -22,7 +22,7 @@ const Navbar = () => {
2222
</a>
2323
<a href="https://github.com/firstcontributions/first-contributions" target="_blank" rel="noopener noreferrer">
2424
<img src={github} className="logo" alt="github logo" />
25-
Github
25+
<span>GitHub</span>
2626
</a>
2727
</div>
2828
);

‎src/components/ProjectList/CardsContainer.jsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,16 +119,17 @@ export default class CardsContainer extends React.Component {
119119
<div>
120120
<div id='container'>
121121
<div className='inputContainer'>
122-
<input id='search' type='text' name='search' placeholder='Search...' onChange={this.handleChange} />
122+
<input id='search' type='text' name='search' placeholder='Search...' onChange={this.handleChange} aria-label='Search'/>
123123
</div>
124-
<div className='inputContainer'>
124+
<div id="tag-selector-container" className='inputContainer'>
125125
<Select
126126
name='tag-selector'
127127
value={this.state.value}
128128
onChange={this.handleSelectChange}
129129
options={this.filterOptions}
130130
multi={true}
131-
placeholder='Filter'
131+
placeholder={<div className='filter-placeholder-text'>Filter</div>}
132+
aria-labelledby='tag-selector-container'
132133
/>
133134
</div>
134135
</div>
@@ -142,6 +143,7 @@ export default class CardsContainer extends React.Component {
142143
projectLink={item.projectLink}
143144
description={item.description}
144145
tags={item.tags}
146+
className='testing-testing'
145147
/>
146148
);
147149
})}

0 commit comments

Comments
 (0)