Skip to content

Commit

Permalink
Merge branch 'apu52:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
avanimathur authored May 21, 2024
2 parents bb501f4 + fbcb35d commit 470d78c
Show file tree
Hide file tree
Showing 9 changed files with 218 additions and 220 deletions.
18 changes: 18 additions & 0 deletions .github/workflows/greetings.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Greetings

on: [pull_request_target, issues]

jobs:
greeting:
runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write
steps:
- uses: actions/first-interaction@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
issue-message: >
Hi @${{ github.actor }}! Thanks for opening this issue. We appreciate your contribution to this open-source project.
pr-message: >
Hi @${{ github.actor }}! Thank you for your valuable contribution! Our team will review it and get back to you soon.
41 changes: 34 additions & 7 deletions Code_of_conduct.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,41 @@
## Travel_Website Code of Conduct

Welcome to the Metaverse Front-End Playground community! We're dedicated to fostering a collaborative and inclusive environment for all contributors. To ensure a positive experience, we've established the following code of conduct:
## Pledge
Welcome to the Metaverse Front-End Playground community! We're dedicated to fostering a collaborative and inclusive environment for all contributors. To ensure a positive experience .In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in GitHub Community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.

## Standards
Examples of encouraged behavior that contributes to a positive environment include:

- Using welcoming and inclusive language
- Privacy and Security
- Respect Others' Contributions
- Being respectful of differing viewpoints and experiences
- Respect and Inclusivity
- No Code Deletion
- Quality Over Quantity
- Respect Others' Contributions
- Collaborative Problem Solving
- Showing empathy towards others and Event Participants

Unacceptable behavior includes, but is not limited to:

- No Code Deletion
- No Trolling or Disruptive Behavior
- Attribution and Licensing
- Privacy and Security
- Trolling, insulting or derogatory comments or behavior
- Personal or political attacks toward Event Participants
- Sustained disruption of talks or any other events or activities organized by GitHub in association with the Event
- Public or private harassment
- Publishing others' private information, such as a physical or email address, without their explicit permission
- Reporting Violations **(NO spammy contribution will be allowed)**
- Enforcement
Each Event Participant is entirely responsible for their own actions.

## Our Responsibilities
Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.

Project maintainers 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, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.

## Scope
This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of 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. Representation of a project may be further defined and clarified by project maintainers.

## Attribution
This Code of Conduct is adapted from the Contributor Covenant, version 2.0, available at https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.

For answers to common questions about this code of conduct, see FAQ.

26 changes: 26 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,30 @@ Show some ❤️&nbsp; by giving <img src="https://imgur.com/o7ncZFp.jpg" height
</p>

<div align="center">

<div align="center">

## Project Mentor

<table>
<tr>
<td align="center"><a href="https://github.com/KrishnenduDG"><img src="img/krishnendu DG.png" width=130px height=130px /></a></br> <h4 style="color:red;">Krishnendu Dasgupta</h4>
<a href="https://www.linkedin.com/in/krishnendu-dasgupta-450391186/"><img src="https://img.icons8.com/fluency/2x/linkedin.png" width="32px" height="32px"></img></a>
</td>

</tr>
</table>

<table>
<tr>
<td align="center"><a href="https://github.com/Ghanshyam89"><img src="img/GhanshyamNewPic.jpg" width=130px height=130px /></a></br> <h4 style="color:red;">Ghanshyam Prajapati</h4>
<a href="https://www.linkedin.com/in/ghanshyam-prajapati/"><img src="https://img.icons8.com/fluency/2x/linkedin.png" width="32px" height="32px"></img></a>
</td>

</tr>
</table>

</div>

# Project Admin⚡

Expand All @@ -194,6 +218,8 @@ Show some ❤️&nbsp; by giving <img src="https://imgur.com/o7ncZFp.jpg" height

</div>



## Contributing is fun🧡
<p align ="center">
<img src="https://github.com/shruti-sen2004/Travel_Website/assets/115914670/d544fd3b-aed2-4a05-a2f8-0b7a2ff9014f" width="700" height= "250" />
Expand Down
Binary file added img/GhanshyamNewPic.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/krishnendu DG.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 470d78c

Please sign in to comment.