Skip to content

Commit

Permalink
socioboard 3.0 update
Browse files Browse the repository at this point in the history 
socioboard 3.0 update
  • Loading branch information
@swetasb
swetasb committed Jan 9, 2018
1 parent c37fde4 commit 324c867
Show file tree
Hide file tree
Showing 11 changed files with 145 additions and 80 deletions.
Binary file modified .vs/Socioboard/v14/.suo
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion src/Api.Socioboard/Controllers/SocialMessagesController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ public async Task<IActionResult> ComposeMessage(string message, string profileId
Domain.Socioboard.Models.Facebookaccounts objFacebookAccount = Api.Socioboard.Repositories.FacebookRepository.getFacebookAccount(prId, _redisCache, dbr);
string ret = Helper.FacebookHelper.ComposeMessage(objFacebookAccount.FbProfileType, objFacebookAccount.AccessToken, objFacebookAccount.FbUserId, updatedtext, prId, userId, uploads, link, mediaType, objFacebookAccount.FbUserName, dbr, _logger);

}).Start();
}).Start();
}
catch (Exception ex)
{
Expand Down
29 changes: 29 additions & 0 deletions src/Domain.Socioboard/Models/Mongo/FacebookPasswordChangeUserDetail.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
using Domain.Socioboard.Helpers;
using MongoDB.Bson;
using MongoDB.Bson.Serialization.Attributes;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;

namespace Domain.Socioboard.Models.Mongo
{
[BsonIgnoreExtraElements]
public class FacebookPasswordChangeUserDetail
{
[JsonConverter(typeof(ObjectIdConverter))]
public ObjectId Id { get; set; }
public string strId { get; set; }
public long userId { get; set; }
public string userPrimaryEmail { get; set; }
public string profileId { get; set; }
public string profileName { get; set; }
public string message { get; set; }
public string dateValue { get; set; }
public bool status { get; set; }



}
}
3 changes: 2 additions & 1 deletion src/Socioboard/Controllers/IndexController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -986,7 +986,8 @@ public async Task<IActionResult> paymentWithPayUMoney(bool contesnt)
}
else
{
return Redirect(response.RequestMessage.RequestUri.OriginalString);
//return Redirect(response.RequestMessage.RequestUri.OriginalString);
return Content(response.RequestMessage.RequestUri.OriginalString);
}
}
else
Expand Down
2 changes: 1 addition & 1 deletion src/Socioboard/Themes/Socioboard/Views/Index/SignIn.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
}
window.top.location = '/home/index'
} else if (msg == "Trail Expire") {
alertify.error("your trial has beed expired.so you can't use paid features");
alertify.error("your trial has been expired.so you can't use paid features");
setTimeout(function () {
window.top.location = '/home/index';
}, 3000);
Expand Down
2 changes: 1 addition & 1 deletion src/Socioboard/Themes/Socioboard/Views/Shared/_SocioboardLayout.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1007,7 +1007,7 @@ analytics" href="http://statcounter.com/shopify/"
}
window.top.location = '/home/index'
} else if (msg == "Trail Expire") {
alertify.error("your trial has beed expired.so you can't use paid features");
alertify.error("your trial has been expired.so you can't use paid features");
setTimeout(function () {
window.top.location = '/home/index';
}, 3000);
Expand Down
126 changes: 76 additions & 50 deletions src/Socioboard/wwwroot/contents/socioboard/controllers/dashboardcontroller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -444,8 +444,41 @@ SocioboardApp.controller('DashboardController', function ($rootScope, $scope, $h

//$scope.fetchYTChannels();

$scope.deleteProfile = function (profileId) {
//$scope.deleteProfile = function (profileId) {

// swal({
// title: "Are you sure?",
// text: "You will not be able to send any message via this account!",
// type: "warning",
// showCancelButton: true,
// confirmButtonColor: "#DD6B55",
// confirmButtonText: "Yes, delete it!",
// closeOnConfirm: false
// },

// function () {
// $scope.chk(profileId);
// if ($scope.isprimacc == false) {

// $http({
// method: 'POST',
// url: apiDomain + '/api/GroupProfiles/DeleteProfile?groupId=' + $rootScope.groupId + '&userId=' + $rootScope.user.Id + '&profileId=' + profileId,
// }).then(function (response) {
// if (response.data == "Deleted") {
// // swal("Deleted!", "Your profile has been deleted", "Success");
// swal("Deleted!", "Account is deleted", "success");
// }
// window.location.reload();
// });
// }
// if ($scope.isprimacc == true) {
// swal("You can't delete primary account");
// }
// });
//}

$scope.deleteProfile = function (profileId) {

swal({
title: "Are you sure?",
text: "You will not be able to send any message via this account!",
Expand All @@ -455,62 +488,55 @@ SocioboardApp.controller('DashboardController', function ($rootScope, $scope, $h
confirmButtonText: "Yes, delete it!",
closeOnConfirm: false
},

function () {
$scope.chk(profileId);
if ($scope.isprimacc == false) {

$http({
method: 'POST',
url: apiDomain + '/api/GroupProfiles/DeleteProfile?groupId=' + $rootScope.groupId + '&userId=' + $rootScope.user.Id + '&profileId=' + profileId,
}).then(function (response) {
if (response.data == "Deleted") {
// swal("Deleted!", "Your profile has been deleted", "Success");
swal("Deleted!", "Account is deleted", "success");
}
window.location.reload();
});
}
if ($scope.isprimacc == true) {
swal("You can't delete primary account");
}
});
}

$scope.chk = function (profileId) {
debugger;
$http({
method: 'POST',
url: apiDomain + '/api/GroupProfiles/IsPrimaryAcc?userId=' + $rootScope.user.Id + '&profileId=' + profileId,
}).then(function (response) {
debugger;
if (response.data == "Primary Account") {
$scope.isprimacc = true;
}
else {
$scope.isprimacc = false;
}
});
}

$scope.delconfprimaryacc = function (profileId) {
debugger;
$http({
method: 'POST',
url: apiDomain + '/api/GroupProfiles/DeleteProfile?groupId=' + $rootScope.groupId + '&userId=' + $rootScope.user.Id + '&profileId=' + profileId,
}).then(function (response) {
if (response.data == "Deleted") {
// swal("Deleted!", "Your profile has been deleted", "Success");
swal("Deleted!", "Account is deleted", "success");
}
window.location.reload();
$http({
method: 'POST',
url: apiDomain + '/api/GroupProfiles/DeleteProfile?groupId=' + $rootScope.groupId + '&userId=' + $rootScope.user.Id + '&profileId=' + profileId,
}).then(function (response) {
if (response.data == "Deleted") {
// swal("Deleted!", "Your profile has been deleted", "Success");
swal("Deleted!", "Account is deleted", "success");
}
window.location.reload();
});

});
}

//$scope.chk = function (profileId) {
// debugger;
// $http({
// method: 'POST',
// url: apiDomain + '/api/GroupProfiles/IsPrimaryAcc?userId=' + $rootScope.user.Id + '&profileId=' + profileId,
// }).then(function (response) {
// debugger;
// if (response.data == "Primary Account") {
// $scope.isprimacc = true;
// }
// else {
// $scope.isprimacc = false;
// }
// });
//}

$scope.isprimaryacc = function (profileId) {

}
//$scope.delconfprimaryacc = function (profileId) {
// debugger;
// $http({
// method: 'POST',
// url: apiDomain + '/api/GroupProfiles/DeleteProfile?groupId=' + $rootScope.groupId + '&userId=' + $rootScope.user.Id + '&profileId=' + profileId,
// }).then(function (response) {
// if (response.data == "Deleted") {
// // swal("Deleted!", "Your profile has been deleted", "Success");
// swal("Deleted!", "Account is deleted", "success");
// }
// window.location.reload();
// });
//}




$scope.deleteGpProfile = function (profileId) {

Expand Down
2 changes: 1 addition & 1 deletion src/Socioboard/wwwroot/contents/socioboard/views/groups/youtubegroup.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ <h6 style="margin: 0; padding: 20px 10px; color: #ffffff !important; background-
<li class="collection-item avatar" style="min-height: 65px;" ng-repeat="grpmem in lstYtGrpMem">
<img src="{{grpmem.sbProfilePic}}" alt="" class="circle">
<div class="title truncate" style="width: 9999px;"><span>{{grpmem.sbUserName}}</span><br /> <span title="" class="grey-text text-darken-1" style="font-size:14px;">{{grpmem.sbEmailId}}</span></div>
<a href="javascript:void(0);" style="margin-top:6px" class="secondary-content" ng-if="$index == 0"><i class="fa fa-key indigo-text darken-4" aria-hidden="true"></i></a>
<a href="javascript:void(0);" style="margin-top:6px" class="secondary-content" ng-if="$index == 0"><i class="fa fa-key indigo-text darken-4" title="Admin" aria-hidden="true"></i></a>
<a href="javascript:void(0);" style="margin-top:-6px" class="secondary-content" ng-if="grpmem.active == 1 && $index > 0"><i class="fa fa-check green-text" aria-hidden="true" title="Accepted"></i></a>
<a href="javascript:void(0);" style="margin-top:-6px" class="secondary-content" ng-if="grpmem.active == 0 && $index > 0"><i class="fa fa-clock-o red-text" aria-hidden="true" title="Pending"></i></a>
<a href="javascript:void(0);" ng-click="deleteMember(grpmem)" style="margin-top:20px" class="secondary-content" ng-if="$index > 0"><i class="fa fa-trash-o removeMember" aria-hidden="true" title="Remove"></i></a>
Expand Down
24 changes: 4 additions & 20 deletions src/Socioboard/wwwroot/contents/socioboard/views/shared/header.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,11 @@ <h1 class="logo-wrapper"><a href="#dashboard" class="brand-logo darken-1"><img s
<span class="groupslist"><i class="icon-user"></i>Profile Settings </span>
</a>
</li>
<!--<li>
<li>
<a href="#/youtubegroup">
<span class="groupslist"><i class="icon-user"></i>YT group Invite </span>
<span class="groupslist"><i class="icon-social-youtube"></i>YT group Invite </span>
</a>
</li>-->
</li>
<li>
<a href="#/access_passwd">
<span class="groupslist"><i class="icon-key"></i>Access Password</span>
Expand Down Expand Up @@ -210,23 +210,7 @@ <h6 ng-if="notify.status==1" class="center success_box">Message Sent Successfull
<h6 ng-if="notify.status==0" class="center error_box">Message Not Sent</h6>
</div>
</a>
</li>

<li ng-repeat="notify in lstnotifications">
<a ng-href="#/notification_all" terget="_blank" class="recent-activity-list chat-out-list row no-space" style="height:auto;">
<div class="col s3 recent-activity-list-icon">
<img src="{{notify.picUrl}}" class="responsive-img circle" />
</div>
<div class="col s9 recent-activity-list-text margin-top-10">
<h6 class="no-space">{{notify.socialprofileName}}</h6>
<span class="">Password change , please reconnect your account !!</span>
</div>
<div class="col s12">
<span class="truncate">{{notify.shareMessage}}</span>
<h6 ng-if="notify.status==0" class="center error_box">Reconnect</h6>
</div>
</a>
</li>
</li>
</ul>
</li>
</ul>
Expand Down
17 changes: 17 additions & 0 deletions src/Socioboard/wwwroot/contents/socioboard/views/shared/sidebar.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,23 @@
</ul>
</div>
</li>
<li class="bold">
<a class="collapsible-header waves-effect waves-cyan" title="Youtube Inbox">
Youtube Inbox
</a>
<div class="collapsible-body">
<ul>
<li ng-repeat="profile in lstProfiles | filter:{profileType:7}">
<a href="#/youtube_inbox/{{profile.profileId}}" class="truncate" style="color:#444444"><i class="icon-user"></i>{{profile.profileName}}</a>
</li>
</ul>
<ul>
<li ng-repeat="profile in lstYtGrpMembersSidebar">
<a href="#/youtubeinbox_member/{{profile.profileId}}" class="truncate" style="color:#444444"><i class="icon-users"></i>{{profile.profileName}}</a>
</li>
</ul>
</div>
</li>
</ul>
</div>
</li>
Expand Down
18 changes: 13 additions & 5 deletions src/Socioboard/wwwroot/contents/socioboard/views/twitterengagement/youtube_inbox.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,11 @@ <h6 style="color:gray; font-size:18px; font-family:Calibri">Loading Comments...<
<span ng-if="singleCommentShow.sbGrpTaskAssign==true && singleCommentShow.parentIdforReply != null" class="ultra-small">Assigned to <b>{{singleCommentShow.sbGrpMemberName}}</b><br /><span><a ng-click="RemoveTask(singleCommentShow, 'reply')" class="highlight"><b>Remove task </b></a><i class="fa fa-circle-o-notch fa-spin fa-fw" ng-class="removingtaskloader"></i></span></span>
</div>
<div class="right" title="Review">
<a ng-if="singleCommentShow.parentIdforReply == null && singleCommentShow.review==false" href="javascript:void(0)" class="btn btn_style btn_round grey" ng-click="reviewed(singleCommentShow, true, 'main')">
<a ng-if="singleCommentShow.parentIdforReply == null && singleCommentShow.review==false" href="javascript:void(0)" class="btn btn_style btn_round highlightgreen grey" ng-click="reviewed(singleCommentShow, true, 'main')">
<i ng-class="reviewLoading" class="fa fa-spinner fa-pulse fa-3x" aria-hidden="true"></i>
<i ng-class="reviewLoaded" class="fa fa-check-circle" aria-hidden="true"></i>
</a>
<a ng-if="singleCommentShow.parentIdforReply != null && singleCommentShow.review==false" href="javascript:void(0)" class="btn btn_style btn_round grey" ng-click="reviewed(singleCommentShow, true, 'reply')">
<a ng-if="singleCommentShow.parentIdforReply != null && singleCommentShow.review==false" href="javascript:void(0)" class="btn btn_style btn_round highlightgreen grey" ng-click="reviewed(singleCommentShow, true, 'reply')">
<i ng-class="reviewLoading" class="fa fa-spinner fa-pulse fa-3x" aria-hidden="true"></i>
<i ng-class="reviewLoaded" class="fa fa-check-circle" aria-hidden="true"></i>
</a>
Expand All @@ -195,9 +195,7 @@ <h6 style="color:gray; font-size:18px; font-family:Calibri">Loading Comments...<
<i ng-class="reviewLoading" class="fa fa-spinner fa-pulse fa-3x" aria-hidden="true"></i>
<i ng-class="reviewLoaded" class="fa fa-check-circle" aria-hidden="true"></i>
</a>
<a ng-if="user.TrailStatus!=2" ng-click="taskOpensModel(singleCommentShow)" class="modal-trigger btn btn_style btn_round grey darken-4" href="javascript:void(0);" title="Task">
<i class="icon-pin"></i>
</a>
<a ng-click="taskOpensModel(singleCommentShow)" class="modal-trigger btn btn_style btn_round grey darken-4" href="javascript:void(0);" title="Task"><b>Assign</b></a>
</div>
</div>
<form class="container">
Expand Down Expand Up @@ -385,4 +383,14 @@ <h5>Group Invite</h5>
text-decoration: underline;
color: indigo;
}


a.highlightgreen:hover {
color: green;
}

a.highlightgreen:active {
text-decoration: underline;
color: indigo;
}
</style>

0 comments on commit 324c867

Please sign in to comment.