Skip to content

Commit

Permalink
Merge branch 'master' into cleanup-package-file
Browse files Browse the repository at this point in the history
  • Loading branch information
cbridges1 committed Aug 6, 2020
2 parents d520e30 + 808bba3 commit 9a12048
Show file tree
Hide file tree
Showing 5 changed files with 119 additions and 49 deletions.
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Prometheus

[![License](https://img.shields.io/github/license/aeon-software/prometheus)](LICENSE.md)
[![Commit](https://img.shields.io/github/last-commit/aeon-software/prometheus)](https://github.com/aeon-software/prometheus/commits)
[![Repo](https://img.shields.io/github/repo-size/aeon-software/prometheus)](https://github.com/aeon-software/prometheus)

<p align="center">
<img alt="Prometheus UI" src="https://user-images.githubusercontent.com/34227411/88206375-c46acd00-cc13-11ea-8f60-f8564ab6c185.png">
</p>
Expand Down Expand Up @@ -27,7 +31,7 @@ These instructions will get Prometheus up and running on your local machine for

Run `npm install`

Start development by running `npm run development`
Start development by running `npm run dev`

Build project by running `npm run build`

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"private": true,
"scripts": {
"build": "react-scripts build && (if exist server\\build rmdir /s /q server\\build) && move build server",
"build-linux": "react-scripts build && (if exist server\\build rmdir /s /q server\\build) && mv build server",
"development": "concurrently \"react-scripts start\" \"nodemon server/server.js\"",
"build-linux": "react-scripts build && (if exist server/build rm -rf server/build) && mv build server",
"dev": "concurrently \"react-scripts start\" \"nodemon server/server.js\"",
"lint": "./node_modules/.bin/eslint app.js",
"react": "react-scripts start",
"start": "node server/server.js",
Expand Down
Loading

0 comments on commit 9a12048

Please sign in to comment.