sagi/se-hub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #109 from sagidayan/UI

Browse source 
- project Page - Commits - added (work in progress..)
This commit is contained in:
Sagi Dayan 2015-07-01 08:26:52 +03:00
commit 99f7f32075
13 changed files with 357 additions and 323 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

322
templates/css/theme.css
View file

@ -151,33 +151,6 @@ body.noscroll
/*width: 100%;*/ /*width: 100%;*/
} }
/*.hvr-curl-top-left {
display: inline-block;
vertical-align: middle;
-webkit-transform: translateZ(0);
transform: translateZ(0);
box-shadow: 0 0 1px rgba(0, 0, 0, 0);
-webkit-backface-visibility: hidden;
backface-visibility: hidden;
-moz-osx-font-smoothing: grayscale;
position: relative;
}*/
/* Grow Rotate */
/*.campusCard {
display: inline-block;
vertical-align: middle;
-webkit-transform: translateZ(0);
transform: translateZ(0);
box-shadow: 0 0 1px rgba(0, 0, 0, 0);
-webkit-backface-visibility: hidden;
backface-visibility: hidden;
-moz-osx-font-smoothing: grayscale;
-webkit-transition-duration: 0.3s;
transition-duration: 0.3s;
-webkit-transition-property: transform;
transition-property: transform;
}*/
.campusCard:hover, .campusCard:focus, .campusCard:active { .campusCard:hover, .campusCard:focus, .campusCard:active {
-webkit-transform: rotate(4deg); -webkit-transform: rotate(4deg);
transform: rotate(4deg); transform: rotate(4deg);
@ -220,186 +193,172 @@ body.noscroll
-moz-box-shadow: 0 0 8px rgba(0, 0, 0, .8); -moz-box-shadow: 0 0 8px rgba(0, 0, 0, .8);
} }
/*.dropDown /* TODO * .allCampusesShow
{ {
border-bottom: 2px black solid; overflow:hidden;
border-top: 2px black solid; background-size: auto;
border-left: 2px black solid;
border-right: 2px black solid;
border-radius: 1px black solid;
}*/
.allCampusesShow }
{
overflow:hidden;
background-size: auto;
}
.campusCard
{
/*height:80%;*/
/*width:80%;*/
}
.gray-font-no-animation .gray-font-no-animation
{ {
color: #7f7f7f; color: #7f7f7f;
font-size: 300%; font-size: 300%;
text-shadow:#e0e0e0 1px 1px 0; text-shadow:#e0e0e0 1px 1px 0;
}
.gray-font
{
color: #7f7f7f;
font-size: 300%;
text-shadow:#e0e0e0 1px 1px 0;
opacity: 0;
-webkit-animation-duration: 8s;
animation-duration: 8s;
-webkit-animation-fill-mode: both;
animation-fill-mode: both;
overflow: hidden;
height: 100%;
}
@-webkit-keyframes fadeOutUp {
0% {
opacity: 1;
-webkit-transform: translateY(0);
} }
100% {
.gray-font
{
color: #7f7f7f;
font-size: 300%;
text-shadow:#e0e0e0 1px 1px 0;
opacity: 0; opacity: 0;
-webkit-animation-duration: 8s; -webkit-transform: translateY(-200px);
animation-duration: 8s; /*-webkit-transform: scale(0,0); */
-webkit-animation-fill-mode: both; height: 0px;
animation-fill-mode: both;
overflow: hidden;
height: 100%;
} }
}
@-webkit-keyframes fadeOutUp { @keyframes fadeOutUp {
0% { 0% {
opacity: 1; opacity: 1;
-webkit-transform: translateY(0); transform: translateY(0);
}
100% {
opacity: 0;
-webkit-transform: translateY(-200px);
/*-webkit-transform: scale(0,0); */
height: 0px;
}
} }
@keyframes fadeOutUp { 100% {
0% { opacity: 0;
opacity: 1; transform: translateY(-200px);
transform: translateY(0); /*transform: scale(0,0); */
} height: 0px;
100% {
opacity: 0;
transform: translateY(-200px);
/*transform: scale(0,0); */
height: 0px;
}
}
.fadeOutUp {
-webkit-animation-name: fadeOutUp;
animation-name: fadeOutUp;
} }
}
.fadeOutUp {
-webkit-animation-name: fadeOutUp;
animation-name: fadeOutUp;
}
.user-pane-menu{ .user-pane-menu{
width: 100%; width: 100%;
height: 15%; height: 15%;
background-color: #3F51B5; background-color: #3F51B5;
-webkit-box-shadow: 0px 13px 34px -14px rgba(0,0,0,0.75); -webkit-box-shadow: 0px 13px 34px -14px rgba(0,0,0,0.75);
-moz-box-shadow: 0px 13px 34px -14px rgba(0,0,0,0.75); -moz-box-shadow: 0px 13px 34px -14px rgba(0,0,0,0.75);
box-shadow: 0px 13px 34px -14px rgba(0,0,0,0.75); box-shadow: 0px 13px 34px -14px rgba(0,0,0,0.75);
top: 20px; top: 20px;
position: relative; position: relative;
} }
.user-pane-menu img{ .user-pane-menu img{
border: 7px rgb(255, 255, 255) solid; border: 7px rgb(255, 255, 255) solid;
-webkit-border-radius: 100px; -webkit-border-radius: 100px;
-moz-border-radius: 100px; -moz-border-radius: 100px;
border-radius: 50px; border-radius: 50px;
width: 30%; width: 30%;
position: relative; position: relative;
z-index: 50; z-index: 50;
} }
.se-menu{ .se-menu{
/*margin-top: 20%; */ /*margin-top: 20%; */
} }
.se-menu ul{ .se-menu ul{
list-style: none; list-style: none;
padding: 0; padding: 0;
padding-left: 0; padding-left: 0;
} }
.se-menu li{ .se-menu li{
width: 100%; width: 100%;
padding: 15px 0px 15px 15px; padding: 15px 0px 15px 15px;
font-size: 150%; font-size: 150%;
} }
.se-menu li:hover{ .se-menu li:hover{
background-color: #E2E2E2; background-color: #E2E2E2;
font-weight: bold; font-weight: bold;
cursor: pointer; cursor: pointer;
} }
.se-menu li:active{ .se-menu li:active{
background-color: #B2B2B2; background-color: #B2B2B2;
text-shadow:#e0e0e0 1px 1px 0; text-shadow:#e0e0e0 1px 1px 0;
font-weight: bold; font-weight: bold;
} }
.se-menu .selected{ .se-menu .selected{
background-color: #E2E2E2; background-color: #E2E2E2;
text-shadow:#e0e0e0 1px 1px 0; text-shadow:#e0e0e0 1px 1px 0;
font-weight: bold; font-weight: bold;
} }
.user-box{ .user-box{
width: 100% width: 100%
} }
.user-box img{ .user-box img{
width: 100%; width: 100%;
border: 4px #7f7f7f solid; border: 4px #7f7f7f solid;
-webkit-border-radius: 5px; -webkit-border-radius: 5px;
-moz-border-radius: 5px; -moz-border-radius: 5px;
border-radius: 5px; border-radius: 5px;
} }
.user-data{ .user-data{
margin-top: auto; margin-top: auto;
} }
.se-menu ul a{ .se-menu ul a{
text-decoration: none !important; text-decoration: none !important;
color: #7f7f7f; color: #7f7f7f;
} }
/*Settings Style*/ /*Settings Style*/
.settingList .settingListItem:hover{ .settingList .settingListItem:hover{
background-color: #E2E2E2; background-color: #E2E2E2;
font-weight: bold; font-weight: bold;
} }
.settingList .settingListItemRoot{ .settingList .settingListItemRoot{
list-style: none; list-style: none;
padding: 0; padding: 0;
padding-left: 0; padding-left: 0;
} }
.settingList .settingListItem{ .settingList .settingListItem{
width: 100%; width: 100%;
padding: 15px 0px auto 15px; padding: 15px 0px auto 15px;
} }
/*End Settings*/ /*End Settings*/
/*md Effects*/ /*md Effects*/
.md-avatar{ .md-avatar{
width: 40px; width: 40px;
height: 40px; height: 40px;
margin-top: 8px; margin-top: 8px;
margin-bottom: 8px; margin-bottom: 8px;
margin-right: 16px; margin-right: 16px;
border-radius: 50%; border-radius: 50%;
box-sizing: content-box; box-sizing: content-box;
} }
/* Colors*/ /* Colors*/
@ -467,6 +426,11 @@ body.noscroll
word-break: break-word; word-break: break-word;
} }
.tabDesign
{
overflow: scroll;
}
.tasksContent .tasksContent
{ {
padding-left: 4px; padding-left: 4px;
@ -492,7 +456,7 @@ p.tasksFeed
{ {
padding-left: 4px; padding-left: 4px;
margin: 5px; margin: 5px;
width:340; width:99%;
height: auto; height: auto;
background-color: aliceblue; background-color: aliceblue;
@ -501,7 +465,7 @@ p.messagesFeed
{ {
padding-left: 4px; padding-left: 4px;
margin: 5px; margin: 5px;
width:690; width:99%;
height: auto; height: auto;
background-color: #f5f5f5; background-color: #f5f5f5;
} }

2
templates/js/controllers/campusesController.js
View file

@ -1,6 +1,7 @@
angular.module('SeHub') angular.module('SeHub')
.controller('campusesController', ['$scope', '$cookies', '$cookieStore', '$window', '$location', '$mdToast', '$mdDialog', 'apiService', '$rootScope', function($scope, $cookies, $cookieStore, $window, $location, $mdToast, $mdDialog, apiService, $rootScope) .controller('campusesController', ['$scope', '$cookies', '$cookieStore', '$window', '$location', '$mdToast', '$mdDialog', 'apiService', '$rootScope', function($scope, $cookies, $cookieStore, $window, $location, $mdToast, $mdDialog, apiService, $rootScope)
{ {
$scope.loadingData = true;
$scope.campusesEmpty = false; $scope.campusesEmpty = false;
var token = $cookies['com.sehub.www']; var token = $cookies['com.sehub.www'];
@ -34,6 +35,7 @@ angular.module('SeHub')
{ {
apiService.getCampusesByUser(token).success(function(data) // Get all the campuses apiService.getCampusesByUser(token).success(function(data) // Get all the campuses
{ {
$scope.loadingData = true;
$scope.campuses = data; $scope.campuses = data;
console.log("INSIDE " + $scope.campuses); console.log("INSIDE " + $scope.campuses);
init(); // Executing the function to initialize campuses display init(); // Executing the function to initialize campuses display

47
templates/js/controllers/homeController.js
View file

@ -34,28 +34,16 @@ angular.module('SeHub')
console.log("Student Mode!"); console.log("Student Mode!");
} }
// apiService.getCourseByCampusName(token).success(function(data)
// {
// console.log("Campus Name is ON! " + token)
// $scope.course = data;
// }).error(function(err)
// {
// console.log("Error ===> " + err + " ===> getCourseByCampusName")
// });
$scope.addMessageClicked = function() $scope.addMessageClicked = function()
{ {
$scope.addMsg = true; // Reveal the "POST" Button $scope.addMsg = true; // Reveal the "POST" Button
} }
$scope.postMessageClicked = function() // Posting the message itself $scope.postMessageClicked = function() // Posting the message itself
{ {
if($scope.msg.msgToAdd != null) if($scope.msg.msgToAdd != null)
{ {
jsonNewMsg = { jsonNewMsg = {
'courseName': 'A', // TODO Should be ===> $scope.course.courseName 'courseName': 'Math', // TODO Should be ===> $scope.course.courseName
'message': $scope.msg.msgToAdd 'message': $scope.msg.msgToAdd
}; };
@ -80,6 +68,37 @@ angular.module('SeHub')
$scope.msg.msgToAdd = null; $scope.msg.msgToAdd = null;
} }
$scope.displayTasks = function()
{
// apiService.getAllFutureTasks(token, courseId).success(function(data) // need to check courseId
// {
// }).error(function(err)
// {
// });
}
$scope.getCourses = function()
{
// apiService.getAllCoursesByCampus(token, campusId).success(function(data) // Shows all classes from this campus
// {
// $scope.loadingData = false;
// $scope.courses = data;
// console.log("success " + $scope.courses);
// init(); // Executing the function to initialize course display
// if($scope.courses && $scope.courses.length > 0)
// {
// $scope.coursesEmpty = false;
// }
// }).error(function(err)
// {
// console.log("error: " + err);
// });
}
$scope.clearAllClicked = function() // Clear Screen from text $scope.clearAllClicked = function() // Clear Screen from text
{ {
$scope.messages = []; $scope.messages = [];
@ -97,4 +116,6 @@ angular.module('SeHub')
// animation // animation
$scope.isEnterd = top.setIsEnterd; $scope.isEnterd = top.setIsEnterd;
$scope.getCourses(); // Get all the courses info
$scope.displayTasks(); // Display all tasks in task feed
}]); }]);

1
templates/js/controllers/myClassesController.js
View file

@ -131,7 +131,6 @@ angular.module('SeHub')
init(); // Executing the function to initialize course display init(); // Executing the function to initialize course display
if($scope.courses && $scope.courses.length > 0) if($scope.courses && $scope.courses.length > 0)
{ {
// $scope.coursesEmpty = true;
$scope.coursesEmpty = false; $scope.coursesEmpty = false;
} }
}).error(function(err) }).error(function(err)

7
templates/js/controllers/projectController.js
View file

@ -26,14 +26,13 @@ angular.module('SeHub')
// }); // Pop-up alert // }); // Pop-up alert
}; };
$scope.getProfileRoute = function(assigneeName) $scope.getProfileRoute = function(userName)
{ {
for(var i = 0; i < $scope.project.members.length; i++) for(var i = 0; i < $scope.project.members.length; i++)
{ {
if(userName === $scope.project.members[i].name)
if(assigneeName === $scope.project.members[i].name)
{ {
console.log(assigneeName); console.log(userName);
console.log($scope.project.members[i].name); console.log($scope.project.members[i].name);
return '#/profile/' + $scope.project.members[i].id; return '#/profile/' + $scope.project.members[i].id;
} }

4
templates/js/controllers/tasksController.js
View file

@ -3,10 +3,8 @@ angular.module('SeHub')
{ {
console.log("in controller"); console.log("in controller");
$scope.createTaskClicked = function(name) $scope.createTaskClicked = function()
{ {
var taskName = name;
console.log("task created! " + taskName);
$location.path("/tasks/new"); // Reference to 'newTask' page $location.path("/tasks/new"); // Reference to 'newTask' page
} }

164
templates/js/services/apiService.js
View file

@ -13,6 +13,14 @@ service.factory('apiService', ['$http', function($http) {
}; };
return $http(req); return $http(req);
}, },
getUserById: function(token, id){
var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/users/getUserById/" + token + "/" + id;
req = {
method : "GET",
url : url
};
return $http(req);
},
getAllCampuses: function(token){ getAllCampuses: function(token){
var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/campuses/getAll/" + token; var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/campuses/getAll/" + token;
req = { req = {
@ -21,25 +29,11 @@ service.factory('apiService', ['$http', function($http) {
}; };
return $http(req); return $http(req);
}, },
sendValidationMail: function(token, email){ getCampusesByUser: function(token){
var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/validation/sendmail/" + token; var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/campuses/getCampusesByUser/" + token;
payload = {
email: email
};
req = { req = {
method: "POST", method : "GET",
url: url, url : url
data: payload
};
return $http(req);
},
updateUser: function(token, payLoad){
var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/users/updateUser/" + token;
req = {
method: "PUT",
url: url,
data: payLoad
}; };
return $http(req); return $http(req);
}, },
@ -48,7 +42,6 @@ service.factory('apiService', ['$http', function($http) {
req = { req = {
method : "GET", method : "GET",
url : url url : url
}; };
return $http(req); return $http(req);
}, },
@ -57,7 +50,6 @@ service.factory('apiService', ['$http', function($http) {
req = { req = {
method : "GET", method : "GET",
url : url url : url
}; };
return $http(req); return $http(req);
}, },
@ -66,17 +58,6 @@ service.factory('apiService', ['$http', function($http) {
req = { req = {
method : "GET", method : "GET",
url : url url : url
};
return $http(req);
},
createMessage: function(token, payLoad){
var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/courses/createMessage/" + token;
req = {
method : "POST",
url : url,
data: payLoad
}; };
return $http(req); return $http(req);
}, },
@ -85,25 +66,6 @@ service.factory('apiService', ['$http', function($http) {
req = { req = {
method : "GET", method : "GET",
url : url url : url
};
return $http(req);
},
createCourse: function(token, payLoad){
var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/courses/create/" + token;
req = {
method : "POST",
url : url,
data: payLoad
};
return $http(req);
},
getCampusesByUser: function(token){
var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/campuses/getCampusesByUser/" + token;
req = {
method : "GET",
url : url
}; };
return $http(req); return $http(req);
}, },
@ -112,7 +74,6 @@ service.factory('apiService', ['$http', function($http) {
req = { req = {
method : "GET", method : "GET",
url : url url : url
}; };
return $http(req); return $http(req);
}, },
@ -121,7 +82,6 @@ service.factory('apiService', ['$http', function($http) {
req = { req = {
method : "GET", method : "GET",
url : url url : url
}; };
return $http(req); return $http(req);
}, },
@ -135,16 +95,6 @@ service.factory('apiService', ['$http', function($http) {
}, },
getProjectsByUser: function(token){ getProjectsByUser: function(token){
var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/projects/getProjectsByUser/" + token; var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/projects/getProjectsByUser/" + token;
req = {
method : "GET",
url : url
};
return $http(req);
},
getUserById: function(token, id){
var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/users/getUserById/" + token + "/" + id;
req = { req = {
method : "GET", method : "GET",
url : url url : url
@ -156,7 +106,70 @@ service.factory('apiService', ['$http', function($http) {
req = { req = {
method : "GET", method : "GET",
url : url url : url
};
return $http(req);
},
getCoursesByUserID: function(token, userId){
var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/courses/getCoursesByUser/" + token + "/" + userId;
req = {
method : "GET",
url : url
};
return $http(req);
},
getAllFutureTasks: function(token, courseId){
var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/tasks/getAllFutureTasks/" + token + "/" + courseId;
req = {
method : "GET",
url : url
};
return $http(req);
},
createMessage: function(token, payLoad){
var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/messages/create/" + token;
req = {
method : "POST",
url : url,
data: payLoad
};
return $http(req);
},
create: function(token, payLoad){ // createProject
var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/projects/create/" + token;
req = {
method : "POST",
url : url,
data: payLoad
};
return $http(req);
},
createMessage: function(token, payLoad){
var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/courses/createMessage/" + token;
req = {
method : "POST",
url : url,
data: payLoad
};
return $http(req);
},
sendValidationMail: function(token, email){
var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/validation/sendmail/" + token;
payload = {
email: email
};
req = {
method: "POST",
url: url,
data: payload
};
return $http(req);
},
createCourse: function(token, payLoad){
var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/courses/create/" + token;
req = {
method : "POST",
url : url,
data: payLoad
}; };
return $http(req); return $http(req);
}, },
@ -168,31 +181,14 @@ service.factory('apiService', ['$http', function($http) {
}; };
return $http(req); return $http(req);
}, },
createMessage: function(token, payLoad){ updateUser: function(token, payLoad){
var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/courses/create/" + token; var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/users/updateUser/" + token;
req = { req = {
method : "POST", method: "PUT",
url : url, url: url,
data: payLoad data: payLoad
}; };
return $http(req); return $http(req);
},
create: function(token, payLoad){
var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/projects/create/" + token;
req = {
method : "POST",
url : url,
data: payLoad
};
return $http(req);
},
getCoursesByUserID: function(token, userId){
var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/courses/getCoursesByUser/" + token + "/" + userId;
req = {
method : "GET",
url : url
};
return $http(req);
} }
}; };
}]); }]);

4
templates/views/campuses.html
View file

@ -1,7 +1,5 @@
<div class = "myCampuses"> <div class = "myCampuses">
<md-content layout-padding layout-margin> <h1 layout-margin style="margin-left:15px"><i class="fa fa-university"></i> Pick A Campus</h1>
<h1 layout-margin style="margin-left:15px"><i class="fa fa-university"></i> Pick A Campus</h1>
</md-content>
<md-card class="cardAllCampuses"> <md-card class="cardAllCampuses">
<div ng-if = "!scope.campusesEmpty"> <div ng-if = "!scope.campusesEmpty">
<div flex = "99" layout = "row" ng-repeat = "t in threeSizedArray" value = "{{t}}" layout-padding> <div flex = "99" layout = "row" ng-repeat = "t in threeSizedArray" value = "{{t}}" layout-padding>

5
templates/views/class.html
View file

@ -55,7 +55,7 @@
</md-input-container> </md-input-container>
</div> </div>
<!-- <div> <!-- <div>
<p>/</p> <br>/</br>
</div> --> </div> -->
<div> <div>
<md-input-container flex> <md-input-container flex>
@ -85,4 +85,7 @@
</md-card> </md-card>
</div> </div>
</div> </div>
<div layout-margin>
</div>
</div> </div>

48
templates/views/home.html
View file

@ -88,6 +88,54 @@
</md-card> </md-card>
</div> </div>
</div> </div>
<md-card height="70%">
<md-content class="md-padding">
<md-tabs md-dynamic-height md-border-bottom>
<md-tab label="Messages">
<md-content class="md-padding">
<div class = "messagesContent">
<md-card ng-repeat = "msg in messages">
<div layout="column">
<div layout="row" layout-margin layout-padding>
<div flex="10" class="md-avatar">
<img ng-src="{{user.avatar_url}}" style="width:100%">
</div>
<div flex>
<div layout = "column">
<div>
<b>{{user.name}}</b>
</div>
<div>
class_name
</div>
</div>
</div>
</div>
<div>
<div flex="69" class="msgSent" layout-margin layout-padding>
{{msg.text}}
</div>
</div>
</div>
</md-card>
</div>
</md-content>
</md-tab>
<md-tab label="one">
<md-content class="md-padding">
<h1 class="md-display-2">Tab One</h1>
One
</md-content>
</md-tab>
<md-tab label="two">
<md-content class="md-padding">
<h1 class="md-display-2">Tab Two</h1>
Two
</md-content>
</md-tab>
</md-tabs>
</md-content>
</md-card>
<div class ="addMessage" layout="row" layout-margin layout padding> <div class ="addMessage" layout="row" layout-margin layout padding>
<div> <div>
<md-button ng-click="addMessageClicked()" ng class="md-raised md-primary"><i class="fa fa-comments"></i></md-button> <md-button ng-click="addMessageClicked()" ng class="md-raised md-primary"><i class="fa fa-comments"></i></md-button>

4
templates/views/myClasses.html
View file

@ -1,7 +1,7 @@
<div class = "myClasses"> <div class = "myClasses">
<md-content layout-padding layout-margin> <!-- <md-content layout-padding layout-margin> -->
<h1 layout-margin style="margin-left:15px"><i class="fa fa-graduation-cap"></i> My Classes</h1> <h1 layout-margin style="margin-left:15px"><i class="fa fa-graduation-cap"></i> My Classes</h1>
</md-content> <!-- </md-content> -->
<div layout-paddig layout-margin class="loader" ng-if="loadingData"> <div layout-paddig layout-margin class="loader" ng-if="loadingData">
<md-progress-circular md-mode="indeterminate"></md-progress-circular> <md-progress-circular md-mode="indeterminate"></md-progress-circular>
</div> </div>

32
templates/views/project.html
View file

@ -68,32 +68,37 @@
</md-tab> </md-tab>
<md-tab label="Commits"> <md-tab label="Commits">
<md-content class="md-padding"> <md-content class="md-padding">
<h1 class="md-display-2">Commits</h1> <table style="width:100%;" border = "1" class = "tabDesign">
<table style="width:100%;" border = "1">
<tr> <tr>
<th>Name</th> <th>Message</th>
<th>Title</th> <th style = "width:20%;">Date</th>
<th>Url</th> <th style = "width:10%;">Committer</th>
</tr> </tr>
<tr ng-repeat = "member in project.members"> <tr ng-repeat = "commit in project.info.commits" layout-margin align = "center">
<td> <td>
<span ng-repeat = "msg in commit">
<a target = "_blank"ng-href="{{commit.html_url}}"
style="text-decoration:none; color:black;">
{{msg.message}}
</a>
</span>
</td>
<td>
<span ng-repeat = "date in commit.author">
{{date.date}}
</span>
</td>
<td ng-repeat = "member in project.members">
<a ng-href="#/profile/{{member.id}}" style="text-decoration:none; color:black;"> <a ng-href="#/profile/{{member.id}}" style="text-decoration:none; color:black;">
{{member.name}} {{member.name}}
</a> </a>
</td> </td>
<td>
<div ng-repeat = "commit in project.info.info">
{{commit.commits_url}}
</div>
</td>
<td></td>
</tr> </tr>
</table> </table>
</md-content> </md-content>
</md-tab> </md-tab>
<md-tab label="Issues"> <md-tab label="Issues">
<md-content class="md-padding" style="overflow:scroll;"> <md-content class="md-padding" style="overflow:scroll;">
<h1 class="md-display-2">Issues</h1>
<table style="width:100%;" border = "1"> <table style="width:100%;" border = "1">
<tr> <tr>
<th>Title</th> <th>Title</th>
@ -127,7 +132,6 @@
</td> </td>
</tr> </tr>
</table> </table>
</md-content> </md-content>
</md-tab> </md-tab>
<md-tab label="tasks"> <md-tab label="tasks">

34
templates/views/tasks.html
View file

@ -1,17 +1,22 @@
<div class = "tasks"> <div class = "tasks">
<md-content layout-padding layout-margin> <md-content layout-padding layout-margin>
<h1 style="margin-left:15px"><i class="fa fa-file-text-o"></i> Tasks</h1> <h1 style="margin-left:15px"><i class="fa fa-file-text-o"></i> Tasks</h1>
<div ng-if="user.isLecturer">
<md-button ng-click="createTaskClicked(taskName)" ng class="md-raised md-primary">Create Task</md-button>
<div flex> <div flex>
<md-card> <md-card>
<md-content class="md-padding"> <md-content class="md-padding">
<md-tabs md-dynamic-height md-border-bottom> <md-tabs md-dynamic-height md-border-bottom>
<md-tab label="Submitted"> <md-tab label="" <i class="fa fa-check"></i>
<md-content class="md-padding"> <md-content class="md-padding">
<h1 class="md-display-2">Submitted</h1> <table style="width:100%;" border = "1" class = "tabDesign">
<p>Submitted...</p> <tr>
<th style = "width:20%">Task Name</th>
<th style = "width:20%">Date</th>
<th style = "width:20%">Grade</th>
</tr>
</table>
</md-content> </md-content>
</md-tab> </md-tab>
<md-tab label="Delayed"> <md-tab label="Delayed">
@ -26,23 +31,20 @@
<p> Not Submitted ..</p> <p> Not Submitted ..</p>
</md-content> </md-content>
</md-tab> </md-tab>
<md-tab label="WhatEver"> <div ng-if = "user.isLecturer">
<md-content class="md-padding"> <md-button ng-click="createTaskClicked()" ng class="md-raised md-primary">Create Task</md-button>
<h1 class="md-display-2">WhatEver</h1> </div>
<p>Bla Bla Bla..</p>
</md-content>
</md-tab>
</md-tabs> </md-tabs>
</md-content> </md-content>
</md-card> </md-card>
</div> </div>
<!-- Should Be In Table List --> <!-- Should Be In Table List -->
<div class = "allProjectsShow" flex = "99" layout = "row" ng-repeat = "t in threeSizedArray" value = "{{t}}" layout-padding> <div class = "allTasksShow" flex = "99" layout = "row" ng-repeat = "t in threeSizedArray" value = "{{t}}" layout-padding>
<div flex = "32" layout = "column" ng-repeat = "project in t" value = "{{project}}"> <div flex = "32" layout = "column" ng-repeat = "task in t" value = "{{task}}">
<md-button ng-click = "goToProject(project.id)" style="width:32%; height:32%;" flex="32" layout-padding class = "md-raised"> <md-button ng-click = "goToTask(task.id)" style="width:32%; height:32%;" flex="32" layout-padding class = "md-raised">
<!-- <img src="{{campus.avatar_url}}" style = "width:14%; height:auto;"> --> <!-- <img src="{{campus.avatar_url}}" style = "width:14%; height:auto;"> -->
{{project.title}} {{task.title}}
</md-button> </md-button>
</div> </div>
</div> </div>