From 5360968a91683369bd2a3774543b1cd3d46e35ab Mon Sep 17 00:00:00 2001 From: Vincent Date: Mon, 13 Jan 2020 16:10:19 +1100 Subject: [PATCH] Add public server modal to message pane --- _locales/en/messages.json | 10 ++++-- js/background.js | 9 +++--- js/views/app_view.js | 1 + stylesheets/_session.scss | 32 +++++++++++++++++++ stylesheets/_session_left_pane.scss | 10 ++++++ ts/components/MainViewController.tsx | 7 +++- .../session/LeftPaneMessageSection.tsx | 14 ++++++++ .../session/LeftPaneSectionHeader.tsx | 1 + .../session/LeftPaneSettingSection.tsx | 5 +++ ts/components/session/SessionButton.tsx | 8 +++-- ts/global.d.ts | 1 + 11 files changed, 88 insertions(+), 10 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 46d15bc9e..bf39fa7c8 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -2480,6 +2480,12 @@ "decline": { "message": "Decline" }, + "generalSettingsTitle": { + "message": "Generals" + }, + "generalSettingsDescription": { + "message": "General settings and configuration" + }, "accountSettingsTitle": { "message": "Account" }, @@ -2496,12 +2502,12 @@ "message": "Notifications" }, "notificationSettingsDescription": { - "message": "Choose what you're notified about." + "message": "Choose what you're notified about" }, "devicesSettingsTitle": { "message": "Devices" }, "devicesSettingsDescription": { - "message": "Managed linked devices." + "message": "Managed linked devices" } } diff --git a/js/background.js b/js/background.js index 134fc88b7..62665b499 100644 --- a/js/background.js +++ b/js/background.js @@ -821,6 +821,7 @@ }; window.showSeedDialog = window.owsDesktopApp.appView.showSeedDialog; + window.showAddServerDialog = window.owsDesktopApp.appView.showAddServerDialog; window.generateID = () => Math.random() @@ -872,10 +873,10 @@ return toastID; }; - window.deleteAccount = () => { - // Delete local data - // TOOD. MAKE THIS PROCESS SECURED WITH rm-secure - // https://www.npmjs.com/package/secure-rm + window.deleteAccount = async () => { + await window.Signal.Data.removeAll(); + await window.storage.fetch(); + alert('YOUR ACCOUNT HAS BEEN DELETED'); }; diff --git a/js/views/app_view.js b/js/views/app_view.js index b38259e2f..f17014a30 100644 --- a/js/views/app_view.js +++ b/js/views/app_view.js @@ -17,6 +17,7 @@ this.applyHideMenu(); this.showSeedDialog = this.showSeedDialog.bind(this); + this.showAddServerDialog = this.showAddServerDialog.bind(this); }, events: { 'click .openInstaller': 'openInstaller', // NetworkStatusView has this button diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss index 61f902d3e..183c7baa8 100644 --- a/stylesheets/_session.scss +++ b/stylesheets/_session.scss @@ -226,6 +226,10 @@ $session_message-container-border-radius: 5px; cursor: pointer; transition: $session-transition-duration; + &.disabled { + cursor: default; + } + &.default, &.square, &.brand { @@ -234,27 +238,50 @@ $session_message-container-border-radius: 5px; &.green { border: 2px solid $session-color-green; background-color: $session-color-green; + + &.disabled{ + background-color: rgba($session-color-green, 0.6); + } + &:hover { @include transparent-background($session-color-green); } } &.white { background-color: $session-color-white; + &.disabled{ + background-color: rgba($session-color-white, 0.6); + } } &.primary { background-color: $session-color-primary; + &.disabled{ + background-color: rgba($session-color-primary, 0.6); + } } &.secondary { background-color: $session-color-secondary; + &.disabled{ + background-color: rgba($session-color-secondary, 0.6); + } } &.success { background-color: $session-color-success; + &.disabled{ + background-color: rgba($session-color-success, 0.6); + } } &.danger { background-color: $session-color-danger; + &.disabled{ + background-color: rgba($session-color-danger, 0.6); + } } &.warning { background-color: $session-color-warning; + &.disabled{ + background-color: rgba($session-color-warning, 0.6); + } } } @@ -1004,3 +1031,8 @@ label { .messages li { transition: $session-transition-duration !important; } + + +.network-status-container{ + +} \ No newline at end of file diff --git a/stylesheets/_session_left_pane.scss b/stylesheets/_session_left_pane.scss index 1571ca349..555cd2f10 100644 --- a/stylesheets/_session_left_pane.scss +++ b/stylesheets/_session_left_pane.scss @@ -173,6 +173,16 @@ $session-compose-margin: 20px; .session-button { margin-left: auto; } + + &-buttons { + margin-bottom: $session-margin-sm; + display: inline-flex; + width: 100%; + + .session-button { + flex: 1; + } + } } &__title { diff --git a/ts/components/MainViewController.tsx b/ts/components/MainViewController.tsx index 4bcc9554a..b733ada74 100644 --- a/ts/components/MainViewController.tsx +++ b/ts/components/MainViewController.tsx @@ -176,10 +176,15 @@ export class SettingsHeader extends React.Component{ render() { const category = String(this.props.category) + const categoryTitlePrefix = category[0].toUpperCase() + category.substr(1); + // Remove 's' on the end to keep words in singular form + const categoryTitle = categoryTitlePrefix[categoryTitlePrefix.length - 1] === 's' + ? categoryTitlePrefix.slice(0, -1) + ' Settings' + : categoryTitlePrefix + ' Settings'; return (
- {category[0].toUpperCase() + category.substr(1)} Settings + { categoryTitle } { return [list]; } + public renderMessagePanelButtons(): JSX.Element { + return ( +
+ +
+ ); + } + public renderHeader(): JSX.Element { const labels = [window.i18n('messagesHeader')]; @@ -180,6 +193,7 @@ export class LeftPaneMessageSection extends React.Component { public renderConversations() { return (
+ {this.renderMessagePanelButtons()} { text={window.i18n('compose')} onClick={buttonClicked} key="compose" + disabled={false} /> ); } else if (notificationCount && notificationCount > 0) { diff --git a/ts/components/session/LeftPaneSettingSection.tsx b/ts/components/session/LeftPaneSettingSection.tsx index d928399e8..784ebced4 100644 --- a/ts/components/session/LeftPaneSettingSection.tsx +++ b/ts/components/session/LeftPaneSettingSection.tsx @@ -175,6 +175,11 @@ export class LeftPaneSettingSection extends React.Component { public getCategories() { return [ + { + id: SessionSettingCategory.General, + title: window.i18n('generalSettingsTitle'), + description: window.i18n('generalSettingsDescription'), + }, { id: SessionSettingCategory.Account, title: window.i18n('accountSettingsTitle'), diff --git a/ts/components/session/SessionButton.tsx b/ts/components/session/SessionButton.tsx index ad432305a..e7cce52d9 100644 --- a/ts/components/session/SessionButton.tsx +++ b/ts/components/session/SessionButton.tsx @@ -24,6 +24,7 @@ export enum SessionButtonColor { interface Props { text?: string; + disabled?: boolean; buttonType: SessionButtonType; buttonColor: SessionButtonColor; onClick: any; @@ -33,6 +34,7 @@ export class SessionButton extends React.PureComponent { public static defaultProps = { buttonType: SessionButtonType.Default, buttonColor: SessionButtonColor.Primary, + disabled: false, onClick: () => null, }; @@ -42,7 +44,7 @@ export class SessionButton extends React.PureComponent { } public render() { - const { buttonType, buttonColor, text } = this.props; + const { buttonType, buttonColor, text, disabled } = this.props; const buttonTypes = []; @@ -53,9 +55,9 @@ export class SessionButton extends React.PureComponent { return (
null : this.clickHandler} > {this.props.children || text}
diff --git a/ts/global.d.ts b/ts/global.d.ts index 9507486e5..f6d86a07d 100644 --- a/ts/global.d.ts +++ b/ts/global.d.ts @@ -23,6 +23,7 @@ interface Window { pushToast: any; confirmationDialog: any; showSeedDialog: any; + showAddServerDialog: any; toggleTheme: any; }