nostr/iris-messenger
1
0
Fork 0
mirror of https://github.com/irislib/iris-messenger.git synced 2024-09-20 01:56:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

show accounts view by default on settings

Browse Source
This commit is contained in:
Martti Malmi 2022-08-23 14:09:25 +03:00
parent 30a5505a88
commit 6b85c4dce8
2 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/js/views/settings/Settings.tsx
View File

@ -27,36 +27,26 @@ class Settings extends Component<Props,State> {
}
render() {
let page = null;
const isDesktopNonMac = this.state.platform && this.state.platform !== 'darwin';
console.log("page: " + this.props.page);
let mainpage = (this.props.page == 'undefined' || this.props.page == null || this.props.page == '');
if(mainpage){
page = html`<${SettingsMenu} />`;
}else if(!($(window).width() > 625)){
page = html`<div style="padding: 0px 15px;"> <${SettingsContent} id=${this.props.page} /> </div>`;
}else{
page = html`<${SettingsMenu} /> <div style="padding: 0px 15px;"> <${SettingsContent} id=${this.props.page} /> </div>`;
}
console.log("Visible: " + this.state.showSettingsMenu);
return (
<>
<Header />
<div class="main-view" id="settings">
<div style="flex-direction: row;" id="settings">
<div class='logo' style={(mainpage || ($(window).width() > 625)) ? 'display: none !important;' : 'display: flex;' }>
<div href="/settings/" onClick={e => this.onLogoClick(e) } style="margin: 1em; display:flex;" >
<div>{Icons.backArrow}</div>
<div style="flex-direction: row;" id="settings">
<div class='logo' className={this.props.page ? 'visible-xs-flex' : 'hidden' }>
<div href="/settings/" onClick={e => this.onLogoClick(e) } style="margin: 1em; display:flex;" >
<div>{Icons.backArrow}</div>
</div>
</div>
<SettingsMenu activePage={this.props.page} />
<div className={this.props.page ? '' : 'hidden-xs' } style="padding: 0px 15px;">
<SettingsContent id={this.props.page} />
</div>
</div>
{page}
</div>
</div>
</>
);

5
src/js/views/settings/SettingsMenu.js
View File

@ -25,15 +25,16 @@ export default class SettingsMenu extends Component{
}
render() {
const activePage = this.props.activePage || 'account';
return (
<>
<div class="settings-list">
<div className={!this.props.activePage ? 'settings-list' : 'settings-list hidden-xs' }>
{Helpers.isElectron ? html`<div class="electron-padding"/>` : html`
<h3 style="padding: 0px 15px;">Settings</h3>
`}
{SETTINGS.map((item) => {
return (
<a activeClassName="active" onClick={() => this.menuLinkClicked(item.url)} key={item.id}>
<a class={(activePage === item.url && window.innerWidth > 624) ? 'active' : ''} onClick={() => this.menuLinkClicked(item.url)} key={item.id}>
<span class="text">{item.text}</span>
</a>
);