Skip to content

Commit

Permalink
resolved the conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
parasss19 committed Jun 29, 2023
2 parents 80f204a + 1cc89fb commit f1b29fe
Show file tree
Hide file tree
Showing 50 changed files with 58,381 additions and 12,037 deletions.
7 changes: 3 additions & 4 deletions .github/ISSUE_TEMPLATE/question.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
---
name: General question
about: Request information about the project; clarify behavior of the software
title: ''
labels: 'kind/question'
assignees: ''

title: ""
labels: "kind/question"
assignees: ""
---

**How can we help?**
Expand Down
6 changes: 3 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Closes

Closes #issue_number
Closes #issue_number

<!-- Replace <`issue_number`> with the Issue number to link it with this PR -->
<!-- Example: Closes #1-->
Expand Down Expand Up @@ -29,12 +29,12 @@ Closes #issue_number
- [ ] I have built and tested the changes, and they do not break or show any errors.

<!--
Thank you for contributing to OSCodeCommunitySite!
Thank you for contributing to OSCodeCommunitySite!
Contributing Conventions:
1. Include descriptive PR titles with [<component-name>] prepended.
By following the community's contribution conventions upfront, the review process will
By following the community's contribution conventions upfront, the review process will
be accelerated and your PR merged more quickly.
-->
21 changes: 21 additions & 0 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Linting

on: [push, pull_request]

jobs:

Linting:

runs-on: ubuntu-latest

steps:

- name: Checkout
uses: actions/checkout@v3
with:
ref: ${{ github.head_ref }}

- name: Lint code with prettier
uses: creyD/[email protected]
with:
prettier_options: --write **/*.{js,md}
3 changes: 0 additions & 3 deletions .vscode/settings.json

This file was deleted.

22 changes: 11 additions & 11 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,23 @@ diverse, inclusive, and healthy community.
Examples of behavior that contributes to a positive environment for our
community includes:

* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
- Demonstrating empathy and kindness toward other people
- Being respectful of differing opinions, viewpoints, and experiences
- Giving and gracefully accepting constructive feedback
- Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the
- Focusing on what is best not just for us as individuals, but for the
overall community

Examples of unacceptable behavior include:

* The use of sexualized language or imagery, and sexual attention or
- The use of sexualized language or imagery, and sexual attention or
advances of any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email
- Trolling, insulting or derogatory comments, and personal or political attacks
- Public or private harassment
- Publishing others' private information, such as a physical or email
address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
- Other conduct which could reasonably be considered inappropriate in a
professional setting

## Enforcement Responsibilities
Expand Down Expand Up @@ -106,7 +106,7 @@ Violating these terms may lead to a permanent ban.
### 4. Permanent Ban

**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within
Expand Down
42 changes: 28 additions & 14 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Contributing guidelines

> :information_source: Before contributing, please make sure you have read the guidelines below. <br>
If you're new to _git_ and/or _GitHub_, we suggest you go through [the GitHub Guides](https://guides.github.com/introduction/flow/).
<br>
> :information*source: Before contributing, please make sure you have read the guidelines below. <br>
> If you're new to \_git* and/or _GitHub_, we suggest you go through [the GitHub Guides](https://guides.github.com/introduction/flow/).
> <br>
Thank you for taking the time to contribute to our project. Please take a moment to read the following guidelines before contributing:

> ⚠️IMPORTANT **Note**
> ⚠️IMPORTANT **Note**
>
> **Pull Requests having no issue associated with them will not be accepted. Firstly get an issue assigned, whether it's already opened or raised by you, and then create a Pull Request.**
Expand All @@ -22,8 +22,8 @@ By forking the repository, you will have your own version of the repository unde

Once you have forked your repository, go to your profile inside the repository section you will find your forked repository.

### Step 2: Clone the Forked Repository

### Step 2: Clone the Forked Repository
Once you locate your repository you need to clone it to your local machine.

Click on the "Code" button located on the repository's page.
Expand All @@ -37,69 +37,84 @@ In the terminal, run this command:
```bash
git clone <paste-the-link-here>
```

Make sure to remove <paste-the-link-here> and replace it with the actual link you copied earlier.

Which looks something like:

```bash
git clone https://github.com/yourUsername/OSCodeCommunitySite
.git
```

The yourUsername is nothing but your GitHub username.

Congratulations! You have successfully cloned the repository to your local machine. You can now make changes, add new features, or fix issues in the codebase.

### Step 3: Create a New Branch

After making the necessary changes, it's recommended to create a new branch for your changes. This helps keep your modifications separate from the main branch, making it easier to manage and review your contributions.

Use the following command to create a new branch:

``` bash
```bash
git checkout -b my-branch-name
```

Replace my-branch-name with a name of your choice for your branch.

### git checkout -b branch-name

The git checkout -b branch-name command in Git creates a new branch with the specified branch-name and switches to it.

**checkout branch-name** : switches to the branch branch-name.

**-b** : this creates the branch if it not exists already of name branch-name.
**-b** : this creates the branch if it not exists already of name branch-name.

### Step 4: Make Your Changes

Make the necessary changes or additions to the codebase.
Once you have added changes in your local, its time to push them, for that run this command to bring the modification to the staging area.

### git add .
This command is used to stage all the changes in the current directory and it's subdirectories for the next commit. It adds all modified and new files to the staging area, allowing you to include them in the next commit.

This command is used to stage all the changes in the current directory and it's subdirectories for the next commit. It adds all modified and new files to the staging area, allowing you to include them in the next commit.

**Note:** The . represents the current directory, so git add . includes all files and directories within the current working directory. This means if you are anywhere outside from the directory then the changes would not be staged.
So make sure you are in correct directory.

To change directory run this command:
``` bash

```bash
cd <path>
```

replace <path> with your working directory.

and then run this command:
``` bash

```bash
git add .
```

### Step 5: Commit Your Changes

Commit your changes with a meaningful commit message using the following command:
``` bash

```bash
git commit -m "Enter Your message related to what work you did"
```

Once you have committed your changes, it's time to push them to your forked repository on GitHub.

### Step 6: Push Your Changes

Use the following command to push your changes:

``` bash
```bash
git push origin branch-name
```

Replace branch-name with the name of the branch you created earlier.

### Step 7: Make a Pull Request
Expand All @@ -111,7 +126,6 @@ Go to pull request section in your forked repository (not the main repository)
Click on "New Pull Request".
Then this will appear.


Provide a clear and informative title and description for your pull request. Explain the changes you have made and why they should be incorporated into the original repository.

Review your pull request to ensure everything is correct, and then click on the "Create pull request" button to submit it.
Expand All @@ -126,4 +140,4 @@ Congratulations! You have successfully created a pull request to contribute your

- If anything is missing or if you feel that something is not well described, please create [an issue](https://github.com/OSCode-Community/OSCodeCommunitySite/issues)
- Any changes or suggestions to the existing content or repository are welcome.
- No need to worry, if any changes are required, the maintainers will request them from you.
- No need to worry, if any changes are required, the maintainers will request them from you.
5 changes: 2 additions & 3 deletions DESIGN.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
# Logo Design✨

We have worked hard to create a theme and identity of our brand that will not only resonate with our work and community but will stand out and make it unique. This logo that we created is based on our ideals as a community. This is a simple minimalistic rendition that is versatile and scalable to potray who we are.
We have worked hard to create a theme and identity of our brand that will not only resonate with our work and community but will stand out and make it unique. This logo that we created is based on our ideals as a community. This is a simple minimalistic rendition that is versatile and scalable to potray who we are.

If you are interested in designing logo, you can give it a try!!🤩

### -> Done by @soumizde
### -> Done by @soumizde

<img src="https://github.com/soumizde/OSCodeCommunitySite/assets/104732379/c2b9845b-50e6-443a-a159-d58602fd7adb" height="500" width="800"/>

38 changes: 15 additions & 23 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,18 @@
<img src="https://img.shields.io/github/last-commit/OSCode-Community/OSCodeCommunitySite?style=for-the-badge" />
</p>



<div align="center"><h1>🙌 About Us</h1></div>

+ We are a Multi-College Tech Community that helps college students to **Learn in Public** and **Engage** with like-minded people.
+ We help local college communities to encourage the technical culture on their campus and help them build it. We help students by upskilling them in the domains of their interests by organizing **workshops, technical seminars, hackathons, project sessions, code-along, etc.**
+ We help students to get start with their **lifelong journey of coding.** Students will explore and learn what real-world Software development looks like - problem-solving skills and interpersonal **skills will be refined.**
+ Overall students will enjoy with this **collaborative journey of learning**, practicing and sharing technical skills with our enthusiastic community!!
- We are a Multi-College Tech Community that helps college students to **Learn in Public** and **Engage** with like-minded people.
- We help local college communities to encourage the technical culture on their campus and help them build it. We help students by upskilling them in the domains of their interests by organizing **workshops, technical seminars, hackathons, project sessions, code-along, etc.**
- We help students to get start with their **lifelong journey of coding.** Students will explore and learn what real-world Software development looks like - problem-solving skills and interpersonal **skills will be refined.**
- Overall students will enjoy with this **collaborative journey of learning**, practicing and sharing technical skills with our enthusiastic community!!

<div align="center"><h1>💪 OSCode</h1></div>

<div align="center">Visit our website - <a href="https://oscode-community.github.io/OSCodeCommunitySite/"><strong>OSCode</strong></a> and start your journey with us !</div>
<br>


<div align="center"><h1>💈 Want to Contribute?</h1></div>

We welcome contributions in our community.<br>
Expand All @@ -54,12 +51,10 @@ We are proud to be a part of GSSoC '23 (GirlScript Summer of Code)! Join us and
<a href=""><img src="https://img.shields.io/static/v1.svg?label=Contributions&message=Welcome&color=yellow"></a>
<a href=""><img src="https://img.shields.io/badge/Maintained%3F-yes-brightgreen.svg?v=103"></a>


<div align="center"><h1>🧧 Code of Conduct</h1></div>

Check out <a href="https://github.com/OSCode-Community/OSCodeCommunitySite/blob/master/CODE_OF_CONDUCT.md">Code of Conduct</a> to know inclusive environment that respects all contributions.


At OSCode, we value an inclusive environment that respects all contributions. To ensure a positive experience for everyone, please review our Code of Conduct.

<div align="center"><h1>📜 License</h1></div>
Expand Down Expand Up @@ -89,10 +84,10 @@ These instructions will get you a copy of the project up and running on your loc

- Make a pull request! (compare your branch with the owner main branch)


<div align="center"><h1>🧾 Prerequisites</h1></div>

Before starting out, you'll need to install the following on your computer.

<div style="text-align: center;">
<a href="https://nodejs.org/en/download/">
<img src="https://img.shields.io/badge/node.js-6DA55F?style=for-the-badge&logo=node.js&logoColor=white" alt="NodeJS" />
Expand All @@ -107,7 +102,6 @@ Before starting out, you'll need to install the following on your computer.

<div align="center"><h1>⚡ Tech Stack Used</h1></div>


![HTML5](https://img.shields.io/badge/HTML5-E34F26?style=for-the-badge&logo=html5&logoColor=white)
![CSS5](https://img.shields.io/badge/CSS3-1572B6?style=for-the-badge&logo=css3&logoColor=white)
![javascript](https://img.shields.io/badge/javascript-F7DF1E?style=for-the-badge&logo=javascript&logoColor=black)
Expand All @@ -129,19 +123,18 @@ Before starting out, you'll need to install the following on your computer.
We help local college communities to encourage this culture on their campus and help them to build it.

We help upskill in the domain of your interests by organizing workshops, technical seminars, hackathons, project sessions, code-along, etc.

The Community aims to help individuals to Collaborate and Contribute to Open-Source Projects by mentoring them at each stage of their Contribution.

<div align="center"><h1>🎓 College Chapters</h1></div>

1. Bangalore Institute of Technology
2. Dayananda Sagar University
3. S J C institute of technology
4. Sambhram Institute of Technology
5. Sir M Vishwesariya Institute of Technology
6. Sri Krishna Institute of Technology
7. Vemana institute of technology
<div align="center"><h1>🎓 College Chapters</h1></div>

1. Bangalore Institute of Technology
2. Dayananda Sagar University
3. S J C institute of technology
4. Sambhram Institute of Technology
5. Sir M Vishwesariya Institute of Technology
6. Sri Krishna Institute of Technology
7. Vemana institute of technology

<div align="center"><h1>📱 Connect with us</h1></div>

Expand Down Expand Up @@ -170,14 +163,13 @@ Before starting out, you'll need to install the following on your computer.

<br>


<div align="center"><h1>❤️ Thanks to all the contributors</h1></div>

<a href="https://github.com/OSCode-Community/OSCodeCommunitySite/graphs/contributors">
<img src="https://contrib.rocks/image?repo=OSCode-Community/OSCodeCommunitySite" />
</a>


---

✨✨
We extend our heartfelt gratitude to all the contributors who have helped make OSCodeCommunitySite a success. We appreciate your dedication and hardwork in improving the project.🚀🚀
Loading

0 comments on commit f1b29fe

Please sign in to comment.