summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorokalintu <ilkka.oks4nen@gmail.com>2015-03-03 13:49:21 +0200
committerokalintu <ilkka.oks4nen@gmail.com>2015-03-03 13:49:21 +0200
commitc3f11b89b73e1e1e109631493150817bd8c78a66 (patch)
tree3293a1f76d7c4093e785eb89bbc3178ad3b1890c
initial commit
-rw-r--r--adm.html18
-rw-r--r--client.js26
-rw-r--r--index.html23
-rw-r--r--index.js36
-rw-r--r--package.json9
-rw-r--r--readme.md7
6 files changed, 119 insertions, 0 deletions
diff --git a/adm.html b/adm.html
new file mode 100644
index 0000000..a602da9
--- /dev/null
+++ b/adm.html
@@ -0,0 +1,18 @@
+<!doctype HTML>
+<html >
+<head>
+<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.0.8/angular.min.js"></script>
+<script src="/socket.io/socket.io.js"></script>
+<script src="/client.js"></script>
+<title>Jono</title>
+</head>
+<body ng-app="ioc" >
+<div ng-controller="ioctrl">
+ <div ng-click="popfirst()" style="font-size:72px;">
+ <div>Jonoa: {{qsize}}</div>
+ <div>Rivi: {{que[0].row}}</div>
+ <div>Nimi: {{que[0].name}}</div>
+ </div>
+</div>
+</body>
+</html>
diff --git a/client.js b/client.js
new file mode 100644
index 0000000..fb612ed
--- /dev/null
+++ b/client.js
@@ -0,0 +1,26 @@
+var ioc = angular.module('ioc',[]);
+
+ioc.controller('ioctrl',function($scope){
+ var soc= io();
+ $scope.que=[];
+ $scope.row="";
+ $scope.name="";
+ $scope.qsize=0;
+
+ $scope.submit = function(){
+ soc.emit("queadd",{"row":$scope.row,"name":$scope.name});
+ $scope.row="";
+ $scope.name="";
+ };
+
+ soc.on("quedata",function(data){
+ $scope.que=data;
+ $scope.qsize=data.length;
+ $scope.$apply();
+ });
+
+ $scope.popfirst = function(){
+ soc.emit("quepopfirst","");
+ };
+
+});
diff --git a/index.html b/index.html
new file mode 100644
index 0000000..536f644
--- /dev/null
+++ b/index.html
@@ -0,0 +1,23 @@
+<!doctype HTML>
+<html >
+<head>
+<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.0.8/angular.min.js"></script>
+<script src="/socket.io/socket.io.js"></script>
+<script src="/client.js"></script>
+<title>Jono</title>
+</head>
+<body ng-app="ioc" >
+<div ng-controller="ioctrl" style="font-size:36px;width:400px;margin-left:auto;margin-right:auto;">
+<div>Rivi: <input type="text" ng-model="row"></input></div>
+<div> Nimi: <input type="text" ng-model="name"></input></div>
+<button ng-click="submit();">Add</button>
+
+<table>
+<tr ng-repeat="person in que">
+ <td >{{person.row}}</td>
+ <td >{{person.name}}</td>
+</tr>
+</table>
+</div>
+</body>
+</html>
diff --git a/index.js b/index.js
new file mode 100644
index 0000000..3e06e9a
--- /dev/null
+++ b/index.js
@@ -0,0 +1,36 @@
+var app = require('express')();
+var http = require('http').Server(app);
+var io = require('socket.io')(http);
+
+var que = []
+
+app.get('/', function(req, res){
+ res.sendFile(__dirname + '/index.html');
+});
+app.get('/client.js', function(req, res){
+ res.sendFile(__dirname + '/client.js');
+});
+app.get('/adm', function(req, res){
+ res.sendFile(__dirname + '/adm.html');
+});
+
+io.on('connection', function(socket){
+ socket.emit("quedata",que);
+
+ socket.on("queadd",function(data){
+ console.log("adding new que entry");
+ que.push(data);
+ io.emit("quedata",que);
+ });
+ socket.on("quepopfirst",function(data){
+ console.log("deleting first from que");
+ que.shift();
+ io.emit("quedata",que);
+ });
+
+
+});
+
+http.listen(3000, function(){
+ console.log('listening on *:3000');
+});
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..aebaa7a
--- /dev/null
+++ b/package.json
@@ -0,0 +1,9 @@
+{
+ "name": "jono",
+ "version": "0.0.1",
+ "description": "jonosysteemi",
+ "dependencies": {
+ "express": "^4.12.1",
+ "socket.io": "^1.3.4"
+ }
+}
diff --git a/readme.md b/readme.md
new file mode 100644
index 0000000..4774200
--- /dev/null
+++ b/readme.md
@@ -0,0 +1,7 @@
+#Que
+a simple quesystem implementation
+##Dependencies
+nodejs
+angular.js
+socket.io
+express.js