crt0mega
/
converse-desktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Temporary remove before connect spinner as no stable events atm for this

This commit is contained in:
Nick Denry 2019-04-29 03:42:15 +03:00
parent f611bd1272
commit cf296eb9e9
4 changed files with 4 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
css/spinner.css
View File

@ -1,41 +0,0 @@
.spinner {
margin: 0px auto 0;
width: 70px;
text-align: center;
}
.spinner > div {
width: 10px;
height: 10px;
background-color: #999999;
border-radius: 100%;
display: inline-block;
-webkit-animation: sk-bouncedelay 1.4s infinite ease-in-out both;
animation: sk-bouncedelay 1.4s infinite ease-in-out both;
}
.spinner .bounce1 {
-webkit-animation-delay: -0.64s;
animation-delay: -0.64s;
}
.spinner .bounce2 {
-webkit-animation-delay: -0.32s;
animation-delay: -0.32s;
}
@-webkit-keyframes sk-bouncedelay {
0%, 80%, 100% { -webkit-transform: scale(0) }
40% { -webkit-transform: scale(1.0) }
}
@keyframes sk-bouncedelay {
0%, 80%, 100% {
-webkit-transform: scale(0);
transform: scale(0);
} 40% {
-webkit-transform: scale(1.0);
transform: scale(1.0);
}
}

10
index.html
View File

@ -5,7 +5,6 @@
<title>Chimeverse</title> <title>Chimeverse</title>
<link rel="stylesheet" type="text/css" media="screen" href="node_modules/converse.js/css/converse.css"> <link rel="stylesheet" type="text/css" media="screen" href="node_modules/converse.js/css/converse.css">
<link rel="stylesheet" type="text/css" href="node_modules/uikit/dist/css/uikit.min.css"> <link rel="stylesheet" type="text/css" href="node_modules/uikit/dist/css/uikit.min.css">
<link rel="stylesheet" type="text/css" href="css/spinner.css">
<link rel="stylesheet" type="text/css" href="css/app.css"> <link rel="stylesheet" type="text/css" href="css/app.css">
</head> </head>
<body ng-app="app"> <body ng-app="app">
@ -57,14 +56,7 @@
<div class="uk-text-center"> <div class="uk-text-center">
<img src="images/logo.png" srcset="images/logo@2x.png 2x" alt="" /> <img src="images/logo.png" srcset="images/logo@2x.png 2x" alt="" />
<h3 class="uk-heading-small uk-text-muted uk-margin-remove">Chimeverse</h3> <h3 class="uk-heading-small uk-text-muted uk-margin-remove">Chimeverse</h3>
<div ng-show="connectSpinner"> <div class="uk-text-small uk-text-muted">0.0.16</div>
<div class="spinner">
<div class="bounce1"></div>
<div class="bounce2"></div>
<div class="bounce3"></div>
</div>
</div>
<div ng-show="!connectSpinner" class="uk-text-small uk-text-muted">0.0.16</div>
</div> </div>
</div> </div>
</div> </div>

2
main.js
View File

@ -33,7 +33,7 @@ function createWindow () {
menuService.createMenu() menuService.createMenu()
// Open the DevTools. // Open the DevTools.
mainWindow.webContents.openDevTools() // mainWindow.webContents.openDevTools()
// Emitted when the window is closed. // Emitted when the window is closed.
mainWindow.on('closed', function () { mainWindow.on('closed', function () {

13
renderer.js
View File

@ -88,7 +88,7 @@ angApp.factory('SystemService', () => {
}) })
angApp.factory('ChimeVerseService', ($rootScope, SettingsServise, SystemService) => { angApp.factory('ChimeVerseService', (SettingsServise, SystemService) => {
let chimeverseService = {} let chimeverseService = {}
@ -124,9 +124,6 @@ angApp.factory('ChimeVerseService', ($rootScope, SettingsServise, SystemService)
_converse.api.waitUntil('rosterContactsFetched'), _converse.api.waitUntil('rosterContactsFetched'),
_converse.api.waitUntil('chatBoxesFetched') _converse.api.waitUntil('chatBoxesFetched')
]).then(() => { ]).then(() => {
_converse.once('contactPresenceChanged', (data) => {
$rootScope.$broadcast('ChimeVerseService:connected')
})
_converse.api.listen.on('logout', () => { _converse.api.listen.on('logout', () => {
chimeverseService.logout() chimeverseService.logout()
}) })
@ -163,23 +160,17 @@ angApp.factory('ChimeVerseService', ($rootScope, SettingsServise, SystemService)
}) })
angApp.controller('AppController', function ($scope, $rootScope, ChimeVerseService) { angApp.controller('AppController', function ($scope, ChimeVerseService) {
const { ipcRenderer } = require('electron'); const { ipcRenderer } = require('electron');
$scope.showLoginForm = false $scope.showLoginForm = false
$scope.connectSpinner = true
ipcRenderer.on('force-logout-event', () => { ipcRenderer.on('force-logout-event', () => {
ChimeVerseService.logout() ChimeVerseService.logout()
ipcRenderer.getCurrentWindow().reload() ipcRenderer.getCurrentWindow().reload()
}) })
$rootScope.$on('ChimeVerseService:connected', function () {
$scope.connectSpinner = false
$scope.$apply()
})
$scope.addAccountAction = () => { $scope.addAccountAction = () => {
ChimeVerseService.settings.addCredentials($scope.bosh, $scope.login, $scope.password) ChimeVerseService.settings.addCredentials($scope.bosh, $scope.login, $scope.password)
$scope.showLoginForm = false $scope.showLoginForm = false