Skip to content
This repository was archived by the owner on Nov 24, 2021. It is now read-only.

Commit 42bd0d3

Browse files
rexwangccAlexChrisF
authored andcommitted
More changes to the readme and add a PR template file. (#184)
* Re-word the comments in compose file. * Further polish the readme. * Add a PR template. * Fix another broken link.
1 parent 63f9a3b commit 42bd0d3

File tree

3 files changed

+35
-8
lines changed

3 files changed

+35
-8
lines changed

README.md

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,43 @@
44
[![Travis (.org) branch](https://img.shields.io/travis/piximi/application/production.svg?label=Production%20Build%20on%20Travis%20CI%20&style=flat-square&logo=Travis)](https://travis-ci.org/piximi/application)
55

66
A web-based deep learning tool for classification of human cells, created with Tensorflow.js and React.
7-
https://application.piximi.org
7+
https://www.piximi.app
88

99
**Please make sure to clean your browser cache, since we are continuously developing new features:)**
1010

11-
![alt text](./public/piximi.png)
12-
1311
## Getting Started
1412

1513
These instructions will get you a copy of the project up and running on your local machine for development and testing purposes. See deployment for notes on how to deploy the project on a live system.
1614

1715
## Development
1816

19-
### Option 1: Develop Locally Without Docker
17+
### Set up your development environment
18+
19+
#### Option 1: Develop locally without Docker
2020
1. Install npm and Node.js: https://www.npmjs.com/get-npm
2121
2. Verify the installation by: `node --version` and `npm -v`
2222
3. Install the node dependencies with `npm install`
2323
4. Clone the project: `git clone https://github.com/piximi/application.git` and move into the repo with `cd application`
2424
5. Run `npm start` from within the root directory of the repo, which should pop up a new tab your browser pointing at http://localhost:3000
2525

26-
### Option 2: Develop Using Docker-Compose
26+
#### Option 2: Develop using Docker-Compose
2727
1. Clone the project: `git clone https://github.com/piximi/application.git` and move into the repo with `cd application`
2828
2. Make sure you have docker-compose installed: `docker-compose version`
2929
3. From within the root directory, run `docker-compose up`. (Note you might want to run `docker-compose up --build` whenever you make changes to the `Dockerfile.dev`.)
30-
4. You should be able to see the application page at http://localhost:3000
30+
4. You should be able to see the application page at http://localhost:3000. _You won't need to restart the server as long as the docker-compose is running, the app will be dynamically relaoded._
31+
32+
### Development process
33+
34+
There is no _master_ branch in this repo, and `develop` is the default branch that you should branch off when you want to make changes. Although in some rare cases the maintainers of the repo could merge hot-fix PRs directly to `production` branch,
35+
in general developers follow the process:
36+
37+
1. Branch off the latest remote `develop` branch either in a forked repo or the same repo (requries write access to the repo).
38+
2. Make changes, commit the changes and create a PR against the `develop` branch.
39+
3. Make sure all of the tests pass.
40+
4. Ask the maintainers of the repo to merge the PR for you, usually they will be the reviewers of your PR.
41+
5. PRs merged to `develop` will trigger a deployment to the dev server.
42+
43+
Maintainers can merge the `develop` to `production` to trigger a deployment/promotion to the prod server. External contributors will need to follow the CONTRIBUTING guide.
3144

3245
## Deployment
3346

@@ -37,7 +50,7 @@ You can define where to deploy in the package.json file under: ** homepage **
3750

3851
## Contributing
3952

40-
Please read [CONTRIBUTING.md](https://github.com/piximi/application/blob/master/CONTRIBUTING.md) for details on our code of conduct, and the process for submitting pull requests to us.
53+
Please read [CONTRIBUTING.md](https://github.com/piximi/application/blob/develop/CONTRIBUTING.md) for details on our code of conduct, and the process for submitting pull requests to us.
4154

4255
## Versioning
4356

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ services:
88
command:
99
["npm", "start"]
1010
volumes:
11-
# Only mount a whitelist of top-level /ui files/directories; specifically
11+
# Only mount a whitelist of top-level files/directories; specifically
1212
# exclude node_modules here.
1313
- ./src:/application/src
1414
- ./public:/application/public

pull_request_template.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
### Purpose
2+
<!-- Please explain the purpose of this PR and include links to any GitHub issues that it fixes: -->
3+
4+
- No issue is linked to this PR.
5+
6+
### Changes
7+
<!-- Please list out what major changes were made in this PR to address the issue: -->
8+
9+
- No changes.
10+
11+
### Review Instructions
12+
<!-- Please provide instructions about how should a reviewer test/verify the changes in this PR: -->
13+
14+
- No instructions.

0 commit comments

Comments
 (0)