diff --git a/app/controllers/about-controller.js b/app/controllers/about-controller.js
index 72366bb..8d1fb7d 100644
--- a/app/controllers/about-controller.js
+++ b/app/controllers/about-controller.js
@@ -1,4 +1,4 @@
-let angApp = require(__dirname+'/../init')
+const angApp = (await import('../init.js')).default;
angApp.controller('AboutController', function($scope, AppStateService, AppInfo) {
diff --git a/app/controllers/default-controller.js b/app/controllers/default-controller.js
index f2ebe99..1f3b695 100644
--- a/app/controllers/default-controller.js
+++ b/app/controllers/default-controller.js
@@ -1,4 +1,4 @@
-let angApp = require(__dirname+'/../init')
+const angApp = (await import('../init.js')).default;
angApp.controller('DefaultController', function($scope, $timeout, $http, AppInfo) {
diff --git a/app/controllers/footer-controller.js b/app/controllers/footer-controller.js
index 6747c82..1b291c2 100644
--- a/app/controllers/footer-controller.js
+++ b/app/controllers/footer-controller.js
@@ -1,4 +1,4 @@
-let angApp = require(__dirname+'/../init')
+const angApp = (await import('../init.js')).default;
angApp.controller('FooterController', function($scope, AppInfo) {
diff --git a/app/controllers/login-controller.js b/app/controllers/login-controller.js
index c364351..a846229 100644
--- a/app/controllers/login-controller.js
+++ b/app/controllers/login-controller.js
@@ -1,4 +1,4 @@
-let angApp = require(__dirname+'/../init')
+const angApp = (await import('../init.js')).default;
angApp.controller('LoginController', function($scope, DesktopService, CredentialsService) {
diff --git a/app/controllers/settings-controller.js b/app/controllers/settings-controller.js
index be5154f..7896f65 100644
--- a/app/controllers/settings-controller.js
+++ b/app/controllers/settings-controller.js
@@ -1,4 +1,4 @@
-let angApp = require(__dirname+'/../init')
+const angApp = (await import('../init.js')).default;
angApp.controller('SettingsController', function ($scope, $rootScope, AppStateService, SettingsService) {
diff --git a/app/init.js b/app/init.js
index 6b654f1..06d647b 100644
--- a/app/init.js
+++ b/app/init.js
@@ -1,6 +1,4 @@
-const angular = require('angular')
-let angApp = angular.module('app', [])
-
+const angApp = angular.module('app', [])
angApp.constant('AppInfo', {
APP_NAME: 'Converse Desktop',
APP_VERSION: 'v0.1.0',
@@ -11,4 +9,4 @@ angApp.constant('AppInfo', {
ELECTRON_VERSION: '13.6.6'
});
-module.exports = angApp
+export default angApp;
diff --git a/app/services/app-state-service.js b/app/services/app-state-service.js
index 9c4ba66..cd61c89 100644
--- a/app/services/app-state-service.js
+++ b/app/services/app-state-service.js
@@ -1,4 +1,4 @@
-let angApp = require(__dirname + '/../init')
+const angApp = (await import('../init.js')).default;
angApp.factory('AppStateService', [ '$rootScope', ($rootScope) => {
diff --git a/app/services/credentials-service.js b/app/services/credentials-service.js
index cd6831f..d7e8d59 100644
--- a/app/services/credentials-service.js
+++ b/app/services/credentials-service.js
@@ -1,26 +1,20 @@
-let angApp = require(__dirname+'/../init')
+const angApp = (await import('../init.js')).default;
angApp.factory('CredentialsService', () => {
-
- const keytar = require('keytar')
- const settings = require('electron-settings')
-
let credentialsService = {}
-
credentialsService.getCredentials = () => {
let credentials = {}
- credentials.login = settings.getSync('login')
+ credentials.login = api.electronSettings.getSync('login')
let promise = new Promise((resolve, reject) => {
if (credentials.login) {
- credentials.connectionManager = settings.getSync('connectionManager')
+ credentials.connectionManager = api.electronSettings.getSync('connectionManager')
credentials.xmppService = credentials.login.split('@').pop()
let password = keytar.getPassword(credentials.xmppService, credentials.login)
password.then((result) => {
credentials.password = result
resolve(credentials)
})
- }
- else {
+ } else {
reject(Error('No login stored'))
}
})
@@ -29,18 +23,18 @@ angApp.factory('CredentialsService', () => {
credentialsService.addCredentials = (connectionManager, login, password) => {
let xmppService = login.split('@').pop()
- settings.setSync('connectionManager', connectionManager)
- settings.setSync('login', login)
+ api.electronSettings.setSync('connectionManager', connectionManager)
+ api.electronSettings.setSync('login', login)
keytar.setPassword(xmppService, login, password)
}
credentialsService.removeCredentials = (login) => {
let xmppService = login.split('@').pop()
- passwordDelete = keytar.deletePassword(xmppService, login)
+ keytar.deletePassword(xmppService, login)
let promise = new Promise((resolve, reject) => {
passwordDelete.then((result) => {
- settings.unsetSync('login')
- settings.unsetSync('connectionManager')
+ api.electronSettings.unsetSync('login')
+ api.electronSettings.unsetSync('connectionManager')
resolve()
}, (error) => {
reject(error)
@@ -51,4 +45,3 @@ angApp.factory('CredentialsService', () => {
return credentialsService
})
-
diff --git a/app/services/desktop-service.js b/app/services/desktop-service.js
index ebaec6a..f4f1894 100644
--- a/app/services/desktop-service.js
+++ b/app/services/desktop-service.js
@@ -1,6 +1,5 @@
-let angApp = require(__dirname + '/../init')
-
-const desktopPlugin = require(__dirname +'/../../libs/converse.js/converse-desktop/desktop-plugin')
+const angApp = (await import('../init.js')).default;
+const desktopPlugin = (await import('../../libs/converse.js/converse-desktop/desktop-plugin.js')).desktopPlugin;
angApp.factory('DesktopService', (
$window, $timeout, CredentialsService, SystemService, AppStateService,
diff --git a/app/services/settings-service.js b/app/services/settings-service.js
index 0d19ac6..2756971 100644
--- a/app/services/settings-service.js
+++ b/app/services/settings-service.js
@@ -1,11 +1,8 @@
-let angApp = require(__dirname+'/../init')
+const angApp = (await import('../init.js')).default;
angApp.factory('SettingsService', () => {
let settingsService = {}
-
- const electronSettings = require('electron-settings')
-
const settings = {
converseDesktop: {
runMinimized: {
@@ -44,7 +41,7 @@ angApp.factory('SettingsService', () => {
}
const iterateSettings = (callback, settingsObj) => {
- if(typeof settingsObj === "undefined") {
+ if (typeof settingsObj === "undefined") {
settingsObj = settings
}
angular.forEach(settingsObj, (value, key) => {
@@ -59,23 +56,23 @@ angApp.factory('SettingsService', () => {
// Callback
// TODO: replace with promise?
const saveDefault = (key, value) => {
- if (!electronSettings.hasSync(key)) {
- electronSettings.setSync(key, value)
+ if (!api.electronSettings.hasSync(key)) {
+ api.electronSettings.setSync(key, value)
}
}
// Callback
const save = (key, defaultValue, settingsList) => {
let value = settingsList[key]['value']
- electronSettings.setSync(key, value)
+ api.electronSettings.setSync(key, value)
}
// Callback
const loadAll = (key, defaultValue, settingsList) => {
- if (!electronSettings.hasSync(key)) {
+ if (!api.electronSettings.hasSync(key)) {
settingsList[key]['value'] = defaultValue
}
- settingsList[key]['value'] = electronSettings.getSync(key)
+ settingsList[key]['value'] = api.electronSettings.getSync(key)
}
/**
@@ -84,14 +81,14 @@ angApp.factory('SettingsService', () => {
settingsService.initDefaults = () => {
iterateSettings(saveDefault)
// Logout for versions with BOSH only
- if (electronSettings.hasSync('bosh')) {
- electronSettings.unsetSync('bosh')
- electronSettings.unsetSync('login')
+ if (api.electronSettings.hasSync('bosh')) {
+ api.electronSettings.unsetSync('bosh')
+ api.electronSettings.unsetSync('login')
}
}
settingsService.get = (key) => {
- return electronSettings.getSync(key)
+ return api.electronSettings.getSync(key)
}
settingsService.loadAll = () => {
diff --git a/app/services/system-service.js b/app/services/system-service.js
index 98f2af1..bb7759a 100644
--- a/app/services/system-service.js
+++ b/app/services/system-service.js
@@ -1,9 +1,6 @@
-let angApp = require(__dirname + '/../init')
+const angApp = (await import('../init.js')).default;
angApp.factory('SystemService', () => {
-
- const remote = require('electron').remote
-
let systemService = {}
systemService.playAudio = () => {
@@ -12,15 +9,15 @@ angApp.factory('SystemService', () => {
}
systemService.showEnvelope = () => {
- remote.require('./main').trayService.showEnvelope()
+ api.trayService.showEnvelope()
}
systemService.hideEnvelope = () => {
- remote.require('./main').trayService.hideEnvelope()
+ api.trayService.hideEnvelope()
}
systemService.reloadWindow = () => {
- remote.getCurrentWindow().reload()
+ api.reload()
}
return systemService
diff --git a/app/services/xmpp-helper-service.js b/app/services/xmpp-helper-service.js
index 74408ab..de0bb9d 100644
--- a/app/services/xmpp-helper-service.js
+++ b/app/services/xmpp-helper-service.js
@@ -1,4 +1,4 @@
-let angApp = require(__dirname + '/../init')
+const angApp = (await import('../init.js')).default;
angApp.factory('XmppHelperService', [() => {
diff --git a/index.html b/index.html
index 436a80c..eaef17f 100644
--- a/index.html
+++ b/index.html
@@ -11,9 +11,15 @@
+
+
+
+
+
+