Skip to content

Commit beeafb1

Browse files
authored
Merge pull request #58 from sbliven/contributing
Update Contributing page
2 parents dda1234 + 5bca1f4 commit beeafb1

File tree

7 files changed

+68
-139
lines changed

7 files changed

+68
-139
lines changed

Development/v3.x/Contributing.md

Lines changed: 25 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,33 @@
11
# Contributing
22

3-
There are 3 core ways to get involved with the Data Catalogue project:
4-
5-
1. Documentation - Fixing errors, covering weaker areas, adding examples
6-
2. Github Issues - This should be the first area to focus on for those that want to amend the code. To see how the project is developed, see the [Git Workflow page.](./Development_Methods.md)
7-
3. Testing
8-
9-
For information about the development method we follow, please check [Development Methodology.](./Development_Methods.md)
3+
There are many to get involved with the SciCat project:
4+
5+
1. Documentation - Fixing errors, covering weaker areas, adding examples. Documentation
6+
is divided between the
7+
[homepage](https://github.com/SciCatProject/scicatproject.github.io),
8+
[documentation pages](https://github.com/SciCatProject/documentation), and READMEs in
9+
the repositories.
10+
2. Github Issues - This should be the first area to focus on for those that want to
11+
amend the code. To see how the project is developed, see the [Git Workflow
12+
page.](./Development_Methods.md)
13+
3. [Testing](./Testing.md) - Most repositories contain unit tests. Integration between
14+
components is tested with [scicatlive](https://github.com/SciCatProject/scicatlive),
15+
which is also the easiest way to run and develop SciCat locally.
16+
4. Development - For information about the development method we follow, please check
17+
[Git Flow Workflow](./Development_Methods.md).
18+
19+
Communication is done through github issues, a slack channel, and a biweekly developer
20+
meeting. Please [contact](https://scicatproject.github.io/#team) the project leader, Max
21+
Novelli, for more information on getting involved.
1022

1123
## Issues
1224

13-
Issues are handled within the Github Issue tracker and should follow the template:
14-
15-
```markdown
16-
## Issue Name
17-
18-
### Summary
19-
20-
### Steps to Reproduce
21-
22-
### Current Behaviour
23-
24-
### Expected Behaviour
25-
26-
### Extra Details
27-
28-
Here you should include details about the system (if it is unique) and possible information about a fix (feel free to link to code where relevant). Screenshots/GIFs are also fine here.
29-
30-
```
31-
32-
25+
Issues are handled within the Github Issue tracker. Please follow the provided template
26+
for each repository.
3327

3428
## Merge Requests
3529

36-
There should be **no** pushing directly to the `master` or `develop` branches. To implement a fix, one should open a branch with the naming: `hotfix/ISSUE-NAME` from the `develop` branch and complete all work there. When it is complete, a Merge Request should be opened that follows this template:
37-
38-
```markdown
39-
## Description
40-
41-
## Motivation
42-
43-
Link to any open issues here
44-
45-
## Fixes:
46-
47-
*
48-
*
49-
50-
## Changes:
51-
52-
*
53-
*
54-
55-
## Tests included/Docs Updated?
56-
57-
- [ ] Included for each change/fix?
58-
- [ ] Passing? (Merge will not be approved unless this is checked)
59-
- [ ] Docs updated?
60-
61-
## Extra Information/Screenshots
62-
```
63-
64-
When the request is created, it should be assigned to any other appropriate team member with `develop` as the target branch. Tests **must** be written for all features/changes made and any major changes should be updated in the `docs` repo.
65-
66-
67-
68-
69-
30+
There should be **no** pushing directly to the `main`, `master` or `develop` branches.
31+
To implement a fix, fork the repository and create a branch (eg `fix/ISSUE-NAME`)
32+
complete all work there. When it is complete, open a Pull Request, which will be
33+
reviewed and merged by the core developers.

Development/v3.x/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
This guide aims to help developers understand the overall structure of the software and therefore enables people to contribute to the development of the software. See also the [Overview in the Operator Manual](../Operator/) for a helicopter view of the involved components.
44

5-
If you want to contribute to the software you should also read the [Contributing](../Development/Development_Methods.html) section, which among others links to the git workflow to be used.
5+
If you want to contribute to the software you should also read the [Contributing](./Contributing.md) section, which among others links to the git workflow to be used.
66

77

88
# Getting an development environment set up
@@ -21,8 +21,8 @@ The most important part to understand is how loopback works, because it is the p
2121

2222
## Web Browser Client (Frontend)
2323

24-
* [Angular 9+](https://angular.io/)
25-
* [Angular Material Widgets and Design](https://material.angular.io/)
24+
* [Angular 9+](https://angular.io/)
25+
* [Angular Material Widgets and Design](https://material.angular.io/)
2626
* [NGRX for State Management](https://ngrx.io/)
2727
* [Loopback SDK generator for Angular](https://github.com/mean-expert-official/loopback-sdk-builder)
2828

Development/v4.x/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
This guide aims to help developers understand the overall structure of the software and therefore enables people to contribute to the development of the software. See also the [Overview in the Operator Manual](../Operator/) for a helicopter view of the involved components.
44

5-
If you want to contribute to the software you should also read the [Contributing](../Development/Development_Methods.html) section, which among others links to the git workflow to be used.
5+
If you want to contribute to the software you should also read the [Contributing](./contributing.md) section.
66

77
# Getting an development environment set up
88

Development/v4.x/contributing.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Contributing
2+
3+
There are many to get involved with the SciCat project:
4+
5+
1. Documentation - Fixing errors, covering weaker areas, adding examples. Documentation
6+
is divided between the
7+
[homepage](https://github.com/SciCatProject/scicatproject.github.io),
8+
[documentation pages](https://github.com/SciCatProject/documentation), and READMEs in
9+
the repositories.
10+
2. Github Issues - This should be the first area to focus on for those that want to
11+
amend the code.
12+
3. [Testing](./testing.md) - Most repositories contain unit tests. Integration between
13+
components is tested with [scicatlive](https://github.com/SciCatProject/scicatlive),
14+
which is also the easiest way to run and develop SciCat locally.
15+
4. Development - Check individual repositories for more information on how to contribute
16+
code. For an overview, see the [developer guide](./developers_guide.md).
17+
18+
Communication is done through github issues, a slack channel, and a biweekly developer
19+
meeting. Please [contact](https://scicatproject.github.io/#team) the project leader, Max
20+
Novelli, for more information on getting involved.
21+
22+
## Issues
23+
24+
Issues are handled within the Github Issue tracker. Please follow the provided template
25+
for each repository.
26+
27+
## Merge Requests
28+
29+
There should be **no** pushing directly to the `main`, `master` or `develop` branches.
30+
To implement a fix, fork the repository and create a branch (eg `fix/ISSUE-NAME`)
31+
complete all work there. When it is complete, open a Pull Request, which will be
32+
reviewed and merged by the core developers.

Development/v4.x/developers_guide.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# SciCat Data Catalogue Developer Guide
22

3-
This guide aims to help developers understand the overall structure of the software and therefore enables people to contribute back to develop and improve this tool.
3+
This guide aims to help developers understand the overall structure of the software and therefore enables people to contribute back to develop and improve this tool.
44
Please refer to [Overview in the Operator Manual](../Operator/) for a bird-eye view of the components that are part of SciCat.
55

6-
If you want to contribute to this software, please read the [Contributing](../Development/Development_Methods.html) section, which among others links to the git workflow to be used.
6+
If you want to contribute to this software, please read the [Contributing](./contributing.md) section, which among others links to the git workflow to be used.
77

88
## Introduction to SciCat architecture
9-
SciCat architecture has been designed embracing the micro-services philosophy.
9+
SciCat architecture has been designed embracing the micro-services philosophy.
1010
The software has two main components:
1111
* Frontend
1212
* Backend
@@ -27,8 +27,8 @@ Technologies:
2727
### Frontend
2828
The frontend provides a single page UI application running in the browser intended to provide a easy to use interface to the backend functionalities
2929
Technologies:
30-
* [Angular 9+](https://angular.io/)
31-
* [Angular Material Widgets and Design](https://material.angular.io/)
30+
* [Angular 9+](https://angular.io/)
31+
* [Angular Material Widgets and Design](https://material.angular.io/)
3232
* [NGRX for State Management](https://ngrx.io/)
3333
* [Loopback SDK generator for Angular](https://github.com/mean-expert-official/loopback-sdk-builder)
3434

Development/v4.x/old/Contributing.md

Lines changed: 0 additions & 69 deletions
This file was deleted.

SUMMARY.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@
3939
- [Git Flow Workflow](Development/v3.x/Development_Methods.md)
4040
- [v4.x](Development/v4.x/README.md)
4141
- [Overview](Development/v4.x/overview.md)
42+
- [Contributing](Development/v4.x/contributing.md)
43+
- [Developer Guide](Development/v4.x/developers_guide.md)
4244
- [An Introduction to the Data Model](Development/v4.x/Data_Model.md)
4345
- [Running the Components](Development/v4.x/running.md)
4446
- [Configuration](Development/v4.x/configuration.md)

0 commit comments

Comments
 (0)