Skip to content

Commit 501f718

Browse files
authored
Merge pull request #1110 from PathwayCommons/v2.0.0
V2.0.0
2 parents 3ea44d4 + cce07e0 commit 501f718

File tree

169 files changed

+11806
-9555
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

169 files changed

+11806
-9555
lines changed

.stylelintrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"ignoreFiles": [
33
"./node_modules/**/*",
4-
"./src/styles/vendor/**/*"
4+
"./src/styles/vendor/**/*",
5+
"**/*.js"
56
],
67
"extends": "stylelint-config-standard",
78
"rules": {

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ npm run start
3333
The following environment variables can be used to configure the server:
3434

3535
- `NODE_ENV` : the environment mode, either `production` or `development` (default)
36-
- `PC_URL` : actual Pathway Commons web service endpoint URL (default: 'http://www.pathwaycommons.org/pc2/')
36+
- `PC_URL` : root Pathway Commons URL (default: 'http://www.pathwaycommons.org/')
3737
- `PORT` : the port on which the server runs (default 3000)
3838

3939
### Configure RethinkDB

ci.sh

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,24 @@
44
# be used with `cron` in order to set up regular builds, e.g. for every 15 minutes:
55
#
66
# `crontab -e`
7-
#
8-
# @reboot /home/username/rethinkdb.sh > /home/username/rethinkdb.log
9-
# */15 * * * * /home/username/master.sh > /home/username/master.log
107
#
11-
# To use this script, create a script per server instance, e.g. `master.sh`:
8+
# */15 * * * * /home/baderlab/development.sh > /home/baderlab/development_cron.log 2>&1
129
#
13-
# #!/bin/bash
10+
# To use this script, create a script per server instance, e.g. `development.sh`:
1411
#
15-
# # Mandatory repo/branch conf
16-
# export REPO=https://github.com/PathwayCommons/factoid.git
17-
# export BRANCH=master
12+
#!/bin/bash
1813
#
19-
# # Project-specific env vars
14+
# PATH=$PATH:/home/baderlab/.nvm/versions/node/v8.11.2/bin
15+
# export BRANCH=development
2016
# export PORT=3000
21-
#
22-
# ./ci.sh
17+
#
18+
# /home/baderlab/ci.sh
19+
20+
#!/bin/bash
2321

2422
JOB_NAME=$BRANCH
25-
WORKSPACE=/home/`whoami`/$JOB_NAME
23+
REPO=https://github.com/PathwayCommons/app-ui.git
24+
WORKSPACE=/home/baderlab/workspace/$JOB_NAME
2625
WORKSPACE_TMP=/tmp/$JOB_NAME
2726

2827
rm -rf $WORKSPACE_TMP
@@ -37,7 +36,7 @@ git checkout $BRANCH
3736
npm install
3837
npm run clean
3938

40-
export NODE_ENV=production
39+
#export NODE_ENV=production
4140

4241
npm run build
4342

0 commit comments

Comments
 (0)