Skip to content

Commit 59676dd

Browse files
ety001ety001
authored
Merge pull request #12 from ety001/3.0.3
add privacy policy
2 parents 437cebf + 0a11c27 commit 59676dd

File tree

6 files changed

+50
-32
lines changed

6 files changed

+50
-32
lines changed

‎package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "review-bookmark",
3-
"version": "3.0.2",
3+
"version": "3.0.3",
44
"description": "A bookmark manager for Chrome.",
55
"author": "ETY001 <[email protected]>",
66
"license": "MIT",

‎src/_locales/en/messages.json

+8-2
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,15 @@
132132
"message": "Clear List"
133133
},
134134
"ga": {
135-
"message": "Whether to enable Data Analyzes? This will help author improve the extension's experience."
135+
"message": "Whether to enable Data Analyzes?"
136136
},
137-
"enable": {
137+
"enable_btn": {
138138
"message": "Enable"
139+
},
140+
"disable_btn": {
141+
"message": "Disable"
142+
},
143+
"privacy_policy": {
144+
"message": "Review Bookmarks will collect anonymously how freqency to display/block/manage bookmarks, if you have agreed. These data will help author to improve the extension's experience."
139145
}
140146
}

‎src/_locales/zh_CN/messages.json

+9-3
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,15 @@
132132
"message": "清空列表"
133133
},
134134
"ga": {
135-
"message": "是否允许作者统计数据以此提升使用体验"
135+
"message": "是否允许统计数据"
136136
},
137-
"enable": {
138-
"message": "激活"
137+
"enable_btn": {
138+
"message": "允许"
139+
},
140+
"disable_btn": {
141+
"message": "拒绝"
142+
},
143+
"privacy_policy": {
144+
"message": "如果同意，温故知新将会匿名地收集用户的展示/屏蔽/整理书签的频率，这将帮助作者提升扩展的使用体验。"
139145
}
140146
}

‎src/background.js

+17-17
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ const GetUid = {
6868
const uid = GetUid.get();
6969

7070
//google analytics
71-
let currentVersion = '3_0_2';
71+
let currentVersion = '3_0_3';
7272
if (isChrome) {
7373
currentVersion = `chrome_${currentVersion}`;
7474
}
@@ -104,7 +104,7 @@ chrome.runtime.onConnect.addListener(function(port) {
104104
}
105105
const bmForFull = BookmarkLib.getBookmark();
106106
sendPageview('/full_mode_page');
107-
sendEvent(currentVersion, 'getbookmark_from_full', 'get_bookmark_' + uid, JSON.stringify({ uid, bmForFull }));
107+
sendEvent(currentVersion, 'getbookmark_from_full', uid);
108108
port.postMessage({ ctype: ctype, cdata: bmForFull });
109109
break;
110110
case 'getbookmark_from_mini':
@@ -114,7 +114,7 @@ chrome.runtime.onConnect.addListener(function(port) {
114114
}
115115
const bmForMini = BookmarkLib.getBookmark();
116116
sendPageview('/mini_mode_notification');
117-
sendEvent(currentVersion, 'getbookmark_from_mini', 'get_bookmark_' + uid, JSON.stringify({ uid, bmForMini }));
117+
sendEvent(currentVersion, 'getbookmark_from_mini', uid);
118118
port.postMessage({
119119
ctype,
120120
cdata: {
@@ -128,7 +128,7 @@ chrome.runtime.onConnect.addListener(function(port) {
128128
if (bm) {
129129
BookmarkLib.getBookmarkById(bm.parentId, parentBm => {
130130
bm.parent = parentBm;
131-
sendEvent(currentVersion, 'getbookmark_byid', 'get_bookmark_' + uid, JSON.stringify({ uid, bm }));
131+
sendEvent(currentVersion, 'getbookmark_byid', uid);
132132
return port.postMessage({
133133
ctype,
134134
cdata: {
@@ -138,7 +138,7 @@ chrome.runtime.onConnect.addListener(function(port) {
138138
});
139139
});
140140
} else {
141-
sendEvent(currentVersion, 'getbookmark_byid', 'get_bookmark_' + uid, JSON.stringify({ uid, bm }));
141+
sendEvent(currentVersion, 'getbookmark_byid', uid);
142142
return port.postMessage({
143143
ctype,
144144
cdata: {
@@ -152,46 +152,46 @@ chrome.runtime.onConnect.addListener(function(port) {
152152
case 'getbookmark_menu':
153153
BookmarkLib.getBookmarkMenu(menu => {
154154
sendPageview('/bookmark_manager_page');
155-
sendEvent(currentVersion, 'getbookmark_menu', 'getbookmark_menu_' + uid, JSON.stringify({ uid }));
155+
sendEvent(currentVersion, 'getbookmark_menu', uid);
156156
port.postMessage({ ctype, cdata: menu });
157157
});
158158
break;
159159
case 'getbookmark_children':
160-
sendEvent(currentVersion, 'getbookmark_children', 'getbookmark_children_' + uid, JSON.stringify({ uid }));
160+
sendEvent(currentVersion, 'getbookmark_children', uid);
161161
BookmarkLib.getBookmarkChildren(cdata, bookmarks => {
162162
port.postMessage({ ctype, cdata: bookmarks });
163163
});
164164
break;
165165
case 'block':
166-
sendEvent(currentVersion, 'block', 'block_' + uid, JSON.stringify({ uid }));
166+
sendEvent(currentVersion, 'block', uid);
167167
BookmarkLib.addBlockedBookmark(cdata);
168168
port.postMessage({ ctype, cdata: true });
169169
break;
170170
case 'cancel_block':
171-
sendEvent(currentVersion, 'cancel_block', 'cancel_block_' + uid, JSON.stringify({ uid }));
171+
sendEvent(currentVersion, 'cancel_block', uid);
172172
BookmarkLib.removeBlockedBookmark(cdata);
173173
port.postMessage({ ctype, cdata: true });
174174
break;
175175
case 'remove_bookmark':
176-
sendEvent(currentVersion, 'remove_bookmark', 'remove_bookmark_' + uid, JSON.stringify({ uid }));
176+
sendEvent(currentVersion, 'remove_bookmark', uid);
177177
// 从 chrome 删除
178178
BookmarkLib.removeBookmark(cdata, () => {
179179
port.postMessage({ ctype, cdata: true });
180180
});
181181
break;
182182
case 'update_bookmark':
183-
sendEvent(currentVersion, 'update_bookmark', 'update_bookmark_' + uid, JSON.stringify({ uid }));
183+
sendEvent(currentVersion, 'update_bookmark', uid);
184184
BookmarkLib.updateBookmark(cdata, () => {
185185
port.postMessage({ ctype, cdata: true });
186186
});
187187
break;
188188
case 'get_config':
189189
sendPageview('/popup');
190-
sendEvent(currentVersion, 'get_config', 'get_config_' + uid, JSON.stringify({ uid, config: store.getters.config }));
190+
sendEvent(currentVersion, 'get_config', uid);
191191
port.postMessage({ ctype, cdata: store.getters.config });
192192
break;
193193
case 'save_config':
194-
sendEvent(currentVersion, 'save_config', 'save_config_' + uid, JSON.stringify({ uid }));
194+
sendEvent(currentVersion, 'save_config', uid);
195195
store.commit(types.UPDATE_CONFIG, {
196196
status: cdata.status,
197197
mini: cdata.mini,
@@ -212,24 +212,24 @@ chrome.runtime.onConnect.addListener(function(port) {
212212
break;
213213
case 'get_block_list':
214214
sendPageview('/block_list_page');
215-
sendEvent(currentVersion, 'get_block_list', 'get_block_list_' + uid, JSON.stringify({ uid }));
215+
sendEvent(currentVersion, 'get_block_list', uid);
216216
BookmarkLib.getBlockList(blockedBookmarks => {
217217
port.postMessage({ ctype, cdata: blockedBookmarks });
218218
});
219219
break;
220220
case 'create_bookmark_folder':
221-
sendEvent(currentVersion, 'create_bookmark_folder', 'create_bookmark_folder_' + uid, JSON.stringify({ uid }));
221+
sendEvent(currentVersion, 'create_bookmark_folder', uid);
222222
BookmarkLib.createBookmark(cdata, () => {
223223
port.postMessage({ ctype, cdata: true });
224224
});
225225
break;
226226
case 'remove_block_bookmark':
227-
sendEvent(currentVersion, 'remove_block_bookmark', 'remove_block_bookmark_' + uid, JSON.stringify({ uid }));
227+
sendEvent(currentVersion, 'remove_block_bookmark', uid);
228228
BookmarkLib.removeBlockedBookmark(cdata);
229229
port.postMessage({ ctype, cdata: true });
230230
break;
231231
case 'clear_block_list':
232-
sendEvent(currentVersion, 'clear_block_list', 'clear_block_list_' + uid, JSON.stringify({ uid }));
232+
sendEvent(currentVersion, 'clear_block_list', uid);
233233
BookmarkLib.clearBlockList();
234234
port.postMessage({ ctype, cdata: true });
235235
break;

‎src/popup/App.vue

+14-8
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
<template>
22
<div>
33
<el-row class="config-box" v-if="formData !== null">
4-
<el-col :span="24" v-if="ga === false">
4+
<el-col :span="24" v-if="displayGaReminder === 'display'">
55
<h4>{{ 'ga' | lang }}</h4>
6+
<div style="margin-bottom: 20px;">
7+
<el-alert :title="'privacy_policy' | lang" type="warning" :closable="false"></el-alert>
8+
</div>
69
<el-form>
710
<el-form-item>
8-
<el-button type="primary" @click="enableGa()">{{ 'confirm_btn' | lang }}</el-button>
9-
<el-button type="warning" @click="cancelGa()">{{ 'cancel_btn' | lang }}</el-button>
11+
<el-button type="primary" @click="enableGa()">{{ 'enable_btn' | lang }}</el-button>
12+
<el-button type="warning" @click="cancelGa()">{{ 'disable_btn' | lang }}</el-button>
1013
</el-form-item>
1114
</el-form>
1215
</el-col>
13-
<el-col :span="24" v-if="ga === true">
16+
<el-col :span="24" v-if="displayGaReminder === 'hidden'">
1417
<el-form ref="form1" :rules="rules" :model="formData" label-position="left" label-width="140px" @submit.native.prevent>
1518
<el-form-item :label="'switch' | lang" prop="status">
1619
<el-switch v-model="formData.status"></el-switch>
@@ -33,6 +36,9 @@
3336
<el-checkbox-group v-model="formData.ga">
3437
<el-checkbox :label="'ga' | lang" name="ga"></el-checkbox>
3538
</el-checkbox-group>
39+
<div style="margin-bottom: 20px;">
40+
<el-alert :title="'privacy_policy' | lang" type="warning" :closable="false"></el-alert>
41+
</div>
3642
</el-form-item>
3743

3844
<el-form-item>
@@ -58,7 +64,7 @@ export default {
5864
};
5965
return {
6066
formData: null,
61-
ga: false,
67+
displayGaReminder: 'display',
6268
notifyLocation: [
6369
{
6470
name: this.getLang('top_right'),
@@ -98,7 +104,7 @@ export default {
98104
this.port.postMessage({ ctype: 'save_config', cdata: this.formData });
99105
},
100106
cancelGa() {
101-
this.ga = true;
107+
this.displayGaReminder = 'hidden';
102108
},
103109
save(formName) {
104110
this.$refs[formName].validate(valid => {
@@ -133,7 +139,7 @@ export default {
133139
type: 'success',
134140
message: this.getLang('save_success'),
135141
});
136-
this.ga = true;
142+
this.displayGaReminder = 'hidden';
137143
break;
138144
case 'get_config':
139145
this.formData = {
@@ -144,7 +150,7 @@ export default {
144150
currentNotifyLocation: msg.cdata.currentNotifyLocation,
145151
ga: msg.cdata.ga,
146152
};
147-
this.ga = msg.cdata.ga;
153+
this.displayGaReminder = msg.cdata.ga === true ? 'hidden' : 'display';
148154
break;
149155
}
150156
});

0 commit comments

Comments
 (0)