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

Update converse.js and electron

This commit is contained in:
Keith Maika 2022-01-04 19:34:28 -05:00
parent 4c6ce2e905
commit e2bcd80222
No known key found for this signature in database
GPG Key ID: F71740E8722C75F1
7 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,3 +2,4 @@ node_modules
.DS_* .DS_*
package-lock.json package-lock.json
dist/ dist/
.idea/

4
app/init.js
View File

@ -7,8 +7,8 @@ angApp.constant('AppInfo', {
APP_HOME: 'https://github.com/conversejs/converse-desktop', APP_HOME: 'https://github.com/conversejs/converse-desktop',
APP_RELEASES_CHECK_URL: 'https://api.github.com/repos/conversejs/converse-desktop/releases', APP_RELEASES_CHECK_URL: 'https://api.github.com/repos/conversejs/converse-desktop/releases',
APP_RELEASES_URL: 'https://github.com/conversejs/converse-desktop/releases', APP_RELEASES_URL: 'https://github.com/conversejs/converse-desktop/releases',
CONVERSE_VERSION: 'v7.0.4', CONVERSE_VERSION: 'v9.0.0',
ELECTRON_VERSION: '11.2.3' ELECTRON_VERSION: '13.6.6'
}); });
module.exports = angApp module.exports = angApp

4
app/views/default/page.html
View File

@ -1,4 +1,5 @@
<div class="page-default" ng-controller="DefaultController"> <div class="page-default" ng-controller="DefaultController">
<converse-root></converse-root>
<div class="chimeverse-branding noselect"> <div class="chimeverse-branding noselect">
<img src="./resources/images/logo.png" srcset="./resources/images/logo@2x.png 2x" alt="" <img src="./resources/images/logo.png" srcset="./resources/images/logo@2x.png 2x" alt=""
class="chimeverse-branding__img" /> class="chimeverse-branding__img" />
@ -18,7 +19,4 @@
</span> </span>
</div> </div>
</div> </div>
<div class="conversejs-adoption">
<div id="conversejs"></div>
</div>
</div> </div>

1
index.html
View File

@ -14,7 +14,6 @@
</head> </head>
<base href="./"> <base href="./">
<body ng-app="app"> <body ng-app="app">
<div class="main-background"></div>
<div class="main-window" ng-controller="AppController" ng-cloak> <div class="main-window" ng-controller="AppController" ng-cloak>
<div ng-show="state == 'default'"> <div ng-show="state == 'default'">
<ng-include src="'./app/views/default/page.html'"></ng-include> <ng-include src="'./app/views/default/page.html'"></ng-include>

4
package.json
View File

@ -23,13 +23,13 @@
"author": "Nick Denry <nick@denry.ru>", "author": "Nick Denry <nick@denry.ru>",
"license": "MPL-2.0", "license": "MPL-2.0",
"devDependencies": { "devDependencies": {
"electron": "11.2.3", "electron": "^13.0.0",
"electron-builder": "^22.9.1", "electron-builder": "^22.9.1",
"electron-packager": "^15.2.0" "electron-packager": "^15.2.0"
}, },
"dependencies": { "dependencies": {
"angular": "^1.7.9", "angular": "^1.7.9",
"converse.js": "7.0.4", "converse.js": "^9.0.0",
"electron-settings": "^4.0.2", "electron-settings": "^4.0.2",
"github-buttons": "^2.8.0", "github-buttons": "^2.8.0",
"keytar": "^7.3.0", "keytar": "^7.3.0",

44
resources/css/app.css
View File

@ -20,39 +20,43 @@ a {
color: #777; color: #777;
} }
.main-background { .main-window {
background: #f8f8f8; background: #f8f8f8;
height: 100%; height: 100%;
left: 0px; left: 0;
position: fixed; position: fixed;
top: 0px; top: 0;
width: 100%; width: 100%;
z-index: -1; z-index: -1;
} }
.conversejs-adoption { .main-window > div {
background: transparent;
pointer-events: none;
position: fixed;
left: 0px;
top: 0px;
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
#conversejs .converse-chatboxes {
pointer-events: none; .conversejs converse-chats.converse-embedded .chat-body {
height: 50%;
flex-grow: 1;
} }
#conversejs .converse-chatboxes > * { .conversejs converse-chats.converse-embedded .chatbox {
pointer-events: auto; width: 100%;
} }
.chat-body { .conversejs converse-chats.converse-embedded .flyout {
overflow: hidden; position: static;
} }
#conversejs.converse-embedded .chatbox { .conversejs .chatbox .bottom-panel .sendXMPPMessage .chat-textarea {
flex-grow: 1 !important; margin-bottom: 0;
flex-shrink: 1 !important; }
.conversejs converse-chats.converse-embedded #controlbox {
padding: 0;
}
.conversejs converse-chats.converse-embedded .chatbox {
margin-left: 0;
} }

8
resources/css/page-default.css
View File

@ -1,9 +1,15 @@
.page-default {
width: 100%;
height: 100%;
}
.chimeverse-branding { .chimeverse-branding {
left: 50%;
position: absolute; position: absolute;
left: 50%;
top: 50%; top: 50%;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
text-align: center; text-align: center;
z-index: -1;
} }
.chimeverse-branding__img { .chimeverse-branding__img {