diff --git a/screenshot2.png b/screenshot2.png index ff29203..91476e8 100644 Binary files a/screenshot2.png and b/screenshot2.png differ diff --git a/webapp/controllers.js b/webapp/controllers.js index 4950445..14cbc52 100644 --- a/webapp/controllers.js +++ b/webapp/controllers.js @@ -5,9 +5,10 @@ angular.module('workApp', ['chart.js']) $interval ) { $scope.user={ - username: "Arnau", + username: "idoctnef", avatar: "toucan", - github: "https://github.com/idoctnef", + github: ["github.com/idoctnef", "https://github.com/idoctnef"], + taiga: ["project page", "https://projects.primustech.io"], totalWorkedTime: 4520 }; //localStorage.clear(); diff --git a/webapp/index.html b/webapp/index.html index 5feb91b..fc9f6bd 100644 --- a/webapp/index.html +++ b/webapp/index.html @@ -12,17 +12,17 @@ - Open Work Time - local version + Open Work Time - online version - +
-
+
-
- -

{{user.username}}

+
+
+
+ +
+
+
{{user.username}}
+

- Users's github: {{user.github}} + {{user.github[0]}} +

+

+ {{user.taiga[0]}}

Total worked time: {{user.totalWorkedTime | secondsToDateTime | date:'HH:mm'}}h

-
+







+







+







+







+
-
+
-
+
Projects
- +
-
+
-
+
@@ -106,7 +118,7 @@
-
+
@@ -135,14 +147,14 @@
-
+
Select a project
-
+
diff --git a/webapp/own.css b/webapp/own.css index d55ee0e..6b5b458 100644 --- a/webapp/own.css +++ b/webapp/own.css @@ -20,9 +20,16 @@ } .o_user_title{ - width: 70%; + width: 60%; max-width: 150px; margin-top: 20px; margin-left: auto; margin-right: auto; } + + +/*@media only screen and (min-width: 601px){ + .o_sidenav{ + height: 100%; + } +}*/