From 57ab01c2cfa28324f7c975758c90713fbd2b4e49 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Thu, 18 Aug 2022 17:45:05 +0100 Subject: [PATCH] Update documentation with up to date information --- CODE_OF_CONDUCT.md | 2 +- CONTRIBUTING.md | 47 ++++++++++++++++++++++++++-------------------- package.json | 9 ++++++--- readme.md | 3 ++- 4 files changed, 36 insertions(+), 25 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index bf49b55..d4ae5d3 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -61,7 +61,7 @@ representative at an online or offline event. Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at -[INSERT CONTACT METHOD]. +[helpdesk@vylpes.com](mailto:helpdesk@vylpes.com). All complaints will be reviewed and investigated promptly and fairly. All community leaders are obligated to respect the privacy and security of the diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5acd471..971bb3d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,6 +14,8 @@ This project and everyone participating in it is governed by the Random Bunny Co You can ask a question about the project in the `#development` channel in the [Discord Server](https://discord.gg/UyAhAVp). +You can also email with queries and support if you'd prefer at [helpdesk@vylpes.com](mailto:helpdesk@vylpes.com). + ## What you should know ### Javascript and Node @@ -115,13 +117,13 @@ You'll need the following tools: * Git * NodeJS +* Yarn Install and build all of the dependencies using `npm` ```bash -cd Random Bunny -npm install -cp config.json.template config.json +cd random-bunny +yarn install ``` And then use your text editor of choice to fill in the `config.json` file. @@ -132,22 +134,20 @@ If you want to understand how Random Bunny works or want to debug an issue, you' First, fork the Random Bunny repository so that you can make a pull request. Then, clone your fork locally: ```bash -git clone https://gitlab.vylpes.com//random-bunny.git +git clone https://gitea.vylpes.xyz//random-bunny.git ``` Occasionally, you will want to merge changes in the upstream repository (the official code repo) with your fork. ```bash -cd Random Bunny +cd random-bunny git checkout master -git pull https://gitlab.vylpes.com/vylpes/random-bunny.git master +git pull https://gitea.vylpes.xyz/vylpes/random-bunny.git master ``` Manage any merge conflicts, commit them, and then push them to your fork. -Go into `Random Bunny` and start the bot in dev mode with `npm run dev` or `node bot dev` - -> **Note:** If you have `nodemon` installed on your system you can use this during development so it auto restarts when you make code changes. Instead of the commands above you can then run `nodemon bot dev`. +Go into `random-bunny` and build the package using `yarn build`. #### Pull Requests @@ -169,6 +169,11 @@ Please follow these steps to have your contribution considered by maintainers: While the prerequesites above must be satisifed prior to having your pull reuqest accepted, the reviewer(s) may ask you to complete additional design ork, tests, or other changes before your pull request can be ultimately accepted. +#### Submitting Changes via Email +If you're not within our gitea instance and still like to contribute, you can send us your contributions to [git@vylpes.com](mailto:git@vylpes.com). + +For more information on how to do this, see the [git documentation](https://git-scm.com/docs/git-send-email). + #### JavaScript Styleguide All JavaScript code is linted with `eslint`. @@ -309,21 +314,20 @@ Unsure where to begin contributing to Random Bunny? You can start by looking thr #### Prerequisites -In order to download necessary tools, clone the repository, and install dependencies via `npm` you need network access. +In order to download necessary tools, clone the repository, and install dependencies via `yarn` you need network access. You'll need the following tools: * Git * NodeJS +* Yarn -Install and build all of the dependencies using `npm` +Install and build all of the dependencies using `yarn` ```bash -cd Random Bunny +cd random-bunny npm install -cp config.json.template config.json ``` -And then use your text editor of choice to fill in the `config.json` file. #### Build and Run @@ -332,22 +336,20 @@ If you want to understand how Random Bunny works or want to debug an issue, you' First, fork the Random Bunny repository so that you can make a pull request. Then, clone your fork locally: ```bash -git clone https://gitlab.vylpes.com//random-bunny.git +git clone https://gitea.vylpes.xyz//random-bunny.git ``` Occasionally, you will want to merge changes in the upstream repository (the official code repo) with your fork. ```bash -cd Random Bunny +cd random-bunny git checkout master -git pull https://github.com/getgravitysoft/random-bunny.git master +git pull https://gitea.vylpes.xyz/RabbitLabs/random-bunny.git master ``` Manage any merge conflicts, commit them, and then push them to your fork. -Go into `Random Bunny` and start the bot in dev mode with `npm run dev` or `node bot dev` - -> **Note:** If you have `nodemon` installed on your system you can use this during development so it auto restarts when you make code changes. Instead of the commands above you can then run `nodemon bot dev`. +Go into `random-bunny` and build the package using `yarn build`. #### Pull Requests @@ -369,6 +371,11 @@ Please follow these steps to have your contribution considered by maintainers: While the prerequesites above must be satisifed prior to having your pull reuqest accepted, the reviewer(s) may ask you to complete additional design ork, tests, or other changes before your pull request can be ultimately accepted. +#### Submitting Changes via Email +If you're not within our gitea instance and still like to contribute, you can send us your contributions to [git@vylpes.com](mailto:git@vylpes.com). + +For more information on how to do this, see the [git documentation](https://git-scm.com/docs/git-send-email). + #### JavaScript Styleguide All JavaScript code is linted with `eslint`. diff --git a/package.json b/package.json index cb5021b..f9b084f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "random-bunny", - "version": "2.0.1", + "version": "2.0.2", "description": "Get a random subreddit image url", "license": "MIT", "author": "Vylpes", @@ -26,8 +26,11 @@ "test": "echo none", "lint": "eslint ." }, - "bugs": "https://github.com/Vylpes/random-bunny/issues", - "homepage": "https://github.com/Vylpes/random-bunny", + "bugs": { + "url": "https://gitea.vylpes.xyz/RabbitLabs/random-bunny/issues", + "email": "helpdesk@vylpes.com" + }, + "homepage": "https://gitea.vylpes.xyz/RabbitLabs/random-bunny", "funding": "https://ko-fi.com/vylpes", "devDependencies": { "@types/node": "^16.11.11", diff --git a/readme.md b/readme.md index edccb31..0d05a3e 100644 --- a/readme.md +++ b/readme.md @@ -53,7 +53,8 @@ The json string which gets returned consists of: ## Links -* Discord: [Server Link](https://vylpes.xyz/discord) +* Discord: [Server Link](https://discord.gg/UyAhAVp) +* Support: [helpdesk@vylpes.com](mailto:helpdesk@vylpes.com) ## License