Skip to content

Commit a74d34d

Browse files
cancel
1 parent 78e7d8c commit a74d34d

5 files changed

Lines changed: 35 additions & 11 deletions

File tree

src/components/AddNewKeyQr.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ export default {
4949
name: parsedTotp.label,
5050
period: parsedTotp.period || 30,
5151
secret: parsedTotp.secret.base32,
52+
counter: { "low": 0, "high": 0, "unsigned": false }
5253
}])
5354
},
5455
async onDecode(result) {

src/locales/en.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
"import_from_google": "Import from Google 2FA",
44
"save_to_file": "Save all keys to file",
55
"copied": "Token Copied!",
6-
"powered": "Powered by"
6+
"powered": "Powered by",
7+
"cancel": "Cancel"
78
}

src/locales/ru.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
"import_from_google": "Импортировать из Гугл 2FA",
44
"save_to_file": "Сохранить все ключи в файл",
55
"copied": "Код скопирован!",
6-
"powered": "Создано в"
6+
"powered": "Создано в",
7+
"cancel": "Отмена"
78
}

src/mixins/app.js

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,27 @@
11
import packageJson from '../../package.json';
22

33
export default {
4+
data() {
5+
return {
6+
prevText: '',
7+
}
8+
},
49
methods: {
510
currentVersion() {
611
return packageJson.version;
712
},
813
async doCopyText(text) {
9-
await this.$copyText(text);
10-
this.$snotify.info(this.$t('copied'), {
11-
timeout: 800,
12-
showProgressBar: false,
13-
closeOnClick: false,
14-
pauseOnHover: true,
15-
position: 'leftBottom'
16-
});
14+
if (text !== this.prevText) {
15+
this.prevText = text;
16+
await this.$copyText(text);
17+
this.$snotify.info(this.$t('copied'), {
18+
timeout: 800,
19+
showProgressBar: false,
20+
closeOnClick: false,
21+
pauseOnHover: true,
22+
position: 'leftBottom'
23+
});
24+
}
1725
},
1826
}
1927
}

src/views/Home.vue

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,18 @@
6363
</div>
6464
</div>
6565

66+
<div v-if="op === 'itemRawData'"
67+
style="backdrop-filter: blur(4px); background: rgba(43,68,87,0.93); width: 100%; height: 100vh; position: absolute; top:0; padding: 4% !important; margin: 0 !important; z-index: 200000;">
68+
<p class="text-white">
69+
{{itemRaw}}
70+
</p>
71+
72+
73+
<div style="margin-left: auto; margin-right: auto;width:25px;margin-bottom: 5px; margin-top: 10px;">
74+
<b-button @click="op = 'home'" :pill="true" variant="info">X</b-button>
75+
</div>
76+
</div>
77+
6678
<div class="row">
6779
<div class="container mb-2" style="margin-top:55px;padding-bottom: 38px;">
6880
<div class="w-100" style="background: rgb(193 51 162);position: fixed; margin-top: 0px">
@@ -256,7 +268,7 @@ export default {
256268
opacity: 0.9;
257269
}
258270
.itemSubMenu {
259-
z-index: 100000;
271+
z-index: 200000;
260272
position: absolute;
261273
top: 6px;
262274
right: 24px;
@@ -266,6 +278,7 @@ export default {
266278
}
267279
268280
.item-2fa {
281+
z-index: 0;
269282
top: 0;
270283
border-bottom: dashed 1px #76797c;
271284
padding-bottom: 4px;

0 commit comments

Comments
 (0)