Skip to content

Commit 6c22124

Browse files
update translations and UI elements for improved user experience
1 parent 3ebb23f commit 6c22124

6 files changed

Lines changed: 28 additions & 11 deletions

File tree

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "smart2fa",
3-
"version": "1.0.2",
3+
"version": "1.0.3",
44
"private": true,
55
"description": "Alternative open source software for 2fa authorization",
66
"author": "technolog <technolog@smartholdem.io>",
@@ -59,7 +59,7 @@
5959
"@vue/cli-plugin-vuex": "~4.5.13",
6060
"@vue/cli-service": "~4.5.13",
6161
"babel-eslint": "^10.1.0",
62-
"electron": "13.0.0",
62+
"electron": "31.0.0-beta.1",
6363
"electron-devtools-installer": "^3.1.0",
6464
"eslint": "^6.7.2",
6565
"eslint-plugin-vue": "^6.2.2",

public/style.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
#app {
2+
margin: auto;
3+
max-width: 640px;
4+
}
15

26
-moz-scrollbar, ::-webkit-scrollbar {
37
width: 7px;
@@ -32,3 +36,4 @@ body, html {
3236
/* Non-prefixed version, currently
3337
supported by Chrome, Opera and Firefox */
3438
}
39+

src/locales/en.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"keys_added": "Keys added",
2222
"token_add_info_input": "This feature is for adding a new access token from a new site or application. Enter the proposed secret code, get an access token and confirm it on the added site.",
2323
"token_add_info_qr": "This feature is for adding a new access token from a new site or application. Scan the proposed QR code, get an access token and confirm it on the added site.",
24-
"google_migrate_info": "This feature is designed to quickly import access tokens from the Google Authenticator app. In the Google Authenticator app, click in the settings to transfer accounts - export accounts. Scan the Google Authenticator QR codes to transfer to Smart2FA."
25-
24+
"google_migrate_info": "This feature is designed to quickly import access tokens from the Google Authenticator app. In the Google Authenticator app, click in the settings to transfer accounts - export accounts. Scan the Google Authenticator QR codes to transfer to Smart2FA.",
25+
"unlock": "Unlock",
26+
"remove": "Remove all"
2627
}

src/locales/ru.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,7 @@
2121
"keys_added": "Добавлены ключи",
2222
"token_add_info_input": "Эта функция предназначена для добавления нового токена доступа с нового сайта или приложения. Введите предложенный секретный-код, получите токен-доступа и подтвердите его на добавляемом сайте.",
2323
"token_add_info_qr": "Эта функция предназначена для добавления нового токена доступа с нового сайта или приложения. Отсканируйте предложенный QR-код, получите токен-доступа и подтвердите его на добавляемом сайте.",
24-
"google_migrate_info": "Данная функция предназначена для быстрого импорта токенов доступа из приложения Google Authenticator. В приложении Google Authenticator нажмите в настройках перенести аккаунты - экспорт аккаунтов. Отсканируйте QR-коды Google Authenticator, для переноса в Smart2FA. Если у вас нет камеры, выберите графический файл с QR-кодом."
24+
"google_migrate_info": "Данная функция предназначена для быстрого импорта токенов доступа из приложения Google Authenticator. В приложении Google Authenticator нажмите в настройках перенести аккаунты - экспорт аккаунтов. Отсканируйте QR-коды Google Authenticator, для переноса в Smart2FA. Если у вас нет камеры, выберите графический файл с QR-кодом.",
25+
"unlock": "Вход",
26+
"remove": "Удалить всё"
2527
}

src/views/Home.vue

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="w-100">
33
<b-navbar toggleable="lg" type="dark" variant="info" :sticky="true" fixed="top"
44
style="position: fixed;background: linear-gradient(-45deg, #146eb9 1%, #146eb9 48%, #146eb9);">
5-
<b-navbar-brand><img width="24px" src="images/logo48.png"/> <span class="small mr-1">SMART 2FA</span>
5+
<b-navbar-brand><img width="24px" src="images/logo48.png" alt="logo"/> <span class="small mr-1">SMART 2FA</span>
66
<span class="badge badge-success"
77
style="border: solid 1px rgba(35,59,93,0.76);" v-html="(seconds < 10 ? '0' + seconds : seconds)">
88
</span>
@@ -14,7 +14,8 @@
1414
<b-nav-item @click="op = 'importKeys'; ddShow = false">
1515
<span class="text-white">{{ $t('import_from_google') }}</span>
1616
</b-nav-item>
17-
<b-nav-item v-show="isElectron" v-b-modal.modal-save-file>
17+
<!-- v-show="isElectron" -->
18+
<b-nav-item v-b-modal.modal-save-file>
1819
<span class="text-white">{{ $t('save_to_file') }}</span>
1920
</b-nav-item>
2021
</b-navbar-nav>
@@ -30,11 +31,16 @@
3031
</b-navbar>
3132

3233

34+
<div v-if="op!=='home'" style="position: relative; max-width: 800px; height: 100vh; background: rgba(0,0,0,0.5); z-index: 200000;">
35+
<div class="text-center text-white" style="margin-top: 20px;">
36+
<b-spinner variant="primary" label="Loading..."></b-spinner>
37+
</div>
38+
3339
<div v-if="op === 'importKeys'"
3440
style="backdrop-filter: blur(4px); background: rgba(43,68,87,0.63); width: 100%; height: 100vh; position: absolute; top:0; padding: 4% !important; margin: 0 !important; z-index: 200000;">
3541
<QrScanImport2fa
3642
style="margin-left: auto; margin-right: auto; width:250px; height:250px; border: solid 2px #333;margin-top: 50px;"/>
37-
<div style="margin-left: auto; margin-right: auto;width:25px;margin-bottom: 5px; margin-top: 25px;">
43+
<div style="width:25px;margin: 25px auto 5px;">
3844
<b-button @click="op = 'home'" :pill="true" variant="success">X</b-button>
3945
</div>
4046
<p class="text-white">{{ $t('google_migrate_info') }}</p>
@@ -82,6 +88,9 @@
8288

8389
</div>
8490

91+
</div>
92+
93+
8594
<div class="row">
8695
<div class="container" style="margin-top:55px;padding-bottom: 48px;position: relative;">
8796
<div class="w-100" style="background: rgb(193 51 162);position: fixed; margin-top: 0px">
@@ -119,7 +128,7 @@
119128

120129
</div>
121130

122-
<img @click="ddShow = !ddShow" class="btnBotAdd" src="images/add.png"/>
131+
<img @click="ddShow = !ddShow" class="btnBotAdd" src="images/add.png" alt="add"/>
123132
<div v-show="ddShow"
124133
style="border-radius: 6px 6px 0 6px; position: absolute; bottom: 56px;right: 15px; background: linear-gradient(-45deg, #4eabf7 1%, #4eabf7 48%, #4eabf7);">
125134
<b-nav vertical class="w-100">

src/views/Unlock.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727

2828
<div class="row">
2929
<div class="col-6">
30-
<b-button :disabled="!isValid" type="submit" variant="primary" class="w-100 text-uppercase">Unlock</b-button>
30+
<b-button :disabled="!isValid" type="submit" variant="primary" class="w-100 text-uppercase">{{$t('unlock')}}</b-button>
3131
</div>
3232
<div class="col-6">
33-
<b-button @click="show = false" variant="danger" class="w-100 text-uppercase">Reset All data?</b-button>
33+
<b-button @click="show = false" variant="danger" class="w-100 text-uppercase">{{$t('remove')}}</b-button>
3434
</div>
3535
</div>
3636

0 commit comments

Comments
 (0)