- project Page - Commits - added (work in progress..)
- createMessage API - fixed (still need to check retrieve data from server) - theme.css - removed some unneccesary methods, tabDesign overflow - added (work in progress)
This commit is contained in:
Matan Bar Yosef
parent
b97e543ce3
commit
5201634551
5 changed files with 168 additions and 203 deletions
|
|
@ -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
|
.gray-font
|
||||||
{
|
{
|
||||||
color: #7f7f7f;
|
color: #7f7f7f;
|
||||||
font-size: 300%;
|
font-size: 300%;
|
||||||
text-shadow:#e0e0e0 1px 1px 0;
|
text-shadow:#e0e0e0 1px 1px 0;
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
-webkit-animation-duration: 8s;
|
-webkit-animation-duration: 8s;
|
||||||
animation-duration: 8s;
|
animation-duration: 8s;
|
||||||
-webkit-animation-fill-mode: both;
|
-webkit-animation-fill-mode: both;
|
||||||
animation-fill-mode: both;
|
animation-fill-mode: both;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
@-webkit-keyframes fadeOutUp {
|
||||||
|
0% {
|
||||||
|
opacity: 1;
|
||||||
|
-webkit-transform: translateY(0);
|
||||||
}
|
}
|
||||||
|
100% {
|
||||||
@-webkit-keyframes fadeOutUp {
|
opacity: 0;
|
||||||
0% {
|
-webkit-transform: translateY(-200px);
|
||||||
opacity: 1;
|
/*-webkit-transform: scale(0,0); */
|
||||||
-webkit-transform: translateY(0);
|
height: 0px;
|
||||||
}
|
|
||||||
100% {
|
|
||||||
opacity: 0;
|
|
||||||
-webkit-transform: translateY(-200px);
|
|
||||||
/*-webkit-transform: scale(0,0); */
|
|
||||||
height: 0px;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@keyframes fadeOutUp {
|
}
|
||||||
0% {
|
@keyframes fadeOutUp {
|
||||||
opacity: 1;
|
0% {
|
||||||
transform: translateY(0);
|
opacity: 1;
|
||||||
}
|
transform: translateY(0);
|
||||||
100% {
|
|
||||||
opacity: 0;
|
|
||||||
transform: translateY(-200px);
|
|
||||||
/*transform: scale(0,0); */
|
|
||||||
height: 0px;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
.fadeOutUp {
|
100% {
|
||||||
-webkit-animation-name: fadeOutUp;
|
opacity: 0;
|
||||||
animation-name: fadeOutUp;
|
transform: translateY(-200px);
|
||||||
}
|
/*transform: scale(0,0); */
|
||||||
|
height: 0px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.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;
|
||||||
|
|
|
||||||
|
|
@ -50,12 +50,10 @@ angular.module('SeHub')
|
||||||
}
|
}
|
||||||
$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
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -169,7 +169,7 @@ service.factory('apiService', ['$http', function($http) {
|
||||||
return $http(req);
|
return $http(req);
|
||||||
},
|
},
|
||||||
createMessage: function(token, payLoad){
|
createMessage: 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/messages/create/" + token;
|
||||||
req = {
|
req = {
|
||||||
method : "POST",
|
method : "POST",
|
||||||
url : url,
|
url : url,
|
||||||
|
|
@ -177,7 +177,7 @@ service.factory('apiService', ['$http', function($http) {
|
||||||
};
|
};
|
||||||
return $http(req);
|
return $http(req);
|
||||||
},
|
},
|
||||||
create: function(token, payLoad){
|
create: function(token, payLoad){ // createProject
|
||||||
var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/projects/create/" + token;
|
var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/projects/create/" + token;
|
||||||
req = {
|
req = {
|
||||||
method : "POST",
|
method : "POST",
|
||||||
|
|
|
||||||
|
|
@ -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">
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue