From 885c0c0d966378e1e367294128c4fdf504fbe1f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Micha=C5=82owski?= Date: Thu, 11 Jul 2024 08:20:27 +0200 Subject: [PATCH 1/8] test push --- admin/src/App.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/admin/src/App.vue b/admin/src/App.vue index 2094e06b1..29d0da3eb 100644 --- a/admin/src/App.vue +++ b/admin/src/App.vue @@ -11,6 +11,9 @@ import defaultLayout from '@/layouts/defaultLayout' export default { name: 'app', components: { defaultLayout }, + mounted() { + console.log('Test mounted log') + }, } diff --git a/admin/src/components/ContributionLink/ContributionLink.vue b/admin/src/components/ContributionLink/ContributionLink.vue index 027eb35d7..3b8f5f74f 100644 --- a/admin/src/components/ContributionLink/ContributionLink.vue +++ b/admin/src/components/ContributionLink/ContributionLink.vue @@ -10,21 +10,21 @@ > {{ $t('math.plus') }} {{ $t('contributionLink.newContributionLink') }} - +

{{ $t('contributionLink.contributionLinks') }}

@@ -33,9 +33,9 @@
{{ $t('contributionLink.noContributionLinks') }}
@@ -62,6 +62,7 @@ export default { required: true, }, }, + emits: ['get-contribution-links'], data: function () { return { visible: false, diff --git a/admin/src/components/ContributionLink/ContributionLinkForm.vue b/admin/src/components/ContributionLink/ContributionLinkForm.vue index f8e3d0f1f..239d77c83 100644 --- a/admin/src/components/ContributionLink/ContributionLinkForm.vue +++ b/admin/src/components/ContributionLink/ContributionLinkForm.vue @@ -1,13 +1,13 @@ - diff --git a/admin/src/components/Tables/StatisticTable.vue b/admin/src/components/Tables/StatisticTable.vue index a72e007a3..a533a2932 100644 --- a/admin/src/components/Tables/StatisticTable.vue +++ b/admin/src/components/Tables/StatisticTable.vue @@ -1,84 +1,100 @@ - diff --git a/admin/src/components/TransactionLinkList.vue b/admin/src/components/TransactionLinkList.vue index eb58903c6..d829002c3 100644 --- a/admin/src/components/TransactionLinkList.vue +++ b/admin/src/components/TransactionLinkList.vue @@ -5,9 +5,9 @@ { - this.rows = result.data.listTransactionLinksAdmin.count - this.items = result.data.listTransactionLinksAdmin.links - }) - .catch((error) => { - this.toastError(error.message) - }) - }, - }, computed: { fields() { return [ @@ -94,13 +74,33 @@ export default { ] }, }, - created() { - this.getListTransactionLinks() - }, watch: { currentPage() { this.getListTransactionLinks() }, }, + created() { + this.getListTransactionLinks() + }, + methods: { + getListTransactionLinks() { + this.$apollo + .query({ + query: listTransactionLinksAdmin, + variables: { + currentPage: this.currentPage, + pageSize: this.perPage, + userId: this.userId, + }, + }) + .then((result) => { + this.rows = result.data.listTransactionLinksAdmin.count + this.items = result.data.listTransactionLinksAdmin.links + }) + .catch((error) => { + this.toastError(error.message) + }) + }, + }, } diff --git a/admin/src/components/UserQuery.vue b/admin/src/components/UserQuery.vue index 449b4bdc9..3ec02a074 100644 --- a/admin/src/components/UserQuery.vue +++ b/admin/src/components/UserQuery.vue @@ -1,43 +1,53 @@ - diff --git a/admin/src/components/input/Coordinates.vue b/admin/src/components/input/Coordinates.vue index b71e5d9d4..6493c19cf 100644 --- a/admin/src/components/input/Coordinates.vue +++ b/admin/src/components/input/Coordinates.vue @@ -11,24 +11,24 @@ :description="$t('geo-coordinates.latitude-longitude-smart.describe')" > @@ -41,9 +41,12 @@ export default { name: 'Coordinates', props: { - value: Object, - default: null, + value: { + type: Object, + default: null, + }, }, + emits: ['input'], data() { return { inputValue: this.value, diff --git a/admin/src/components/input/EditableGroup.vue b/admin/src/components/input/EditableGroup.vue index 6a998f542..9f683fc06 100644 --- a/admin/src/components/input/EditableGroup.vue +++ b/admin/src/components/input/EditableGroup.vue @@ -1,17 +1,17 @@