From 93565de2a22e42bcd87e48447da2f647791c930c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20L=C3=B6nn?= Date: Wed, 17 May 2017 14:45:38 +0200 Subject: [PATCH 1/7] add app.json --- app.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 app.json diff --git a/app.json b/app.json new file mode 100644 index 0000000..9b2d360 --- /dev/null +++ b/app.json @@ -0,0 +1,7 @@ +{ + "name": "VoteIT", + "description": "A voting system", + "repository": "https://github.com/mlonn/VoteIT", + "logo": "https://node-js-sample.herokuapp.com/node.png", + "keywords": ["node", "express", "static"] +} \ No newline at end of file From 9b9199cfcdbc5c3aca33b634b3f38eb59149cba7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20L=C3=B6nn?= Date: Wed, 17 May 2017 15:17:52 +0200 Subject: [PATCH 2/7] Add variables to app.json --- app.json | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/app.json b/app.json index 9b2d360..427e3a6 100644 --- a/app.json +++ b/app.json @@ -2,6 +2,20 @@ "name": "VoteIT", "description": "A voting system", "repository": "https://github.com/mlonn/VoteIT", - "logo": "https://node-js-sample.herokuapp.com/node.png", - "keywords": ["node", "express", "static"] -} \ No newline at end of file + "logo": "http://imgur.com/3Xwg8XF", + "keywords": ["node", "voteIT", "voteing"], + "env": { + "PASSWORD": { + "description": "password for /admin", + "required": true + }, + "NUM_USERS ": { + "description": "Hur många får rösta?", + "required": true + }, + "CODES_PER_USER": { + "description": "Hur många koder per användare?", + "required": true + } + } +} From cd8efe335f7dae2a9a22dfe5a96bb95ae3b86cc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20L=C3=B6nn?= Date: Wed, 17 May 2017 15:19:51 +0200 Subject: [PATCH 3/7] fixes logo --- app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.json b/app.json index 427e3a6..a4ad67f 100644 --- a/app.json +++ b/app.json @@ -2,7 +2,7 @@ "name": "VoteIT", "description": "A voting system", "repository": "https://github.com/mlonn/VoteIT", - "logo": "http://imgur.com/3Xwg8XF", + "logo": "http://imgur.com/3Xwg8XF.png", "keywords": ["node", "voteIT", "voteing"], "env": { "PASSWORD": { From 3a45ef6c68bc065b6e4caa763a82df62860cfe23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20L=C3=B6nn?= Date: Fri, 21 Jul 2017 09:31:54 +0200 Subject: [PATCH 4/7] Update app.json --- app.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app.json b/app.json index a4ad67f..0775ede 100644 --- a/app.json +++ b/app.json @@ -1,7 +1,7 @@ { "name": "VoteIT", "description": "A voting system", - "repository": "https://github.com/mlonn/VoteIT", + "repository": "https://github.com/cthit/VoteIT", "logo": "http://imgur.com/3Xwg8XF.png", "keywords": ["node", "voteIT", "voteing"], "env": { @@ -10,11 +10,11 @@ "required": true }, "NUM_USERS ": { - "description": "Hur många får rösta?", + "description": "Hur mÃ¥nga fÃ¥r rösta?", "required": true }, "CODES_PER_USER": { - "description": "Hur många koder per användare?", + "description": "Hur mÃ¥nga koder per användare?", "required": true } } From e38ad6a20b4ec8eb89b1833b4eb03f4fad6314d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20L=C3=B6nn?= Date: Fri, 21 Jul 2017 09:34:16 +0200 Subject: [PATCH 5/7] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 1762efd..3890c91 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,10 @@ A voting system for student Division Meeting (Sektionsmöte). [Setup Instructions](https://github.com/cthit/VoteIT/wiki/Setup-Instructions-for-Vote-Counters) +or + +[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy) + [User Instructions](https://github.com/cthit/VoteIT/wiki/User-Instructions) Server on heroku needs to be kept alive (sleeps after 30 mins of inactivity by default) using something like the following script: From 950ac90125d4f2a74d5b4db5d2beb08baf488eb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20L=C3=B6nn?= Date: Fri, 21 Jul 2017 09:42:07 +0200 Subject: [PATCH 6/7] Update app.json --- app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.json b/app.json index 0775ede..efa5565 100644 --- a/app.json +++ b/app.json @@ -3,7 +3,7 @@ "description": "A voting system", "repository": "https://github.com/cthit/VoteIT", "logo": "http://imgur.com/3Xwg8XF.png", - "keywords": ["node", "voteIT", "voteing"], + "keywords": ["node", "voteIT", "voting"], "env": { "PASSWORD": { "description": "password for /admin", From bbb4a9cb3390abc48fb7fa8e2b055e0e363b0e27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20L=C3=B6nn?= Date: Fri, 21 Jul 2017 10:27:34 +0200 Subject: [PATCH 7/7] Update app.json --- app.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app.json b/app.json index efa5565..d049396 100644 --- a/app.json +++ b/app.json @@ -6,15 +6,15 @@ "keywords": ["node", "voteIT", "voting"], "env": { "PASSWORD": { - "description": "password for /admin", + "description": "Password for /admin", "required": true }, "NUM_USERS ": { - "description": "Hur mÃ¥nga fÃ¥r rösta?", + "description": "How many users can vote?", "required": true }, "CODES_PER_USER": { - "description": "Hur mÃ¥nga koder per användare?", + "description": "How many codes per user?", "required": true } }