Skip to content

Commit

Permalink
Resolve merge conflicts in package files
Browse files Browse the repository at this point in the history
  • Loading branch information
Vin205 committed Oct 31, 2024
2 parents 05c2c54 + c123dab commit f3415d8
Show file tree
Hide file tree
Showing 244 changed files with 17,744 additions and 6,023 deletions.
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
*.yml filter=lfs diff=lfs merge=lfs -text
*.jsx filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.jpg filter=lfs diff=lfs merge=lfs -text
36 changes: 36 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
---
name: "🐞 Bug Report"
about: "Report a bug in the Enyanjyoti Website."
title: "[Bug]: "
labels: bug
assignees: ''

---

# 🐞 Bug Report

### 📋 Description
<!-- A clear and concise description of what the bug is. -->

### ⚙️ Steps to Reproduce
Steps to reproduce the behavior:
1.
2.
3.

### ✔️ Expected Behavior
<!-- A clear description of what you expected to happen. -->

### ❌ Actual Behavior
<!-- A clear description of what actually happens. -->

### 📷 Screenshots
<!-- If applicable, add screenshots to help explain your problem. -->

### 🖥️ Environment (if applicable):
- **OS**: (e.g., Windows, macOS, Linux)
- **Browser**: (e.g., Chrome, Safari, Firefox)
- **Version**: (if relevant)

### 🔧 Additional Information
<!-- Include any other details that may help diagnose the issue. -->
25 changes: 25 additions & 0 deletions .github/ISSUE_TEMPLATE/custom_issue_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
---
name: "💡 Custom Issue"
about: "Create a custom issue related to the Enyanjyoti Website."
title: "[Custom]: "
labels: enhancement, discussion
assignees: ''

---

# 💡 Custom Issue

### 📝 Description
<!-- Provide a detailed explanation of your issue or request. -->

### 🔍 Steps to Reproduce (if applicable)
1.
2.
3.

### 🎯 Expected Outcome
<!-- Describe what you expect to happen. -->

### 📸 Screenshots or Additional Information
<!-- Add screenshots, logs, or any additional information if applicable. -->

26 changes: 26 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
name: "🚀 Feature Request"
about: "Suggest a new feature or enhancement for the Enyanjyoti Website."
title: "[Feature]: "
labels: enhancement, feature request
assignees: ''

---

# 🚀 Feature Request

### 📝 Feature Description
<!-- A clear and concise description of the feature you're requesting. -->

### 🔧 How Will This Enhance the App?
<!-- Explain how the requested feature will improve the user experience or functionality. -->

### 🎯 Use Cases
<!-- If applicable, provide use cases that illustrate the need for the feature. -->

### 📦 Suggested Implementation
<!-- If you have suggestions on how to implement this feature, describe them here. -->

### 📸 Additional Context
<!-- Add any other context, screenshots, or details that will help support your request. -->

3 changes: 3 additions & 0 deletions .github/workflows/Greetings.yml
Git LFS file not shown
Binary file modified .gitignore
Binary file not shown.
5 changes: 5 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npm run lint
npm run format
117 changes: 117 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@

# Contributor Covenant Code of Conduct

## Our Pledge

We as members, contributors, and leaders pledge to make participation in our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
nationality, personal appearance, race, religion, or sexual identity
and orientation.

We pledge to act and interact in ways that contribute to an open, welcoming,
diverse, inclusive, and healthy community.

## Our Standards

Examples of behavior that contributes to a positive environment for our
community include:

* 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
overall community

Examples of unacceptable behavior include:

* 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
address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Enforcement Responsibilities

Community leaders are responsible for clarifying and enforcing our standards of
acceptable behavior and will take appropriate and fair corrective action in
response to any behavior that they deem inappropriate, threatening, offensive,
or harmful.

Community leaders have the right and responsibility to remove, edit, or reject
comments, commits, code, wiki edits, issues, and other contributions that are
not aligned to this Code of Conduct, and will communicate reasons for moderation
decisions when appropriate.

## Scope

This Code of Conduct applies within all community spaces, and also applies when
an individual is officially representing the community in public spaces.
Examples of representing our community include using an official e-mail address,
posting via an official social media account, or acting as an appointed
representative at an online or offline event.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement.
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
reporter of any incident.

## Enforcement Guidelines

Community leaders will follow these Community Impact Guidelines in determining
the consequences for any action they deem in violation of this Code of Conduct:

### 1. Correction

**Community Impact**: Use of inappropriate language or other behavior deemed
unprofessional or unwelcome in the community.

**Consequence**: A private, written warning from community leaders, providing
clarity around the nature of the violation and an explanation of why the
behavior was inappropriate. A public apology may be requested.

### 2. Warning

**Community Impact**: A violation through a single incident or series
of actions.

**Consequence**: A warning with consequences for continued behavior. No
interaction with the people involved, including unsolicited interaction with
those enforcing the Code of Conduct, for a specified period of time. This
includes avoiding interactions in community spaces as well as external channels
like social media. Violating these terms may lead to a temporary or
permanent ban.

### 3. Temporary Ban

**Community Impact**: A serious violation of community standards, including
sustained inappropriate behavior.

**Consequence**: A temporary ban from any sort of interaction or public
communication with the community for a specified period of time. No public or
private interaction with the people involved, including unsolicited interaction
with those enforcing the Code of Conduct, is allowed during this period.
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
individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within
the community.

## Contact Information

For any questions or further clarification, please contact admin
119 changes: 119 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
# Contributing Guidelines [![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/Vin205/Enyanjyoti/issues)

🚀 **Welcome to Enyanjyoti!** Thank you for considering contributing to this project. Please take a moment to review the guidelines below to help streamline the process.

When contributing to this repository, please first discuss the change you wish to make via an [issue](https://github.com/Vin205/Enyanjyoti/issues).

📚 **Make sure to read our [Wiki](https://github.com/Vin205/Enyanjyoti/wiki)** and familiarize yourself with the repository’s structure and objectives before making any contributions.

**Do not open issues for general support questions** — we want to keep GitHub issues focused on bug reports and feature requests. If you have any questions, feel free to email us via our [Discord: sk_miraj](https://discord.com/users/sk_miraj) or join our real-time discussion on [Discort: GSSOC](https://discord.com/channels/1231112132595028008/1235286614909911110).

**Please remember**: This is an inclusive community. We are committed to fostering a safe and positive environment. Be sure to follow our [Code of Conduct](https://github.com/Vin205/Enyanjyoti/blob/main/CODE_OF_CONDUCT.md) in all interactions.

---

## 🐛 Submitting or Requesting an Issue/Enhancement

### 📝 **Best Practices for Reporting Issues or Requesting Enhancements**:
- 🔍 **Search First**: Before submitting, please search the issue tracker to avoid duplicates.
- 📝 **Use the Issue Template**: Always follow the issue template provided.
- 📸 **Screenshots**: Include them for UI-related issues.
- 🖼️ **Mockups**: Provide mockups when suggesting UI or workflow enhancements.

### **Getting Assigned to Work on an Issue**:
- 🚀 **Express Your Interest**: Comment on the issue to request assignment.
-**Reproduce the Issue**: Ensure you can reproduce the problem before starting.
- 🚫 **Don’t Work on Already Assigned Issues**: Allow the assigned contributor 2 days to make progress before stepping in. If no progress is made, feel free to claim it.
⚠️ Note: Avoid working on an issue already assigned to another contributor. Allow the assigned person at least 2 days to work on the issue. If no progress is made, feel free to ask for an update.
---

## 🚀 Submitting a Pull Request (PR)

### 🛠️ **Best Practices**:
1. **Fork the Project**:
```
git clone https://github.com/your-username/Enyanjyoti.git
```
2. **Switch to the `master` branch**:
```
git checkout master
```
3. **Create a New Branch** with a meaningful name:
```
git checkout -b branch-name
```
4. **Add specific files** (avoid `git add .`):
```
git add file-name
```
5. **Write meaningful commit messages** (see [Commit Message Guidelines](COMMIT_MESSAGE.md)):
```
git commit
```
6. **Squash commits** if needed:
```
git rebase --interactive HEAD~2
```
7. **Push your branch**:
```
git push origin branch-name
```
8. **Submit the PR**: Follow the PR template and ensure you provide clear context for your changes.

9. **During review**: If requested to make changes, rebase and squash your commits before pushing the changes.

**Note**: Do not create multiple PRs for the same issue. Avoid duplicating effort. Be patient if others are working on the same issue.

---

## 🌐 Configuring Remotes

Keep track of the original repository by adding an upstream remote:

1. **Set `upstream`**:
```
git remote add upstream https://github.com/Vin205/Enyanjyoti.git
```
2. **Verify remotes**:
```
git remote -v
```
3. **Sync changes with `upstream`**:
```
git fetch upstream
git checkout master
git merge upstream/master
git push origin master
```

---

## 🔄 After Your Pull Request is Merged

1. **Delete remote branch**:
```
git push origin --delete branch-name
```
2. **Switch to `master`**:
```
git checkout master
```
3. **Delete local branch**:
```
git branch -D branch-name
```
4. **Pull the latest changes**:
```
git pull upstream master
```

---

## ⚡ Skipping Travis CI Builds

If a build is not required (e.g., for documentation updates), include `[ci skip]` or `[skip ci]` in your commit message to skip Travis CI.

---

That’s it! Thank you for your contribution to the Enyanjyoti project! 😊
For more information, see our [Code of Conduct](https://github.com/Vin205/Enyanjyoti/blob/main/CODE_OF_CONDUCT.md), [License](https://github.com/Vin205/Enyanjyoti/blob/main/LICENSE), and [README](https://github.com/Vin205/Enyanjyoti/blob/main/README.md).
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2024 Vin205

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
Loading

0 comments on commit f3415d8

Please sign in to comment.