Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

⬆️ deps: Bump @ethersproject/providers from 5.4.4 to 5.5.1 #19

Open
wants to merge 19 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
<a href="https://github.com/snapshot-labs/snapshot/actions/workflows/nodejs.yml">
<img src="https://github.com/snapshot-labs/snapshot/actions/workflows/nodejs.yml/badge.svg" alt="Node CI">
</a>
<img src="https://img.shields.io/github/commit-activity/w/snapshot-labs/snapshot" alt="GitHub commit activity">
<a href="https://github.com/snapshot-labs/snapshot/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22">
<img src="https://img.shields.io/github/issues/snapshot-labs/snapshot/help wanted" alt="GitHub issues help wanted">
</a>
<a href="https://telegram.snapshot.org">
<img src="https://img.shields.io/badge/Telegram-white?logo=telegram" alt="Telegram">
</a>
Expand Down
13 changes: 6 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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": {
Expand Down
18 changes: 15 additions & 3 deletions src/assets/fonts/iconfont.css
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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";
}
Expand Down
Binary file modified src/assets/fonts/iconfont.ttf
Binary file not shown.
Binary file modified src/assets/fonts/iconfont.woff
Binary file not shown.
Binary file modified src/assets/fonts/iconfont.woff2
Binary file not shown.
4 changes: 1 addition & 3 deletions src/components/Block/Space.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand Down
3 changes: 1 addition & 2 deletions src/components/Block/Votes.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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(() =>
Expand Down
16 changes: 8 additions & 8 deletions src/components/Modal/About.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,27 +25,27 @@ function changeLang() {
<template v-slot:header>
<h3>{{ $t('about') }}</h3>
</template>
<div class="text-center mt-4">
<div class="text-center mt-4 space-x-3">
<a href="https://twitter.com/SnapshotLabs" target="_blank">
<Icon size="32" name="twitter" class="mr-1 mx-2" />
<Icon size="32" name="twitter" class="hover:opacity-80" />
</a>
<a href="https://discord.snapshot.org" target="_blank">
<Icon size="32" name="discord" class="mr-1 mx-2" />
<Icon size="32" name="discord" class="hover:opacity-80" />
</a>
<a href="https://t.me/snapshotlabs" target="_blank">
<Icon size="32" name="telegram" class="mr-1 mx-2" />
<Icon size="32" name="telegram" class="hover:opacity-80" />
</a>
<a :href="`https://github.com/${pkg.repository}`" target="_blank">
<Icon size="32" name="github" class="mr-1 mx-2" />
<Icon size="32" name="github" class="hover:opacity-80" />
</a>
<a href="https://docs.snapshot.org/" target="_blank">
<Icon size="32" name="gitbook" class="mr-1 mx-2" />
<Icon size="32" name="gitbook" class="hover:opacity-80" />
</a>
<a href="https://gitcoin.co/grants/1093/snapshot" target="_blank">
<Icon size="32" name="loveit" class="mr-1 mx-2" />
<Icon size="32" name="loveit" class="hover:opacity-80" />
</a>
</div>
<div class="m-4 p-4 mt-3 border rounded-md link-color">
<div class="m-4 p-4 mt-3 space-y-1 border rounded-md link-color">
<div class="flex">
<span v-text="$t('language')" class="flex-auto text-color mr-1" />
<a @click="changeLang()">{{ languages[$i18n.locale]?.name }}</a>
Expand Down
41 changes: 13 additions & 28 deletions src/components/Modal/Plugins.vue
Original file line number Diff line number Diff line change
@@ -1,58 +1,42 @@
<script setup>
import { ref, computed, watch, toRefs } from 'vue';
import { useSearchFilters } from '@/composables/useSearchFilters';
import { clone } from '@snapshot-labs/snapshot.js/src/utils';

const props = defineProps({ open: Boolean, plugin: Object });
const emit = defineEmits(['add', 'close']);

const { open } = toRefs(props);
const searchInput = ref('');
const input = ref('');
const input = ref({});
const isValid = ref(true);
const selectedPlugin = ref({});

const { filteredPlugins } = useSearchFilters();
const plugins = computed(() => filteredPlugins());

const isValid = computed(() => {
try {
const params = JSON.parse(input.value);
return !!params;
} catch (e) {
return false;
}
});

function handleSubmit() {
let inputClone = clone(input.value);
inputClone = JSON.parse(inputClone);
const key = selectedPlugin.value.key;
emit('add', { inputClone, key });
emit('add', { input: input.value, key });
emit('close');
}

function selectPlugin(plugin) {
selectedPlugin.value = plugin;
input.value = selectedPlugin.value?.defaultParams ?? {};
}

watch(open, () => {
if (Object.keys(props.plugin).length > 0) {
const key = Object.keys(props.plugin)[0];
input.value = JSON.stringify(props.plugin[key], null, 2);
input.value = props.plugin[key];
selectedPlugin.value = plugins.value.find(obj => {
return obj.key === key;
});
} else {
input.value = JSON.stringify({}, null, 2);
input.value = {};
selectedPlugin.value = {};
}
});

watch(
selectedPlugin,
() =>
(input.value = JSON.stringify(
selectedPlugin.value?.defaultParams ?? {},
null,
2
))
);
</script>

<template>
Expand Down Expand Up @@ -82,8 +66,9 @@ watch(
class="block w-full mb-3 overflow-x-auto"
style="height: auto"
>
<TextareaAutosize
<TextareaJson
v-model="input"
v-model:is-valid="isValid"
:placeholder="$t('settings.pluginParameters')"
class="input text-left"
style="width: 560px"
Expand All @@ -102,7 +87,7 @@ watch(
<a
v-for="(plugin, i) in filteredPlugins(searchInput)"
:key="i"
@click="selectedPlugin = plugin"
@click="selectPlugin(plugin)"
>
<BlockPlugin :plugin="plugin" />
</a>
Expand Down
Loading