diff --git a/assets/css/rop.css b/assets/css/rop.css index 211345151..96a866c4a 100644 --- a/assets/css/rop.css +++ b/assets/css/rop.css @@ -4362,3 +4362,9 @@ padding: 0 20px; .rop-spacer{ margin: 5px; } + + +.tile-action div { + display: inline-block; + vertical-align: middle; +} \ No newline at end of file diff --git a/assets/js/build/dashboard.js b/assets/js/build/dashboard.js index 3936168f9..3bf565e3a 100644 --- a/assets/js/build/dashboard.js +++ b/assets/js/build/dashboard.js @@ -17758,6 +17758,9 @@ exports.default = new _vuex2.default.Store({ apiNotAvailable: function apiNotAvailable(state, data) { state.api_not_available = data; }, + preloading_change: function preloading_change(state, data) { + state.hide_preloading = data; + }, updateState: function updateState(state, _ref) { var stateData = _ref.stateData, requestName = _ref.requestName; @@ -17947,6 +17950,11 @@ exports.default = new _vuex2.default.Store({ commit('apiNotAvailable', true); _vue2.default.$log.error('Error when trying to do request: ', data.req); + }).catch(function (error) { + commit('setAjaxState', false); + commit('apiNotAvailable', true); + commit('preloading_change', 1); + _vue2.default.$log.error('Error when getting response for: ', data.req, error); }); }); } @@ -21254,7 +21262,7 @@ if (false) {(function () { module.hot.accept() var hotAPI = require("vue-hot-reload-api") hotAPI.install(require("vue"), true) if (!hotAPI.compatible) return - var id = "/home/uriahsvictor/atom/git_repos/tweet-old-post/vue/src/vue-elements/reusables/multiple-select.vue" + var id = "/Users/mihaiirodiu/Local Sites/revivesocialpantheon/app/public/wp-content/plugins/tweet-old-post/vue/src/vue-elements/reusables/multiple-select.vue" if (!module.hot.data) { hotAPI.createRecord(id, module.exports) } else { @@ -21689,7 +21697,7 @@ if (false) {(function () { module.hot.accept() var hotAPI = require("vue-hot-reload-api") hotAPI.install(require("vue"), true) if (!hotAPI.compatible) return - var id = "/home/uriahsvictor/atom/git_repos/tweet-old-post/vue/src/vue-elements/reusables/button-checkbox.vue" + var id = "/Users/mihaiirodiu/Local Sites/revivesocialpantheon/app/public/wp-content/plugins/tweet-old-post/vue/src/vue-elements/reusables/button-checkbox.vue" if (!module.hot.data) { hotAPI.createRecord(id, module.exports) } else { @@ -21713,8 +21721,8 @@ if(content.locals) module.exports = content.locals; if(false) { // When the styles change, update the // }; // @@ -35938,7 +36090,7 @@ module.exports = { /* 236 */ /***/ (function(module, exports) { -module.exports = "\n\t
\n\t\t
\n\t\t\t
\n\t\t
\n\t\t
\n\t\t\t\t\t\n\t\t
\n\t
\n"; +module.exports = "\n\t
\n\t\t
\n\t\t
\n\t\t
\n \n\n\t\t\t\t\t\n\t\t
\n\t
\n"; /***/ }), /* 237 */ @@ -35955,7 +36107,7 @@ if (false) {(function () { module.hot.accept() var hotAPI = require("vue-hot-reload-api") hotAPI.install(require("vue"), true) if (!hotAPI.compatible) return - var id = "/home/uriahsvictor/atom/git_repos/tweet-old-post/vue/src/vue-elements/reusables/vue-spinner.vue" + var id = "/Users/mihaiirodiu/Local Sites/revivesocialpantheon/app/public/wp-content/plugins/tweet-old-post/vue/src/vue-elements/reusables/vue-spinner.vue" if (!module.hot.data) { hotAPI.createRecord(id, module.exports) } else { @@ -35979,8 +36131,8 @@ if(content.locals) module.exports = content.locals; if(false) { // When the styles change, update the diff --git a/vue/src/vue-elements/service-user-tile.vue b/vue/src/vue-elements/service-user-tile.vue index ebb5e1923..2141e6625 100644 --- a/vue/src/vue-elements/service-user-tile.vue +++ b/vue/src/vue-elements/service-user-tile.vue @@ -1,10 +1,6 @@ @@ -228,8 +230,6 @@ width:15px; text-align: center; cursor: pointer; - padding-right: 10px; - margin-right: 10px; height: 100%; -ms-flex: 0 0 auto; line-height: 40px; diff --git a/vue/src/vue-elements/sign-in-btn.vue b/vue/src/vue-elements/sign-in-btn.vue index d925b5adb..4b1f707e4 100644 --- a/vue/src/vue-elements/sign-in-btn.vue +++ b/vue/src/vue-elements/sign-in-btn.vue @@ -3,6 +3,7 @@
{{labels.fb_own_app_signin}}
-
+
{{labels.tw_own_app_signin}}
-
+
+ + {{labels.li_own_app_signin}} +
+
+ +
+
-
+
{{ field.description }}

-
+
-
+

-
+
-
+
@@ -89,17 +97,50 @@ appOrigin: ropAuthAppData.authAppUrl, appPathFB: ropAuthAppData.authAppFacebookPath, appPathTW: ropAuthAppData.authAppTwitterPath, + appPathLI: ropAuthAppData.authAppLinkedInPath, + appPathBuffer: ropAuthAppData.authAppBufferPath, appAdminEmail: ropAuthAppData.adminEmail, siteAdminUrl: ropAuthAppData.adminUrl, appUniqueId: ropAuthAppData.authToken, appSignature: ropAuthAppData.authSignature, windowParameters: 'top=20,left=100,width=560,height=670', authPopupWindow: null, - showTwAppBtn: ropApiSettings.show_tw_app_btn, + showLiAppBtn: ropApiSettings.show_li_app_btn, showBtn: false } }, methods: { + /** + * Get tooltip for the service. + * + * + * @param service + * @param network + * @returns {string} + */ + getTooltip(service, network) { + if (service !== undefined && service.active === false) { + return this.labels.only_in_pro + } + let countAuthServices = 0 + for (let authService in this.$store.state.authenticatedServices) { + if (this.$store.state.authenticatedServices[authService].service === network) { + countAuthServices++ + } + } + + let countActiveAccounts = 0 + for (let activeAccount in this.$store.state.activeAccounts) { + if (this.$store.state.activeAccounts[activeAccount].service === network) { + countActiveAccounts++ + } + } + + if (service !== undefined && (service.allowed_accounts <= countAuthServices || service.allowed_accounts <= countActiveAccounts)) { + return this.labels.limit_reached + } + return '' + }, /** * Check status for the service. * @@ -249,6 +290,44 @@ window.removeEventListener("message", event => this.getChildWindowMessage(event)); this.authPopupWindow.close(); window.location.reload(); + }, error => { + this.is_loading = false; + Vue.$log.error('Got nothing from server. Prompt user to check internet connection and try again', error) + }); + }, + /** + * Add LinkedIn account. + * + * @param data Data. + */ + addAccountLI(data) { + this.$store.dispatch('fetchAJAXPromise', { + req: 'add_account_li', + updateState: false, + data: data + }).then(response => { + window.removeEventListener("message", event => this.getChildWindowMessage(event)); + this.authPopupWindow.close(); + window.location.reload(); + }, error => { + this.is_loading = false; + Vue.$log.error('Got nothing from server. Prompt user to check internet connection and try again', error) + }); + }, + /** + * Add Buffer account. + * + * @param data Data. + */ + addAccountBuffer(data) { + this.$store.dispatch('fetchAJAXPromise', { + req: 'add_account_buffer', + updateState: false, + data: data + }).then(response => { + window.removeEventListener("message", event => this.getChildWindowMessage(event)); + this.authPopupWindow.close(); + window.location.reload(); }, error => { this.is_loading = false; Vue.$log.error('Got nothing from server. Prompt user to check internet connection and try again', error) @@ -256,11 +335,15 @@ }, getChildWindowMessage: function (event) { if (~event.origin.indexOf(this.appOrigin)) { - if ('Twitter' === this.modal.serviceName) { - this.addAccountTW(JSON.parse(event.data)); - } else if ('Facebook' === this.modal.serviceName) { + if ('Twitter' === this.modal.serviceName) { + this.addAccountTW(JSON.parse(event.data)); + } else if ('Facebook' === this.modal.serviceName) { this.addAccountFB(JSON.parse(event.data)); - } + } else if ('LinkedIn' === this.modal.serviceName) { + this.addAccountLI(JSON.parse(event.data)); + } else if ('Buffer' === this.modal.serviceName) { + this.addAccountBuffer(JSON.parse(event.data)); + } } else { return; @@ -288,6 +371,30 @@ this.authPopupWindow = window.open(loginUrl, 'authTW', this.windowParameters); this.cancelModal(); } + window.addEventListener("message", event => this.getChildWindowMessage(event)); + }, + openPopupLI: function () { // Open the popup specific for LinkedIn + let loginUrl = this.appOrigin + this.appPathLI + '?callback_url=' + this.siteAdminUrl + '&token=' + this.appUniqueId + '&signature=' + this.appSignature + '&data=' + this.appAdminEmail; + try { + this.authPopupWindow.close(); + } catch (e) { + // nothing to do + } finally { + this.authPopupWindow = window.open(loginUrl, 'authLI', this.windowParameters); + this.cancelModal(); + } + window.addEventListener("message", event => this.getChildWindowMessage(event)); + }, + openPopupBuffer: function () { // Open the popup specific for Buffer + let loginUrl = this.appOrigin + this.appPathBuffer + '?callback_url=' + this.siteAdminUrl + '&token=' + this.appUniqueId + '&signature=' + this.appSignature + '&data=' + this.appAdminEmail; + try { + this.authPopupWindow.close(); + } catch (e) { + // nothing to do + } finally { + this.authPopupWindow = window.open(loginUrl, 'authLI', this.windowParameters); + this.cancelModal(); + } window.addEventListener("message", event => this.getChildWindowMessage(event)); } }, @@ -325,17 +432,23 @@ isTwitter() { return this.modal.serviceName === 'Twitter'; }, - isAllowedTwitter: function () { - let showButton = true; - - if (!this.showTwAppBtn) { - showButton = false; - } - - return showButton; - } - } + // will return true if the current service actions are for LinkedIn. + isLinkedIn() { + return this.modal.serviceName === 'LinkedIn'; + }, + isAllowedLinkedIn: function () { + let showButton = true; + if (!this.showLiAppBtn) { + showButton = false; + } + return showButton; + }, + // will return true if the current service actions are for Buffer. + isBuffer() { + return this.modal.serviceName === 'Buffer'; + }, } +}