Set new project name
This commit is contained in:
parent
71b0fc69ff
commit
6cde106134
|
@ -1,6 +1,6 @@
|
||||||
let angApp = require(__dirname+'/../init')
|
let angApp = require(__dirname+'/../init')
|
||||||
|
|
||||||
angApp.controller('LoginController', function($scope, ChimeVerseService, CredentialsServise) {
|
angApp.controller('LoginController', function($scope, DesktopService, CredentialsServise) {
|
||||||
|
|
||||||
$scope.help = {}
|
$scope.help = {}
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@ angApp.controller('LoginController', function($scope, ChimeVerseService, Credent
|
||||||
$scope.credentials.login,
|
$scope.credentials.login,
|
||||||
$scope.credentials.password
|
$scope.credentials.password
|
||||||
)
|
)
|
||||||
ChimeVerseService.getCredentialsAndLogin()
|
DesktopService.getCredentialsAndLogin()
|
||||||
$scope.accountForm.$setPristine()
|
$scope.accountForm.$setPristine()
|
||||||
$scope.accountForm.$setUntouched()
|
$scope.accountForm.$setUntouched()
|
||||||
$scope.credentials = {}
|
$scope.credentials = {}
|
||||||
|
|
|
@ -1,24 +1,24 @@
|
||||||
let angApp = require(__dirname + '/../init')
|
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,
|
$window, $timeout, CredentialsServise, SystemService, AppStateService,
|
||||||
SettingsService, XmppHelperService
|
SettingsService, XmppHelperService
|
||||||
) => {
|
) => {
|
||||||
|
|
||||||
let chimeverseService = {}
|
let desktopService = {}
|
||||||
|
|
||||||
chimeverseService._notifyMessage = () => {
|
desktopService._notifyMessage = () => {
|
||||||
SystemService.playAudio()
|
SystemService.playAudio()
|
||||||
SystemService.showEnvelope()
|
SystemService.showEnvelope()
|
||||||
}
|
}
|
||||||
|
|
||||||
chimeverseService._hideNotifyMessage = () => {
|
desktopService._hideNotifyMessage = () => {
|
||||||
SystemService.hideEnvelope()
|
SystemService.hideEnvelope()
|
||||||
}
|
}
|
||||||
|
|
||||||
chimeverseService.logout = () => {
|
desktopService.logout = () => {
|
||||||
let credentials = CredentialsServise.getCredentials()
|
let credentials = CredentialsServise.getCredentials()
|
||||||
credentials.then((result) => {
|
credentials.then((result) => {
|
||||||
let remove = CredentialsServise.removeCredentials(result.login)
|
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
|
AppStateService.set(AppStateService.APP_STATE_DEFAULT) // Always set to default state before init
|
||||||
chimeversePlugin.register(login)
|
desktopPlugin.register(login)
|
||||||
let lang = navigator.language
|
let lang = navigator.language
|
||||||
let allowBookmarks = SettingsService.get('allowBookmarks')
|
let allowBookmarks = SettingsService.get('allowBookmarks')
|
||||||
let omemoDefault = SettingsService.get('omemoDefault')
|
let omemoDefault = SettingsService.get('omemoDefault')
|
||||||
let xmppResource = XmppHelperService.getResourceFromJid(login)
|
let xmppResource = XmppHelperService.getResourceFromJid(login)
|
||||||
if (!xmppResource) {
|
if (!xmppResource) {
|
||||||
xmppResource = '.' + (Math.random().toString(36)+'00000000000000000').slice(2, 7) // Generate 5 char unique str
|
xmppResource = '.' + (Math.random().toString(36)+'00000000000000000').slice(2, 7) // Generate 5 char unique str
|
||||||
login = login + '/Chimeverse'+xmppResource
|
login = login + '/converseDesktop'+xmppResource
|
||||||
}
|
}
|
||||||
let conversejsParams = {
|
let conversejsParams = {
|
||||||
assets_path: './node_modules/converse.js/dist/',
|
assets_path: './node_modules/converse.js/dist/',
|
||||||
|
@ -53,7 +53,7 @@ angApp.factory('ChimeVerseService', (
|
||||||
play_sounds: false,
|
play_sounds: false,
|
||||||
priority: 50,
|
priority: 50,
|
||||||
view_mode: 'embedded',
|
view_mode: 'embedded',
|
||||||
whitelisted_plugins: ['chimeVerse'],
|
whitelisted_plugins: ['converseDesktop'],
|
||||||
}
|
}
|
||||||
if (connectionManager.startsWith('ws')) {
|
if (connectionManager.startsWith('ws')) {
|
||||||
conversejsParams.websocket_url = connectionManager
|
conversejsParams.websocket_url = connectionManager
|
||||||
|
@ -65,32 +65,32 @@ angApp.factory('ChimeVerseService', (
|
||||||
}, 50)
|
}, 50)
|
||||||
}
|
}
|
||||||
|
|
||||||
chimeverseService.getCredentialsAndLogin = () => {
|
desktopService.getCredentialsAndLogin = () => {
|
||||||
let credentials = CredentialsServise.getCredentials()
|
let credentials = CredentialsServise.getCredentials()
|
||||||
credentials.then((result) => {
|
credentials.then((result) => {
|
||||||
chimeverseService.initConverse(result.connectionManager, result.login, result.password)
|
desktopService.initConverse(result.connectionManager, result.login, result.password)
|
||||||
}, (error) => {
|
}, (error) => {
|
||||||
AppStateService.set(AppStateService.APP_STATE_LOGIN)
|
AppStateService.set(AppStateService.APP_STATE_LOGIN)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
chimeverseService.chatToOpen = null
|
desktopService.chatToOpen = null
|
||||||
|
|
||||||
$window.document.addEventListener('conversejs-logout', function (e) {
|
$window.document.addEventListener('conversejs-logout', function (e) {
|
||||||
chimeverseService.logout()
|
desktopService.logout()
|
||||||
})
|
})
|
||||||
|
|
||||||
$window.document.addEventListener('conversejs-unread', function (e) {
|
$window.document.addEventListener('conversejs-unread', function (e) {
|
||||||
let sender = e.detail
|
let sender = e.detail
|
||||||
chimeverseService.chatToOpen = sender
|
desktopService.chatToOpen = sender
|
||||||
chimeverseService._notifyMessage()
|
desktopService._notifyMessage()
|
||||||
})
|
})
|
||||||
|
|
||||||
$window.document.addEventListener('conversejs-no-unread', function (e) {
|
$window.document.addEventListener('conversejs-no-unread', function (e) {
|
||||||
chimeverseService._hideNotifyMessage()
|
desktopService._hideNotifyMessage()
|
||||||
})
|
})
|
||||||
|
|
||||||
return chimeverseService
|
return desktopService
|
||||||
|
|
||||||
})
|
})
|
|
@ -7,16 +7,16 @@ angApp.factory('SettingsService', () => {
|
||||||
const electronSettings = require('electron-settings')
|
const electronSettings = require('electron-settings')
|
||||||
|
|
||||||
const settings = {
|
const settings = {
|
||||||
chimeverse: {
|
converseDesktop: {
|
||||||
runMinimized: {
|
runMinimized: {
|
||||||
default: false,
|
default: false,
|
||||||
title: 'Run minimized',
|
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: {
|
minimizeOnClose: {
|
||||||
default: false,
|
default: false,
|
||||||
title: 'Minimize on close',
|
title: 'Minimize on close',
|
||||||
hint: 'Default: false. Minimize or close Chimeverse window.'
|
hint: 'Default: false. Minimize or close Converse Desktop window.'
|
||||||
},
|
},
|
||||||
preserveWindowSize: {
|
preserveWindowSize: {
|
||||||
default: true,
|
default: true,
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<div class="login-form">
|
<div class="login-form">
|
||||||
<h3 class="login-form__title">Welcome to Chimeverse</h3>
|
<h3 class="login-form__title">Welcome to Converse Desktop</h3>
|
||||||
<div class="login-form__description">Jabber/XMPP client based on Converse.js and Electron</div>
|
<div class="login-form__description">Jabber/XMPP client based on Converse.js and Electron</div>
|
||||||
<div class="login-form__card">
|
<div class="login-form__card">
|
||||||
<form name="accountForm" ng-controller="LoginController">
|
<form name="accountForm" ng-controller="LoginController">
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<div class="settings-page" ng-controller="SettingsController">
|
<div class="settings-page" ng-controller="SettingsController">
|
||||||
<form name="settignsForm">
|
<form name="settignsForm">
|
||||||
<h3 class="settings-page__title">Chimeverse settings</h3>
|
<h3 class="settings-page__title">Chimeverse settings</h3>
|
||||||
<div class="form-item" ng-repeat="(key, item) in settings.chimeverse">
|
<div class="form-item" ng-repeat="(key, item) in settings.converseDesktop">
|
||||||
<label>
|
<label>
|
||||||
<input type="checkbox" name="{{key}}" ng-model="item.value" /> {{item.title}}
|
<input type="checkbox" name="{{key}}" ng-model="item.value" /> {{item.title}}
|
||||||
</label>
|
</label>
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<title>Chimeverse</title>
|
<title>Converse Desktop</title>
|
||||||
<link rel="stylesheet" type="text/css" media="screen" href="node_modules/open-iconic/font/css/open-iconic.css">
|
<link rel="stylesheet" type="text/css" media="screen" href="node_modules/open-iconic/font/css/open-iconic.css">
|
||||||
<link rel="stylesheet" type="text/css" media="screen" href="node_modules/converse.js/dist/converse.min.css">
|
<link rel="stylesheet" type="text/css" media="screen" href="node_modules/converse.js/dist/converse.min.css">
|
||||||
<link rel="stylesheet" type="text/css" href="resources/css/app.css">
|
<link rel="stylesheet" type="text/css" href="resources/css/app.css">
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
let chimeversePlugin = {}
|
let desktopPlugin = {}
|
||||||
|
|
||||||
chimeversePlugin.register = (login) => {
|
desktopPlugin.register = (login) => {
|
||||||
converse.plugins.add('chimeVerse', {
|
converse.plugins.add('converseDesktop', {
|
||||||
initialize: (event) => {
|
initialize: (event) => {
|
||||||
let _converse = event.properties._converse
|
let _converse = event.properties._converse
|
||||||
let Strophe = converse.env.Strophe
|
let Strophe = converse.env.Strophe
|
||||||
|
@ -64,4 +64,4 @@ chimeversePlugin.register = (login) => {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
module.exports = chimeversePlugin
|
module.exports = desktopPlugin
|
4
main.js
4
main.js
|
@ -17,7 +17,7 @@ function initApp() {
|
||||||
createWindow()
|
createWindow()
|
||||||
// Set Windows platform notifications
|
// Set Windows platform notifications
|
||||||
if (isWin) {
|
if (isWin) {
|
||||||
app.setAppUserModelId("com.denry.chimeverse")
|
app.setAppUserModelId("com.denry.converseDesktop")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -67,7 +67,7 @@ function createWindow () {
|
||||||
menuService.createMenu()
|
menuService.createMenu()
|
||||||
|
|
||||||
// Open the DevTools.
|
// Open the DevTools.
|
||||||
// mainWindow.webContents.openDevTools()
|
mainWindow.webContents.openDevTools()
|
||||||
|
|
||||||
// Before close
|
// Before close
|
||||||
let minimizeOnClose = settingsService.get('minimizeOnClose')
|
let minimizeOnClose = settingsService.get('minimizeOnClose')
|
||||||
|
|
|
@ -12,7 +12,7 @@ menuService.createMenu = () => {
|
||||||
const isMac = process.platform === 'darwin'
|
const isMac = process.platform === 'darwin'
|
||||||
|
|
||||||
const about = {
|
const about = {
|
||||||
label: 'About Chimeverse',
|
label: 'About Converse Desktop',
|
||||||
click: () => {
|
click: () => {
|
||||||
// @see https://github.com/electron/electron/issues/16558#issuecomment-484460276
|
// @see https://github.com/electron/electron/issues/16558#issuecomment-484460276
|
||||||
// let activeWindow = BrowserWindow.getFocusedWindow()
|
// let activeWindow = BrowserWindow.getFocusedWindow()
|
||||||
|
@ -23,7 +23,7 @@ menuService.createMenu = () => {
|
||||||
}
|
}
|
||||||
|
|
||||||
const application = {
|
const application = {
|
||||||
label: 'Chimeverse',
|
label: 'Converse Desktop',
|
||||||
submenu: [
|
submenu: [
|
||||||
... isMac ? [about] : [],
|
... isMac ? [about] : [],
|
||||||
{
|
{
|
||||||
|
|
|
@ -29,7 +29,7 @@ trayService.initTray = (window) => {
|
||||||
trayServiceWindow = window
|
trayServiceWindow = window
|
||||||
let iconPath = getTrayServiceIcon()
|
let iconPath = getTrayServiceIcon()
|
||||||
tray = new Tray(iconPath)
|
tray = new Tray(iconPath)
|
||||||
tray.setToolTip('Chimeverse')
|
tray.setToolTip('Converse Desktop')
|
||||||
tray.on('click', function() {
|
tray.on('click', function() {
|
||||||
// Sent open-related-chat event only on click
|
// Sent open-related-chat event only on click
|
||||||
let activeWindow = BrowserWindow.getAllWindows()[0]
|
let activeWindow = BrowserWindow.getAllWindows()[0]
|
||||||
|
|
10
renderer.js
10
renderer.js
|
@ -9,20 +9,20 @@ require('./app/services/settings-service')
|
||||||
require('./app/services/system-service')
|
require('./app/services/system-service')
|
||||||
require('./app/services/app-state-service')
|
require('./app/services/app-state-service')
|
||||||
require('./app/services/xmpp-helper-service')
|
require('./app/services/xmpp-helper-service')
|
||||||
require('./app/services/chimeverse-service')
|
require('./app/services/desktop-service')
|
||||||
require('./app/controllers/settings-controller')
|
require('./app/controllers/settings-controller')
|
||||||
require('./app/controllers/login-controller')
|
require('./app/controllers/login-controller')
|
||||||
require('./app/controllers/default-controller')
|
require('./app/controllers/default-controller')
|
||||||
require('./app/controllers/about-controller')
|
require('./app/controllers/about-controller')
|
||||||
require('./app/controllers/footer-controller')
|
require('./app/controllers/footer-controller')
|
||||||
|
|
||||||
angApp.controller('AppController', function ($scope, $timeout, ChimeVerseService, SettingsService, AppStateService) {
|
angApp.controller('AppController', function ($scope, $timeout, DesktopService, SettingsService, AppStateService) {
|
||||||
|
|
||||||
const { ipcRenderer } = require('electron')
|
const { ipcRenderer } = require('electron')
|
||||||
|
|
||||||
// Menu force logout event
|
// Menu force logout event
|
||||||
ipcRenderer.on('force-logout-event', () => {
|
ipcRenderer.on('force-logout-event', () => {
|
||||||
ChimeVerseService.logout()
|
DesktopService.logout()
|
||||||
let event = new CustomEvent("converse-force-logout") // Dispatch to the plugin
|
let event = new CustomEvent("converse-force-logout") // Dispatch to the plugin
|
||||||
document.dispatchEvent(event)
|
document.dispatchEvent(event)
|
||||||
})
|
})
|
||||||
|
@ -39,7 +39,7 @@ angApp.controller('AppController', function ($scope, $timeout, ChimeVerseService
|
||||||
|
|
||||||
// Menu about event
|
// Menu about event
|
||||||
ipcRenderer.on('open-unread-chat', () => {
|
ipcRenderer.on('open-unread-chat', () => {
|
||||||
let event = new CustomEvent('conversejs-open-chat', {detail: ChimeVerseService.chatToOpen})
|
let event = new CustomEvent('conversejs-open-chat', {detail: DesktopService.chatToOpen})
|
||||||
document.dispatchEvent(event)
|
document.dispatchEvent(event)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -59,6 +59,6 @@ angApp.controller('AppController', function ($scope, $timeout, ChimeVerseService
|
||||||
|
|
||||||
SettingsService.initDefaults()
|
SettingsService.initDefaults()
|
||||||
|
|
||||||
ChimeVerseService.getCredentialsAndLogin()
|
DesktopService.getCredentialsAndLogin()
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in New Issue