mirror of
https://github.com/zulip/zulip-desktop.git
synced 2025-11-01 04:23:30 +00:00
Refactor ServerManagerView and setup layout for PreferenceView.
This commit is contained in:
committed by
akashnimare
parent
6b29139805
commit
3fe23e84b3
49
app/renderer/css/preference.css
Normal file
49
app/renderer/css/preference.css
Normal file
@@ -0,0 +1,49 @@
|
||||
html, body {
|
||||
height: 100%;
|
||||
margin: 0;
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
#content {
|
||||
display: flex;
|
||||
height: 100%;
|
||||
font-family: sans-serif;
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
#sidebar {
|
||||
width: 80px;
|
||||
padding: 40px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
#tabs-container {
|
||||
padding: 20px 0;
|
||||
}
|
||||
|
||||
.tab {
|
||||
padding: 5px 0;
|
||||
color: #999;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.tab.active {
|
||||
color: #464e5a;
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
.tab.active::before {
|
||||
color: #464e5a;
|
||||
cursor: default;
|
||||
}
|
||||
#settings-header {
|
||||
font-size: 24px;
|
||||
color: #5c6166;
|
||||
}
|
||||
|
||||
.settings-container {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
html, body {
|
||||
height: 100%;
|
||||
margin: 0;
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
#content {
|
||||
@@ -35,25 +36,24 @@ html, body {
|
||||
.action-button i {
|
||||
color: #6c8592;
|
||||
font-size: 28px;
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
.action-button:hover i {
|
||||
color: #98a9b3;
|
||||
}
|
||||
|
||||
#servers-container {
|
||||
#tabs-container {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.server-button {
|
||||
.tab {
|
||||
position: relative;
|
||||
margin: 5px 0;
|
||||
}
|
||||
|
||||
.server-button.active::before{
|
||||
.tab.active::before{
|
||||
content: "";
|
||||
background: #fff;
|
||||
border-radius: 0 3px 3px 0;
|
||||
@@ -64,7 +64,7 @@ html, body {
|
||||
top: 5px;
|
||||
}
|
||||
|
||||
.server-button .server-name{
|
||||
.tab .server-tab{
|
||||
background: #a4d3c4;
|
||||
background-size: 100%;
|
||||
border-radius: 4px;
|
||||
@@ -74,7 +74,7 @@ html, body {
|
||||
margin: 5px 0;
|
||||
z-index: 11;
|
||||
line-height: 44px;
|
||||
font-size: 24px;
|
||||
font-size: 32px;
|
||||
font-family: sans-serif;
|
||||
color: #194a2b;
|
||||
text-align: center;
|
||||
@@ -82,11 +82,20 @@ html, body {
|
||||
opacity: 0.6;
|
||||
}
|
||||
|
||||
.server-button .server-name:hover{
|
||||
.tab .server-tab:hover{
|
||||
opacity: 0.8;
|
||||
}
|
||||
|
||||
.server-button.active .server-name{
|
||||
.tab .settings-tab{
|
||||
background: #eee;
|
||||
}
|
||||
|
||||
.tab .settings-tab i{
|
||||
font-size: 28px;
|
||||
line-height: 44px;
|
||||
}
|
||||
|
||||
.tab.active .server-tab{
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ const path = require("path");
|
||||
const DomainUtil = require(path.resolve(('app/renderer/js/utils/domain-util.js')));
|
||||
class ServerManagerView {
|
||||
constructor() {
|
||||
this.$serversContainer = document.getElementById('servers-container');
|
||||
this.$tabsContainer = document.getElementById('tabs-container');
|
||||
|
||||
const $actionsContainer = document.getElementById('actions-container');
|
||||
this.$addServerButton = $actionsContainer.querySelector('#add-action');
|
||||
@@ -12,46 +12,38 @@ class ServerManagerView {
|
||||
this.$content = document.getElementById('content');
|
||||
|
||||
this.isLoading = false;
|
||||
this.settingsTabIndex = -1;
|
||||
}
|
||||
|
||||
init() {
|
||||
this.domainUtil = new DomainUtil();
|
||||
this.initServers();
|
||||
this.initTabs();
|
||||
this.initActions();
|
||||
}
|
||||
|
||||
initServers() {
|
||||
initTabs() {
|
||||
const servers = this.domainUtil.getDomains();
|
||||
for (let server of servers) {
|
||||
this.initServer(server);
|
||||
this.initTab(server);
|
||||
}
|
||||
|
||||
const $firstServerButton = this.$serversContainer.firstChild;
|
||||
$firstServerButton.classList.add('active');
|
||||
this.$activeServerButton = $firstServerButton;
|
||||
this.initWebView($firstServerButton.getAttribute('domain'));
|
||||
|
||||
this.activateTab(0);
|
||||
}
|
||||
|
||||
initServer(server) {
|
||||
initTab(tab) {
|
||||
const {
|
||||
alias,
|
||||
url
|
||||
} = server;
|
||||
const icon = server.icon || 'https://chat.zulip.org/static/images/logo/zulip-icon-128x128.271d0f6a0ca2.png';
|
||||
const serverButtonTemplate = `
|
||||
<div class="server-button" domain="${url}">
|
||||
<div class="server-name" style="background-image: url(${icon});"></div>
|
||||
} = tab;
|
||||
const icon = tab.icon || 'https://chat.zulip.org/static/images/logo/zulip-icon-128x128.271d0f6a0ca2.png';
|
||||
const tabTemplate = tab.template || `
|
||||
<div class="tab" domain="${url}">
|
||||
<div class="server-tab" style="background-image: url(${icon});"></div>
|
||||
</div>`;
|
||||
const $serverButton = this.__insert_node(serverButtonTemplate);
|
||||
this.$serversContainer.appendChild($serverButton);
|
||||
$serverButton.addEventListener('click', () => {
|
||||
if (this.isLoading || this.$activeServerButton == $serverButton) return;
|
||||
|
||||
this.$activeServerButton.classList.remove('active');
|
||||
$serverButton.classList.add('active');
|
||||
const url = $serverButton.getAttribute('domain');
|
||||
this.$activeServerButton = $serverButton;
|
||||
this.startLoading(url);
|
||||
});
|
||||
const $tab = this.__insert_node(tabTemplate);
|
||||
const index = this.$tabsContainer.childNodes.length;
|
||||
this.$tabsContainer.appendChild($tab);
|
||||
$tab.addEventListener('click', this.activateTab.bind(this, index));
|
||||
}
|
||||
|
||||
initWebView(url) {
|
||||
@@ -79,18 +71,62 @@ class ServerManagerView {
|
||||
endLoading() {
|
||||
this.isLoading = false;
|
||||
this.$webView.classList.remove('loading');
|
||||
this.$webView.openDevTools();
|
||||
}
|
||||
|
||||
initActions() {
|
||||
|
||||
this.$addServerButton.addEventListener('click', this.openSettings.bind(this));
|
||||
}
|
||||
|
||||
addServer() {
|
||||
|
||||
|
||||
}
|
||||
|
||||
openSettings() {
|
||||
if (this.settingsTabIndex != -1) {
|
||||
this.activateTab(this.settingsTabIndex);
|
||||
return;
|
||||
}
|
||||
const url = 'file:///' + path.resolve(('app/renderer/preference.html'));
|
||||
console.log(url);
|
||||
const settingsTabTemplate = `
|
||||
<div class="tab" domain="${url}">
|
||||
<div class="server-tab settings-tab">
|
||||
<i class="material-icons md-48">settings</i>
|
||||
</div>
|
||||
</div>`;
|
||||
this.initTab({
|
||||
alias: 'Settings',
|
||||
url: url,
|
||||
template: settingsTabTemplate
|
||||
});
|
||||
|
||||
this.settingsTabIndex = this.$tabsContainer.childNodes.length - 1;
|
||||
this.activateTab(this.settingsTabIndex);
|
||||
}
|
||||
|
||||
activateTab(index) {
|
||||
if (this.isLoading) return;
|
||||
|
||||
const $tab = this.$tabsContainer.childNodes[index];
|
||||
|
||||
if (this.$activeTab) {
|
||||
if (this.$activeTab == $tab) {
|
||||
return;
|
||||
} else {
|
||||
this.$activeTab.classList.remove('active');
|
||||
}
|
||||
}
|
||||
|
||||
$tab.classList.add('active');
|
||||
this.$activeTab = $tab;
|
||||
|
||||
const domain = $tab.getAttribute('domain');
|
||||
if (this.$webView){
|
||||
this.startLoading(domain);
|
||||
} else {
|
||||
this.initWebView(domain);
|
||||
}
|
||||
}
|
||||
|
||||
__insert_node(html) {
|
||||
|
||||
0
app/renderer/js/preference.js
Normal file
0
app/renderer/js/preference.js
Normal file
@@ -10,7 +10,7 @@
|
||||
<body>
|
||||
<div id="content">
|
||||
<div id="sidebar">
|
||||
<div id="servers-container"></div>
|
||||
<div id="tabs-container"></div>
|
||||
<div id="actions-container">
|
||||
<div class="action-button" id="add-action">
|
||||
<i class="material-icons md-48">add_circle</i>
|
||||
|
||||
23
app/renderer/preference.html
Normal file
23
app/renderer/preference.html
Normal file
@@ -0,0 +1,23 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" class="responsive desktop">
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<meta name="viewport" content="width=device-width">
|
||||
<title>Zulip - Settings</title>
|
||||
<link rel="stylesheet" href="css/preference.css" type="text/css" media="screen">
|
||||
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
|
||||
</head>
|
||||
<body>
|
||||
<div id="content">
|
||||
<div id="sidebar">
|
||||
<div id="settings-header">Settings</div>
|
||||
<div id="tabs-container">
|
||||
<div class="tab" id="general-settings">General</div>
|
||||
<div class="tab active" id="server-settings">Servers</div>
|
||||
<div class="tab" id="about-settings">About</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
<script src="js/preference.js"></script>
|
||||
</html>
|
||||
Reference in New Issue
Block a user