From 6997f4b69b56933eb1bfda9390d3ea0e5e8bbc67 Mon Sep 17 00:00:00 2001 From: sweta kumari Date: Mon, 12 Mar 2018 19:32:10 +0530 Subject: [PATCH] socioboard 3.0 update socioboard 3.0 update --- .../SavedFeedsManagementController.cs | 6 +- .../Controllers/TwitterController.cs | 34 +-- .../SavedFeedsManagementRepository.cs | 19 +- .../Enum/ScheduledStatusFeedsManager.cs | 16 + .../Models/Mongo/SavedFeedsManagement.cs | 11 +- .../facebookfeedsmanagercontroller.js | 64 +++- .../controllers/instagramfeedscontroller.js | 22 +- .../linkedinpagefeedsmanagercontroller.js | 104 ++++++- .../controllers/socioqueuecontroller.js | 2 - .../twitterfeedsmanagercontroller.js | 67 ++++- .../socioboard/js/admin/socioboard.js | 65 ++++ .../socioboard/views/dashboard/dashboard.html | 14 +- .../socioboard/views/feeds/facebookfeeds.html | 2 +- .../feeds_manager/facebookfeedsmanager.html | 107 +++---- .../linkedinpagefeedsmanager.html | 171 ++++++++++- .../feeds_manager/twitterfeedsmanager.html | 281 +++++++++++++++++- .../views/settings/upgradeplan.html | 16 +- .../socioboard/views/shared/sidebar.html | 5 +- 18 files changed, 831 insertions(+), 175 deletions(-) create mode 100644 src/Domain.Socioboard/Enum/ScheduledStatusFeedsManager.cs diff --git a/src/Api.Socioboard/Controllers/SavedFeedsManagementController.cs b/src/Api.Socioboard/Controllers/SavedFeedsManagementController.cs index 3a71881a8..cf849eb05 100644 --- a/src/Api.Socioboard/Controllers/SavedFeedsManagementController.cs +++ b/src/Api.Socioboard/Controllers/SavedFeedsManagementController.cs @@ -95,10 +95,10 @@ public IActionResult aprove(string strid ,bool update) } //ScheduleMsg - [HttpPost("ScheduleMsg")] - public IActionResult ScheduleMsg(string postId, long groupId ,string schtime) + [HttpGet("ScheduleMsg")] + public IActionResult ScheduleMsg(string postId, long groupId ,DateTime schtime,string timeval) { - bool status = SavedFeedsManagementRepository.scheduleMsgRepo(postId, groupId, schtime, _appSettings); + bool status = SavedFeedsManagementRepository.scheduleMsgRepo(postId, groupId, schtime, timeval, _appSettings); return Ok(status); } } diff --git a/src/Api.Socioboard/Controllers/TwitterController.cs b/src/Api.Socioboard/Controllers/TwitterController.cs index 6cbb98929..c8e0a3b86 100644 --- a/src/Api.Socioboard/Controllers/TwitterController.cs +++ b/src/Api.Socioboard/Controllers/TwitterController.cs @@ -521,23 +521,23 @@ public IActionResult GettwitterSingle(string profileId) } - // [HttpPost("publish")] - //public IActionResult publish(string profileId,string twitterText, long userId , string imgUrl ,string strid) - //{ - // DatabaseRepository dbr = new DatabaseRepository(_logger, _appEnv); - // string ret = Helper.TwitterHelper.PostTwitterMessage(_appSettings, _redisCache, twitterText, profileId, userId, imgUrl, true, 0, "", dbr, _logger); - // if (ret =="") - // { - // string responce = SavedFeedsManagementRepository.publish( profileId, strid, _appSettings); + [HttpPost("publish")] + public IActionResult publish(string profileId, string twitterText, long userId, string imgUrl, string strid) + { + DatabaseRepository dbr = new DatabaseRepository(_logger, _appEnv); + string ret = Helper.TwitterHelper.PostTwitterMessage(_appSettings, _redisCache, twitterText, profileId, userId, imgUrl, true, 0, "", dbr, _logger); + if (ret == "") + { + string responce = SavedFeedsManagementRepository.publish(profileId, strid, _appSettings); + + return Ok(responce); + } + else + { + return Ok("failed"); + } - // return Ok(responce); - // } - // else - // { - // return Ok("failed"); - // } - - // } - } + } + } } diff --git a/src/Api.Socioboard/Repositories/SavedFeedsManagementRepository.cs b/src/Api.Socioboard/Repositories/SavedFeedsManagementRepository.cs index 1d7dabce4..775cb14a2 100644 --- a/src/Api.Socioboard/Repositories/SavedFeedsManagementRepository.cs +++ b/src/Api.Socioboard/Repositories/SavedFeedsManagementRepository.cs @@ -4,6 +4,7 @@ using MongoDB.Driver; using System; using System.Collections.Generic; +using System.Globalization; using System.Linq; using System.Threading.Tasks; @@ -17,6 +18,7 @@ public static bool SavePost(SavedFeedsManagement objDta, Helper.AppSettings _set { objDta.Id = ObjectId.GenerateNewId(); objDta.strId = ObjectId.GenerateNewId().ToString(); + objDta.postId = ObjectId.GenerateNewId().ToString(); objDta.savedTime = Helper.DateExtension.ConvertToUnixTimestamp(DateTime.UtcNow); MongoRepository mongorepo = new MongoRepository("SavedFeedsManagement", _settings); var result = mongorepo.Add(objDta); @@ -168,15 +170,26 @@ public static string publish(string profileId, string strid, Helper.AppSettings } - public static bool scheduleMsgRepo(string postId, long groupId,string schtime, Helper.AppSettings _settings) + public static bool scheduleMsgRepo(string postId, long groupId,DateTime schtime,string timeval, Helper.AppSettings _settings) { + MongoRepository mongorepo = new MongoRepository("SavedFeedsManagement", _settings); try { + string dateval = schtime.ToString("dd/MM/yyyy", CultureInfo.InvariantCulture); + DateTime schdatetime = Convert.ToDateTime(dateval + " " + timeval); + FilterDefinition filter = new BsonDocument("postId", postId); - var update = Builders.Update.Set("scheduleTime", schtime); - mongorepo.Update(update, filter); + var update = Builders.Update.Set("scheduleTime", schdatetime).Set("schedOrNotstatus", 1).Set("scheduleTimestr", schdatetime.ToString()); + try + { + mongorepo.Update(update, filter); + } + catch (Exception ex) + { + + } return true; } catch diff --git a/src/Domain.Socioboard/Enum/ScheduledStatusFeedsManager.cs b/src/Domain.Socioboard/Enum/ScheduledStatusFeedsManager.cs new file mode 100644 index 000000000..164c662a4 --- /dev/null +++ b/src/Domain.Socioboard/Enum/ScheduledStatusFeedsManager.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace Domain.Socioboard.Enum +{ + public enum ScheduledStatusFeedsManager + { + Default = 0, + Scheduled = 1, + Published = 2, + Deleted = 3, + error = 4 + } +} diff --git a/src/Domain.Socioboard/Models/Mongo/SavedFeedsManagement.cs b/src/Domain.Socioboard/Models/Mongo/SavedFeedsManagement.cs index 2f38282be..cf6d77712 100644 --- a/src/Domain.Socioboard/Models/Mongo/SavedFeedsManagement.cs +++ b/src/Domain.Socioboard/Models/Mongo/SavedFeedsManagement.cs @@ -17,10 +17,11 @@ public class SavedFeedsManagement [JsonConverter(typeof(ObjectIdConverter))] public ObjectId Id { get; set; } public string strId { get; set; } + public string postId { get; set; } public string shareMessage { get; set; } public string postLink { get; set; } public double savedTime { get; set; } - public ScheduledStatus status { get; set; } + public ScheduledStatusFeedsManager status { get; set; } public bool review { get; set; } public long userId { get; set; } public string sbuserName { get; set; } @@ -34,6 +35,12 @@ public class SavedFeedsManagement public string link { get; set; } public double calenderTime { get; set; } public MediaType mediaType { get; set; } - + public DateTime scheduleTime { get; set; } + public string scheduleTimestr { get; set; } + + public int schedOrNotstatus { get; set; } + + + } } diff --git a/src/Socioboard/wwwroot/contents/socioboard/controllers/facebookfeedsmanagercontroller.js b/src/Socioboard/wwwroot/contents/socioboard/controllers/facebookfeedsmanagercontroller.js index 1ed78a5de..79ab77e49 100644 --- a/src/Socioboard/wwwroot/contents/socioboard/controllers/facebookfeedsmanagercontroller.js +++ b/src/Socioboard/wwwroot/contents/socioboard/controllers/facebookfeedsmanagercontroller.js @@ -73,7 +73,7 @@ SocioboardApp.controller('FacebookFeedsManagerController', function ($rootScope, showConfirmButton: false, timer: 5000 }) - window.location.reload() + $scope.loadfeedsSavedData(); }) @@ -123,7 +123,9 @@ SocioboardApp.controller('FacebookFeedsManagerController', function ($rootScope, transformRequest: angular.identity, }).then(function (response) { if (response.data == true) { - swal('Post saved successfully'); + $scope.loadfeedsSavedData(); + $('#ComposePostModal').closeModal(); + swal('Post saved successfully'); console.log(response.data); $(".dropify-clear").click(); } @@ -196,26 +198,57 @@ SocioboardApp.controller('FacebookFeedsManagerController', function ($rootScope, } - $scope.hour_select = function (hrvalue) { - $scope.hourval = hrvalue; + //open schedule modal + $scope.openSchedule = function (feeds) { + debugger; + $('#scheduleModal').openModal(); + $scope.selectedFeedsch = feeds; + $rootScope.feedval = feeds; + console.log("noroot", $scope.selectedFeedsch); + console.log("withroot", $rootScope.feedval); + var dateval = $('#datepickerval').val(); + var timeval = $scope.hourval + ":" + $scope.minval + '' + $scope.ampmvalu ; + console.log(datetime); + //$http.get(apiDomain + '/api/SavedFeedsManagement/ScheduleMsg?postId=' + selectedFeedData.strId + '&groupId=' + $rootScope.groupId + '&schtime=') + // .then(function (response) { + // $scope.allcomment = response.data; + // }, function (reason) { + // $scope.error = reason.data; + // }); } - $scope.min_select = function (minvalu) { - $scope.minval = minvalu; - } - $scope.ampm_select = function (ampmval) { - $scope.ampmvalu = ampmval; - } + //schedule post + $scope.schdule = function (schdata) { + debugger; + // $('#scheduleModal').openModal(); + // $scope.selectedFeedsch = selectedFeedData; + // $rootScope.feedval = selectedFeedData; + var $input = $('.datepicker').pickadate(); + var picker = $input.pickadate('picker','dateformat'); + var dt = new Date(picker.get()); + var hr = $('#hourSelect').val(); + var min = $('#minSelect').val(); + var ampm = $('#AmPmSelect').val(); + var timeval = hr + ':' + min +ampm; + //$('#datepicker').datepicker({ dateFormat: 'dd-mm-yy' }).val(); - $scope.schedule = function (selectedFeedData) { - $('#scheduleModal').openModal(); - $scope.selectedFeed = selectedFeedData; - var datetime = $scope.hourval + ":" + $scope.minval + '' + $scope.ampmvalu + + console.log(dt); + var datetime = $scope.hourval + ":" + $scope.minval + '' + $scope.ampmvalu; - $http.get(apiDomain + '/api/SavedFeedsManagement/ScheduleMsg?postId=' + selectedFeedData.strId + '&groupId=' + $rootScope.groupId + '&schtime=') + $http.get(apiDomain + '/api/SavedFeedsManagement/ScheduleMsg?postId=' + schdata.postId + '&groupId=' + $rootScope.groupId + '&schtime=' + picker.get() + '&timeval=' + timeval) .then(function (response) { $scope.allcomment = response.data; + if(response.data == true) + { + $('#scheduleModal').closeModal(); + swal("successfully scheduled") + $scope.loadfeedsSavedData(); + } + else { + swal("error while scheduling") + } }, function (reason) { $scope.error = reason.data; }); @@ -256,6 +289,7 @@ SocioboardApp.controller('FacebookFeedsManagerController', function ($rootScope, $http.post(apiDomain + '/api/SavedFeedsManagement/DeletePost?postId=' + tempPostId) .then(function (response) { if (response.data == true) { + $scope.loadfeedsSavedData(); swal("Deleted"); } }, function (reason) { diff --git a/src/Socioboard/wwwroot/contents/socioboard/controllers/instagramfeedscontroller.js b/src/Socioboard/wwwroot/contents/socioboard/controllers/instagramfeedscontroller.js index 1079074ca..92da4e9bc 100644 --- a/src/Socioboard/wwwroot/contents/socioboard/controllers/instagramfeedscontroller.js +++ b/src/Socioboard/wwwroot/contents/socioboard/controllers/instagramfeedscontroller.js @@ -9,9 +9,10 @@ SocioboardApp.controller('InstagramFeedsController', function ($rootScope, $scop var lstnofeeds = false; var preloadmorefeeds = false; var endfeeds = false; - var ending = start + 10; + var ending = start + 12; var reachLast = false; var count = 10; + var videofiltter = false; // var show = true; $scope.filterrTxtt = 'All Posts'; $scope.SorttTxtt = 'Popular'; @@ -78,7 +79,6 @@ SocioboardApp.controller('InstagramFeedsController', function ($rootScope, $scop } $http.get(apiDomain + '/api/Instagram/GetInstagramFeeds?instagramId=' + $stateParams.profileId + '&userId=' + $rootScope.user.Id + '&skip=' + ending + '&count=9') .then(function (response) { - debugger; // $scope.lstProfiles = response.data; if (response.data == null || response.data == "") { $scope.endfeeds = true; @@ -100,9 +100,7 @@ SocioboardApp.controller('InstagramFeedsController', function ($rootScope, $scop $scope.filterSearch = function (postType, txtt) { - // $scope.nomessages = false; - $scope.filters = true; $scope.preloadmorefeeds = false; $scope.lstinsFeeds = null; @@ -110,21 +108,20 @@ SocioboardApp.controller('InstagramFeedsController', function ($rootScope, $scop //codes to load recent Feeds $http.get(apiDomain + '/api/Instagram/GetInstagramFilterFeeds?instagramId=' + $stateParams.profileId + '&userId=' + $rootScope.user.Id + '&skip=0&count=50' + '&postType=' + postType) .then(function (response) { - // + debugger; + if (postType == "video") + { + $scope.videofiltter = true; + } if (response.data == "") { $scope.nomessages = true; $scope.preloadmorefeeds = true; } - // $scope.lstProfiles = response.data; - //$scope.lstinsFeeds = response.data; - if (response.data == null) { reachLast = true; } $scope.lstinsFeeds = response.data; - $scope.preloadmorefeeds = true; - }, function (reason) { $scope.error = reason.data; }); @@ -280,7 +277,6 @@ SocioboardApp.controller('InstagramFeedsController', function ($rootScope, $scop } $scope.Deletefeeds = function (id) { - debugger; var Feedid = id; $http.get(apiDomain + '/api/Instagram/DeleteinstagramFeed?profileId=' + $stateParams.profileId + '&FeedId=' + Feedid) .then(function (response) { @@ -341,15 +337,13 @@ SocioboardApp.controller('InstagramFeedsController', function ($rootScope, $scop var qury = $('#categories').val(); $http.get(apiDomain + '/api/Instagram/Searchinsta?instagramId=' + $stateParams.profileId + '&qury=' + qury) .then(function (response) { - debugger; if (response != null) { $scope.seachdata = response.data.data; - debugger; $('#SearchProfileModal').openModal(); } else { swal('No Result Found') - }debugger; + } var data = response; }); diff --git a/src/Socioboard/wwwroot/contents/socioboard/controllers/linkedinpagefeedsmanagercontroller.js b/src/Socioboard/wwwroot/contents/socioboard/controllers/linkedinpagefeedsmanagercontroller.js index 165841610..1149067f3 100644 --- a/src/Socioboard/wwwroot/contents/socioboard/controllers/linkedinpagefeedsmanagercontroller.js +++ b/src/Socioboard/wwwroot/contents/socioboard/controllers/linkedinpagefeedsmanagercontroller.js @@ -34,9 +34,10 @@ SocioboardApp.controller('LinkedinPageFeedsManagerController', function ($rootSc }, transformRequest: angular.identity, }).then(function (response) { - if (response.data == "Posted") { + if (response.data == true) { + $scope.loadfeedsSavedData(); $('#ComposePostModal').closeModal(); - swal('Message composed successfully'); + swal('message saved successfully'); $(".dropify-clear").click(); } @@ -101,6 +102,7 @@ SocioboardApp.controller('LinkedinPageFeedsManagerController', function ($rootSc .then(function (response) { debugger; $scope.profileData = response.data; + console.log($scope.profileData); }, function (reason) { $scope.error = reason.data; }); @@ -167,6 +169,7 @@ SocioboardApp.controller('LinkedinPageFeedsManagerController', function ($rootSc $http.post(apiDomain + '/api/SavedFeedsManagement/DeletePost?postId=' + tempPostId) .then(function (response) { if (response.data == true) { + $scope.loadfeedsSavedData(); swal("Deleted"); } }, function (reason) { @@ -176,6 +179,103 @@ SocioboardApp.controller('LinkedinPageFeedsManagerController', function ($rootSc } //END DELETE POST + //open schedule modal + $scope.openSchedule = function (feeds) { + debugger; + $('#scheduleModal').openModal(); + $scope.selectedFeedsch = feeds; + $rootScope.feedval = feeds; + console.log("noroot", $scope.selectedFeedsch); + console.log("withroot", $rootScope.feedval); + var dateval = $('#datepickerval').val(); + var timeval = $scope.hourval + ":" + $scope.minval + '' + $scope.ampmvalu; + console.log(datetime); + //$http.get(apiDomain + '/api/SavedFeedsManagement/ScheduleMsg?postId=' + selectedFeedData.strId + '&groupId=' + $rootScope.groupId + '&schtime=') + // .then(function (response) { + // $scope.allcomment = response.data; + // }, function (reason) { + // $scope.error = reason.data; + // }); + + } + + //schedule post + $scope.schdule = function (schdata) { + debugger; + // $('#scheduleModal').openModal(); + // $scope.selectedFeedsch = selectedFeedData; + // $rootScope.feedval = selectedFeedData; + var $input = $('.datepicker').pickadate(); + var picker = $input.pickadate('picker', 'dateformat'); + var dt = new Date(picker.get()); + var hr = $('#hourSelect').val(); + var min = $('#minSelect').val(); + var ampm = $('#AmPmSelect').val(); + var timeval = hr + ':' + min + ampm; + //$('#datepicker').datepicker({ dateFormat: 'dd-mm-yy' }).val(); + + + console.log(dt); + var datetime = $scope.hourval + ":" + $scope.minval + '' + $scope.ampmvalu; + + $http.get(apiDomain + '/api/SavedFeedsManagement/ScheduleMsg?postId=' + schdata.postId + '&groupId=' + $rootScope.groupId + '&schtime=' + picker.get() + '&timeval=' + timeval) + .then(function (response) { + $scope.allcomment = response.data; + if (response.data == true) { + $('#scheduleModal').closeModal(); + swal("successfully scheduled") + $scope.loadfeedsSavedData(); + } + else { + swal("error while scheduling") + } + }, function (reason) { + $scope.error = reason.data; + }); + + } + + //aprove post + + $scope.aprovepost = function (value) { + debugger; + if (value.review == false) { + var d = value.strId + $http.post(apiDomain + '/api/SavedFeedsManagement/aprove?strid=' + d + '&update=' + 'true') + .then(function (response) { + swal({ + position: 'top-end', + type: 'success', + title: 'Your post has approved', + showConfirmButton: false, + timer: 5000 + }) + $scope.loadfeedsSavedData(); + }) + + + } + else { + var e = value.strId + $http.post(apiDomain + '/api/SavedFeedsManagement/aprove?strid=' + e + '&update=' + 'false') + .then(function (response) { + swal({ + position: 'top-end', + type: 'success', + title: 'sucessfully changes ', + showConfirmButton: false, + timer: 5000 + }) + $scope.loadfeedsSavedData(); + + }) + } + + + } + //End + + //Show AND hide Header $scope.hideheadernames = " Hide"; var countheader = 0; diff --git a/src/Socioboard/wwwroot/contents/socioboard/controllers/socioqueuecontroller.js b/src/Socioboard/wwwroot/contents/socioboard/controllers/socioqueuecontroller.js index 88b2c7c03..e5b82acfb 100644 --- a/src/Socioboard/wwwroot/contents/socioboard/controllers/socioqueuecontroller.js +++ b/src/Socioboard/wwwroot/contents/socioboard/controllers/socioqueuecontroller.js @@ -121,8 +121,6 @@ SocioboardApp.controller('SocioqueueController', function ($rootScope, $scope, $ } - - var getAllSelected = function () { var selectedItems = $scope.lstsocioqueuemessage.filter(function (profile) { return $scope.temp; diff --git a/src/Socioboard/wwwroot/contents/socioboard/controllers/twitterfeedsmanagercontroller.js b/src/Socioboard/wwwroot/contents/socioboard/controllers/twitterfeedsmanagercontroller.js index dd4c584be..94f25b621 100644 --- a/src/Socioboard/wwwroot/contents/socioboard/controllers/twitterfeedsmanagercontroller.js +++ b/src/Socioboard/wwwroot/contents/socioboard/controllers/twitterfeedsmanagercontroller.js @@ -24,6 +24,7 @@ SocioboardApp.controller('TwitterFeedsManagerController', function ($rootScope, .then(function (response) { debugger; $scope.profileData = response.data; + console.log($scope.profileData); }, function (reason) { $scope.error = reason.data; }); @@ -57,7 +58,7 @@ SocioboardApp.controller('TwitterFeedsManagerController', function ($rootScope, showConfirmButton: false, timer: 5000 }) - window.location.reload() + $scope.loadfeedsSavedData(); }) @@ -74,7 +75,7 @@ SocioboardApp.controller('TwitterFeedsManagerController', function ($rootScope, showConfirmButton: false, timer: 5000 }) - window.location.reload() + $scope.loadfeedsSavedData(); }) } @@ -96,6 +97,7 @@ SocioboardApp.controller('TwitterFeedsManagerController', function ($rootScope, showConfirmButton: false, timer: 4000 }) + $scope.loadfeedsSavedData(); //} //else { // swal("Somthing Went Wrong"); @@ -126,7 +128,8 @@ SocioboardApp.controller('TwitterFeedsManagerController', function ($rootScope, }, transformRequest: angular.identity, }).then(function (response) { - if (response.data == "Posted") { + if (response.data == true) { + $scope.loadfeedsSavedData(); $('#ComposePostModal').closeModal(); swal('Message composed successfully'); $(".dropify-clear").click(); @@ -149,6 +152,64 @@ SocioboardApp.controller('TwitterFeedsManagerController', function ($rootScope, //code for compose message end + //open schedule modal + $scope.openSchedule = function (feeds) { + debugger; + $('#scheduleModal').openModal(); + $scope.selectedFeedsch = feeds; + $rootScope.feedval = feeds; + console.log("noroot", $scope.selectedFeedsch); + console.log("withroot", $rootScope.feedval); + var dateval = $('#datepickerval').val(); + var timeval = $scope.hourval + ":" + $scope.minval + '' + $scope.ampmvalu; + console.log(datetime); + //$http.get(apiDomain + '/api/SavedFeedsManagement/ScheduleMsg?postId=' + selectedFeedData.strId + '&groupId=' + $rootScope.groupId + '&schtime=') + // .then(function (response) { + // $scope.allcomment = response.data; + // }, function (reason) { + // $scope.error = reason.data; + // }); + + } + + //schedule post + $scope.schdule = function (schdata) { + debugger; + // $('#scheduleModal').openModal(); + // $scope.selectedFeedsch = selectedFeedData; + // $rootScope.feedval = selectedFeedData; + var $input = $('.datepicker').pickadate(); + var picker = $input.pickadate('picker', 'dateformat'); + var dt = new Date(picker.get()); + var hr = $('#hourSelect').val(); + var min = $('#minSelect').val(); + var ampm = $('#AmPmSelect').val(); + var timeval = hr + ':' + min + ampm; + //$('#datepicker').datepicker({ dateFormat: 'dd-mm-yy' }).val(); + + + console.log(dt); + var datetime = $scope.hourval + ":" + $scope.minval + '' + $scope.ampmvalu; + + $http.get(apiDomain + '/api/SavedFeedsManagement/ScheduleMsg?postId=' + schdata.postId + '&groupId=' + $rootScope.groupId + '&schtime=' + picker.get() + '&timeval=' + timeval) + .then(function (response) { + $scope.allcomment = response.data; + if (response.data == true) { + $scope.loadfeedsSavedData(); + $('#scheduleModal').closeModal(); + swal("successfully scheduled") + + } + else { + swal("error while scheduling") + } + }, function (reason) { + $scope.error = reason.data; + }); + + } + + //code for checking the file format start $scope.checkfile = function () { var filesinput = $('#input_file');//composeImage diff --git a/src/Socioboard/wwwroot/contents/socioboard/js/admin/socioboard.js b/src/Socioboard/wwwroot/contents/socioboard/js/admin/socioboard.js index dd1463ebd..c3051f99d 100644 --- a/src/Socioboard/wwwroot/contents/socioboard/js/admin/socioboard.js +++ b/src/Socioboard/wwwroot/contents/socioboard/js/admin/socioboard.js @@ -702,6 +702,71 @@ facebookfeedsmanager = function () { }); } + +// twitter feed smanager +twitterfeedsmanager = function () { + // initialize core components + $('.modal-trigger').leanModal(); + $('ul.tabs').tabs(); + $('select').material_select(); + $('.tooltipped').tooltip({ delay: 50 }); + $('.dropdown-button').dropdown({ + inDuration: 300, + outDuration: 225, + constrain_width: false, // Does not change width of dropdown to that of the activator + hover: true, // Activate on hover + gutter: 0, // Spacing from edge + belowOrigin: false, // Displays dropdown below the button + alignment: 'left' // Displays dropdown with edge aligned to the left of button + }); + $('.datepicker').pickadate({ + selectMonths: true, // Creates a dropdown to control month + selectYears: 15 // Creates a dropdown of 15 years to control year + }); + + + // Basic + $('.dropify').dropify(); + + // Translated + $('.dropify-fr').dropify({ + messages: { + default: 'Glissez-déposez un fichier ici ou cliquez', + replace: 'Glissez-déposez un fichier ou cliquez pour remplacer', + remove: 'Supprimer', + error: 'Désolé, le fichier trop volumineux' + } + }); + + // Used events + var drEvent = $('.dropify-event').dropify(); + + drEvent.on('dropify.beforeClear', function (event, element) { + return confirm("Do you really want to delete \"" + element.filename + "\" ?"); + }); + + drEvent.on('dropify.afterClear', function (event, element) { + alert('File deleted'); + }); + + + $('.instagramfeeds').slimScroll({ + color: '-webkit-gradient(linear,left top,right top,color-stop(32%,#FAB51C),color-stop(60%,#EF0915),color-stop(100%,#BE039C))', + size: '10px', + height: '600px', + alwaysVisible: true, + allowPageScroll: true + }); + + $('.instagramcommand').slimScroll({ + color: '-webkit-gradient(linear,left top,right top,color-stop(32%,#FAB51C),color-stop(60%,#EF0915),color-stop(100%,#BE039C))', + size: '10px', + height: '300px', + alwaysVisible: true, + allowPageScroll: true + }); +} + twitterfeeds = function () { // initialize core components $('.modal-trigger').leanModal(); diff --git a/src/Socioboard/wwwroot/contents/socioboard/views/dashboard/dashboard.html b/src/Socioboard/wwwroot/contents/socioboard/views/dashboard/dashboard.html index 975de37c9..3aabdc98c 100644 --- a/src/Socioboard/wwwroot/contents/socioboard/views/dashboard/dashboard.html +++ b/src/Socioboard/wwwroot/contents/socioboard/views/dashboard/dashboard.html @@ -469,7 +469,7 @@
Oops!
You have no profiles
-
+
@@ -1066,7 +1066,7 @@
Social Profiles
-
  • +
    • @@ -1422,7 +1422,7 @@

    Adding Profiles

    Add Instagram Profile -
    +

    To allow Socioboard access to your Youtube account, you must first give authorization from the Youtube website

    diff --git a/src/Socioboard/wwwroot/contents/socioboard/views/feeds/facebookfeeds.html b/src/Socioboard/wwwroot/contents/socioboard/views/feeds/facebookfeeds.html index e8307336b..833fc7b3c 100644 --- a/src/Socioboard/wwwroot/contents/socioboard/views/feeds/facebookfeeds.html +++ b/src/Socioboard/wwwroot/contents/socioboard/views/feeds/facebookfeeds.html @@ -16,7 +16,7 @@
    - Facebook live feeds{{filterrTxtt}} {{SorttTxtt}} Recent  + Facebook live feeds{{filterrTxtt}} {{SorttTxtt}} Recent  Reconnect    diff --git a/src/Socioboard/wwwroot/contents/socioboard/views/feeds_manager/facebookfeedsmanager.html b/src/Socioboard/wwwroot/contents/socioboard/views/feeds_manager/facebookfeedsmanager.html index 6d826a3df..3e8806c6e 100644 --- a/src/Socioboard/wwwroot/contents/socioboard/views/feeds_manager/facebookfeedsmanager.html +++ b/src/Socioboard/wwwroot/contents/socioboard/views/feeds_manager/facebookfeedsmanager.html @@ -1,8 +1,3 @@ -
    @@ -10,13 +5,13 @@
    -
    {{profileData.fbUserName}}
    - + +
    @@ -217,6 +349,19 @@
    {{profileData.linkedinPageName}}
    #myHide { transition:2s; } + .right { + } + .modal { + max-height:none!important; + height:75%!important; + } + + + .myBtn{ + border: 2px solid green; + border-radius: 20px; + padding: 3px 12px; + background:green; diff --git a/src/Socioboard/wwwroot/contents/socioboard/views/feeds_manager/twitterfeedsmanager.html b/src/Socioboard/wwwroot/contents/socioboard/views/feeds_manager/twitterfeedsmanager.html index 032e107c3..b2019c5ad 100644 --- a/src/Socioboard/wwwroot/contents/socioboard/views/feeds_manager/twitterfeedsmanager.html +++ b/src/Socioboard/wwwroot/contents/socioboard/views/feeds_manager/twitterfeedsmanager.html @@ -7,7 +7,7 @@
    - +
    {{profileData.twitterScreenName}}
    @@ -20,13 +20,45 @@
    {{profileData.twitterScreenName}}
  • {{hideheadernames}}
    • - Last created + All Type
    @@ -51,19 +83,24 @@
    {{profileData.twitterScreenName}}
    Publish Now
    -
    - - Scedule +
    + + Schedule + +
    +
    + + Scheduled
    - - Approve + + Approve
    - - Approved + + Approved
    @@ -153,6 +190,224 @@
    {{profileData.twitterScreenName}}
    + + +
    + + \ No newline at end of file diff --git a/src/Socioboard/wwwroot/contents/socioboard/views/settings/upgradeplan.html b/src/Socioboard/wwwroot/contents/socioboard/views/settings/upgradeplan.html index fabc7bf93..11c82ccd5 100644 --- a/src/Socioboard/wwwroot/contents/socioboard/views/settings/upgradeplan.html +++ b/src/Socioboard/wwwroot/contents/socioboard/views/settings/upgradeplan.html @@ -98,7 +98,9 @@
    Upgrade, Change or Cancel Anytime

    You can connect 1 type of social account per network on this plan

    - For example : 1 Facebook account, 1 Google plus account, 1 Instagram account, 1 Linkedin account, and 1 Twitter account. Please note that Pinterest account, Youtube channel and Google Analytics aren't available for this plan + + For example : 1 Facebook account, 1 Google plus account, 1 Instagram account, 1 Linkedin account, and 1 Twitter account. Please note that Youtube channel and Google Analytics aren't available for this plan +

    @@ -147,7 +149,7 @@
    Upgrade, Change or Cancel Anytime
    - + @@ -157,7 +159,7 @@
    Upgrade, Change or Cancel Anytime
    - + @@ -167,7 +169,7 @@
    Upgrade, Change or Cancel Anytime
    - + @@ -177,7 +179,7 @@
    Upgrade, Change or Cancel Anytime
    - + @@ -187,7 +189,7 @@
    Upgrade, Change or Cancel Anytime
    - + @@ -197,7 +199,7 @@
    Upgrade, Change or Cancel Anytime
    - + diff --git a/src/Socioboard/wwwroot/contents/socioboard/views/shared/sidebar.html b/src/Socioboard/wwwroot/contents/socioboard/views/shared/sidebar.html index 61a8912d5..2469abdd2 100644 --- a/src/Socioboard/wwwroot/contents/socioboard/views/shared/sidebar.html +++ b/src/Socioboard/wwwroot/contents/socioboard/views/shared/sidebar.html @@ -277,8 +277,9 @@