diff --git a/package-lock.json b/package-lock.json index ac021416..1cc8304b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,6 +7,7 @@ "devDependencies": { "@fortawesome/fontawesome-svg-core": "^6.4.2", "@fortawesome/free-brands-svg-icons": "^6.4.2", + "@fortawesome/free-regular-svg-icons": "^6.4.2", "@fortawesome/free-solid-svg-icons": "^6.4.2", "@fortawesome/vue-fontawesome": "^3.0.3", "@kyvg/vue3-notification": "^3.0.2", @@ -439,6 +440,19 @@ "node": ">=6" } }, + "node_modules/@fortawesome/free-regular-svg-icons": { + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.4.2.tgz", + "integrity": "sha512-0+sIUWnkgTVVXVAPQmW4vxb9ZTHv0WstOa3rBx9iPxrrrDH6bNLsDYuwXF9b6fGm+iR7DKQvQshUH/FJm3ed9Q==", + "dev": true, + "hasInstallScript": true, + "dependencies": { + "@fortawesome/fontawesome-common-types": "6.4.2" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/@fortawesome/free-solid-svg-icons": { "version": "6.4.2", "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.4.2.tgz", diff --git a/package.json b/package.json index edec0e08..71276306 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "devDependencies": { "@fortawesome/fontawesome-svg-core": "^6.4.2", "@fortawesome/free-brands-svg-icons": "^6.4.2", + "@fortawesome/free-regular-svg-icons": "^6.4.2", "@fortawesome/free-solid-svg-icons": "^6.4.2", "@fortawesome/vue-fontawesome": "^3.0.3", "@kyvg/vue3-notification": "^3.0.2", diff --git a/resources/js_vue3/assets/app.scss b/resources/js_vue3/assets/app.scss index 70be65fd..9c89d468 100644 --- a/resources/js_vue3/assets/app.scss +++ b/resources/js_vue3/assets/app.scss @@ -1321,4 +1321,28 @@ footer.main .field.is-grouped { } :root[data-theme="dark"] .card-footer-item:not(:last-child) { border-right: 1px solid $grey-darker; +} + +.addressbar { + padding: 6px; + border: 1px solid $grey-light; + background-color: $white; + border-radius: $radius; + position: relative; +} +:root[data-theme="dark"] .addressbar { + background-color: $black-bis; + border: none; +} + +.circled::before { + display: block; + content: ""; + position: absolute; + border-radius: 50%; + border: 2px solid $danger; + left: 25px; + top: 4px; + width: 29px; + height: 29px; } \ No newline at end of file diff --git a/resources/js_vue3/icons.js b/resources/js_vue3/icons.js index d1da8bcc..a63056d4 100644 --- a/resources/js_vue3/icons.js +++ b/resources/js_vue3/icons.js @@ -43,9 +43,14 @@ import { faCircleNotch, faCircleCheck, faTriangleExclamation, - faFileLines + faFileLines, + faVideoSlash, } from '@fortawesome/free-solid-svg-icons' +import { + faStar +} from '@fortawesome/free-regular-svg-icons' + import { faGithubAlt } from '@fortawesome/free-brands-svg-icons' @@ -93,7 +98,9 @@ library.add( faCircleNotch, faCircleCheck, faTriangleExclamation, - faFileLines + faFileLines, + faVideoSlash, + faStar, ); export default FontAwesomeIcon \ No newline at end of file diff --git a/resources/js_vue3/views/twofaccounts/Capture.vue b/resources/js_vue3/views/twofaccounts/Capture.vue index 3f50cee2..8925cbba 100644 --- a/resources/js_vue3/views/twofaccounts/Capture.vue +++ b/resources/js_vue3/views/twofaccounts/Capture.vue @@ -123,13 +123,36 @@
- - + \ No newline at end of file diff --git a/resources/lang/en/twofaccounts.php b/resources/lang/en/twofaccounts.php index 1635226a..4797d0e6 100644 --- a/resources/lang/en/twofaccounts.php +++ b/resources/lang/en/twofaccounts.php @@ -101,7 +101,8 @@ 'live_scan_cant_start' => 'Live scan can\'t start :(', 'need_grant_permission' => [ 'reason' => '2FAuth does not have permission to access your camera', - 'solution' => 'You need to grant permission to use your device camera. If you already denied and your browser do not prompt you again, please refers to the browser documentation to find out how to grant permission.' + 'solution' => 'You need to grant permission to use your device camera. If you already denied and your browser do not prompt you again, please refers to the browser documentation to find out how to grant permission.', + 'click_camera_icon' => 'It is usually done by clicking on a slashed camera icon in or next to the browser\'s address bar', ], 'not_readable' => [ 'reason' => 'Fail to load scanner',