From 6cde106134b4bc0e20d118ebc9407c7e5bebbf1d Mon Sep 17 00:00:00 2001 From: Nick Denry Date: Fri, 7 Aug 2020 14:53:57 +0300 Subject: [PATCH] Set new project name --- app/controllers/login-controller.js | 4 +-- ...imeverse-service.js => desktop-service.js} | 36 +++++++++---------- app/services/settings-service.js | 6 ++-- app/views/login/page.html | 2 +- app/views/settings/page.html | 2 +- index.html | 2 +- ...chimeverse-plugin.js => desktop-plugin.js} | 8 ++--- main.js | 4 +-- modules/menu-service.js | 4 +-- modules/tray-service.js | 2 +- renderer.js | 10 +++--- 11 files changed, 40 insertions(+), 40 deletions(-) rename app/services/{chimeverse-service.js => desktop-service.js} (72%) rename libs/converse.js/converse-desktop/{chimeverse-plugin.js => desktop-plugin.js} (95%) diff --git a/app/controllers/login-controller.js b/app/controllers/login-controller.js index 462ef0a..1f5c9e6 100644 --- a/app/controllers/login-controller.js +++ b/app/controllers/login-controller.js @@ -1,6 +1,6 @@ let angApp = require(__dirname+'/../init') -angApp.controller('LoginController', function($scope, ChimeVerseService, CredentialsServise) { +angApp.controller('LoginController', function($scope, DesktopService, CredentialsServise) { $scope.help = {} @@ -13,7 +13,7 @@ angApp.controller('LoginController', function($scope, ChimeVerseService, Credent $scope.credentials.login, $scope.credentials.password ) - ChimeVerseService.getCredentialsAndLogin() + DesktopService.getCredentialsAndLogin() $scope.accountForm.$setPristine() $scope.accountForm.$setUntouched() $scope.credentials = {} diff --git a/app/services/chimeverse-service.js b/app/services/desktop-service.js similarity index 72% rename from app/services/chimeverse-service.js rename to app/services/desktop-service.js index 8c9381d..a35456e 100644 --- a/app/services/chimeverse-service.js +++ b/app/services/desktop-service.js @@ -1,24 +1,24 @@ let angApp = require(__dirname + '/../init') -const chimeversePlugin = require(__dirname +'/../../libs/converse.js/converse-desktop/chimeverse-plugin') +const desktopPlugin = require(__dirname +'/../../libs/converse.js/converse-desktop/desktop-plugin') -angApp.factory('ChimeVerseService', ( +angApp.factory('DesktopService', ( $window, $timeout, CredentialsServise, SystemService, AppStateService, SettingsService, XmppHelperService ) => { - let chimeverseService = {} + let desktopService = {} - chimeverseService._notifyMessage = () => { + desktopService._notifyMessage = () => { SystemService.playAudio() SystemService.showEnvelope() } - chimeverseService._hideNotifyMessage = () => { + desktopService._hideNotifyMessage = () => { SystemService.hideEnvelope() } - chimeverseService.logout = () => { + desktopService.logout = () => { let credentials = CredentialsServise.getCredentials() credentials.then((result) => { let remove = CredentialsServise.removeCredentials(result.login) @@ -29,16 +29,16 @@ angApp.factory('ChimeVerseService', ( }) } - chimeverseService.initConverse = (connectionManager, login, password) => { + desktopService.initConverse = (connectionManager, login, password) => { AppStateService.set(AppStateService.APP_STATE_DEFAULT) // Always set to default state before init - chimeversePlugin.register(login) + desktopPlugin.register(login) let lang = navigator.language let allowBookmarks = SettingsService.get('allowBookmarks') let omemoDefault = SettingsService.get('omemoDefault') let xmppResource = XmppHelperService.getResourceFromJid(login) if (!xmppResource) { xmppResource = '.' + (Math.random().toString(36)+'00000000000000000').slice(2, 7) // Generate 5 char unique str - login = login + '/Chimeverse'+xmppResource + login = login + '/converseDesktop'+xmppResource } let conversejsParams = { assets_path: './node_modules/converse.js/dist/', @@ -53,7 +53,7 @@ angApp.factory('ChimeVerseService', ( play_sounds: false, priority: 50, view_mode: 'embedded', - whitelisted_plugins: ['chimeVerse'], + whitelisted_plugins: ['converseDesktop'], } if (connectionManager.startsWith('ws')) { conversejsParams.websocket_url = connectionManager @@ -65,32 +65,32 @@ angApp.factory('ChimeVerseService', ( }, 50) } - chimeverseService.getCredentialsAndLogin = () => { + desktopService.getCredentialsAndLogin = () => { let credentials = CredentialsServise.getCredentials() credentials.then((result) => { - chimeverseService.initConverse(result.connectionManager, result.login, result.password) + desktopService.initConverse(result.connectionManager, result.login, result.password) }, (error) => { AppStateService.set(AppStateService.APP_STATE_LOGIN) }) } - chimeverseService.chatToOpen = null + desktopService.chatToOpen = null $window.document.addEventListener('conversejs-logout', function (e) { - chimeverseService.logout() + desktopService.logout() }) $window.document.addEventListener('conversejs-unread', function (e) { let sender = e.detail - chimeverseService.chatToOpen = sender - chimeverseService._notifyMessage() + desktopService.chatToOpen = sender + desktopService._notifyMessage() }) $window.document.addEventListener('conversejs-no-unread', function (e) { - chimeverseService._hideNotifyMessage() + desktopService._hideNotifyMessage() }) - return chimeverseService + return desktopService }) \ No newline at end of file diff --git a/app/services/settings-service.js b/app/services/settings-service.js index 3a9ca39..6033ec0 100644 --- a/app/services/settings-service.js +++ b/app/services/settings-service.js @@ -7,16 +7,16 @@ angApp.factory('SettingsService', () => { const electronSettings = require('electron-settings') const settings = { - chimeverse: { + converseDesktop: { runMinimized: { default: false, title: 'Run minimized', - hint: 'Default: false. Whether run Chimeverse minimized to tray or not.' + hint: 'Default: false. Whether run Converse Desktop minimized to tray or not.' }, minimizeOnClose: { default: false, title: 'Minimize on close', - hint: 'Default: false. Minimize or close Chimeverse window.' + hint: 'Default: false. Minimize or close Converse Desktop window.' }, preserveWindowSize: { default: true, diff --git a/app/views/login/page.html b/app/views/login/page.html index 859f2a0..e7e0525 100644 --- a/app/views/login/page.html +++ b/app/views/login/page.html @@ -1,5 +1,5 @@
- +