diff --git a/adamant-wallets b/adamant-wallets index af8f93b3a..2e4175ae3 160000 --- a/adamant-wallets +++ b/adamant-wallets @@ -1 +1 @@ -Subproject commit af8f93b3a140a2baf983f935d59bd4a8a1938130 +Subproject commit 2e4175ae32c380eb3006021b34830a3874f3e47b diff --git a/index.html b/index.html index 14df5187d..cc3e902be 100644 --- a/index.html +++ b/index.html @@ -43,7 +43,7 @@ - + diff --git a/package-lock.json b/package-lock.json index 52364ace8..8736fe9c4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "adamant-im", - "version": "4.5.1", + "version": "4.5.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "adamant-im", - "version": "4.5.1", + "version": "4.5.2", "hasInstallScript": true, "license": "GPLv3", "dependencies": { diff --git a/package.json b/package.json index b798fc6b5..7a3d9ac26 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "adamant-im", - "version": "4.5.1", + "version": "4.5.2", "author": "ADAMANT Foundation ", "license": "GPLv3", "description": "Decentralized Messenger", diff --git a/public/fonts/Exo+2.css b/public/fonts/Exo+2.css deleted file mode 100644 index c52dc8a52..000000000 --- a/public/fonts/Exo+2.css +++ /dev/null @@ -1,66 +0,0 @@ -@font-face { - font-family: 'Exo 2'; - font-style: italic; - font-weight: 400; - src: url('Exo+2_400_italic.eot'); /* {{embedded-opentype-gf-url}} */ - src: local('☺'), - url(Exo+2_400_italic.eot?#iefix) format('embedded-opentype'), /* {{embedded-opentype-gf-url}} */ - url(Exo+2_400_italic.woff) format('woff'), /* http://fonts.gstatic.com/s/exo2/v4/G075hziEYGpfdK2KgVmqBQ.woff */ - url(Exo+2_400_italic.ttf) format('truetype'), /* http://fonts.gstatic.com/s/exo2/v4/eq5mS-KPawZNVWb_JoPWQwLUuEpTyoUstqEm5AMlJo4.ttf */ - url(Exo+2_400_italic.svg#Exo+2_400_italic) format('svg'); /* {{svg-gf-url}} */ -} -@font-face { - font-family: 'Exo 2'; - font-style: normal; - font-weight: 100; - src: url(Exo+2_100_normal.eot); /* {{embedded-opentype-gf-url}} */ - src: local('☺'), - url(Exo+2_100_normal.eot?#iefix) format('embedded-opentype'), /* {{embedded-opentype-gf-url}} */ - url(Exo+2_100_normal.woff) format('woff'), /* http://fonts.gstatic.com/s/exo2/v4/H184PiVPwxcA4lae41SXXA.woff */ - url(Exo+2_100_normal.ttf) format('truetype'), /* http://fonts.gstatic.com/s/exo2/v4/zsUPyQQR5Nf1c5_Wodx4EALUuEpTyoUstqEm5AMlJo4.ttf */ - url(Exo+2_100_normal.svg#Exo+2_100_normal) format('svg'); /* {{svg-gf-url}} */ -} -@font-face { - font-family: 'Exo 2'; - font-style: normal; - font-weight: 300; - src: url(Exo+2_300_normal.eot); /* {{embedded-opentype-gf-url}} */ - src: local('☺'), - url(Exo+2_300_normal.eot?#iefix) format('embedded-opentype'), /* {{embedded-opentype-gf-url}} */ - url(Exo+2_300_normal.woff) format('woff'), /* http://fonts.gstatic.com/s/exo2/v4/JWvvdsUbb528VH-BDTzpW_esZW2xOQ-xsNqO47m55DA.woff */ - url(Exo+2_300_normal.ttf) format('truetype'), /* http://fonts.gstatic.com/s/exo2/v4/ngiFXK5ukde3w4E-Lmb_OnYhjbSpvc47ee6xR_80Hnw.ttf */ - url(Exo+2_300_normal.svg#Exo+2_300_normal) format('svg'); /* {{svg-gf-url}} */ -} -@font-face { - font-family: 'Exo 2'; - font-style: normal; - font-weight: 400; - src: url(Exo+2_400_normal.eot); /* {{embedded-opentype-gf-url}} */ - src: local('☺'), - url(Exo+2_400_normal.eot?#iefix) format('embedded-opentype'), /* {{embedded-opentype-gf-url}} */ - url(Exo+2_400_normal.woff) format('woff'), /* http://fonts.gstatic.com/s/exo2/v4/8C2PVL2WIMUnPF90ukjrZQ.woff */ - url(Exo+2_400_normal.ttf) format('truetype'), /* http://fonts.gstatic.com/s/exo2/v4/K95WapF0Wa6u7CY0wsZbXqCWcynf_cDxXwCLxiixG1c.ttf */ - url(Exo+2_400_normal.svg#Exo+2_400_normal) format('svg'); /* http://fonts.gstatic.com/l/font?kit=UaJJNujq9sDPVrjoyxn8ng&skey=1b9a3dc5c6de9cce&v=v4#Exo2 */ -} -@font-face { - font-family: 'Exo 2'; - font-style: normal; - font-weight: 500; - src: url(Exo+2_500_normal.eot); /* {{embedded-opentype-gf-url}} */ - src: local('☺'), - url(Exo+2_500_normal.eot?#iefix) format('embedded-opentype'), /* {{embedded-opentype-gf-url}} */ - url(Exo+2_500_normal.woff) format('woff'), /* http://fonts.gstatic.com/s/exo2/v4/SJSKlaAoPzG8E6EMHXZfevesZW2xOQ-xsNqO47m55DA.woff */ - url(Exo+2_500_normal.ttf) format('truetype'), /* http://fonts.gstatic.com/s/exo2/v4/Aj85fDXQrYnqAVDyNP57H3YhjbSpvc47ee6xR_80Hnw.ttf */ - url(Exo+2_500_normal.svg#Exo+2_500_normal) format('svg'); /* {{svg-gf-url}} */ -} -@font-face { - font-family: 'Exo 2'; - font-style: normal; - font-weight: 700; - src: url(Exo+2_700_normal.eot); /* {{embedded-opentype-gf-url}} */ - src: local('☺'), - url(Exo+2_700_normal.eot?#iefix) format('embedded-opentype'), /* {{embedded-opentype-gf-url}} */ - url(Exo+2_700_normal.woff) format('woff'), /* http://fonts.gstatic.com/s/exo2/v4/RZBBdEhQV3g9mUXUAU9PpvesZW2xOQ-xsNqO47m55DA.woff */ - url(Exo+2_700_normal.ttf) format('truetype'), /* http://fonts.gstatic.com/s/exo2/v4/F-JaJbplW75-CW3MZ1qMbnYhjbSpvc47ee6xR_80Hnw.ttf */ - url(Exo+2_700_normal.svg#Exo+2_700_normal) format('svg'); /* {{svg-gf-url}} */ -} diff --git a/public/fonts/Exo+2_100_normal.ttf b/public/fonts/Exo+2_100_normal.ttf deleted file mode 100644 index 32203e0dd..000000000 Binary files a/public/fonts/Exo+2_100_normal.ttf and /dev/null differ diff --git a/public/fonts/Exo+2_100_normal.woff b/public/fonts/Exo+2_100_normal.woff deleted file mode 100644 index 4af0b8e22..000000000 Binary files a/public/fonts/Exo+2_100_normal.woff and /dev/null differ diff --git a/public/fonts/Exo+2_300_normal.ttf b/public/fonts/Exo+2_300_normal.ttf deleted file mode 100644 index 68fb23f13..000000000 Binary files a/public/fonts/Exo+2_300_normal.ttf and /dev/null differ diff --git a/public/fonts/Exo+2_300_normal.woff b/public/fonts/Exo+2_300_normal.woff deleted file mode 100644 index bf14fa73a..000000000 Binary files a/public/fonts/Exo+2_300_normal.woff and /dev/null differ diff --git a/public/fonts/Exo+2_400_italic.ttf b/public/fonts/Exo+2_400_italic.ttf deleted file mode 100644 index fccd229d7..000000000 Binary files a/public/fonts/Exo+2_400_italic.ttf and /dev/null differ diff --git a/public/fonts/Exo+2_400_italic.woff b/public/fonts/Exo+2_400_italic.woff deleted file mode 100644 index df20db585..000000000 Binary files a/public/fonts/Exo+2_400_italic.woff and /dev/null differ diff --git a/public/fonts/Exo+2_400_normal.svg b/public/fonts/Exo+2_400_normal.svg deleted file mode 100644 index b7840616f..000000000 --- a/public/fonts/Exo+2_400_normal.svg +++ /dev/null @@ -1,318 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/fonts/Exo+2_400_normal.ttf b/public/fonts/Exo+2_400_normal.ttf deleted file mode 100644 index 8e9dcaddb..000000000 Binary files a/public/fonts/Exo+2_400_normal.ttf and /dev/null differ diff --git a/public/fonts/Exo+2_400_normal.woff b/public/fonts/Exo+2_400_normal.woff deleted file mode 100644 index 3471a5040..000000000 Binary files a/public/fonts/Exo+2_400_normal.woff and /dev/null differ diff --git a/public/fonts/Exo+2_500_normal.ttf b/public/fonts/Exo+2_500_normal.ttf deleted file mode 100644 index 4276190d8..000000000 Binary files a/public/fonts/Exo+2_500_normal.ttf and /dev/null differ diff --git a/public/fonts/Exo+2_500_normal.woff b/public/fonts/Exo+2_500_normal.woff deleted file mode 100644 index 0a7a53764..000000000 Binary files a/public/fonts/Exo+2_500_normal.woff and /dev/null differ diff --git a/public/fonts/Exo+2_700_normal.ttf b/public/fonts/Exo+2_700_normal.ttf deleted file mode 100644 index bb6b3e625..000000000 Binary files a/public/fonts/Exo+2_700_normal.ttf and /dev/null differ diff --git a/public/fonts/Exo+2_700_normal.woff b/public/fonts/Exo+2_700_normal.woff deleted file mode 100644 index 1fbb261d5..000000000 Binary files a/public/fonts/Exo+2_700_normal.woff and /dev/null differ diff --git a/src/assets/styles/generic/_vuetify.scss b/src/assets/styles/generic/_vuetify.scss index 1f6d23853..d8f3b892f 100644 --- a/src/assets/styles/generic/_vuetify.scss +++ b/src/assets/styles/generic/_vuetify.scss @@ -1,7 +1,8 @@ @import 'vuetify/settings'; @import '../settings/_colors.scss'; -$font-family: 'Exo 2', sans-serif; +$font-family: -apple-system, system-ui, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', + Arial, sans-serif; html { font-family: $font-family; diff --git a/src/components/icons/cryptos/GtIcon.vue b/src/components/icons/cryptos/GtIcon.vue new file mode 100644 index 000000000..083056020 --- /dev/null +++ b/src/components/icons/cryptos/GtIcon.vue @@ -0,0 +1,9 @@ + diff --git a/src/lib/constants/cryptos/data.json b/src/lib/constants/cryptos/data.json index 188670b02..e79d78ed9 100644 --- a/src/lib/constants/cryptos/data.json +++ b/src/lib/constants/cryptos/data.json @@ -426,6 +426,21 @@ "type": "ERC20", "fees": "ethereum" }, + "GT": { + "symbol": "GT", + "name": "Gate", + "decimals": 8, + "contractId": "0xe66747a101bff2dba3697199dcce5b743b454759", + "createCoin": false, + "cryptoTransferDecimals": 6, + "defaultVisibility": true, + "defaultGasLimit": 58000, + "defaultOrdinalLevel": 100, + "status": "active", + "mainCoin": "ETH", + "type": "ERC20", + "fees": "ethereum" + }, "SKL": { "symbol": "SKL", "name": "SKALE", @@ -592,4 +607,4 @@ "type": "ERC20", "fees": "ethereum" } -} \ No newline at end of file +} diff --git a/src/lib/vibrate.js b/src/lib/vibrate.js index 1fc72244b..96aa69e32 100644 --- a/src/lib/vibrate.js +++ b/src/lib/vibrate.js @@ -1,10 +1,11 @@ const VIBRATION_PATTERN = { - VERY_SHORT: [25], - SHORT: [50], - MEDIUM: [80], + VERY_SHORT: [40], + SHORT: [80], + MEDIUM: [160], LONG: [300], - DOUBLE_VERY_SHORT: [25, 25], - TRIPLE_VERY_SHORT: [25, 25, 25] + DOUBLE_VERY_SHORT: [40, 60, 40], + TRIPLE_VERY_SHORT: [40, 60, 40, 60, 40], + DOUBLE_SHORT: [80, 60, 80] } function checkVibrateIsSupported() { @@ -30,5 +31,6 @@ export const vibrate = { medium: createVibrationPattern(VIBRATION_PATTERN.MEDIUM), long: createVibrationPattern(VIBRATION_PATTERN.LONG), doubleVeryShort: createVibrationPattern(VIBRATION_PATTERN.DOUBLE_VERY_SHORT), - tripleVeryShort: createVibrationPattern(VIBRATION_PATTERN.TRIPLE_VERY_SHORT) + tripleVeryShort: createVibrationPattern(VIBRATION_PATTERN.TRIPLE_VERY_SHORT), + doubleShort: createVibrationPattern(VIBRATION_PATTERN.DOUBLE_SHORT) } diff --git a/src/router/index.js b/src/router/index.js index f33bc778f..a933f6a47 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -15,6 +15,7 @@ import Votes from '@/views/Votes.vue' import Nodes from '@/views/Nodes.vue' import Login from '@/views/Login.vue' import ExportKeys from '@/views/ExportKeys.vue' +import Vibro from '@/views/Vibro.vue' /** * @type {Readonly} @@ -148,6 +149,11 @@ const routes = [ { path: '/:pathMatch(.*)*', redirect: '/' + }, + { + path: '/vibro', + name: 'Vibro', + component: Vibro } ] diff --git a/src/views/Login.vue b/src/views/Login.vue index ecabbf4f1..6a5630333 100644 --- a/src/views/Login.vue +++ b/src/views/Login.vue @@ -196,14 +196,16 @@ export default defineComponent({ height: 100%; &__title { - font-family: 'Exo 2'; + font-family: -apple-system, system-ui, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', + Arial, sans-serif; font-weight: 100; font-size: 40px; line-height: 40px; text-transform: uppercase; } &__subtitle { - font-family: 'Exo 2'; + font-family: -apple-system, system-ui, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', + Arial, sans-serif; font-weight: 100; font-size: 18px; } diff --git a/src/views/Vibro.vue b/src/views/Vibro.vue new file mode 100644 index 000000000..cc0e87363 --- /dev/null +++ b/src/views/Vibro.vue @@ -0,0 +1,101 @@ + + + diff --git a/src/views/Votes.vue b/src/views/Votes.vue index b9fe2ed0c..167b669ca 100644 --- a/src/views/Votes.vue +++ b/src/views/Votes.vue @@ -87,7 +87,7 @@ import AppToolbarCentered from '@/components/AppToolbarCentered.vue' import Pagination from '@/components/Pagination.vue' import DelegatesTable from '@/components/DelegatesTable/DelegatesTable.vue' -import { computed, onMounted, ref, reactive, defineComponent } from 'vue' +import { computed, onMounted, ref, reactive, defineComponent, watch } from 'vue' import { useStore } from 'vuex' import { useI18n } from 'vue-i18n' @@ -134,6 +134,12 @@ export default defineComponent({ return Math.ceil(delegates.value.length / pagination.rowsPerPage) }) + watch(search, (newValue) => { + if (newValue.length > 0) { + pagination.page = 1 + } + }) + const showPagination = computed(() => search.value.length === 0) const reviewButtonDisabled = computed(() => { return numOfUpvotes.value + numOfDownvotes.value === 0