From 8b0b29c424f1f62ed2623c499e8bc3bce4cd9af1 Mon Sep 17 00:00:00 2001 From: cyalins Date: Thu, 25 Jan 2018 13:27:02 +1100 Subject: [PATCH 1/9] Improved clarity of wording --- browser/main/modals/PreferencesModal/StoragesTab.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/main/modals/PreferencesModal/StoragesTab.js b/browser/main/modals/PreferencesModal/StoragesTab.js index 5c328f8a..6a14c067 100644 --- a/browser/main/modals/PreferencesModal/StoragesTab.js +++ b/browser/main/modals/PreferencesModal/StoragesTab.js @@ -78,7 +78,7 @@ class StoragesTab extends React.Component { @@ -167,7 +167,7 @@ class StoragesTab extends React.Component {
- 3rd party cloud integration: + Setting up 3rd-party cloud storage integration: this.handleLinkClick(e)} >Cloud-Syncing-and-Backup From 9165f518a94eb7b0218326358dcabb15b6ec0667 Mon Sep 17 00:00:00 2001 From: cyalins Date: Thu, 25 Jan 2018 13:41:24 +1100 Subject: [PATCH 2/9] Improved wording of data collection --- browser/main/modals/PreferencesModal/InfoTab.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/browser/main/modals/PreferencesModal/InfoTab.js b/browser/main/modals/PreferencesModal/InfoTab.js index 2a1db828..a4ff1579 100644 --- a/browser/main/modals/PreferencesModal/InfoTab.js +++ b/browser/main/modals/PreferencesModal/InfoTab.js @@ -60,7 +60,8 @@ class InfoTab extends React.Component { }) } - infoMessage () { + + Message () { const { amaMessage } = this.state return amaMessage ?

{amaMessage}

: null } @@ -102,7 +103,7 @@ class InfoTab extends React.Component {
-
Info
+
About
@@ -137,17 +138,19 @@ class InfoTab extends React.Component {
-
Data collection policy
-
We collect only the number of DAU for Boostnote and **DO NOT collect** any detail information such as your note content.
+
Analytics
+
Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.
You can see how it works on this.handleLinkClick(e)}>GitHub.
-
This data is only used for Boostnote improvements.
+
+
You can choose to enable or disable this option.
this.handleConfigChange(e)} checked={this.state.config.amaEnabled} ref='amaEnabled' type='checkbox' /> - Enable to send analytics to our servers
+ Enable analytics to help improve Boostnote
+
{this.infoMessage()}
) From f7bd52ac0c53f1b8213f10638c1890fccfe35b97 Mon Sep 17 00:00:00 2001 From: cyalins Date: Thu, 25 Jan 2018 13:46:08 +1100 Subject: [PATCH 3/9] Improved clarity of crowdfunding message --- browser/main/modals/PreferencesModal/Crowdfunding.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/browser/main/modals/PreferencesModal/Crowdfunding.js b/browser/main/modals/PreferencesModal/Crowdfunding.js index 3dccd27b..048520b0 100644 --- a/browser/main/modals/PreferencesModal/Crowdfunding.js +++ b/browser/main/modals/PreferencesModal/Crowdfunding.js @@ -22,18 +22,18 @@ class Crowdfunding extends React.Component { return (
Crowdfunding
-

Dear all,

+

Dear everyone,


-

Thanks for your using!

-

Boostnote is used in about 200 countries and regions, it is a awesome developer community.

+

Thank you for using Boostnote!

+

Boostnote is used in about 200 different countries and regions by an awesome community of developers.


To continue supporting this growth, and to satisfy community expectations,

-

we would like to invest more time in this project.

+

we would like to invest more time and resources in this project.


-

If you like this project and see its potential, you can help!

+

If you like this project and see its potential, you can help by supporting us on OpenCollective!


Thanks,

-

Boostnote maintainers.

+

Boostnote maintainers


-
+
{this.infoMessage()}
) diff --git a/browser/main/modals/PreferencesModal/StoragesTab.js b/browser/main/modals/PreferencesModal/StoragesTab.js index 76e69f87..f66a617e 100644 --- a/browser/main/modals/PreferencesModal/StoragesTab.js +++ b/browser/main/modals/PreferencesModal/StoragesTab.js @@ -167,7 +167,7 @@ class StoragesTab extends React.Component {
- Setting up 3rd-party cloud storage integration: + Setting up 3rd-party cloud storage integration:{' '} this.handleLinkClick(e)} >Cloud-Syncing-and-Backup diff --git a/browser/main/modals/PreferencesModal/index.js b/browser/main/modals/PreferencesModal/index.js index 228a08f4..574b5186 100644 --- a/browser/main/modals/PreferencesModal/index.js +++ b/browser/main/modals/PreferencesModal/index.js @@ -1,6 +1,5 @@ import PropTypes from 'prop-types' import React from 'react' -import ReactDOM from 'react-dom' import { connect } from 'react-redux' import HotkeyTab from './HotkeyTab' import UiTab from './UiTab' @@ -11,6 +10,7 @@ import ModalEscButton from 'browser/components/ModalEscButton' import CSSModules from 'browser/lib/CSSModules' import styles from './PreferencesModal.styl' import RealtimeNotification from 'browser/components/RealtimeNotification' +import _ from 'lodash' class Preferences extends React.Component { constructor (props) { @@ -94,8 +94,8 @@ class Preferences extends React.Component { } getContentBoundingBox () { - const node = ReactDOM.findDOMNode(this.refs.content) - return node.getBoundingClientRect() + console.log(this.refs.content.getBoundingClientRect()) + return this.refs.content.getBoundingClientRect() } haveToSaveNotif (type, message) { diff --git a/browser/main/store.js b/browser/main/store.js index 36e7850d..abd34889 100644 --- a/browser/main/store.js +++ b/browser/main/store.js @@ -355,11 +355,9 @@ function data (state = defaultDataMap(), action) { state.storageMap.set(action.storage.key, action.storage) return state case 'EXPORT_FOLDER': - { - state = Object.assign({}, state) - state.storageMap = new Map(state.storageMap) - state.storageMap.set(action.storage.key, action.storage) - } + state = Object.assign({}, state) + state.storageMap = new Map(state.storageMap) + state.storageMap.set(action.storage.key, action.storage) return state case 'DELETE_FOLDER': {