- 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%;*/
|
||||
}
|
||||
|
||||
/*.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 {
|
||||
-webkit-transform: rotate(4deg);
|
||||
transform: rotate(4deg);
|
||||
|
|
@ -220,37 +193,23 @@ body.noscroll
|
|||
-moz-box-shadow: 0 0 8px rgba(0, 0, 0, .8);
|
||||
}
|
||||
|
||||
/*.dropDown /* TODO *
|
||||
.allCampusesShow
|
||||
{
|
||||
border-bottom: 2px black solid;
|
||||
border-top: 2px black solid;
|
||||
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
|
||||
{
|
||||
{
|
||||
color: #7f7f7f;
|
||||
font-size: 300%;
|
||||
text-shadow:#e0e0e0 1px 1px 0;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
.gray-font
|
||||
{
|
||||
.gray-font
|
||||
{
|
||||
color: #7f7f7f;
|
||||
font-size: 300%;
|
||||
text-shadow:#e0e0e0 1px 1px 0;
|
||||
|
|
@ -261,9 +220,9 @@ body.noscroll
|
|||
animation-fill-mode: both;
|
||||
overflow: hidden;
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
@-webkit-keyframes fadeOutUp {
|
||||
@-webkit-keyframes fadeOutUp {
|
||||
0% {
|
||||
opacity: 1;
|
||||
-webkit-transform: translateY(0);
|
||||
|
|
@ -274,8 +233,8 @@ body.noscroll
|
|||
/*-webkit-transform: scale(0,0); */
|
||||
height: 0px;
|
||||
}
|
||||
}
|
||||
@keyframes fadeOutUp {
|
||||
}
|
||||
@keyframes fadeOutUp {
|
||||
0% {
|
||||
opacity: 1;
|
||||
transform: translateY(0);
|
||||
|
|
@ -286,13 +245,13 @@ body.noscroll
|
|||
/*transform: scale(0,0); */
|
||||
height: 0px;
|
||||
}
|
||||
}
|
||||
.fadeOutUp {
|
||||
}
|
||||
.fadeOutUp {
|
||||
-webkit-animation-name: fadeOutUp;
|
||||
animation-name: fadeOutUp;
|
||||
}
|
||||
}
|
||||
|
||||
.user-pane-menu{
|
||||
.user-pane-menu{
|
||||
width: 100%;
|
||||
height: 15%;
|
||||
background-color: #3F51B5;
|
||||
|
|
@ -301,9 +260,9 @@ body.noscroll
|
|||
box-shadow: 0px 13px 34px -14px rgba(0,0,0,0.75);
|
||||
top: 20px;
|
||||
position: relative;
|
||||
}
|
||||
}
|
||||
|
||||
.user-pane-menu img{
|
||||
.user-pane-menu img{
|
||||
border: 7px rgb(255, 255, 255) solid;
|
||||
-webkit-border-radius: 100px;
|
||||
-moz-border-radius: 100px;
|
||||
|
|
@ -311,87 +270,87 @@ body.noscroll
|
|||
width: 30%;
|
||||
position: relative;
|
||||
z-index: 50;
|
||||
}
|
||||
}
|
||||
|
||||
.se-menu{
|
||||
.se-menu{
|
||||
/*margin-top: 20%; */
|
||||
}
|
||||
}
|
||||
|
||||
.se-menu ul{
|
||||
.se-menu ul{
|
||||
list-style: none;
|
||||
padding: 0;
|
||||
padding-left: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.se-menu li{
|
||||
.se-menu li{
|
||||
width: 100%;
|
||||
padding: 15px 0px 15px 15px;
|
||||
font-size: 150%;
|
||||
}
|
||||
}
|
||||
|
||||
.se-menu li:hover{
|
||||
.se-menu li:hover{
|
||||
background-color: #E2E2E2;
|
||||
font-weight: bold;
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
|
||||
.se-menu li:active{
|
||||
.se-menu li:active{
|
||||
background-color: #B2B2B2;
|
||||
text-shadow:#e0e0e0 1px 1px 0;
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
|
||||
.se-menu .selected{
|
||||
.se-menu .selected{
|
||||
background-color: #E2E2E2;
|
||||
text-shadow:#e0e0e0 1px 1px 0;
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
|
||||
.user-box{
|
||||
.user-box{
|
||||
width: 100%
|
||||
}
|
||||
}
|
||||
|
||||
.user-box img{
|
||||
.user-box img{
|
||||
width: 100%;
|
||||
border: 4px #7f7f7f solid;
|
||||
-webkit-border-radius: 5px;
|
||||
-moz-border-radius: 5px;
|
||||
border-radius: 5px;
|
||||
}
|
||||
.user-data{
|
||||
}
|
||||
.user-data{
|
||||
margin-top: auto;
|
||||
}
|
||||
}
|
||||
|
||||
.se-menu ul a{
|
||||
.se-menu ul a{
|
||||
text-decoration: none !important;
|
||||
color: #7f7f7f;
|
||||
}
|
||||
}
|
||||
|
||||
/*Settings Style*/
|
||||
/*Settings Style*/
|
||||
|
||||
.settingList .settingListItem:hover{
|
||||
.settingList .settingListItem:hover{
|
||||
background-color: #E2E2E2;
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
|
||||
.settingList .settingListItemRoot{
|
||||
.settingList .settingListItemRoot{
|
||||
list-style: none;
|
||||
padding: 0;
|
||||
padding-left: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.settingList .settingListItem{
|
||||
.settingList .settingListItem{
|
||||
width: 100%;
|
||||
padding: 15px 0px auto 15px;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*End Settings*/
|
||||
/*End Settings*/
|
||||
|
||||
|
||||
/*md Effects*/
|
||||
/*md Effects*/
|
||||
|
||||
.md-avatar{
|
||||
.md-avatar{
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
margin-top: 8px;
|
||||
|
|
@ -399,7 +358,7 @@ body.noscroll
|
|||
margin-right: 16px;
|
||||
border-radius: 50%;
|
||||
box-sizing: content-box;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* Colors*/
|
||||
|
|
@ -467,6 +426,11 @@ body.noscroll
|
|||
word-break: break-word;
|
||||
}
|
||||
|
||||
.tabDesign
|
||||
{
|
||||
overflow: scroll;
|
||||
}
|
||||
|
||||
.tasksContent
|
||||
{
|
||||
padding-left: 4px;
|
||||
|
|
|
|||
|
|
@ -50,12 +50,10 @@ angular.module('SeHub')
|
|||
}
|
||||
$scope.postMessageClicked = function() // Posting the message itself
|
||||
{
|
||||
|
||||
|
||||
if($scope.msg.msgToAdd != null)
|
||||
{
|
||||
jsonNewMsg = {
|
||||
'courseName': 'A', // TODO Should be ===> $scope.course.courseName
|
||||
'courseName': 'Math', // TODO Should be ===> $scope.course.courseName
|
||||
'message': $scope.msg.msgToAdd
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -26,14 +26,13 @@ angular.module('SeHub')
|
|||
// }); // Pop-up alert
|
||||
};
|
||||
|
||||
$scope.getProfileRoute = function(assigneeName)
|
||||
$scope.getProfileRoute = function(userName)
|
||||
{
|
||||
for(var i = 0; i < $scope.project.members.length; i++)
|
||||
{
|
||||
|
||||
if(assigneeName === $scope.project.members[i].name)
|
||||
if(userName === $scope.project.members[i].name)
|
||||
{
|
||||
console.log(assigneeName);
|
||||
console.log(userName);
|
||||
console.log($scope.project.members[i].name);
|
||||
return '#/profile/' + $scope.project.members[i].id;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ service.factory('apiService', ['$http', function($http) {
|
|||
return $http(req);
|
||||
},
|
||||
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 = {
|
||||
method : "POST",
|
||||
url : url,
|
||||
|
|
@ -177,7 +177,7 @@ service.factory('apiService', ['$http', function($http) {
|
|||
};
|
||||
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;
|
||||
req = {
|
||||
method : "POST",
|
||||
|
|
|
|||
|
|
@ -68,32 +68,37 @@
|
|||
</md-tab>
|
||||
<md-tab label="Commits">
|
||||
<md-content class="md-padding">
|
||||
<h1 class="md-display-2">Commits</h1>
|
||||
<table style="width:100%;" border = "1">
|
||||
<table style="width:100%;" border = "1" class = "tabDesign">
|
||||
<tr>
|
||||
<th>Name</th>
|
||||
<th>Title</th>
|
||||
<th>Url</th>
|
||||
<th>Message</th>
|
||||
<th style = "width:20%;">Date</th>
|
||||
<th style = "width:10%;">Committer</th>
|
||||
</tr>
|
||||
<tr ng-repeat = "member in project.members">
|
||||
<tr ng-repeat = "commit in project.info.commits" layout-margin align = "center">
|
||||
<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;">
|
||||
{{member.name}}
|
||||
</a>
|
||||
</td>
|
||||
<td>
|
||||
<div ng-repeat = "commit in project.info.info">
|
||||
{{commit.commits_url}}
|
||||
</div>
|
||||
</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
</table>
|
||||
</md-content>
|
||||
</md-tab>
|
||||
<md-tab label="Issues">
|
||||
<md-content class="md-padding" style="overflow:scroll;">
|
||||
<h1 class="md-display-2">Issues</h1>
|
||||
<table style="width:100%;" border = "1">
|
||||
<tr>
|
||||
<th>Title</th>
|
||||
|
|
@ -127,7 +132,6 @@
|
|||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
</md-content>
|
||||
</md-tab>
|
||||
<md-tab label="tasks">
|
||||
|
|
|
|||
Loading…
Reference in a new issue