-
-
this.navigate('login')} outlined style="border-top:0; border-bottom:0;">${translate("login.login")}
-
this.navigate('create-account')} outlined style="border-top:0; border-bottom:0;">${translate("login.createaccount")}
+
+ this.navigate('login')} outlined>${translate("login.login")}
+ this.navigate('create-account')} outlined>${translate("login.createaccount")}
`
}
- back() { }
+ back() {}
- next() { }
+ next() {}
navigate(page) {
this.dispatchEvent(new CustomEvent('navigate', {
diff --git a/core/src/components/settings-view/notifications-view.js b/core/src/components/settings-view/notifications-view.js
index 29fffc28..f8bbb860 100644
--- a/core/src/components/settings-view/notifications-view.js
+++ b/core/src/components/settings-view/notifications-view.js
@@ -1,20 +1,20 @@
import {css, html, LitElement} from 'lit'
import {connect} from 'pwa-helpers'
import {store} from '../../store.js'
+import {allowShowSyncIndicator, removeShowSyncIndicator} from '../../redux/app/app-actions.js'
import {doSetQChatNotificationConfig} from '../../redux/user/user-actions.js'
import {translate} from '../../../translate/index.js'
import isElectron from 'is-electron'
import '@material/mwc-checkbox'
-
class NotificationsView extends connect(store)(LitElement) {
static get properties() {
return {
notificationConfig: { type: Object },
q_chatConfig: { type: Object },
theme: { type: String, reflect: true },
- appNotificationList: {type: Array}
+ appNotificationList: { type: Array }
}
}
@@ -26,8 +26,8 @@ class NotificationsView extends connect(store)(LitElement) {
this.appNotificationList = [] // Fetch the list of apps from local storage
}
- firstUpdated(){
- this.appNotificationList = this.getAppsFromStorage();
+ firstUpdated() {
+ this.appNotificationList = this.getAppsFromStorage()
}
static get styles() {
@@ -54,6 +54,16 @@ class NotificationsView extends connect(store)(LitElement) {
}
}
+ .checkbox-row {
+ position: relative;
+ display: flex;
+ align-items: center;
+ align-content: center;
+ font-family: Montserrat, sans-serif;
+ font-weight: 600;
+ color: var(--black);
+ }
+
.content-box {
border: 1px solid #a1a1a1;
padding: 10px 25px;
@@ -112,82 +122,91 @@ class NotificationsView extends connect(store)(LitElement) {
}
.remove-button {
- font-family: Roboto, sans-serif;
- font-size: 16px;
- color: var(--mdc-theme-primary);
- background-color: transparent;
- padding: 8px 10px;
- border-radius: 5px;
- border: none;
- transition: all 0.3s ease-in-out;
- cursor: pointer;
- }
+ font-family: Roboto, sans-serif;
+ font-size: 16px;
+ color: var(--mdc-theme-primary);
+ background-color: transparent;
+ padding: 8px 10px;
+ border-radius: 5px;
+ border: none;
+ transition: all 0.3s ease-in-out;
+ cursor: pointer;
+ }
`
}
render() {
return html`
-
-
-
-
Q-Chat ${translate("settings.notifications")}
+
+
+
+
Q-Chat ${translate("settings.notifications")}
-
-
this.setQChatNotificationConfig({ type: 'PLAY_SOUND', value: e.target.checked })} ?checked=${this.q_chatConfig.playSound}>
-
+ >
+ ${translate("settings.playsound")}
+
+
-
-
this.setQChatNotificationConfig({ type: 'SHOW_NOTIFICATION', value: e.target.checked })} ?checked=${this.q_chatConfig.showNotification}>
-
+ >
+ ${translate("settings.shownotifications")}
+
-
-
${translate("settings.qappNotification1")}
- ${this.appNotificationList.map((app)=> html`
-
- ${app}
-
-
- `)}
-
-
- ${this.renderSetCoreButton()}
+
+
${translate("settings.qappNotification1")}
+ ${this.appNotificationList.map((app) => html`
+
+ ${app}
+
+
+ `)}
+
+
+
+ this.checkForSyncMessages(e)} ?checked=${store.getState().app.showSyncIndicator}>
+
+ ${this.renderSetCoreButton()}
+
`
}
getAppsFromStorage() {
// Your method to fetch the list of apps from local storage
// Example:
- const address= store.getState().app.selectedAddress.address
- const id = `appNotificationList-${address}`;
- const data = localStorage.getItem(id);
- return data ? Object.keys(JSON.parse(data)) : [];
- }
+ const address = store.getState().app.selectedAddress.address
+ const id = `appNotificationList-${address}`
+ const data = localStorage.getItem(id)
+ return data ? Object.keys(JSON.parse(data)) : []
+ }
- removeApp(appName) {
+ removeApp(appName) {
// Remove the app from local storage
this.removeAppFromStorage(appName);
// Update the apps list in the component
this.appNotificationList = this.appNotificationList.filter(app => app !== appName);
- }
+ }
- removeAppFromStorage(appName) {
+ removeAppFromStorage(appName) {
// Your method to remove the app from local storage
const address= store.getState().app.selectedAddress.address
const id = `appNotificationList-${address}`;
const data = JSON.parse(localStorage.getItem(id) || '{}');
delete data[appName];
localStorage.setItem(id, JSON.stringify(data));
- }
+ }
renderSetCoreButton() {
if (!isElectron()) {
@@ -205,6 +224,14 @@ class NotificationsView extends connect(store)(LitElement) {
window.electronAPI.setStartCore()
}
+ checkForSyncMessages(e) {
+ if (e.target.checked) {
+ store.dispatch(removeShowSyncIndicator(false))
+ } else {
+ store.dispatch(allowShowSyncIndicator(true))
+ }
+ }
+
stateChanged(state) {
this.notificationConfig = state.user.notifications
this.q_chatConfig = this.notificationConfig.q_chat
@@ -226,8 +253,6 @@ class NotificationsView extends connect(store)(LitElement) {
store.dispatch(doSetQChatNotificationConfig(data))
}
}
-
-
}
window.customElements.define('notifications-view', NotificationsView)
diff --git a/core/src/components/settings-view/security-view.js b/core/src/components/settings-view/security-view.js
index c1e9c594..094eac8c 100644
--- a/core/src/components/settings-view/security-view.js
+++ b/core/src/components/settings-view/security-view.js
@@ -145,11 +145,11 @@ class SecurityView extends connect(store)(LitElement) {
-
-
this.checkForAuth(e)} ?checked=${store.getState().app.qAPPAutoAuth}>
+
+
+ this.checkForAuth(e)} ?checked=${store.getState().app.qAPPAutoAuth}>
-
- this.checkForFriends(e)} ?checked=${store.getState().app.qAPPFriendsList}>
+
+ this.checkForFriends(e)} ?checked=${store.getState().app.qAPPFriendsList}>
-
+
-