Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhance setup.js for Improved Docker Compatibility #2447 #2615

Open
wants to merge 95 commits into
base: develop-postgres
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 92 commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
5821d59
added docker check to workflow
VanshikaSabharwal Nov 8, 2024
1519682
Merge branch 'develop' into docker-1
VanshikaSabharwal Nov 8, 2024
81bbb3e
made recommended changes to docker check in workflow
VanshikaSabharwal Nov 8, 2024
7d04c94
made recommended changes to docker check in workflow
VanshikaSabharwal Nov 8, 2024
f8389f6
added changes to docker check inn workflow as recommended
VanshikaSabharwal Nov 8, 2024
f54dcf2
added changes
VanshikaSabharwal Nov 8, 2024
b93aed6
updated indentation in pull-request.yml file
VanshikaSabharwal Nov 8, 2024
a0ee511
updated indentation in pull-request.yml file
VanshikaSabharwal Nov 8, 2024
235d163
added Dockerfile and Docker-compose.yml file
VanshikaSabharwal Nov 10, 2024
66f4843
added Dockerfile and Docker-compose.yml file
VanshikaSabharwal Nov 10, 2024
aef2485
Merge branch 'develop' into dockerfile-1
VanshikaSabharwal Nov 10, 2024
0fa9fe5
updated .docker-ignore file
VanshikaSabharwal Nov 10, 2024
88626b7
Merge branch 'dockerfile-1' of https://github.com/VanshikaSabharwal/t…
VanshikaSabharwal Nov 10, 2024
6fd1e01
Merge branch 'develop' into docker-1
VanshikaSabharwal Nov 11, 2024
e572cf4
Merge branch 'docker-1' of https://github.com/VanshikaSabharwal/talaw…
VanshikaSabharwal Nov 11, 2024
cfdeff5
added recommended changes by code rabbit
VanshikaSabharwal Nov 11, 2024
e188853
added recommended changes by code rabbit
VanshikaSabharwal Nov 11, 2024
9a2b428
added recommended changes by code rabbit
VanshikaSabharwal Nov 11, 2024
12e5474
added recommended changes by code rabbit
VanshikaSabharwal Nov 11, 2024
17a12f7
added recommended changes by code rabbit
VanshikaSabharwal Nov 11, 2024
a44ecdb
added recommended changes by code rabbit
VanshikaSabharwal Nov 11, 2024
526a2cf
properly formatted code
VanshikaSabharwal Nov 11, 2024
82836f0
chore(deps): bump sass from 1.80.6 to 1.80.7 (#2433)
dependabot[bot] Nov 14, 2024
a97314c
chore(deps): bump eslint-plugin-import from 2.30.0 to 2.31.0 (#2434)
dependabot[bot] Nov 14, 2024
32eb6a9
chore(deps): bump @mui/x-charts from 7.22.1 to 7.22.2 (#2435)
dependabot[bot] Nov 14, 2024
ab509f6
chore(deps): bump @types/react from 18.3.3 to 18.3.12 (#2436)
dependabot[bot] Nov 14, 2024
fb913e1
Update pull-request.yml
palisadoes Nov 14, 2024
d4fca6f
trying to make docker check pass
VanshikaSabharwal Nov 15, 2024
41bb9cf
Merge branch 'develop' into docker-1
VanshikaSabharwal Nov 15, 2024
7966dda
trying to make docker check pass
VanshikaSabharwal Nov 15, 2024
ec8ec5f
Merge branch 'docker-1' of https://github.com/VanshikaSabharwal/talaw…
VanshikaSabharwal Nov 15, 2024
96d5e9a
updated INSTALLATION.md
VanshikaSabharwal Nov 15, 2024
ef08944
updated INSTALLATION.md
VanshikaSabharwal Nov 15, 2024
8236c9a
added recommended changes to INSTALLATION.md
VanshikaSabharwal Nov 15, 2024
b09c696
added recommended changes to INSTALLATION.md
VanshikaSabharwal Nov 15, 2024
c8c42a4
added recommended changes to INSTALLATION.md
VanshikaSabharwal Nov 15, 2024
d16b95e
Update dependabot.yaml
palisadoes Nov 16, 2024
aa1cb05
updated docker workflow
VanshikaSabharwal Nov 17, 2024
5e38619
Merge branch 'develop' into docker-1
VanshikaSabharwal Nov 17, 2024
435c0bd
Merge branch 'docker-1' of https://github.com/VanshikaSabharwal/talaw…
VanshikaSabharwal Nov 17, 2024
97bb5e6
updated INSTALLATION.md
VanshikaSabharwal Nov 17, 2024
0b47923
updated INSTALLATION.md
VanshikaSabharwal Nov 17, 2024
31b4bc5
updated INSTALLATION.md
VanshikaSabharwal Nov 17, 2024
c0884d1
updated setup.ts
VanshikaSabharwal Nov 17, 2024
9412b27
Merge branch 'develop-postgres' into setup
VanshikaSabharwal Nov 17, 2024
eac28f7
did recommended changes to setup.ts
VanshikaSabharwal Nov 17, 2024
f1cd66a
Merge branch 'setup' of https://github.com/VanshikaSabharwal/talawa-a…
VanshikaSabharwal Nov 17, 2024
15282bc
updated setup.ts
VanshikaSabharwal Nov 18, 2024
5830ec7
updated INSTALLATION.md
VanshikaSabharwal Nov 18, 2024
0ebafd5
Merge branch 'develop-postgres' into setup
VanshikaSabharwal Nov 19, 2024
c426e45
Merge branch 'develop-postgres' into setup
VanshikaSabharwal Nov 23, 2024
97dde86
Merge branch 'develop-postgres' into setup
VanshikaSabharwal Nov 24, 2024
f9d03de
pull-request.yml formatted
VanshikaSabharwal Nov 24, 2024
6243659
solved the problem with linting of dockerfile in pull-request.yml file
VanshikaSabharwal Nov 24, 2024
4c539cb
solved the problem with linting of dockerfile in pull-request.yml file
VanshikaSabharwal Nov 24, 2024
39115fb
solved the problem with linting of dockerfile in pull-request.yml file
VanshikaSabharwal Nov 24, 2024
3192d45
made recommended changes to pull-request.yml
VanshikaSabharwal Nov 24, 2024
5cd5a48
testing eslint fix
VanshikaSabharwal Nov 24, 2024
da0113c
testing eslint
VanshikaSabharwal Nov 24, 2024
de5cb43
testing eslint
VanshikaSabharwal Nov 24, 2024
2b4f3a0
added askForDocker file with test file
VanshikaSabharwal Nov 25, 2024
3174ea4
Merge branch 'develop-postgres' into setup
VanshikaSabharwal Nov 25, 2024
7eb38f7
Merge branch 'develop-postgres' into setup
VanshikaSabharwal Nov 26, 2024
af8cd4a
updated setup.ts file
VanshikaSabharwal Nov 28, 2024
594765d
updated askForDocker
VanshikaSabharwal Nov 28, 2024
cd99eb0
Merge branch 'develop-postgres' into setup
VanshikaSabharwal Nov 28, 2024
5c41622
updated linting error
VanshikaSabharwal Nov 29, 2024
f9b02a1
Merge branch 'develop-postgres' into setup
VanshikaSabharwal Dec 1, 2024
05dcfc8
adding
VanshikaSabharwal Dec 2, 2024
bab3153
added vitest
VanshikaSabharwal Dec 2, 2024
99bd739
testing
VanshikaSabharwal Dec 2, 2024
c298068
testing type error issue
VanshikaSabharwal Dec 2, 2024
a8ee09e
updated eslint_disable_check.py
VanshikaSabharwal Dec 2, 2024
425b45f
updated eslint_disable_check.py
VanshikaSabharwal Dec 2, 2024
dd635c4
updated eslint_disable_check.py
VanshikaSabharwal Dec 2, 2024
f27ed9e
updated pull-request.yml
VanshikaSabharwal Dec 2, 2024
9316808
updated pull-request.yml
VanshikaSabharwal Dec 2, 2024
ae3dac5
updated pull-request.yml
VanshikaSabharwal Dec 2, 2024
1f9cacc
updated pull-request.yml
VanshikaSabharwal Dec 2, 2024
e863c6b
updated .eslintrc.json
VanshikaSabharwal Dec 4, 2024
a859d25
updated .eslintrc.json
VanshikaSabharwal Dec 4, 2024
418092e
updated .eslintrc.json
VanshikaSabharwal Dec 4, 2024
65e2b3a
updated .eslintrc.json
VanshikaSabharwal Dec 4, 2024
55a8e7c
updated .eslintrc.json
VanshikaSabharwal Dec 4, 2024
3591428
updated .eslintrc.json
VanshikaSabharwal Dec 4, 2024
c860961
updated .eslintrc.json
VanshikaSabharwal Dec 4, 2024
5be01a6
added linters for dockerfile and markdown file
VanshikaSabharwal Dec 4, 2024
ff4ea49
Revert "updated .eslintrc.json"
VanshikaSabharwal Dec 4, 2024
da04be8
testing
VanshikaSabharwal Dec 4, 2024
557c203
testing changes
VanshikaSabharwal Dec 4, 2024
780ae27
testing changes
VanshikaSabharwal Dec 4, 2024
0018f5b
added changes to pass test
VanshikaSabharwal Dec 7, 2024
04eea57
added changes to pass test
VanshikaSabharwal Dec 7, 2024
e391f42
added changes to pass test
VanshikaSabharwal Dec 7, 2024
a67137c
Merge branch 'develop-postgres' into setup
VanshikaSabharwal Dec 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .dockerfilelintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"skipShellCheck": false,
"skipCritical": false,
"disableLineBreaks": false
}
4 changes: 1 addition & 3 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# Contains the PDF file of the Tag as JSON string, thus does not need to be linted

src/components/CheckIn/tagTemplate.ts
package.json
package-lock.json
tsconfig.json
2 changes: 1 addition & 1 deletion .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -409,4 +409,4 @@ jobs:
if: github.event.pull_request.base.ref != 'develop-postgres'
run: |
echo "Error: Pull request target branch must be 'develop-postgres'. Please refer PR_GUIDELINES.md"
exit 1
exit 1
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

Target branch requirement needs to be updated in documentation

The workflow enforces PRs to target 'develop-postgres' branch, but this requirement conflicts with the documented branching strategy. The documentation consistently mentions 'develop' as the target branch for contributions.

  • PR_GUIDELINES.md states: "Only submit PRs against our develop branch"
  • CONTRIBUTING.md describes: "develop: For unstable code and bug fixing"
  • INSTALLATION.md instructs: "Make sure to check out the develop branch"

This inconsistency will confuse contributors and needs to be addressed by either:

  1. Updating all documentation to reflect the new 'develop-postgres' requirement, or
  2. Reverting the workflow to accept PRs against 'develop' as documented
🔗 Analysis chain

Verify the target branch requirement

The new check enforces all PRs to target the 'develop-postgres' branch. This is a significant change that could impact the workflow of all contributors.

Questions to consider:

  1. Is the PostgreSQL migration complete and ready for all new contributions?
  2. Should this be documented in the contributing guidelines?
  3. Should there be a transition period where both branches are accepted?
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Check if this requirement is documented in contribution guidelines
echo "Checking contribution guidelines for target branch requirements..."
rg -i "develop-postgres" "*.md" "docs/*.md" ".github/*.md"

Length of output: 349


Script:

#!/bin/bash
# Let's first find all markdown files in the repository
echo "Finding all markdown files..."
fd -e md

# Check the actual workflow file to understand the target branch check
echo -e "\nChecking the workflow file..."
cat .github/workflows/pull-request.yml

# Look for any documentation about branching strategy
echo -e "\nSearching for branch-related documentation..."
rg -i "branch|develop" -g "*.md"

Length of output: 36780

🧰 Tools
🪛 yamllint (1.35.1)

[error] 413-413: no new line character at the end of file

(new-line-at-end-of-file)

49 changes: 25 additions & 24 deletions CODE_STYLE.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ code style should not be changed and must be followed.

- Typescript

- React.js
- React.js

- CSS module

Expand All @@ -43,7 +43,6 @@ code style should not be changed and must be followed.

- Should make use of React hooks where appropriate


## Code Style and Naming Conventions

- All React components *must* be written in PascalCase, with their file names, and associated CSS modules being written in PascalCase
Expand All @@ -55,13 +54,15 @@ code style should not be changed and must be followed.
- Use of custom classes directly are refrained, use of modular css is encouraged along with bootstrap classes

**Wrong way ❌**

```
<div className="myCustomClass">...</div>
<div className={`${styles.myCustomClass1} myCustomClass2`}>...</div> // No using personal custom classes directly, here you should not use myCustomClass2
.container{...} // No changing the property of already existing classes reserved by boostrap directly in css files
```

**Correct ways ✅**
**Correct ways ✅**

```
<div className={styles.myCustomClass}>...</div> // Use custom class defined in modular css file
<div className={`${styles.myCustomClass} relative bg-danger`}>...</div> // Use classes already defined in Bootstrap
Expand All @@ -74,7 +75,8 @@ code style should not be changed and must be followed.

**Wrong way ❌**

Using plain Bootstrap classes and attributes without leveraging the React-Bootstrap library should be refrained. While it may work for basic functionality, it doesn't fully integrate with React and may cause issues when dealing with more complex state management or component interactions.
Using plain Bootstrap classes and attributes without leveraging the React-Bootstrap library should be refrained. While it may work for basic functionality, it doesn't fully integrate with React and may cause issues when dealing with more complex state management or component interactions.

```
<div class="dropdown">
<button class="btn btn-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
Expand All @@ -87,11 +89,11 @@ Using plain Bootstrap classes and attributes without leveraging the React-Bootst
</ul>
</div>
```


**Correct way ✅**

It's recommended to use the React-Bootstrap library for seamless integration of Bootstrap components in a React application.

```
import Dropdown from 'react-bootstrap/Dropdown';

Expand All @@ -114,27 +116,27 @@ function BasicExample() {
export default BasicExample;
```

## Test and Code Linting

## Test and Code Linting

Unit tests must be written for *all* code submissions to the repository,
Unit tests must be written for *all* code submissions to the repository,
the code submitted must also be linted ESLint and formatted with Prettier.

## Folder/Directory Structure

### Sub Directories of `src`

`assets` - This houses all of the static assets used in the project
- `css` - This houses all of the css files used in the project
- `images` - This houses all of the images used in the project
- `scss` - This houses all of the scss files used in the project
- `components -` All Sass files for components
- `content -` All Sass files for content
- `forms -` All Sass files for forms
- `_talawa.scss` - Partial Sass file for Talawa
- `_utilities.scss` - Partial Sass file for utilities
- `_variables.scss` - Partial Sass file for variables
- `app.scss` - Main Sass file for the app, imports all other partial Sass files

- `css` - This houses all of the css files used in the project
- `images` - This houses all of the images used in the project
- `scss` - This houses all of the scss files used in the project
- `components -` All Sass files for components
- `content -` All Sass files for content
- `forms -` All Sass files for forms
- `_talawa.scss` - Partial Sass file for Talawa
- `_utilities.scss` - Partial Sass file for utilities
- `_variables.scss` - Partial Sass file for variables
- `app.scss` - Main Sass file for the app, imports all other partial Sass files

`components` - The directory for base components that will be used in the various views/screens

Expand All @@ -148,7 +150,6 @@ the code submitted must also be linted ESLint and formatted with Prettier.

`utils` - This holds the utility functions that do not fall into any of the other categories


## Imports

Absolute imports have been set up for the project, so imports may be done directly from `src`.
Expand All @@ -161,10 +162,9 @@ import Navbar from 'components/Navbar/Navbar';

Imports should be grouped in the following order:

- React imports
- Third party imports
- Local imports

- React imports
- Third party imports
- Local imports

If there is more than one import from a single library, they should be grouped together

Expand Down Expand Up @@ -213,7 +213,6 @@ Follow this [link](https://getbootstrap.com/docs/5.3/customize/sass/) to learn h
- **_table.scss**
- **_typography.scss**


- `src/assets/scss/forms/{'{partialFile}'}.scss` - where the {'{partialFile}'} are the following files
- **_check-radios.scss**
- **_floating-label.scss**
Expand Down Expand Up @@ -245,9 +244,11 @@ To watch the Sass file for changes and compile it automatically, run the followi
```
npx sass src/assets/scss/app.scss src/assets/css/app.css --watch
```

The `src/assets/css/app.css.map` file associates the generated CSS code with the original SCSS code. It allows you to see your SCSS code in the browser's developer tools for debugging.

To skip generating the map file, run

```
npx sass --no-source-map src/assets/scss/app.scss src/assets/css/app.css
```
18 changes: 11 additions & 7 deletions DOCUMENTATION.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Documentation

Welcome to our documentation guide. Here are some useful tips you need to know!

# Table of Contents
Expand All @@ -15,18 +16,21 @@ Welcome to our documentation guide. Here are some useful tips you need to know!

Our documentation can be found in ONLY TWO PLACES:

1. ***Inline within the repository's code files***: We have automated processes to extract this information and place it in our Talawa documentation site [docs.talawa.io](https://docs.talawa.io/).
1. ***In our `talawa-docs` repository***: Our [Talawa-Docs](https://github.com/PalisadoesFoundation/talawa-docs) repository contains user edited markdown files that are automatically integrated into our Talawa documentation site [docs.talawa.io](https://docs.talawa.io/) using the [Docusaurus](https://docusaurus.io/) package.
1. **_Inline within the repository's code files_**: We have automated processes to extract this information and place it in our Talawa documentation site [docs.talawa.io](https://docs.talawa.io/).
1. **_In our `talawa-docs` repository_**: Our [Talawa-Docs](https://github.com/PalisadoesFoundation/talawa-docs) repository contains user edited markdown files that are automatically integrated into our Talawa documentation site [docs.talawa.io](https://docs.talawa.io/) using the [Docusaurus](https://docusaurus.io/) package.

## How to use Docusaurus

The process in easy:

1. Install `talawa-docs` on your system
1. Launch docusaurus on your system according to the `talawa-docs`documentation.
- A local version of `docs.talawa.io` should automatically launched in your browser at http://localhost:3000/
1. Launch docusaurus on your system according to the `talawa-docs`documentation.
- A local version of `docs.talawa.io` should automatically launched in your browser at http://localhost:3000/
VanshikaSabharwal marked this conversation as resolved.
Show resolved Hide resolved
1. Add/modify the markdown documents to the `docs/` directory of the `talawa-docs` repository
1. If adding a file, then you will also need to edit the `sidebars.js` which is used to generate the [docs.talawa.io](https://docs.talawa.io/) menus.
1. Always monitor the local website in your brower to make sure the changes are acceptable.
- You'll be able to see errors that you can use for troubleshooting in the CLI window you used to launch the local website.
1. Always monitor the local website in your brower to make sure the changes are acceptable.
VanshikaSabharwal marked this conversation as resolved.
Show resolved Hide resolved
- You'll be able to see errors that you can use for troubleshooting in the CLI window you used to launch the local website.

## Other information
***PLEASE*** do not add markdown files in this repository. Add them to `talawa-docs`!

**_PLEASE_** do not add markdown files in this repository. Add them to `talawa-docs`!
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:20.10.0 AS build
FROM node:20.10.0-alpine AS build

WORKDIR /usr/src/app

Expand All @@ -12,4 +12,4 @@ RUN npm run build

EXPOSE 4321

CMD ["npm", "run", "serve"]
CMD ["npm", "run", "serve"]
43 changes: 33 additions & 10 deletions INSTALLATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,20 +63,23 @@ First you need a local copy of `talawa-admin`. Run the following command in the
![Image of user's clone](public/markdown/images/install2.png)

1. Clone the repository to your local computer (replacing the values in `{{}}`):

```bash
$ git clone https://github.com/{{YOUR GITHUB USERNAME}}/talawa-admin.git
cd talawa-admin
git checkout develop
```

- **Note:** Make sure to check out the `develop` branch

1. You now have a local copy of the code files. For more detailed instructions on contributing code, and managing the versions of this repository with `git`, checkout our [CONTRIBUTING.md](./CONTRIBUTING.md) file.

4. **Talawa Administrators:**

1. Clone the repository to your local computer using this command:

```bash
$ git clone https://github.com/PalisadoesFoundation/talawa-admin.git
git clone https://github.com/PalisadoesFoundation/talawa-admin.git
```

## Install node.js
Expand All @@ -86,7 +89,7 @@ Best way to install and manage `node.js` is making use of node version managers.
Follow these steps to install the `node.js` packages in Windows, Linux and MacOS.

1. For Windows:
1. first install `node.js` from their website at https://nodejs.org
1. first install `node.js` from their website at <https://nodejs.org>
1. When installing, don't click the option to install the `necessary tools`. These are not needed in our case.
2. then install [fnm](https://github.com/Schniz/fnm). Please read all the steps in this section first.
1. All the commands listed on this page will need to be run in a Windows terminal session in the `talawa-admin` directory.
Expand Down Expand Up @@ -141,9 +144,9 @@ The prerequisites are now installed. The next step will be to get the app up and

If you prefer to use Docker, you can install the app using the following command:

1. Create a `.env` file as described in the Configuration section
1. Create a `.env` file as described in the Configuration section

2. Build the Docker Image:
2. Build the Docker Image:

Run the following command to build the Docker image:

Expand All @@ -155,12 +158,32 @@ docker build -t talawa-admin .

After the build is complete, run the Docker container using this command:

For Linux/MacOS
```bash
docker run -p 4321:4321 talawa-admin
docker run -d \
--name talawa-admin \
-p 4321:4321 \
-v $(pwd)/.env:/app/.env \
talawa-admin

```bash

For Windows
docker run -d `
--name talawa-admin `
-p 4321:4321 `
-v ${PWD}\.env:/app/.env `
talawa-admin


The application will be accessible at `http://localhost:4321`

4. Managing the container:

To stop the container:
```bash
docker stop talawa-admin

# Configuration

It's important to configure Talawa-Admin. Here's how to do it.
Expand Down Expand Up @@ -205,23 +228,23 @@ Add the endpoint for accessing talawa-api graphql service to the variable named

```

REACT_APP_TALAWA_URL="http://API-IP-ADRESS:4000/graphql/"
REACT_APP_TALAWA_URL="<http://API-IP-ADRESS:4000/graphql/>"

```

If you are a software developer working on your local system, then the URL would be:

```

REACT_APP_TALAWA_URL="http://localhost:4000/graphql/"
REACT_APP_TALAWA_URL="<http://localhost:4000/graphql/>"

```

If you are trying to access Talawa Admin from a remote host with the API URL containing "localhost", You will have to change the API URL to

```

REACT_APP_TALAWA_URL="http://YOUR-REMOTE-ADDRESS:4000/graphql/"
REACT_APP_TALAWA_URL="<http://YOUR-REMOTE-ADDRESS:4000/graphql/>"

```

Expand Down Expand Up @@ -297,15 +320,15 @@ By default `talawa-admin` runs on port `4321` on your system's localhost. It is

```

http://localhost:4321/
<http://localhost:4321/>

```

If you have specified a custom port number in your `.env` file, Talawa-Admin will run on the following endpoint:

```

http://localhost:${{customPort}}/
<http://localhost:${{customPort}}/>

```

Expand Down
10 changes: 7 additions & 3 deletions ISSUE_GUIDELINES.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
In order to give everyone a chance to submit a issues reports and contribute to the Talawa project, we have put restrictions in place. This section outlines the guidelines that should be imposed upon issue reports in the Talawa project.

___

## Table of Contents

<!-- toc -->
Expand All @@ -19,14 +20,16 @@ ___
<!-- tocstop -->

___

## Issue Management

In all cases please use the [GitHub open issue search](https://github.com/PalisadoesFoundation/talawa-admin/issues) to check whether the issue has already been reported.

### New Issues

To create new issues follow these steps:

1. Your issue may have already been created. Search for duplicate open issues before submitting yours.for similar deficiencies in the code.duplicate issues are created.
1. Your issue may have already been created. Search for duplicate open issues before submitting yours.for similar deficiencies in the code.duplicate issues are created.
VanshikaSabharwal marked this conversation as resolved.
Show resolved Hide resolved
1. Verify whether the issue has been fixed by trying to reproduce it using the latest master or development branch in the repository.
1. Click on the [`New Issue`](https://github.com/PalisadoesFoundation/talawa-admin/issues/new/choose) button
1. Use the templates to create a standardized report of what needs to be done and why.
Expand All @@ -49,11 +52,12 @@ Working on these types of existing issues is a good way of getting started with

Feature requests are welcome. But take a moment to find out whether your idea fits with the scope and aims of the project. It's up to you to make a strong case to convince the mentors of the merits of this feature. Please provide as much detail and context as possible.

### Monitoring the Creation of New Issues
### Monitoring the Creation of New Issues

1. Join our `#talawa-github` slack channel for automatic issue and pull request updates.
VanshikaSabharwal marked this conversation as resolved.
Show resolved Hide resolved

## General Guidelines

1. Discuss issues in our various slack channels when necessary
2. Please do not derail or troll issues.
2. Please do not derail or troll issues.
VanshikaSabharwal marked this conversation as resolved.
Show resolved Hide resolved
3. Keep the discussion on topic and respect the opinions of others.
1 change: 1 addition & 0 deletions PR_GUIDELINES.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ npm run format:check
1. Please read our [CONTRIBUTING.md](CONTRIBUTING.md) document for details on our testing policy.

## Pull Request Processing

These are key guidelines for the procedure:

### Only submit PRs against our `develop` branch, not the default `main` branch
Expand Down
Loading
Loading