Skip to content

Commit 830efb9

Browse files
authored
Merge pull request #46 from RossellaFer/feature/more-data-on-internships
#45 description added to data + disclaimer component
2 parents 0e95d27 + 6b7147a commit 830efb9

File tree

7 files changed

+64
-22
lines changed

7 files changed

+64
-22
lines changed
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
.disclaimerContainer {
2+
padding: 30px 80px 30px 80px;
3+
}
4+
5+
.disclaimerLink {
6+
text-decoration: underline;
7+
color: rgb(0, 122, 124);
8+
}
9+
10+
.disclaimerLink:hover {
11+
color: rgba(0, 122, 124, 0.5);
12+
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import React from 'react';
2+
import '../../assets/css/App.css';
3+
import './Disclaimer.css';
4+
5+
export default function Disclaimer(props) {
6+
7+
return (
8+
<>
9+
<div className="disclaimerContainer">
10+
<p>The source for the data used in this project is <a className="disclaimerLink" target="_blank" href="https://itsfoss.com/best-open-source-internships/" rel="noreferrer">"It's Foss"</a>, an award-winning web-portal that focuses on Open Source.</p>
11+
</div>
12+
13+
</>
14+
);
15+
}

src/components/Resources/Resources.css

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
border: 1px solid #ccc;
1010
box-shadow: 2px 2px 6px 0px rgba(0, 0, 0, 0.3);
1111
width: 110%;
12-
height: 220%;
1312
display: flex;
1413
flex-direction: column;
1514
justify-content: space-between;
@@ -34,4 +33,3 @@
3433
.resourceLink:hover {
3534
background-color: rgba(0, 122, 124, 0.8);
3635
}
37-

src/components/Resources/Resources.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@ import '../../assets/css/App.css';
33
import './Resources.css';
44
import ResourcesList from '../data/data.json';
55
import { Link } from "react-router-dom";
6-
import Toggle from "../Toggle"
7-
8-
9-
6+
import Toggle from "../Toggle";
7+
import Disclaimer from "../Disclaimer/Disclaimer";
108

119
export default function Resources() {
10+
1211
return (
1312
<>
1413
<Toggle />
@@ -20,8 +19,8 @@ return (
2019
</div>
2120
<Link className="resourceLink" to={`/resources/${resource.id}`}><span>More info</span></Link>
2221
</article>)}
23-
</div>
24-
22+
</div>
23+
<Disclaimer />
2524
</>
2625
);
2726
}

src/components/SingleResource/SingleResource.css

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.fullCardContainer {
2-
height: calc(100vh - 62px);
2+
min-height: calc(100vh - 62px);
33
display: flex;
44
justify-content: center;
55
align-items: center;
@@ -8,6 +8,7 @@
88
.fullCard {
99
width: 400px;
1010
padding: 20px 30px;
11+
margin: 30px auto;
1112
border: 1px solid rgb(0, 122, 124);
1213
box-shadow: 4px 5px 10px 0px rgb(0 122 124 / 30%);
1314
display: flex;
@@ -20,6 +21,10 @@
2021
font-weight: 600;
2122
}
2223

24+
.fullCardDescription {
25+
line-height: 1.5em;
26+
}
27+
2328
.fullCardLabelsContainer {
2429
display: flex;
2530
flex-wrap: wrap;

src/components/SingleResource/SingleResource.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import '../../assets/css/App.css';
33
import './SingleResource.css';
44
import { useParams } from "react-router-dom";
55
import data from '../data/data.json';
6+
import Disclaimer from '../Disclaimer/Disclaimer';
67

78
export default function SingleResource() {
89
const { id } = useParams();
@@ -15,19 +16,20 @@ export default function SingleResource() {
1516
.map((resource) => (
1617
<div className="fullCard" key={ resource.id }>
1718
<h2 className="fullCardTitle">{resource.name}</h2>
19+
<p className="fullCardDescription">{resource.description}</p>
1820
<p>Duration: <strong>{resource.internship_period} months</strong></p>
1921
{resource.application_period.length > 0 &&
2022
<div><p>Application period:</p>
2123
<div className="fullCardLabelsContainer">{ resource.application_period.map((month, index) => <span key={index} className="fullCardLabel">{ month }</span>) }</div>
2224
</div>
2325
}
2426
<p>Stipend: {resource.stipend ? <strong>Paid</strong> : <strong>Unpaid</strong>}</p>
25-
<p>Location: { resource.location.join(', ')}</p>
27+
<p>Location: <strong>{ resource.location.join(', ')}</strong></p>
2628
<a className="fullCardLink" target="_blank" href={resource.url} rel="noreferrer">Go to resource website</a>
2729
</div>
2830
))}
2931
</div>
30-
32+
<Disclaimer />
3133
</>
3234
);
3335
}

src/components/data/data.json

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"internship_period": 3,
88
"application_period": ["March", "April"],
99
"stipend": true,
10-
"location": ["Remote"]
10+
"location": ["Remote"],
11+
"description": "You can work with famous organizations like, Debian, Fedora, GCC, FreeBSD, Git (Not GitHub), Gnome, OpenSUSE Arduino, and other more top names in Open Source community."
1112
},
1213
{
1314
"id": 2,
@@ -17,7 +18,8 @@
1718
"internship_period": 3,
1819
"application_period": ["April", "May"],
1920
"stipend": false,
20-
"location": ["Remote", "Boston, US"]
21+
"location": ["Remote", "Boston, US"],
22+
"description": "The oldest, mother of all organizations which started the free software movement. The Internship program runs thrice a year."
2123
},
2224
{
2325
"id": 3,
@@ -40,7 +42,8 @@
4042
"December"
4143
],
4244
"stipend": true,
43-
"location": ["Remote"]
45+
"location": ["Remote"],
46+
"description": "Project which develops, maintains, supports the free software stack for accelerated graphics for all graphics hardware."
4447
},
4548
{
4649
"id": 4,
@@ -50,7 +53,8 @@
5053
"internship_period": 3,
5154
"application_period": ["February", "March", "April"],
5255
"stipend": true,
53-
"location": ["Remote"]
56+
"location": ["Remote"],
57+
"description": "Project to entice/enhance women participation in Rust, Clojure, JavaScript, PHP, Python, Ruby on Rails, Rails web framework etc."
5458
},
5559
{
5660
"id": 5,
@@ -60,7 +64,8 @@
6064
"internship_period": 4,
6165
"application_period": ["February", "March"],
6266
"stipend": true,
63-
"location": ["United States"]
67+
"location": ["United States"],
68+
"description": "A project to collect, understand earth observational data using a variety of sensors, testing and making cohesive sense out of the data collected."
6469
},
6570
{
6671
"id": 6,
@@ -70,7 +75,8 @@
7075
"internship_period": 3,
7176
"application_period": ["January", "February", "March"],
7277
"stipend": true,
73-
"location": ["Remote"]
78+
"location": ["Remote"],
79+
"description": "FOSS Project which works to use and promote software-defined networking and network functions visualization."
7480
},
7581
{
7682
"id": 7,
@@ -93,7 +99,8 @@
9399
"December"
94100
],
95101
"stipend": false,
96-
"location": ["Bangalore", "Remote"]
102+
"location": ["Bangalore", "Remote"],
103+
"description": "Deeproot started in 2000. Their main product is deepOfix Mail Server and is based on Debian."
97104
},
98105
{
99106
"id": 8,
@@ -116,7 +123,8 @@
116123
"December"
117124
],
118125
"stipend": true,
119-
"location": ["Remote"]
126+
"location": ["Remote"],
127+
"description": "An organisation dedicated to network functions virtualisation"
120128
},
121129
{
122130
"id": 9,
@@ -126,7 +134,8 @@
126134
"internship_period": 3,
127135
"application_period": ["February", "March", "April"],
128136
"stipend": true,
129-
"location": ["Remote"]
137+
"location": ["Remote"],
138+
"description": "Outreachy started in 2006, wrapped up, and started up again in 2010. I did share an interview with Maria Glukova which shared her experience. Twice a year it runs and has in excess of 30+ interns per year from 20+ projects including Debian, Redhat, OpenStack, and many others."
130139
},
131140
{
132141
"id": 10,
@@ -136,7 +145,8 @@
136145
"internship_period": 3,
137146
"application_period": ["June", "July"],
138147
"stipend": false,
139-
"location": ["Remote"]
148+
"location": ["Remote"],
149+
"description": "Technical writers can spend three months working closely with an open-source community. Bring their technical writing expertise to the project’s documentation. Google uses Payoneer to pay a stipend to technical writers who have successfully completed their Season of Docs projects."
140150
},
141151
{
142152
"id": 11,
@@ -146,6 +156,7 @@
146156
"internship_period": null,
147157
"application_period": [],
148158
"stipend": true,
149-
"location": ["Remote"]
159+
"location": ["Remote"],
160+
"description": "Khan Academy is looking for talented software developers to create a free virtual classroom for the world. You can work on developing web solutions, data analysis developing classroom content, etc."
150161
}
151162
]

0 commit comments

Comments
 (0)