Skip to content

updating master with developemtn #208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 42 commits into from
Jul 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
a1fc394
updated website with react framework
ayushnagar123 Jan 24, 2020
58dc967
Merge pull request #164 from ayushnagar123/development
devesh-verma Jan 24, 2020
41db742
improved navbar padding, view, title of page
Rupeshiya Jan 25, 2020
eb403f1
Merge pull request #168 from Rupeshiya/improvement
vaibhavdaren Jan 25, 2020
f625145
updated with development branch
Rupeshiya Jan 26, 2020
11495cd
rewritten join us page
Rupeshiya Jan 26, 2020
f8ff144
Merge pull request #173 from Rupeshiya/joinus
ayushnagar123 Jan 26, 2020
4ffa4e7
Added separate component for navbar and footer and updated UI
Jan 27, 2020
4c012ae
Merge pull request #177 from lakshyabatman/development
vaibhavdaren Jan 28, 2020
406c696
removed hardcode html to component and added favicon
Jan 28, 2020
140cfb0
Merge pull request #180 from lakshyabatman/development
vaibhavdaren Jan 28, 2020
8abcc37
Divided home page into reusable components
Jan 30, 2020
096fae6
Improves UI of the website by proper spacing and fixing Nav. (#181)
rak-shit Jan 31, 2020
a641db5
Merge branch 'development' into development
lakshyabatman Jan 31, 2020
70caca1
Divided home page into reusable components (#183)
lakshyabatman Feb 1, 2020
b6aed8b
Fixed the Join Us link (#184)
rak-shit Feb 2, 2020
3f142ac
Fixed the nav links (#187)
rak-shit Feb 3, 2020
ce5a9c4
added coc and updated team page
ayushnagar123 Feb 4, 2020
4f9feac
Merge branch 'development' of https://github.com/codeuino/website-www…
Feb 5, 2020
5567ab8
Changed my surname and removed a linting issue in corecontibutor.js
Feb 5, 2020
e72aa55
Merge pull request #189 from lakshyabatman/development
jaskiratsingh2000 Feb 5, 2020
eaa8c54
Added a scroll to top component (#188)
JanviMahajan14 Feb 8, 2020
fddd1d1
Updated Readme (#190)
lakshyabatman Feb 8, 2020
4d3f643
tweet feeds added
ayushnagar123 Feb 8, 2020
19aeb25
Update Projects.js
adarzh-sys Feb 9, 2020
9ac628f
fixed the major UI issues (#195)
Rupeshiya Feb 12, 2020
49e9012
Fixes #192- Fetching articles from Medium
AuraOfDivinity Feb 19, 2020
a616a0c
Requested changes
AuraOfDivinity Feb 19, 2020
dd40b82
Requested Changes
AuraOfDivinity Feb 22, 2020
6f01c1b
Merge pull request #193 from adarsh-qclw/patch-1
vaibhavdaren Feb 24, 2020
e045962
Removing modal
AuraOfDivinity Feb 26, 2020
4d4d47a
tweet updated (#199)
ayushnagar123 Mar 5, 2020
e80e99e
Update package.json
ayushnagar123 Mar 5, 2020
116a674
Merge pull request #197 from AuraOfDivinity/194
jaskiratsingh2000 Mar 7, 2020
d2c4157
Fixed the responsiveness and Team Page (#202)
DevanshCodes May 6, 2020
3566627
added the serve in start script
DevanshCodes May 6, 2020
faf7684
fixed the designation in team
DevanshCodes May 6, 2020
6fe5246
updated build
DevanshCodes May 6, 2020
8fc47ac
removed build folder
devesh-verma Jun 21, 2020
f20452a
rectifying build errors
devesh-verma Jun 21, 2020
12d805c
Readme - Setup Steps Update (#206)
ksraj123 Jul 6, 2020
d8cf7ab
Merge branch 'master' into hotfix
devesh-verma Jul 7, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
7 changes: 7 additions & 0 deletions Dockerfile-dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
FROM node:12.2.0-alpine
WORKDIR /app
ENV PATH /app/node_modules/.bin:$PATH
COPY package.json /app/package.json
RUN npm install --silent
RUN npm install react-scripts@latest -g --silent
CMD ["npm", "start"]
77 changes: 57 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,42 +1,79 @@
# Codeuino Website

# CODEUINO New Website
Offical site for Codeuino landing page. Please visit [http://www.codeuino.org/](http://www.codeuino.org/)

[![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
## Table of contents

- Requirements
- Installation
- File Structure
- How to contribute
- Credits

## Requirements

Following applications are required to run the application locally.

- Git
- Npm
- Node

## Installation

To run the application on your local system follow these steps

1. `git clone https://github.com/codeuino/website-www.codeuino.org.git`
2. Move to the project directory.
3. `git checkout development`
4. `npm install`
5. `npm run build`
6. `npm start`
7. Open `localhost:5000` to view the website on your local browser.

## File Structure

This section describes about the file structure of the project.
All the source code is located in `src` directory.
There are two main directories in the src folder, `components` and `pages`.
The pages directory contains all the source code of routes in separate folders.
The components directory contains all reusable component file in separate folders.

## Dockerizing the application

### To use the application in docker for both production and development use, follow

- Build and tag docker image ` docker image build -f Dockerfile-dev -t {name-of-docker-file-of-your-choice} . `

- Running docker image ` lakshyadocker run -it -v ${PWD}:/app -v /app/node_modules -p {Port-you-want-your-app-on}:3000 --rm {docker-image} `

## How to contribute

### 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)

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)
* Propose a new feature or other project idea
- Report an error you can’t solve yourself
- Discuss a high-level topic or idea (for example, community, vision or policies)
- Propose a new feature or other project idea

**Tips for communicating on issues:**

If you see an open issue that you want to tackle, comment on the issue to let people know you’re on it. That way, people are less likely to duplicate your work.
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.

## Opening a pull request
### 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)
* Start work on a contribution that was already asked for, or that you’ve already discussed, in an issue
- Submit trivial fixes (for example, a typo, a broken link or an obvious error)
- Start work on a contribution that was already asked for, or that you’ve already discussed, in an issue
A pull request doesn’t have to represent finished work. It’s usually better to open a pull request early on, so others can watch or give feedback on your progress. Just mark it as a “WIP” (Work in Progress) in the subject line. You can always add more commits later.

If the project is on GitHub, here’s how to submit a pull request:

* Fork the repository and clone it locally. Connect your local to the original “upstream” repository by adding it as a remote. Pull in changes from “upstream” often so that you stay up to date so that when you submit your pull request, merge conflicts will be less likely. (See more detailed instructions here.)
* Create a branch for your edits.
* Reference any relevant issues or supporting documentation in your PR. (for example, “Closes #37.”)
* Include screenshots of the before and after if your changes include differences in HTML/CSS. Drag and drop the images into the body of your 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.

---
## Credits

[![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)
This project is currently maintained by [Jaskirat Singh](https://github.com/jaskirat2000) .
Loading