Skip to content

Commit 8f68a3c

Browse files
authored
Merge branch 'source' into patch-1
2 parents eb4c1f4 + d7dfe5e commit 8f68a3c

File tree

9 files changed

+12385
-11043
lines changed

9 files changed

+12385
-11043
lines changed

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
"homepage": "https://firstcontributions.github.io/",
66
"devDependencies": {
77
"enzyme": "^3.0.0",
8-
"gh-pages": "^0.12.0",
9-
"react-scripts": "3.2.0",
8+
"gh-pages": "^3.1.0",
9+
"react-scripts": "^4.0.3",
1010
"react-test-renderer": "^15.0.0",
1111
"sw-precache": "^5.2.0"
1212
},
1313
"dependencies": {
1414
"lodash": "^4.17.19",
15-
"react": "^15.4.0",
16-
"react-dom": "^15.4.0",
15+
"react": "^17.0.2",
16+
"react-dom": "^17.0.2",
1717
"react-select": "^1.0.0-rc.10"
1818
},
1919
"scripts": {

src/components/LinkButton/LinkButton.css

Lines changed: 35 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77

88
border-width: 0;
99
border-radius: 2px;
10-
box-shadow: 0 1px 4px rgba(0, 0, 0, .2);
11-
10+
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2);
11+
1212
background-color: #2ecc71;
1313
color: #fff;
14-
15-
-webkit-transition: background-color .3s;
16-
-moz-transition: background-color .3s;
17-
transition: background-color .3s;
18-
margin-bottom: 10vw;
14+
15+
-webkit-transition: background-color 0.3s;
16+
-moz-transition: background-color 0.3s;
17+
transition: background-color 0.3s;
18+
margin-bottom: 0 !important;
1919
}
2020

2121
.LinkButton:hover {
@@ -24,5 +24,32 @@
2424

2525
.LinkButton > span {
2626
font-size: 1.1em;
27-
letter-spacing: .05em;
27+
letter-spacing: 0.05em;
28+
}
29+
.LinkButton-Wrapper {
30+
display: flex;
31+
align-items: center;
32+
justify-content: center;
33+
flex-direction: column;
34+
margin-bottom: 2rem;
35+
}
36+
.Scroll-Down {
37+
cursor: pointer;
38+
position: relative;
39+
animation: swing alternate 0.5s infinite;
40+
}
41+
.Scroll-Down:active {
42+
opacity: 0.75;
43+
}
44+
.Scroll-Down-Wrapper {
45+
padding: 1vw;
46+
padding-bottom: 1.75vw;
47+
}
48+
@keyframes swing {
49+
from {
50+
top: -0.5rem;
51+
}
52+
to {
53+
top: 1rem;
54+
}
2855
}

src/components/LinkButton/LinkButton.jsx

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,21 @@
1-
import React, { Component } from 'react';
2-
import './LinkButton.css';
1+
import React, { Component } from "react";
2+
import "./LinkButton.css";
3+
import scrollDown from "./scroll-down.svg";
34

45
class LinkButton extends Component {
56
render() {
67
return (
7-
<a className="LinkButton" href="https://github.com/firstcontributions/first-contributions/blob/master/README.md">
8-
<span> Get started </span>
9-
</a>
8+
<div className="LinkButton-Wrapper">
9+
<a
10+
className="LinkButton"
11+
href="https://github.com/firstcontributions/first-contributions/blob/master/README.md"
12+
>
13+
<span> Get started </span>
14+
</a>
15+
<div className="Scroll-Down-Wrapper">
16+
<img className="Scroll-Down" onClick={() => { window.scrollBy({ top: window.innerHeight - 80, left: 0, behavior: "smooth" }); }} src={scrollDown} alt="Scroll Down!" width="64" height="64" />
17+
</div>
18+
</div>
1019
);
1120
}
1221
}
Lines changed: 1 addition & 0 deletions
Loading

src/components/ProjectList/ProjectsCards.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ const Card = ({
3434
<div className="Card-Description">
3535
<p> {description}</p>
3636
</div>
37-
<div className="Card-Link">Go to Project</div>
3837
</div>
38+
<div className="Card-Link">Go to Project</div>
3939
</a>
4040
</div>
4141
);

src/components/ProjectList/css/project-cards.css

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
}
1111
.Project-Logo {
1212
width: 45%;
13-
height: 40%;
13+
height: auto;
1414
margin-top: 5%;
1515
}
1616
.Card-Body {
@@ -49,6 +49,8 @@
4949
color: black;
5050
}
5151
.Card-Real-Link:link {
52+
display: flex;
53+
flex-direction: column;
5254
text-decoration: none;
5355
color: black;
5456
margin: 0 auto;
@@ -63,8 +65,16 @@
6365
}
6466
.Card-Link {
6567
position: relative;
66-
padding: 10px;
68+
padding: 15px;
6769
color: #0f3cef;
70+
background: transparent;
71+
transition: .5s;
72+
margin-top: auto;
73+
border-top: rgba(0, 0, 0, 0.12) 1px solid;
74+
}
75+
.Card-Link:hover {
76+
color: whitesmoke;
77+
background: #0f3cef;
6878
}
6979
.Card-Title {
7080
margin-top: 6%;

src/components/ProjectList/css/search.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
border: 1px solid #DCDCDC;
1717
}
1818

19+
#search:hover,#search:focus {
20+
border: 1px #0f3cef solid ;
21+
}
22+
1923
.inputContainer {
2024
width: 47%;
2125
margin-top: 40px;

src/components/ProjectList/listOfProjects.js

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -735,11 +735,11 @@ const projectList = [
735735
tags: ['React', 'Chat', 'Javascript', 'Beginner', 'NodeJS'],
736736
},
737737
{
738-
name: 'Open Source Code',
739-
imageSrc: 'https://raw.githubusercontent.com/OpenSouceCode/Frontend/master/public/logo/favicon-logo.png',
740-
projectLink: 'https://github.com/OpenSouceCode',
738+
name: 'CodeTrophs',
739+
imageSrc: 'https://avatars.githubusercontent.com/u/62751673?s=200&v=4',
740+
projectLink: 'https://github.com/CodeTrophs',
741741
description: 'Contributing to open source can be a rewarding way to learn, teach, and build experience in just about any skill you can imagine.',
742-
tags: ['React', 'Chat', 'Javascript', 'Beginner', 'NodeJS', 'NextJS'],
742+
tags: ['React', 'Chat', 'Javascript', 'Beginner', 'NodeJS', 'NextJS', 'Python', 'ML/AI', 'OpenSource'],
743743
},
744744
{
745745
name: 'Zulip',
@@ -803,6 +803,27 @@ const projectList = [
803803
projectLink: 'https://github.com/CollaboraOnline/online/contribute',
804804
description: 'A collaborative online office suite based on LibreOffice technology. This is also the source for the Collabora Office apps for iOS and Android.',
805805
tags: ['javascript', 'css', 'android', 'c++', 'design', 'ios', 'web', 'productivity', 'typescript', 'libreoffice', 'office', 'documents']
806+
},
807+
{
808+
name: 'Jigsaw',
809+
imageSrc: 'https://avatars.githubusercontent.com/u/19845815?s=200&v=4',
810+
projectLink: 'https://github.com/Jigsaw-Code',
811+
description: 'Jigsaw is an incubator within Google that uses technology to address geopolitical issues.',
812+
tags: ['Go', 'TypeScript', 'c', 'Shell', 'Python'],
813+
},
814+
{
815+
name: 'Idea Hub',
816+
imageSrc: 'https://avatars3.githubusercontent.com/u/67384272?v=4',
817+
projectLink: 'https://github.com/MakeContributions/ideahub#contribution-guidelines',
818+
description: 'A collection of ideas and projects that contain from beginner to advance :octocat: 🎯🚀',
819+
tags: ['Hub', 'ideas', 'Project List', 'Good First Issue', 'Beginner'],
820+
},
821+
{
822+
name: 'Simple Icons',
823+
imageSrc: 'https://github.com/simple-icons/simple-icons-website/blob/master/public/images/og.png',
824+
projectLink: 'https://github.com/simple-icons/simple-icons',
825+
description: 'SVG icons for popular brands',
826+
tags: ['JavaScript', 'OpenSource', 'Beginner', 'SVG', 'NodeJS']
806827
}
807828
];
808829
export default projectList;

0 commit comments

Comments
 (0)