Skip to content

Commit

Permalink
Merge pull request #446 from EyeSeeTea/development
Browse files Browse the repository at this point in the history
Release 2.4.0
  • Loading branch information
adrianq authored Sep 17, 2023
2 parents 380a412 + 63eb01c commit 9dc1682
Show file tree
Hide file tree
Showing 20 changed files with 105 additions and 5,378 deletions.
23 changes: 18 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,26 @@

A DHIS2 webapp for managing dataset objects.

## Setup

```
$ nvm use
$ yarn install
```

## Build

Create DHIS2 app zip:

```
$ yarn build
```

## Start a development server

Clone the repository and execute:

```
$ cd dataset-configuration
$ yarn install && yarn run build
$ yarn start
```

Expand All @@ -20,7 +33,7 @@ Clone the d2-ui repository, checkout the branch you want to test and create a li
$ git clone https://github.com/eyeseetea/d2-ui
$ cd d2-ui
$ git checkout BRANCH_TO_TEST
$ yarn install && yarn run build
$ yarn install && yarn build
$ yarn link
```

Expand All @@ -29,7 +42,7 @@ And now, on `dataset-configuration`, run:
```
$ yarn link d2-ui
```

## Enable CORS

To set up your DHIS2 instance to work with the development service you will need to add the development servers address to the CORS whitelist. You can do this within the DHIS2 Settings app under the _access_ tab. On the access tab add `http://localhost:8081` to the CORS Whitelist.
Expand Down Expand Up @@ -61,4 +74,4 @@ See `webpack.config.js` for details.

### material-ui

d2-ui makes use of [material-ui](http://www.material-ui.com) for rendering more basic components like TextFields and Lists. It is therefore quite useful to look into this library too when building DHIS2 apps and making use of d2-ui.
d2-ui makes use of [material-ui](http://www.material-ui.com) for rendering more basic components like TextFields and Lists. It is therefore quite useful to look into this library too when building DHIS2 apps and making use of d2-ui.
132 changes: 0 additions & 132 deletions includes/feedback-tool/feedback-dhis2.js

This file was deleted.

151 changes: 0 additions & 151 deletions includes/feedback-tool/feedback-github.js

This file was deleted.

Loading

0 comments on commit 9dc1682

Please sign in to comment.