Skip to content

Commit edcebfc

Browse files
committed
lots of changes made over a long time..
1 parent 1f813d6 commit edcebfc

File tree

5 files changed

+18
-1058
lines changed

5 files changed

+18
-1058
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
/node_modules/
22
/sound/
3+
/.idea/

html/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<script src="http://ajax.aspnetcdn.com/ajax/jQuery/jquery-1.7.2.min.js"></script>
3333
<script src="socket.io/socket.io.js"></script>
3434
<script src="js/date.format.js"></script>
35-
<script src="js/fastclick/lib/fastclick.js"></script>
35+
<script src="jslib/fastclick/fastclick.js"></script>
3636
<script>
3737

3838
var socket = io.connect(/*'http://10.0.0.1:1337'*/);

index.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ var util = require('util'),
1111
nextAlarm = alarm.getNext(),
1212
logHistory = [],
1313
lastAlarmStr,
14-
config = { playlist: 'playlist.txt', playlistShuffle: true, alarmFile: 'sound/galaxy_s4_alarm_no1.mp3' }
14+
config = {
15+
playlist: 'playlist.txt',
16+
playlistShuffle: true,
17+
alarmFile: 'sound/alarm.mp3'
18+
}
1519
/*config = {
1620
plugins: ['verify']
1721
},
@@ -122,6 +126,7 @@ expressServer.configure(function () {
122126
expressServer.use(express.static(__dirname + '/html'));
123127
expressServer.use('/css', express.static(__dirname + '/css'));
124128
expressServer.use('/js', express.static(__dirname + '/lib'));
129+
expressServer.use('/jslib/fastclick', express.static(__dirname + '/node_modules/fastclick/lib'));
125130
});
126131

127132
expressServer.listen(1337, function () {

package.json

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
{
22
"name": "alarm-clock",
3-
"version": "0.0.1",
3+
"version": "0.2",
44
"author": "Markus Hedlund <znarkus@gmail.com>",
55
"dependencies": {
6-
"socket.io": "0.9.x",
7-
"express": "2.5.x"
6+
"express": "2.5.x",
7+
"fastclick": "^1.0.3",
8+
"socket.io": "0.9.x"
89
},
9-
"engine": "node = 0.6.x"
10-
}
10+
"engine": "node = 0.6.x",
11+
"repository": {
12+
"type": "git",
13+
"url": "git@github.com:Znarkus/alarm3.git"
14+
}
15+
}

0 commit comments

Comments
 (0)