diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000000..25e4efef1669 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,20 @@ +version: 2 +updates: + - package-ecosystem: 'npm' + directory: '/' + schedule: + interval: 'daily' + commit-message: + prefix: '⬆️ deps:' + prefix-development: '⬆️ deps(dev):' + open-pull-requests-limit: 20 + rebase-strategy: auto + - package-ecosystem: 'gitsubmodule' + directory: '/' + schedule: + interval: 'daily' + commit-message: + prefix: '⬆️ subs:' + prefix-development: '⬆️ subs(dev):' + open-pull-requests-limit: 20 + rebase-strategy: auto diff --git a/README.md b/README.md index 4e944b9687be..b57b58f767ed 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,10 @@ Node CI + GitHub commit activity + + GitHub issues help wanted + Telegram diff --git a/package.json b/package.json index 80aafbc1bd06..7c1d0484a395 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@ethersproject/address": "^5.4.0", "@ethersproject/bignumber": "^5.4.1", "@ethersproject/bytes": "^5.4.0", - "@ethersproject/providers": "^5.4.3", + "@ethersproject/providers": "^5.5.1", "@ethersproject/solidity": "^5.4.0", "@ethersproject/strings": "^5.5.0", "@ethersproject/units": "^5.4.0", @@ -26,7 +26,7 @@ "@portis/web3": "^4.0.5", "@pusher/push-notifications-web": "^1.1.0", "@snapshot-labs/lock": "github:snapshot-labs/lock#master", - "@snapshot-labs/snapshot.js": "^0.3.22", + "@snapshot-labs/snapshot.js": "^0.3.23", "@toruslabs/torus-embed": "^1.12.1", "@vue/apollo-composable": "4.0.0-alpha.12", "@vueuse/core": "^5.2.0", @@ -38,7 +38,7 @@ "eth-ens-namehash": "^2.0.8", "ethereum-blockies-base64": "^1.0.2", "fortmatic": "^2.2.1", - "graphql": "^15.5.1", + "graphql": "^15.8.0", "graphql-tag": "^2.12.4", "lodash": "^4.17.21", "numeral": "^2.0.6", @@ -49,7 +49,7 @@ "scrollmonitor": "^1.2.4", "timeago.js": "^4.0.2", "typescript": "^4.3.5", - "vue": "^3.2.1", + "vue": "^3.2.26", "vue-i18n": "^9.1.7", "vue-router": "^4.0.9", "vue-tippy": "^6.0.0-alpha.32", @@ -59,8 +59,7 @@ "@types/node": "^16.4.10", "@typescript-eslint/eslint-plugin": "^2.34.0", "@typescript-eslint/parser": "^2.34.0", - "@vitejs/plugin-vue": "^1.3.0", - "@vue/compiler-sfc": "^3.2.1", + "@vitejs/plugin-vue": "^2.0.1", "@vue/eslint-config-prettier": "^6.0.0", "@vue/eslint-config-typescript": "^7.0.0", "autoprefixer": "^10.3.3", @@ -74,7 +73,7 @@ "sass-loader": "^8.0.2", "tailwindcss": "^2.2.9", "unplugin-vue-components": "^0.15.6", - "vite": "^2.6.0-beta.2", + "vite": "^2.7.2", "walletlink": "^2.1.8" }, "resolutions": { diff --git a/snapshot-plugins b/snapshot-plugins index 8d1150823278..4ca2d0a652f7 160000 --- a/snapshot-plugins +++ b/snapshot-plugins @@ -1 +1 @@ -Subproject commit 8d115082327818dc7aa446f94170a411c69273aa +Subproject commit 4ca2d0a652f7db9b87909da2a1ec8796a0527283 diff --git a/snapshot-spaces b/snapshot-spaces index d46c99edf45f..5d18975a5247 160000 --- a/snapshot-spaces +++ b/snapshot-spaces @@ -1 +1 @@ -Subproject commit d46c99edf45f403fefb7c113c7911ad49581ee18 +Subproject commit 5d18975a5247fd1a0616936b8793c951bbe020ef diff --git a/src/assets/fonts/iconfont.css b/src/assets/fonts/iconfont.css index 8eaae741a918..fa148c1cab54 100644 --- a/src/assets/fonts/iconfont.css +++ b/src/assets/fonts/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 1946815 */ - src: url('iconfont.woff2?t=1638129463004') format('woff2'), - url('iconfont.woff?t=1638129463004') format('woff'), - url('iconfont.ttf?t=1638129463004') format('truetype'); + src: url('iconfont.woff2?t=1639572272378') format('woff2'), + url('iconfont.woff?t=1639572272378') format('woff'), + url('iconfont.ttf?t=1639572272378') format('truetype'); } .iconfont { @@ -13,6 +13,18 @@ -moz-osx-font-smoothing: grayscale; } +.iconpreview:before { + content: "\e637"; +} + +.iconfilter:before { + content: "\e74f"; +} + +.iconhome:before { + content: "\e673"; +} + .iconapps:before { content: "\e613"; } diff --git a/src/assets/fonts/iconfont.ttf b/src/assets/fonts/iconfont.ttf index 80f0e0e82d4d..63835fb445a5 100644 Binary files a/src/assets/fonts/iconfont.ttf and b/src/assets/fonts/iconfont.ttf differ diff --git a/src/assets/fonts/iconfont.woff b/src/assets/fonts/iconfont.woff index 126f1c43131a..7a5ab1dd9e7b 100644 Binary files a/src/assets/fonts/iconfont.woff and b/src/assets/fonts/iconfont.woff differ diff --git a/src/assets/fonts/iconfont.woff2 b/src/assets/fonts/iconfont.woff2 index 989e665c8109..c1b77be4a56e 100644 Binary files a/src/assets/fonts/iconfont.woff2 and b/src/assets/fonts/iconfont.woff2 differ diff --git a/src/components/Block/Space.vue b/src/components/Block/Space.vue index 852aaf6af3ab..2cfd0e8cc340 100644 --- a/src/components/Block/Space.vue +++ b/src/components/Block/Space.vue @@ -12,15 +12,13 @@ const props = defineProps({ }); const auth = getInstance(); -const { web3 } = useWeb3(); +const { web3Account } = useWeb3(); const { explore } = useApp(); const nbrMembers = explore.value.spaces[props.space.id].followers; const isVerified = verified[props.space.id] || 0; -const web3Account = computed(() => web3.value.account); - const isAdmin = computed(() => { const admins = props.space?.admins?.map(address => address.toLowerCase()); diff --git a/src/components/Block/Votes.vue b/src/components/Block/Votes.vue index 6fbee7f74c7a..c678487a072b 100644 --- a/src/components/Block/Votes.vue +++ b/src/components/Block/Votes.vue @@ -21,12 +21,11 @@ defineEmits(['loadVotes']); const format = getChoiceString; const { votes } = toRefs(props); -const { web3 } = useWeb3(); +const { web3Account } = useWeb3(); const authorIpfsHash = ref(''); const modalReceiptOpen = ref(false); -const web3Account = computed(() => web3.value.account); const isFinalProposal = computed(() => props.proposal.scores_state === 'final'); const voteCount = computed(() => diff --git a/src/components/Modal/About.vue b/src/components/Modal/About.vue index 47e4e3500ab2..4e00da8cc683 100644 --- a/src/components/Modal/About.vue +++ b/src/components/Modal/About.vue @@ -25,27 +25,27 @@ function changeLang() { -
+
- + - + - + - + - + - +
-