From b8cf0f6e5c0ea9b03815f8ac51b26ed1bd419263 Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Sun, 31 Jan 2016 11:14:13 +0100 Subject: Change client folders --- client/js/directives/empty | 0 client/js/filters/empty | 0 client/js/requests/identity.js | 0 client/js/services/empty | 0 4 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 client/js/directives/empty delete mode 100644 client/js/filters/empty create mode 100644 client/js/requests/identity.js delete mode 100644 client/js/services/empty (limited to 'client') diff --git a/client/js/directives/empty b/client/js/directives/empty deleted file mode 100644 index e69de29..0000000 diff --git a/client/js/filters/empty b/client/js/filters/empty deleted file mode 100644 index e69de29..0000000 diff --git a/client/js/requests/identity.js b/client/js/requests/identity.js new file mode 100644 index 0000000..e69de29 diff --git a/client/js/services/empty b/client/js/services/empty deleted file mode 100644 index e69de29..0000000 -- cgit v1.2.3 From ae774e381148ef3a3a34d2f3bc51f15b033995f1 Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Sun, 31 Jan 2016 11:19:24 +0100 Subject: Remove useless folder --- client/fonts/glyphicons-halflings-regular.eot | Bin 20127 -> 0 bytes client/fonts/glyphicons-halflings-regular.svg | 288 ------------------------ client/fonts/glyphicons-halflings-regular.ttf | Bin 45404 -> 0 bytes client/fonts/glyphicons-halflings-regular.woff | Bin 23424 -> 0 bytes client/fonts/glyphicons-halflings-regular.woff2 | Bin 18028 -> 0 bytes 5 files changed, 288 deletions(-) delete mode 100644 client/fonts/glyphicons-halflings-regular.eot delete mode 100644 client/fonts/glyphicons-halflings-regular.svg delete mode 100644 client/fonts/glyphicons-halflings-regular.ttf delete mode 100644 client/fonts/glyphicons-halflings-regular.woff delete mode 100644 client/fonts/glyphicons-halflings-regular.woff2 (limited to 'client') diff --git a/client/fonts/glyphicons-halflings-regular.eot b/client/fonts/glyphicons-halflings-regular.eot deleted file mode 100644 index b93a495..0000000 Binary files a/client/fonts/glyphicons-halflings-regular.eot and /dev/null differ diff --git a/client/fonts/glyphicons-halflings-regular.svg b/client/fonts/glyphicons-halflings-regular.svg deleted file mode 100644 index 94fb549..0000000 --- a/client/fonts/glyphicons-halflings-regular.svg +++ /dev/null @@ -1,288 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/client/fonts/glyphicons-halflings-regular.ttf b/client/fonts/glyphicons-halflings-regular.ttf deleted file mode 100644 index 1413fc6..0000000 Binary files a/client/fonts/glyphicons-halflings-regular.ttf and /dev/null differ diff --git a/client/fonts/glyphicons-halflings-regular.woff b/client/fonts/glyphicons-halflings-regular.woff deleted file mode 100644 index 9e61285..0000000 Binary files a/client/fonts/glyphicons-halflings-regular.woff and /dev/null differ diff --git a/client/fonts/glyphicons-halflings-regular.woff2 b/client/fonts/glyphicons-halflings-regular.woff2 deleted file mode 100644 index 64539b5..0000000 Binary files a/client/fonts/glyphicons-halflings-regular.woff2 and /dev/null differ -- cgit v1.2.3 From 58e5c44db2f3343c491495d7077f13450db4e324 Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Sun, 31 Jan 2016 11:47:13 +0100 Subject: Make status bar dynamic ! --- client/index.html | 8 +++++++- client/js/controllers/status.js | 18 ++++++++++++++---- client/js/requests/identity.js | 15 +++++++++++++++ 3 files changed, 36 insertions(+), 5 deletions(-) (limited to 'client') diff --git a/client/index.html b/client/index.html index 0c02623..c2d1862 100644 --- a/client/index.html +++ b/client/index.html @@ -62,8 +62,14 @@ - + + + + + + + diff --git a/client/js/controllers/status.js b/client/js/controllers/status.js index 3534912..0767202 100644 --- a/client/js/controllers/status.js +++ b/client/js/controllers/status.js @@ -4,9 +4,19 @@ -mainApp.controller('statusCtrl', function ($scope) +mainApp.controller('statusCtrl', function ($scope,$interval) { - $scope.username="User 1"; - $scope.connection="Online"; - $scope.lastconnection="1 Septembre"; + + // Update status every 2 seconds + $interval(function(){ + var status=identity.fetchStatus(); + $scope.connection=status[0]; + $scope.username=status[1]; + $scope.lastconnection=status[2]; + }, 2000); + + + + + }); \ No newline at end of file diff --git a/client/js/requests/identity.js b/client/js/requests/identity.js index e69de29..369ce85 100644 --- a/client/js/requests/identity.js +++ b/client/js/requests/identity.js @@ -0,0 +1,15 @@ + + +// Make Namespace +var identity = {} ; + + + +// Fetch Status +identity.fetchStatus = function(){ + + // TODO + + return new Array("1", "user1", "25/02/2016"); + +} \ No newline at end of file -- cgit v1.2.3