Skip to content

Commit 6579796

Browse files
authored
Merge pull request #207 from EdgeApp/paul/addEdgeAsset
Paul/add edge asset
2 parents 87447b7 + 8db07b2 commit 6579796

64 files changed

Lines changed: 18242 additions & 9115 deletions

Some content is hidden

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

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# Package managers:
1111
node_modules/
1212
npm-debug.log
13-
package-lock.json
13+
yarn.lock
1414
yarn-error.log
1515

1616
# Editors:

.husky/pre-commit

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
npm run precommit

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ignore-scripts=true

.yarnrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

README.md

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,14 @@
55
## Installation
66

77
```sh
8-
# Install Yarn
9-
10-
https://linuxize.com/post/how-to-install-yarn-on-ubuntu-18-04/
11-
128
# Install Node
139

1410
curl -sL https://deb.nodesource.com/setup_10.x -o nodesource_setup.sh
1511
sudo bash nodesource_setup.sh
1612

17-
# Run Yarn
13+
# Install dependencies
1814

19-
yarn
15+
npm install
2016

2117
# Install CouchDB v3.1
2218

@@ -36,9 +32,9 @@
3632

3733
## Reporting Server
3834

39-
To launch the reports server, just type `yarn start`.
35+
To launch the reports server, just type `npm start`.
4036

41-
You can also build the server code by running `yarn build`, which puts its output in the `lib` folder. You can then use `forever-service` or similar tools to install the software on your server machine.
37+
You can also build the server code by running `npm run build.lib` (or `npm run prepare` for a full build), which puts its output in the `lib` folder. You can then use `forever-service` or similar tools to install the software on your server machine.
4238

4339
```sh
4440

@@ -68,4 +64,4 @@ sudo forever-service delete reportsApi
6864

6965
## Demo app
7066

71-
Run `yarn demo` to launch the demo app in your web browser.
67+
Run `npm run demo` to launch the demo app in your web browser.

0 commit comments

Comments
 (0)