From ab1812dd80cec8b22efb35b3fc37c38c53292f3b Mon Sep 17 00:00:00 2001 From: Vinit Shahdeo Date: Wed, 20 Nov 2019 01:53:41 +0530 Subject: [PATCH 1/4] prettified readme.md with cool badges --- README.md | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 1685e05..2db019d 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,12 @@ -# Codeuino New Website +# CODEUINO New Website -[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) - -# CODEUINO +[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg?logo=github)](https://www.gnu.org/licenses/gpl-3.0) [![GitHub forks](https://img.shields.io/github/forks/codeuino/website-www.codeuino.org?logo=github)](https://github.com/codeuino/website-www.codeuino.org/network) [![GitHub stars](https://img.shields.io/github/stars/codeuino/website-www.codeuino.org?logo=github)](https://github.com/codeuino/website-www.codeuino.org/stargazers) +## Opening an issue +[![GitHub issues](https://img.shields.io/github/issues/codeuino/website-www.codeuino.org?logo=github)](https://github.com/codeuino/website-www.codeuino.org/issues) ![GitHub closed issues](https://img.shields.io/github/issues-closed/codeuino/website-www.codeuino.org?logo=github) -## Opening an issue -You should usually open an issue in the following situations: +You should usually [open an issue](https://github.com/codeuino/website-www.codeuino.org/issues/new) in the following situations: * Report an error you can’t solve yourself * Discuss a high-level topic or idea (for example, community, vision or policies) @@ -20,6 +19,9 @@ If an issue was opened a while ago, it’s possible that it’s being addressed If you opened an issue, but figured out the answer later on your own, comment on the issue to let people know, then close the issue. Even documenting that outcome is a contribution to the project. ## Opening a pull request + +[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?logo=github)](http://makeapullrequest.com) ![GitHub pull requests](https://img.shields.io/github/issues-pr-raw/codeuino/website-www.codeuino.org?logo=git&logoColor=white) ![GitHub contributors](https://img.shields.io/github/contributors/codeuino/website-www.codeuino.org?logo=github) + You should usually open a pull request in the following situations: * Submit trivial fixes (for example, a typo, a broken link or an obvious error) @@ -35,3 +37,6 @@ If the project is on GitHub, here’s how to submit a pull request: * Test your changes! Run your changes against any existing tests if they exist and create new ones when needed. Whether tests exist or not, make sure your changes don’t break the existing project. * Contribute in the style of the project to the best of your abilities. This may mean using indents, semi-colons or comments differently than you would in your own repository, but makes it easier for the maintainer to merge, others to understand and maintain in the future. +--- + +[![Twitter Follow](https://img.shields.io/twitter/follow/codeuino?style=social)](https://twitter.com/codeuino) [![Open Source Love](https://badges.frapsoft.com/os/v2/open-source.svg?v=103)](https://github.com/codeuino/Social-Platform-Donut) \ No newline at end of file From a8dc0de658fa0d1861d8fef45f1f82a6dcdcdd7f Mon Sep 17 00:00:00 2001 From: manaswinidas Date: Wed, 2 Sep 2020 14:46:14 +0530 Subject: [PATCH 2/4] fix typos in README and Projects page --- README.md | 9 +-------- src/pages/Home/Components/Projects.js | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 07ec9de..1704ae3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Codeuino Website -Offical site for Codeuino landing page. Please visit [http://www.codeuino.org/](http://www.codeuino.org/) +Official site for Codeuino landing page. Please visit [http://www.codeuino.org/](http://www.codeuino.org/) ## Table of contents @@ -64,11 +64,7 @@ If you see an open issue that you want to tackle, comment on the issue to let pe If an issue was opened a while ago, it’s possible that it’s being addressed somewhere else, or has already been resolved, so comment to ask for confirmation before starting work. If you opened an issue, but figured out the answer later on your own, comment on the issue to let people know, then close the issue. Even documenting that outcome is a contribution to the project. -<<<<<<< HEAD ### Opening a pull request -======= -## Opening a pull request ->>>>>>> ab1812d... prettified readme.md with cool badges [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?logo=github)](http://makeapullrequest.com) ![GitHub pull requests](https://img.shields.io/github/issues-pr-raw/codeuino/website-www.codeuino.org?logo=git&logoColor=white) ![GitHub contributors](https://img.shields.io/github/contributors/codeuino/website-www.codeuino.org?logo=github) @@ -80,10 +76,7 @@ A pull request doesn’t have to represent finished work. It’s usually better ## Credits -<<<<<<< HEAD This project is currently maintained by [Jaskirat Singh](https://github.com/jaskirat2000) . -======= --- [![Twitter Follow](https://img.shields.io/twitter/follow/codeuino?style=social)](https://twitter.com/codeuino) [![Open Source Love](https://badges.frapsoft.com/os/v2/open-source.svg?v=103)](https://github.com/codeuino/Social-Platform-Donut) ->>>>>>> ab1812d... prettified readme.md with cool badges diff --git a/src/pages/Home/Components/Projects.js b/src/pages/Home/Components/Projects.js index 55ba9a3..34572e6 100644 --- a/src/pages/Home/Components/Projects.js +++ b/src/pages/Home/Components/Projects.js @@ -215,7 +215,7 @@ const Projects = () => { From bdc025dab91d90dc42a9ba26ff73eb53ca685937 Mon Sep 17 00:00:00 2001 From: manaswinidas Date: Wed, 23 Sep 2020 15:15:19 +0530 Subject: [PATCH 3/4] fix conflicts --- src/pages/Home/Components/Projects.js | 221 -------------------------- 1 file changed, 221 deletions(-) diff --git a/src/pages/Home/Components/Projects.js b/src/pages/Home/Components/Projects.js index 2109f16..eb4a31b 100644 --- a/src/pages/Home/Components/Projects.js +++ b/src/pages/Home/Components/Projects.js @@ -8,226 +8,6 @@ import designImage from "../images/designSketch.svg"; const Projects = () => { return ( -<<<<<<< HEAD -
-
-
-
- - Opensource - -

Our Projects

-
-
- - - donut project - - -
-
-

Donut

-

Open source, community-oriented social media platform

-

- Donut is an open-source, feature-rich, highly flexible and - privacy-friendly, social networking platform built for - community-oriented collaboration in a customized way. It has - been built on the Node.js framework allowing an essential - impetus to provide custom and friendly rich widgets and an - expansive library of modules to make communication and - collaboration easy and successful. With a powerful module - system, you can customize this platform by using third party - tools, writing your own or integrating other software. -

-
-
- - Frontend Code on Github - - - Backend Code on Github - - - Donut Design Mockups - - - Youtube - - - Documentation - -
-
-
-
-

Codebadge

-

Tool for measuring contributor's health in the community

-

- Codebadge is an open-source, user-friendly, visual-oriented - collaboration tool which incorporates development of badges - and integrating with forums in a customized way. Codebadge - communicate skills, achievements and contribution tracking by - providing visual symbols of accomplishments packed with - verifiable data and evidence that can be shared across the - web. It is a standard organization-oriented project that - provides an essential impetus to Admins and users with an - appropriate dashboards. -

-
-
- - Frontend Code on Github - - - Backend Code on Github - - - Youtube - - - Documentation - -
-
-
-
- - - codebage project - - -
-
-
-
- - - spansberry project - - -
-
-

Spansberry

-

Open source, community-oriented discussion platform

-

- Spansberry is a community-oriented discussion platform that - comes with an intelligent dashboard mechanism that helps - manage the ongoing discussions in organized and structural - ways. Within the discussion forum, it allows tracking and - assigning tasks within the discussion forum from the replied - thread itself. It helps review team workload alongside - creating polls and surveys, and schedule draft messages inside - the discussions. The exuberant feature of this project is that - it helps turn a new or existing message within the ongoing - discussion into a task, set a deadline for any user, assign it - to a teammate or anyone, add comments or attach documents and - files, and get reminded automatically for meetings, - announcements, projects and any discussions through the bot. -

-
-
- - Frontend Code on Github - - - Backend Code on Github - - - Youtube - - - Documentation - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-

- Design Project - COMING SOON -

- -
-
-
-
-
- image -
-
-
-
-
-
-
-
-
-
-======= { ->>>>>>> development ); }; export default Projects; From bc4e75279eb8c3d07a956f6aadb81b589ff5ade4 Mon Sep 17 00:00:00 2001 From: manaswinidas Date: Wed, 23 Sep 2020 15:21:43 +0530 Subject: [PATCH 4/4] fix conflicts --- src/pages/Home/Components/Projects.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Home/Components/Projects.js b/src/pages/Home/Components/Projects.js index eb4a31b..cca27d5 100644 --- a/src/pages/Home/Components/Projects.js +++ b/src/pages/Home/Components/Projects.js @@ -183,7 +183,7 @@ const Projects = () => {

Design Project

COMING SOON

- To all the designers in the world something big is comming soon! + To all the designers in the world something big is coming soon! Update your tools for the battle.