Merge branch 'develop' into feature/fix-history-pagination

thisissoon · Jul 21, 2015 · 0d956d6 · 0d956d6
2 parents c8716e3 + f5fdda8
commit 0d956d6
Show file tree

Hide file tree

Showing 22 changed files with 822 additions and 16 deletions.
diff --git a/app/fonts/icomoon/icomoon.eot b/app/fonts/icomoon/icomoon.eot
diff --git a/app/fonts/icomoon/icomoon.svg b/app/fonts/icomoon/icomoon.svg
diff --git a/app/fonts/icomoon/icomoon.ttf b/app/fonts/icomoon/icomoon.ttf
diff --git a/app/fonts/icomoon/icomoon.woff b/app/fonts/icomoon/icomoon.woff
diff --git a/app/fonts/icomoon/selection.json b/app/fonts/icomoon/selection.json
@@ -1,6 +1,94 @@
 {
 	"IcoMoonType": "selection",
 	"icons": [
+		{
+			"icon": {
+				"paths": [
+					"M632.571 501.143l-424 424q-10.857 10.857-25.714 10.857t-25.714-10.857l-94.857-94.857q-10.857-10.857-10.857-25.714t10.857-25.714l303.429-303.429-303.429-303.429q-10.857-10.857-10.857-25.714t10.857-25.714l94.857-94.857q10.857-10.857 25.714-10.857t25.714 10.857l424 424q10.857 10.857 10.857 25.714t-10.857 25.714z"
+				],
+				"attrs": [
+					{}
+				],
+				"isMulticolor": false,
+				"width": 731,
+				"tags": [
+					"chevron-right"
+				],
+				"grid": 14
+			},
+			"attrs": [
+				{}
+			],
+			"properties": {
+				"order": 1,
+				"id": 2,
+				"prevSize": 28,
+				"code": 58891,
+				"name": "chevron-right"
+			},
+			"setIdx": 0,
+			"setId": 5,
+			"iconIdx": 0
+		},
+		{
+			"icon": {
+				"paths": [
+					"M669.143 172l-303.429 303.429 303.429 303.429q10.857 10.857 10.857 25.714t-10.857 25.714l-94.857 94.857q-10.857 10.857-25.714 10.857t-25.714-10.857l-424-424q-10.857-10.857-10.857-25.714t10.857-25.714l424-424q10.857-10.857 25.714-10.857t25.714 10.857l94.857 94.857q10.857 10.857 10.857 25.714t-10.857 25.714z"
+				],
+				"attrs": [
+					{}
+				],
+				"isMulticolor": false,
+				"width": 731,
+				"tags": [
+					"chevron-left"
+				],
+				"grid": 14
+			},
+			"attrs": [
+				{}
+			],
+			"properties": {
+				"order": 2,
+				"id": 1,
+				"prevSize": 28,
+				"code": 58893,
+				"name": "chevron-left"
+			},
+			"setIdx": 0,
+			"setId": 5,
+			"iconIdx": 1
+		},
+		{
+			"icon": {
+				"paths": [
+					"M365.714 512v292.571h-146.286v-292.571h146.286zM585.143 219.429v585.143h-146.286v-585.143h146.286zM1170.286 877.714v73.143h-1170.286v-877.714h73.143v804.571h1097.143zM804.571 365.714v438.857h-146.286v-438.857h146.286zM1024 146.286v658.286h-146.286v-658.286h146.286z"
+				],
+				"attrs": [
+					{}
+				],
+				"isMulticolor": false,
+				"width": 1170,
+				"tags": [
+					"bar-chart",
+					"bar-chart-o"
+				],
+				"grid": 14
+			},
+			"attrs": [
+				{}
+			],
+			"properties": {
+				"order": 1,
+				"id": 0,
+				"prevSize": 28,
+				"code": 58892,
+				"name": "stats"
+			},
+			"setIdx": 0,
+			"setId": 5,
+			"iconIdx": 2
+		},
 		{
 			"icon": {
 				"paths": [
@@ -10,10 +98,10 @@
 					{}
 				],
 				"isMulticolor": false,
-				"grid": 0,
 				"tags": [
 					"svg"
-				]
+				],
+				"grid": 0
 			},
 			"attrs": [
 				{}
@@ -25,8 +113,8 @@
 				"code": 58890,
 				"name": "playlist"
 			},
-			"setIdx": 0,
-			"setId": 5,
+			"setIdx": 1,
+			"setId": 4,
 			"iconIdx": 0
 		},
 		{
@@ -61,7 +149,7 @@
 			},
 			"setIdx": 1,
 			"setId": 4,
-			"iconIdx": 0
+			"iconIdx": 1
 		},
 		{
 			"icon": {
@@ -87,7 +175,7 @@
 			},
 			"setIdx": 1,
 			"setId": 4,
-			"iconIdx": 1
+			"iconIdx": 2
 		},
 		{
 			"icon": {
@@ -114,7 +202,7 @@
 			},
 			"setIdx": 1,
 			"setId": 4,
-			"iconIdx": 2
+			"iconIdx": 3
 		},
 		{
 			"icon": {
@@ -141,7 +229,7 @@
 			},
 			"setIdx": 1,
 			"setId": 4,
-			"iconIdx": 3
+			"iconIdx": 4
 		},
 		{
 			"icon": {
@@ -167,7 +255,7 @@
 			},
 			"setIdx": 1,
 			"setId": 4,
-			"iconIdx": 4
+			"iconIdx": 5
 		},
 		{
 			"icon": {
@@ -193,7 +281,7 @@
 			},
 			"setIdx": 1,
 			"setId": 4,
-			"iconIdx": 5
+			"iconIdx": 6
 		},
 		{
 			"icon": {
@@ -220,7 +308,7 @@
 			},
 			"setIdx": 1,
 			"setId": 4,
-			"iconIdx": 6
+			"iconIdx": 7
 		},
 		{
 			"icon": {
@@ -246,7 +334,7 @@
 			},
 			"setIdx": 1,
 			"setId": 4,
-			"iconIdx": 7
+			"iconIdx": 8
 		},
 		{
 			"icon": {
@@ -272,7 +360,7 @@
 			},
 			"setIdx": 1,
 			"setId": 4,
-			"iconIdx": 8
+			"iconIdx": 9
 		},
 		{
 			"icon": {
@@ -299,7 +387,36 @@
 			},
 			"setIdx": 1,
 			"setId": 4,
-			"iconIdx": 9
+			"iconIdx": 10
+		},
+		{
+			"icon": {
+				"paths": [
+					"M320 384h128v128h-128zM512 384h128v128h-128zM704 384h128v128h-128zM128 768h128v128h-128zM320 768h128v128h-128zM512 768h128v128h-128zM320 576h128v128h-128zM512 576h128v128h-128zM704 576h128v128h-128zM128 576h128v128h-128zM832 0v64h-128v-64h-448v64h-128v-64h-128v1024h960v-1024h-128zM896 960h-832v-704h832v704z"
+				],
+				"attrs": [],
+				"tags": [
+					"calendar",
+					"date",
+					"schedule",
+					"time",
+					"day"
+				],
+				"defaultCode": 57619,
+				"grid": 16
+			},
+			"attrs": [],
+			"properties": {
+				"id": 340,
+				"order": 16,
+				"prevSize": 32,
+				"code": 59731,
+				"ligatures": "calendar, date",
+				"name": "calendar"
+			},
+			"setIdx": 4,
+			"setId": 0,
+			"iconIdx": 83
 		}
 	],
 	"height": 1024,

diff --git a/app/index.html b/app/index.html
@@ -77,6 +77,8 @@
     <script src="components/angular-socket-io/socket.js"></script>
     <script src="components/satellizer/satellizer.js"></script>
     <script src="components/angular-notification/angular-notification.js"></script>
+    <script src="components/Chart.js/Chart.js"></script>
+    <script src="components/angular-chart.js/dist/angular-chart.js"></script>
 
     <script src="js/config/config.js"></script>
 
@@ -103,6 +105,7 @@
     <script src="js/api/factories/PlayerRandomResource.js"></script>
     <script src="js/api/factories/PlayerTransportResource.js"></script>
     <script src="js/api/factories/PlayerVolumeResource.js"></script>
+    <script src="js/api/factories/StatsResource.js"></script>
     <script src="js/api/factories/TracksResource.js"></script>
     <script src="js/api/factories/UsersResource.js"></script>
     <script src="js/api/factories/RequestInterceptor.js"></script>
@@ -131,6 +134,9 @@
 
     <script src="js/nav/nav.js"></script>
 
+    <script src="js/stats/stats.js"></script>
+    <script src="js/stats/controllers/StatsCtrl.js"></script>
+
     <script src="js/app.js"></script>
     <!-- /build -->
     <!--<![endif]-->

diff --git a/app/js/api/api.js b/app/js/api/api.js
@@ -11,6 +11,7 @@ angular.module("FM.api", [
     "FM.api.PlayerRandomResource",
     "FM.api.PlayerTransportResource",
     "FM.api.PlayerVolumeResource",
+    "FM.api.StatsResource",
     "FM.api.TracksResource",
     "FM.api.UsersResource",
     "FM.api.RequestInterceptor",

diff --git a/app/js/api/factories/StatsResource.js b/app/js/api/factories/StatsResource.js
@@ -0,0 +1,26 @@
+"use strict";
+/**
+ * Factory which provides methods to perform on thisisoon FM API
+ * /player/stats endpoint.
+ * @module FM.api.StatsResource
+ * @author SOON_
+ */
+angular.module("FM.api.StatsResource", [
+    "config",
+    "ngResource"
+])
+/**
+ * @constructor
+ * @class StatsResource
+ * @param {Service} $resource
+ * @param {String}  env
+ */
+.factory("StatsResource", [
+    "$resource",
+    "env",
+    function ($resource, env) {
+
+        return $resource(env.FM_API_SERVER_ADDRESS + "player/stats");
+
+    }
+]);
diff --git a/app/js/app.js b/app/js/app.js
@@ -18,6 +18,7 @@ angular.module("FM", [
     "FM.sockets",
     "FM.loadingScreen",
     "FM.nav",
+    "FM.stats",
     "ngRoute",
     "notification",
     "config"