From 88b32e317ac3386b981c95a93ef7019cbf6955dc Mon Sep 17 00:00:00 2001 From: Liyas Thomas Date: Fri, 23 Apr 2021 11:38:17 +0000 Subject: [PATCH 1/3] docs: update links --- .dockerignore | 2 +- .gitignore | 2 +- CONTRIBUTING.md | 77 +-------------------------------------- Dockerfile | 2 +- GITHUB_EXTERNSHIP.md | 10 ++--- README.md | 8 ++-- components/app/Footer.vue | 2 +- components/app/Header.vue | 2 +- netlify.toml | 18 +++++++++ nuxt.config.js | 2 +- 10 files changed, 34 insertions(+), 91 deletions(-) diff --git a/.dockerignore b/.dockerignore index 7f62cd7bd..30aebcb54 100644 --- a/.dockerignore +++ b/.dockerignore @@ -30,7 +30,7 @@ coverage # nyc test coverage .nyc_output -# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) +# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) .grunt # Bower dependency directory (https://bower.io/) diff --git a/.gitignore b/.gitignore index f9b8b0df1..9d566a677 100644 --- a/.gitignore +++ b/.gitignore @@ -26,7 +26,7 @@ coverage # nyc test coverage .nyc_output -# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) +# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) .grunt # Bower dependency directory (https://bower.io/) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index feb90bb8b..8b5d00dc8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -12,81 +12,6 @@ Please note we have a code of conduct, please follow it in all your interactions 2. Update the README.md with details of changes to the interface, this includes new environment variables, exposed ports, useful file locations and container parameters. 3. Increase the version numbers in any examples files and the README.md to the new version that this - Pull Request would represent. The versioning scheme we use is [SemVer](http://semver.org/). + Pull Request would represent. The versioning scheme we use is [SemVer](https://semver.org). 4. You may merge the Pull Request once you have the sign-off of two other developers, or if you do not have permission to do that, you may request the second reviewer merge it for you. - -## Code of Conduct - -### Our Pledge - -In the interest of fostering an open and welcoming environment, we as -contributors and maintainers pledge to making participation in our project and -our 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. - -### Our Standards - -Examples of behavior that contributes to creating a positive environment -include: - -* Using welcoming and inclusive language -* Being respectful of differing viewpoints and experiences -* Gracefully accepting constructive criticism -* Focusing on what is best for the community -* Showing empathy towards other community members - -Examples of unacceptable behavior by participants include: - -* The use of sexualized language or imagery and unwelcome sexual attention or -advances -* Trolling, insulting/derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or electronic - address, without explicit permission -* Other conduct which could reasonably be considered inappropriate in a - professional setting - -### Our Responsibilities - -Project maintainers are responsible for clarifying the standards of acceptable -behavior. Maintainers 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 with our 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. - -### Enforcement - -Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the project team at liyascthomas@gmail.com. All -complaints will be reviewed and investigated and will result in a response that -is deemed necessary and appropriate to the circumstances. The project team is -obligated to maintain confidentiality with regard to the reporter of an incident. -Further details of specific enforcement policies may be posted separately. - -Project maintainers who do not follow or enforce the Code of Conduct in good -faith may face temporary or permanent repercussions as determined by other -members of the project's leadership. - -### Attribution - -This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, -available at [http://contributor-covenant.org/version/1/4][version] - -[homepage]: http://contributor-covenant.org -[version]: http://contributor-covenant.org/version/1/4/ diff --git a/Dockerfile b/Dockerfile index eb6c1a5a8..ae4723612 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM node:12.10.0-alpine -LABEL maintainer="Liyas Thomas (liyascthomas@gmail.com)" +LABEL maintainer="Hoppscotch (support@hoppscotch.io)" # Add git as the prebuild target requires it to parse version information RUN apk add --update --no-cache \ diff --git a/GITHUB_EXTERNSHIP.md b/GITHUB_EXTERNSHIP.md index 1a5148eee..6797ed794 100644 --- a/GITHUB_EXTERNSHIP.md +++ b/GITHUB_EXTERNSHIP.md @@ -13,7 +13,7 @@ Before, any of you jump in and start contributing, here are a few documents from - [GitHub Externship: Website](https://github-externships.github.io/externship/index.html) - [GitHub Externship: Program Structure](https://github-externships.github.io/externship/structure.html) -Our awesome community members frequently request for features on our [Discord server](https://discord.gg/GAMWxmR), [Telegram group](https://t.me/hoppscotch_externship), [GitHub issues tab](https://github.com/hoppscotch/hoppscotch/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc) and we have a never ending list of awesome ideas. However, keeping in mind the 3 months time span, we have filtered through our stockpile and come up with the following ideas for [GitHub Externship](https://github-externships.github.io/externship/index.html) program. +Our awesome community members frequently request for features on our [Discord server](https://hoppscotch.io/discord), [Telegram group](https://hoppscotch.io/externship_telegram), [GitHub issues tab](https://github.com/hoppscotch/hoppscotch/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc) and we have a never ending list of awesome ideas. However, keeping in mind the 3 months time span, we have filtered through our stockpile and come up with the following ideas for [GitHub Externship](https://github-externships.github.io/externship/index.html) program. ## **Ideas** @@ -70,9 +70,9 @@ Please read [`CONTRIBUTING`](CONTRIBUTING.md) for details on our [`CODE OF CONDU [**`Web app →`**](https://hoppscotch.io) -[**`Discord server →`**](https://discord.gg/GAMWxmR) +[**`Discord server →`**](https://hoppscotch.io/discord) -[**`Telegram group →`**](https://t.me/hoppscotch_externship) +[**`Telegram group →`**](https://hoppscotch.io/externship_telegram) ## **Discussions channel** @@ -87,7 +87,7 @@ Before asking a question please check this [How do I ask a good question?](https ## **Need help?** -Start a discussion [here](https://github.com/hoppscotch/hoppscotch/discussions) if you’re unable to get a response from the [Telegram](https://t.me/hoppscotch_externship), [Discord](https://discord.gg/GAMWxmR) communities. +Start a discussion [here](https://github.com/hoppscotch/hoppscotch/discussions) if you’re unable to get a response from the [Telegram](https://hoppscotch.io/externship_telegram), [Discord](https://hoppscotch.io/discord) communities. Start a new idea under [discussions](https://github.com/hoppscotch/hoppscotch/discussions) only once you’ve finalized your project proposal. @@ -106,4 +106,4 @@ We look forward to seeing your proposals for a happy summer of coding. - [Liyas Thomas](https://github.com/liyasthomas) - [Andrew Bastin](https://github.com/andrewbastin) -If you have any questions or queries please contact us via [Telegram](https://t.me/hoppscotch_externship), [Discord](https://discord.gg/GAMWxmR) or send an email to us at support@hoppscotch.io. +If you have any questions or queries please contact us via [Telegram](https://hoppscotch.io/externship_telegram), [Discord](https://hoppscotch.io/discord) or send an email to us at support@hoppscotch.io. diff --git a/README.md b/README.md index 098deabd6..71dc275a1 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,11 @@ Hoppscotch - Open source API development ecosystem

- Helps you create requests faster, saving precious time on development - Subscribe + Helps you create requests faster, saving precious time on development - Subscribe

-[![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen?logo=github)](CODE_OF_CONDUCT.md) [![Website](https://img.shields.io/website?url=https%3A%2F%2Fhoppscotch.io&logo=hoppscotch)](https://hoppscotch.io) [![Travis Build Status](https://img.shields.io/travis/com/hoppscotch/hoppscotch/main?logo=Travis)](https://travis-ci.com/hoppscotch/hoppscotch) [![Tweet](https://img.shields.io/twitter/url?url=https%3A%2F%2Fhoppscotch.io%2F)](https://twitter.com/intent/tweet?url=https%3A%2F%2Fhoppscotch.io&text=%F0%9F%91%BD%20Hoppscotch%20%E2%80%A2%20API%20request%20builder%20-%20Helps%20you%20create%20requests%20faster%2C%20saving%20precious%20time%20on%20development&original_referer=https%3A%2F%2Ftwitter.com%2Fshare%3Ftext%3D%25F0%259F%2591%25BD%2520Hoppscotch%2520%25E2%2580%25A2%2520API%2520request%2520builder%2520-%2520Helps%2520you%2520create%2520requests%2520faster%2C%2520saving%2520precious%2520time%2520on%2520development%26url%3Dhttps%3A%2F%2Fhoppscotch.io%26hashtags%3Dhoppscotch%26via%3Dliyasthomas&via=liyasthomas&hashtags=hoppscotch) +[![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen?logo=github)](CODE_OF_CONDUCT.md) [![Website](https://img.shields.io/website?url=https%3A%2F%2Fhoppscotch.io&logo=hoppscotch)](https://hoppscotch.io) [![Travis Build Status](https://img.shields.io/travis/com/hoppscotch/hoppscotch/main?logo=Travis)](https://travis-ci.com/hoppscotch/hoppscotch) [![Tweet](https://img.shields.io/twitter/url?url=https%3A%2F%2Fhoppscotch.io%2F)](https://twitter.com/share?text=%F0%9F%91%BD%20Hoppscotch%20%E2%80%A2%20Open%20source%20API%20development%20ecosystem%20-%20Helps%20you%20create%20requests%20faster,%20saving%20precious%20time%20on%20development.&url=https://hoppscotch.io&hashtags=hoppscotch&via=hoppscotch_io)

@@ -45,7 +45,7 @@ #### **Contact** -[![Chat on Telegram](https://img.shields.io/badge/chat-Telegram-2CA5E0?logo=Telegram)](https://t.me/hoppscotch) [![Chat on Discord](https://img.shields.io/badge/chat-Discord-7289DA?logo=discord)](https://discord.gg/GAMWxmR) +[![Chat on Telegram](https://img.shields.io/badge/chat-Telegram-2CA5E0?logo=Telegram)](https://hoppscotch.io/telegram) [![Chat on Discord](https://img.shields.io/badge/chat-Discord-7289DA?logo=discord)](https://hoppscotch.io/discord) #### **Support** @@ -598,7 +598,7 @@ Become a financial contributor and help us sustain our community [[Support](#sup alt="Erica Brescia" /> - + - + diff --git a/components/app/Header.vue b/components/app/Header.vue index 7a34375a1..b41bcc01e 100644 --- a/components/app/Header.vue +++ b/components/app/Header.vue @@ -110,7 +110,7 @@