Skip to content

Commit 4f9feac

Browse files
lakshyalakshya
authored andcommitted
Merge branch 'development' of https://github.com/codeuino/website-www.codeuino.org into development
2 parents a641db5 + ce5a9c4 commit 4f9feac

File tree

5 files changed

+101
-24
lines changed

5 files changed

+101
-24
lines changed

src/App.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
HashRouter,
1111
BrowserRouter
1212
} from "react-router-dom";
13+
import COC from './pages/COC/COC'
1314
import About from './pages/About/About'
1415
// import Donut from './pages/Donut/Donut';
1516
import Blog from './pages/Blogs/Blog';
@@ -36,9 +37,7 @@ function App() {
3637
<Route path="/joinus" >
3738
<JoinUs/>
3839
</Route>
39-
<Route path="/joinus" >
40-
<NewHome/>
41-
</Route>
40+
<Route path="/codeofconduct"><COC/></Route>
4241
<Route path="/bloglist">
4342
<BlogList/>
4443
</Route>

src/components/NavBar/index.js

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@ const NavBar = () => {
1515
return (
1616
<nav class="navbar navbar-expand-lg navbar-light bg-light fixed-top" id="myNav">
1717
<div className="container">
18-
<a class="navbar-brand" href="/"><Image id="logo" src={logo} alt="codeuino logo" style={{heigth:"20vh",width:"10vw"}}/></a>
18+
<Link class="navbar-brand" to="/"><Image id="logo" src={logo} alt="codeuino logo" style={{heigth:"20vh",width:"10vw"}}/></Link>
1919
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
2020
<span class="navbar-toggler-icon"></span>
2121
</button>
2222
<div class="collapse navbar-collapse" id="navbarSupportedContent">
2323
<ul class="navbar-nav ml-auto">
2424
<li class="nav-item">
25-
<a class="nav-link" href="/">Home <span class="sr-only">(current)</span></a>
25+
<Link class="nav-link" to="/">Home <span class="sr-only">(current)</span></Link>
2626
</li>
2727
<li class="nav-item dropdown">
28-
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
28+
<Link class="nav-link dropdown-toggle" to="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
2929
Activities
30-
</a>
30+
</Link>
3131
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
3232
<a class="dropdown-item" href="https://docs.codeuino.org/documentation/activities/google-summer-of-code-2019" style={{textAlign : "center"}}>GSOC 2019</a>
3333
<a class="dropdown-item" href="https://github.com/codeuino/gci" style={{textAlign : "center"}}>GCI 2019-20</a>
@@ -36,19 +36,22 @@ const NavBar = () => {
3636
</div>
3737
</li>
3838
<li class="nav-item">
39-
<a class="nav-link" href="/team">Team<span class="sr-only">(current)</span></a>
39+
<Link class="nav-link" to="/team">Team<span class="sr-only">(current)</span></Link>
4040
</li>
4141
<li class="nav-item">
4242
<a class="nav-link" href="https://docs.codeuino.org/documentation/">Docs<span class="sr-only">(current)</span></a>
4343
</li>
4444
<li class="nav-item">
45-
<a class="nav-link" href="/about">About Us<span class="sr-only">(current)</span></a>
45+
<Link class="nav-link" to="/about">About Us<span class="sr-only">(current)</span></Link>
4646
</li>
4747
<li class="nav-item">
48-
<a class="nav-link" href="/bloglist">Blogs<span class="sr-only">(current)</span></a>
48+
<Link class="nav-link" to="/bloglist">Blogs<span class="sr-only">(current)</span></Link>
4949
</li>
5050
<li class="nav-item">
51-
<a class="nav-link" href="/bloglist">Join Us<span class="sr-only">(current)</span></a>
51+
<Link class="nav-link" to="/codeofconduct">Code of Conduct<span class="sr-only">(current)</span></Link>
52+
</li>
53+
<li class="nav-item">
54+
<Link class="nav-link" to="/joinus">Join Us<span class="sr-only">(current)</span></Link>
5255
</li>
5356
</ul>
5457
</div>

src/pages/COC/COC.js

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
import React from 'react';
2+
3+
export default function componentName() {
4+
return (
5+
<>
6+
<div>
7+
<div class="mt-12"></div>
8+
<div class="container content blog-page blog-item" id="getInvolved-content">
9+
<div class="blog margin-bottom-40" id="donut">
10+
<div class="g-heading-v9 g-mb-30"></div>
11+
<h1> Code Of Conduct</h1>
12+
13+
<p>The world we currently live in is full of technologies. Like the technical community as a whole, the Codeuino is a non profit open Source organisation that helps to bring amazing people together to create, develop, design and make things with open technologies and share work for benefit of all.</p>
14+
15+
<p>Codeuino Runs various technical projects which tends to bring various open source organisation at one place to build up a unity of Open Source.</p>
16+
17+
<p>Our project is an important part of the Free Software ecosystem. We work with various projects to create high-quality solutions that span the entire software stack of world While the many Codeuino contributors develop code, smash bugs, write documentation, and help users, the Foundation acts as a guiding hand in the process and provides resources and infrastructure for existing and future building other open source Organisations. </p>
18+
<p>Codeuino is a place where we all learn, explore, teach and reflect in order to accomplish the missions.</p>
19+
20+
<p>We have agreed upon the following Code of Conduct as a guide to our collaboration and cooperation.</p>
21+
22+
<h2> Be considerate</h2>
23+
24+
<p>Your work will be used by other people, and you in turn will depend on the work of others. Any decision you take will affect the users and the contributors working on particular project, So you should keep those consequences in mind while making any decision. For instance, if a user is working on some part of a project and you immediately you releases the next part of the same project then it can lead with some problems and the other user may find it difficult in concentrating on previous part which may result in either losing or getting out of track.</p>
25+
26+
<h2> Be Respectful</h2>
27+
28+
<p>Codeuino community believes in healthiness and respectfulness of every decision made. Not all of us will agree all the time, but disagreement is no excuse for unacceptable behavior and manners. We might all experience some frustration now and then, but we cannot allow that frustration to turn into a personal attack. It’s important to remember that a community where people feel uncomfortable or threatened is not a productive one. So Members should be respectfulful while conversating and adore and accept every decision made by the community or group of people. Violence, threats of violence or violent language directed against another person should not be included.</p>
29+
<p>Be careful in the words that you choose. We are a world-wide Community of experts and potential contributors .Be kind to others. Do not insult or put down other aspirants. Harassment and other exclusionary behavior aren't acceptable. This includes, but is not limited to:</p>
30+
<p>Violent threats or language directed against another person for any type of decision can make you dismiss from the community.</p>
31+
32+
<h2> Be careful in the words you choose</h2>
33+
34+
<p>Discriminatory jokes not allowed while talking.</p>
35+
<p>Posting sexually explicit or violent material can make you banned from this community and the issue will be raised about this. Personal insults, especially those using racist or sexist terms.</p>
36+
<p>Repeated harassment of others on the basis of color, size, shape, caste etc is not allowed. In general, if someone asks you to stop these types of behaviour , then you have to stop but if you fail to do so then you will never allowed to collaborate with this community.</p>
37+
<p>We have agreed upon the following Code of Conduct in order to maintain the unity, cooperation and collaboration.</p>
38+
39+
<h2> Be collaborative</h2>
40+
41+
<p>Codeuino community has various projects which works on the basis of working together and collaboration. So Collaboration is the essential part for an Open Source community. Collaboration between teams that each user have their own goal and vision which is essential; for the whole to be more than the sum of its parts, each part must make an effort to understand the whole.</p>
42+
<p>Collaboration reduces redundancy and improves the quality of our work. Internally and externally, we celebrate good collaboration. Wherever possible, we work closely with upstream projects and others in the free software community to coordinate our efforts. We prefer to work transparently and involve interested parties as early as possible.</p>
43+
44+
<h2> Credit</h2>
45+
46+
<p>A good leader does not seek the limelight, but celebrates team members for the work they do. Leaders may be more visible than members of the team, good ones use that visibility to highlight the great work of others. Codeuino treats everyone equally and everyone is appreciated for every single or small change made by every contributor in the community and everyone is allowed to celebrate the success.</p>
47+
48+
<h2> Ask for help when unsure</h2>
49+
50+
<p>Nobody is expected to be perfect in this community. Asking questions early avoids many problems later, so questions are always encouraged, though they may be directed to the appropriate forum but will be appropriate. Those who are asked for assistance should be responsive and helpful.</p>
51+
52+
<h2> Step down considerately</h2>
53+
54+
<p>When somebody leaves or disengages from the project, we ask that they do so in a way that minimises disruption to the project. They should tell people they are leaving and take the proper steps to ensure that others can pick up where they left off. Moreover if the project has been created by single person that would be considered under License of that user in the community.</p>
55+
56+
<h2> Scope.</h2>
57+
58+
<p>This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. For examples if a person is representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. This code of conduct applies to all communication: this includes IRC, the mailing list, private emails and other forums such as Skype, Google+ Hangouts, other social sites, etc.</p>
59+
60+
61+
62+
<p>Some content has been taken from <a href="https://www.ubuntu.com/community/code-of-conduct">Ubuntu</a> and <a href="https://www.djangoproject.com/conduct/">Django</a> Code of Conduct. This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-ShareAlike 3.0 Unported License</a>. You may re-use it for your own project, and modify it as you wish.</p>
63+
</div></div></div>
64+
</>
65+
);
66+
}

src/pages/Team/BoardMembers.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,23 @@ var BoardMembers = [
99
{
1010
name:"Jaskirat Singh",
1111
post:"Founder",
12-
headline:'Matthew is a musician living in Nashville.',
12+
headline:'Founder @Codeuino, Google summer of code & Code In mentor at @sugar_labs, @jbossorg, member at @OpenSourceOrg, Mentor at @kossiitkgp, @microsoft Educator Expert',
1313
profile:jaskirat,
14-
github:'',
14+
github:'https://github.com/jaskirat2000',
1515
linkedin:''
1616
},
1717
{
1818
name:"Devesh",
1919
post:"Donut Maintainer",
20-
headline:'Matthew is a musician living in Nashville.',
20+
headline:'foss contributor|board member@CODEUINO|software engineer@SHAW ACADEMY|ex-intern@SHAW ACADEMY|HASURA| INTERNSHALA|HIREINK|INDICIUMHUB|',
2121
profile:devesh,
2222
github:'',
2323
linkedin:''
2424
},
2525
{
2626
name:"Vaibhav D. Aren",
2727
post:"Co-Founder",
28-
headline:'Matthew is a musician living in Nashville.',
28+
headline:'SDE at HashedIn | GSOC 2018 Developer @SugarLabs | GSOC-19 Mentor @JBOSS(Codeuino)| GCI -18 Mentor @SugarLabs .',
2929
profile:vaibhav,
3030
github:'',
3131
linkedin:''
@@ -34,7 +34,7 @@ var BoardMembers = [
3434
{
3535
name:"Shivam Luthra",
3636
post:"CodeBadge Maintainer",
37-
headline:'Matthew is a musician living in Nashville.',
37+
headline:'Student Mentor at Google Code-in',
3838
profile:shivam,
3939
github:'',
4040
linkedin:''
@@ -43,16 +43,16 @@ var BoardMembers = [
4343
{
4444
name:"Ayush Nagar",
4545
post:"CodeBadge Maintainer",
46-
headline:'Matthew is a musician living in Nashville.',
46+
headline:'Student Mentor at Google Code-in',
4747
profile:'https://avatars1.githubusercontent.com/u/32647423?s=460&v=4',
48-
github:'',
48+
github:'https://github.com/ayushnagar123',
4949
linkedin:''
5050

5151
},
5252
{
5353
name:"Siddharth",
5454
post:"Designer",
55-
headline:'Matthew is a musician living in Nashville.',
55+
headline:'Student Mentor at Google Code-in',
5656
profile:'https://avatars1.githubusercontent.com/u/33068322?s=460&v=4',
5757
github:'',
5858
linkedin:''

src/pages/Team/CoreContributors.js

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,36 @@ var CoreContributors = [
66
{
77
name:"Rupeshiya",
88
post:"Core Colaborator",
9-
headline:'Matthew is a musician living in Nashville.',
9+
headline:'Aspiring Full Stack Web Developer | Love developing. | Can Convert Coffee into Code',
1010
profile:'https://avatars0.githubusercontent.com/u/31209617?s=460&v=4',
11-
github:'',
11+
github:'https://github.com/Rupeshiya',
1212
linkedin:''
1313
},
1414
{
1515
name:"Tushar",
1616
post:"Core Colaborator",
17-
headline:'Matthew is a musician living in Nashville.',
17+
headline:'Student Mentor at Google Code-in',
1818
profile:'https://avatars2.githubusercontent.com/u/34160672?s=460&v=4',
19-
github:'',
19+
github:'https://github.com/TG1999?tab=overview&org=codeuino',
2020
linkedin:''
2121
},
2222
{
2323
name:"Shivansh",
2424
post:"Core Colaborator",
25-
headline:'Matthew is a musician living in Nashville.',
25+
headline:'Student Mentor at Google Code-in',
2626
profile:'https://avatars3.githubusercontent.com/u/43990819?s=460&v=4',
2727
github:'',
2828
linkedin:''
2929
},
30+
,
31+
{
32+
name:"Lakshya Batra",
33+
post:"Core Colaborator",
34+
headline:'GSOCer 2019 Codeuino',
35+
profile:'https://avatars1.githubusercontent.com/u/29687362?s=460&v=4',
36+
github:'https://github.com/lakshyabatman/',
37+
linkedin:''
38+
}
3039
]
3140
const InjectedJSX = CoreContributors.map((member,index) => {
3241
return <TeamCard member={member}/>

0 commit comments

Comments
 (0)