aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoris2016-03-22 21:30:21 +0100
committerJoris2016-03-22 21:30:21 +0100
commit32db6a74d8578f993dd1cce3367fc7615ec730cd (patch)
tree7079540cc628016a867b9cb6a78290d019541324
parent1c7d6ea6e3bcd3c672cb5eb3cf22ffc88cabb257 (diff)
downloadbudget-32db6a74d8578f993dd1cce3367fc7615ec730cd.tar.gz
budget-32db6a74d8578f993dd1cce3367fc7615ec730cd.tar.bz2
budget-32db6a74d8578f993dd1cce3367fc7615ec730cd.zip
Use nodemon insteal of watch
-rw-r--r--application.conf4
-rw-r--r--package.json8
-rw-r--r--src/client/elm/View/Icon.elm2
-rw-r--r--src/client/elm/View/SignIn.elm2
4 files changed, 9 insertions, 7 deletions
diff --git a/application.conf b/application.conf
index 3be05e2..c3a59de 100644
--- a/application.conf
+++ b/application.conf
@@ -1,5 +1,5 @@
-hostname = "localhost:3001"
-port = 3001
+hostname = "localhost:3000"
+port = 3000
currency = "€"
signInExpirationMn = 5
diff --git a/package.json b/package.json
index 23a7b15..9cc8f10 100644
--- a/package.json
+++ b/package.json
@@ -1,14 +1,14 @@
{
"devDependencies": {
- "watch": "0.17.1"
+ "nodemon": "1.9.1"
},
"scripts": {
"start": "npm run watch",
"watch": "npm run watch-server & npm run watch-elm & npm run watch-js",
- "watch-server": "watch 'npm run build-and-launch-server --silent' src/server",
- "watch-elm": "watch 'npm run build-elm --silent' src/client/elm",
- "watch-js": "watch 'npm run build-js --silent' src/client/js",
+ "watch-server": "nodemon -e hs,conf --exec 'npm run build-and-launch-server --silent'",
+ "watch-elm": "nodemon -e elm --exec 'npm run build-elm --silent'",
+ "watch-js": "nodemon --watch src/client/js --exec 'npm run build-js --silent'",
"build": "npm run build-server && npm run build-elm && npm run build-js",
"build-server": "cabal build",
diff --git a/src/client/elm/View/Icon.elm b/src/client/elm/View/Icon.elm
index bdbe6d5..468265f 100644
--- a/src/client/elm/View/Icon.elm
+++ b/src/client/elm/View/Icon.elm
@@ -15,5 +15,5 @@ renderIcon iconClass =
renderSpinIcon : Html
renderSpinIcon =
i
- [ class <| "fa fa-fw fa-pulse fa-spinner" ]
+ [ class <| "fa fa-fw fa-spin fa-spinner" ]
[]
diff --git a/src/client/elm/View/SignIn.elm b/src/client/elm/View/SignIn.elm
index 908ab62..6fba764 100644
--- a/src/client/elm/View/SignIn.elm
+++ b/src/client/elm/View/SignIn.elm
@@ -29,6 +29,8 @@ renderSignIn address model signInView =
[ input
[ value signInView.login
, on "input" targetValue (Signal.message address << UpdateSignIn << UpdateLogin)
+ , type' "text"
+ , autocomplete True
]
[]
, button