From e84ae7c352f4b910a108f27683acd1263ce0eb02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Micha=C5=82owski?= Date: Thu, 11 Jul 2024 08:14:59 +0200 Subject: [PATCH 001/128] initial dependency update with initial setup --- admin/package.json | 38 +++-- admin/src/components/NavBar.vue | 45 ++--- .../src/components/Tables/StatisticTable.vue | 156 ++++++++++-------- admin/src/i18n.js | 12 +- admin/src/main.js | 32 ++-- admin/src/pages/Overview.vue | 18 +- admin/src/plugins/apolloProvider.js | 8 +- admin/src/router/router.js | 12 +- admin/src/router/routes.js | 9 +- admin/src/store/store.js | 7 +- admin/vue.config.js | 19 ++- 11 files changed, 194 insertions(+), 162 deletions(-) diff --git a/admin/package.json b/admin/package.json index 96015e1c0..0288f725b 100644 --- a/admin/package.json +++ b/admin/package.json @@ -23,7 +23,9 @@ "@babel/core": "^7.15.8", "@babel/node": "^7.15.8", "@babel/preset-env": "^7.15.8", - "@vue/cli-plugin-unit-jest": "^4.5.14", + "@vue/apollo-option": "^4.0.0", + "@vue/cli-plugin-unit-jest": "~5.0.8", + "@vue/compat": "3.4.31", "@vue/eslint-config-prettier": "^6.0.0", "@vue/test-utils": "^1.2.2", "apollo-boost": "^0.4.9", @@ -32,8 +34,8 @@ "babel-plugin-component": "^1.1.1", "babel-preset-env": "^1.7.0", "babel-preset-vue": "^2.0.2", - "bootstrap": "4.3.1", - "bootstrap-vue": "^2.21.2", + "bootstrap": "^5.3.3", + "bootstrap-vue-next": "^0.23.2", "core-js": "^3.6.5", "date-fns": "^2.29.3", "dotenv-webpack": "^7.0.3", @@ -43,25 +45,26 @@ "jest": "26.6.3", "jest-canvas-mock": "^2.3.1", "jest-environment-jsdom-sixteen": "^2.0.0", - "portal-vue": "^2.1.7", + "portal-vue": "3.0.0", "qrcanvas-vue": "2.1.1", "regenerator-runtime": "^0.13.9", "stats-webpack-plugin": "^0.7.0", - "vue": "^2.6.11", - "vue-apollo": "^3.0.8", - "vue-i18n": "^8.26.5", - "vue-jest": "^3.0.7", - "vue-router": "^3.5.3", - "vuex": "^3.6.2", - "vuex-persistedstate": "^4.1.0" + "vue": "3.4.31", + "vue-apollo": "3.1.2", + "vue-i18n": "9.13.1", + "vue-jest": "3.0.7", + "vue-router": "4.4.0", + "vuex": "4.1.0", + "vuex-persistedstate": "4.1.0" }, "devDependencies": { - "@apollo/client": "^3.7.1", + "@apollo/client": "^3.10.8", "@babel/eslint-parser": "^7.15.8", "@intlify/eslint-plugin-vue-i18n": "^1.4.0", - "@vue/cli-plugin-babel": "~4.5.0", - "@vue/cli-plugin-eslint": "~4.5.0", - "@vue/cli-service": "~4.5.0", + "@vue/cli-plugin-babel": "~5.0.8", + "@vue/cli-plugin-eslint": "~5.0.8", + "@vue/cli-service": "~5.0.8", + "@vue/compiler-sfc": "3.4.31", "babel-eslint": "^10.1.0", "babel-plugin-transform-require-context": "^0.1.1", "cross-env": "^7.0.3", @@ -75,6 +78,7 @@ "eslint-plugin-prettier": "3.3.1", "eslint-plugin-promise": "^5.1.1", "eslint-plugin-vue": "^7.20.0", + "jest": "^27.1.0", "mock-apollo-client": "^1.2.1", "postcss": "^8.4.8", "postcss-html": "^1.3.0", @@ -82,8 +86,8 @@ "stylelint": "^14.5.3", "stylelint-config-recommended-vue": "^1.3.0", "stylelint-config-standard-scss": "^3.0.0", - "vue-cli-plugin-i18n": "^2.3.1", - "vue-template-compiler": "^2.6.11" + "unplugin-vue-components": "^0.27.2", + "vue-cli-plugin-i18n": "~2.3.2" }, "browserslist": [ "> 1%", diff --git a/admin/src/components/NavBar.vue b/admin/src/components/NavBar.vue index 4191290f3..3bec6ee68 100644 --- a/admin/src/components/NavBar.vue +++ b/admin/src/components/NavBar.vue @@ -1,41 +1,42 @@ diff --git a/admin/src/i18n.js b/admin/src/i18n.js index b2bb08074..c0e6ffedb 100644 --- a/admin/src/i18n.js +++ b/admin/src/i18n.js @@ -1,7 +1,4 @@ -import Vue from 'vue' -import VueI18n from 'vue-i18n' - -Vue.use(VueI18n) +import { createI18n } from 'vue-i18n' const loadLocaleMessages = () => { const locales = require.context('./locales/', true, /[A-Za-z0-9-_,\s]+\.json$/i) @@ -45,7 +42,7 @@ const numberFormats = { }, } -const dateTimeFormats = { +const datetimeFormats = { en: { short: { year: 'numeric', @@ -96,12 +93,13 @@ const dateTimeFormats = { }, } -const i18n = new VueI18n({ +const i18n = createI18n({ locale: 'en', + legacy: false, fallbackLocale: 'en', messages: loadLocaleMessages(), numberFormats, - dateTimeFormats, + datetimeFormats, }) export default i18n diff --git a/admin/src/main.js b/admin/src/main.js index 6a8b017c5..d9bfebe9e 100644 --- a/admin/src/main.js +++ b/admin/src/main.js @@ -1,5 +1,5 @@ -import Vue from 'vue' -import App from './App' +import { createApp } from 'vue' +import App from './App.vue' // without this async calls are not working import 'regenerator-runtime' @@ -15,32 +15,32 @@ import VueApollo from 'vue-apollo' import PortalVue from 'portal-vue' -import { BootstrapVue, IconsPlugin } from 'bootstrap-vue' +import { createBootstrap } from 'bootstrap-vue-next' + +// Add the necessary CSS import 'bootstrap/dist/css/bootstrap.css' -import 'bootstrap-vue/dist/bootstrap-vue.css' +import 'bootstrap-vue-next/dist/bootstrap-vue-next.css' import { toasters } from './mixins/toaster' import { apolloProvider } from './plugins/apolloProvider' -Vue.use(PortalVue) -Vue.use(BootstrapVue) +const app = createApp(App) -Vue.use(IconsPlugin) +app.use(router) +app.use(store) +app.use(i18n) +app.use(PortalVue) +app.use(createBootstrap()) -Vue.use(VueApollo) +app.use(VueApollo) +app.use(apolloProvider) -Vue.mixin(toasters) +app.mixin(toasters) addNavigationGuards(router, store, apolloProvider.defaultClient, i18n) i18n.locale = store.state.moderator && store.state.moderator.language ? store.state.moderator.language : 'en' -new Vue({ - router, - store, - i18n, - apolloProvider, - render: (h) => h(App), -}).$mount('#app') +app.mount('#app') diff --git a/admin/src/pages/Overview.vue b/admin/src/pages/Overview.vue index f921d2bc3..1e72f6a3b 100644 --- a/admin/src/pages/Overview.vue +++ b/admin/src/pages/Overview.vue @@ -1,6 +1,6 @@ diff --git a/admin/src/i18n.js b/admin/src/i18n.js index c0e6ffedb..b2bb08074 100644 --- a/admin/src/i18n.js +++ b/admin/src/i18n.js @@ -1,4 +1,7 @@ -import { createI18n } from 'vue-i18n' +import Vue from 'vue' +import VueI18n from 'vue-i18n' + +Vue.use(VueI18n) const loadLocaleMessages = () => { const locales = require.context('./locales/', true, /[A-Za-z0-9-_,\s]+\.json$/i) @@ -42,7 +45,7 @@ const numberFormats = { }, } -const datetimeFormats = { +const dateTimeFormats = { en: { short: { year: 'numeric', @@ -93,13 +96,12 @@ const datetimeFormats = { }, } -const i18n = createI18n({ +const i18n = new VueI18n({ locale: 'en', - legacy: false, fallbackLocale: 'en', messages: loadLocaleMessages(), numberFormats, - datetimeFormats, + dateTimeFormats, }) export default i18n diff --git a/admin/src/main.js b/admin/src/main.js index d9bfebe9e..6a8b017c5 100644 --- a/admin/src/main.js +++ b/admin/src/main.js @@ -1,5 +1,5 @@ -import { createApp } from 'vue' -import App from './App.vue' +import Vue from 'vue' +import App from './App' // without this async calls are not working import 'regenerator-runtime' @@ -15,32 +15,32 @@ import VueApollo from 'vue-apollo' import PortalVue from 'portal-vue' -import { createBootstrap } from 'bootstrap-vue-next' - -// Add the necessary CSS +import { BootstrapVue, IconsPlugin } from 'bootstrap-vue' import 'bootstrap/dist/css/bootstrap.css' -import 'bootstrap-vue-next/dist/bootstrap-vue-next.css' +import 'bootstrap-vue/dist/bootstrap-vue.css' import { toasters } from './mixins/toaster' import { apolloProvider } from './plugins/apolloProvider' -const app = createApp(App) +Vue.use(PortalVue) +Vue.use(BootstrapVue) -app.use(router) -app.use(store) -app.use(i18n) -app.use(PortalVue) -app.use(createBootstrap()) +Vue.use(IconsPlugin) -app.use(VueApollo) -app.use(apolloProvider) +Vue.use(VueApollo) -app.mixin(toasters) +Vue.mixin(toasters) addNavigationGuards(router, store, apolloProvider.defaultClient, i18n) i18n.locale = store.state.moderator && store.state.moderator.language ? store.state.moderator.language : 'en' -app.mount('#app') +new Vue({ + router, + store, + i18n, + apolloProvider, + render: (h) => h(App), +}).$mount('#app') diff --git a/admin/src/pages/Overview.vue b/admin/src/pages/Overview.vue index 1e72f6a3b..f921d2bc3 100644 --- a/admin/src/pages/Overview.vue +++ b/admin/src/pages/Overview.vue @@ -1,6 +1,6 @@ From 895c2a8d0ea5772d2fd03b44903dfaebca2f7c3a Mon Sep 17 00:00:00 2001 From: Kamila Date: Fri, 19 Jul 2024 11:29:19 +0200 Subject: [PATCH 018/128] remove not needed spaces, --- admin/src/composables/useCreationMonths.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/composables/useCreationMonths.js b/admin/src/composables/useCreationMonths.js index 6adcfc112..f0eeaea19 100644 --- a/admin/src/composables/useCreationMonths.js +++ b/admin/src/composables/useCreationMonths.js @@ -38,7 +38,7 @@ export default () => { } const creationLabel = () => { - return creationDates.value.map((date) => $d(date, 'monthShort')).join(' | ') + return creationDates.value.map((date) => $d(date, 'monthShort')).join('|') } const { result, error } = useQuery(adminOpenCreations, { userId }, { fetchPolicy: 'no-cache' }) From 9df9083cc2ff63d16e71a5a053342ba79b278119 Mon Sep 17 00:00:00 2001 From: Kamila Date: Fri, 19 Jul 2024 12:26:43 +0200 Subject: [PATCH 019/128] rework overview page --- admin/src/pages/Overview.vue | 72 +++++++++++++++++------------------- 1 file changed, 33 insertions(+), 39 deletions(-) diff --git a/admin/src/pages/Overview.vue b/admin/src/pages/Overview.vue index 1e72f6a3b..0c6ff86fd 100644 --- a/admin/src/pages/Overview.vue +++ b/admin/src/pages/Overview.vue @@ -1,21 +1,21 @@ - From 6b5941b4cb19406d2077a4a6a979b23813bb47f6 Mon Sep 17 00:00:00 2001 From: Kamila Date: Fri, 19 Jul 2024 12:27:25 +0200 Subject: [PATCH 020/128] rework component --- admin/src/components/UserQuery.vue | 69 ++++++++++++++++-------------- 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/admin/src/components/UserQuery.vue b/admin/src/components/UserQuery.vue index 449b4bdc9..f6677fa1a 100644 --- a/admin/src/components/UserQuery.vue +++ b/admin/src/components/UserQuery.vue @@ -1,43 +1,46 @@ - From b29230bc7956bbb6c6a98cf72f7fefb36daf2bc5 Mon Sep 17 00:00:00 2001 From: Kamila Date: Fri, 19 Jul 2024 12:29:03 +0200 Subject: [PATCH 021/128] rework user search page --- admin/src/pages/UserSearch.vue | 86 ++++++++++++++++++---------------- 1 file changed, 46 insertions(+), 40 deletions(-) diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue index 90ee6b485..8aa84c086 100644 --- a/admin/src/pages/UserSearch.vue +++ b/admin/src/pages/UserSearch.vue @@ -2,7 +2,7 @@
- + {{ filters.byActivated === null ? $t('all_emails') @@ -12,7 +12,7 @@ }} - + {{ filters.byDeleted === null ? $t('all_emails') @@ -39,18 +39,20 @@ :total-rows="rows" align="center" :hide-ellipsis="true" - > + />
From 968c7ceac34df8fdc5de0fd361f85b682a5238a3 Mon Sep 17 00:00:00 2001 From: Kamila Date: Fri, 19 Jul 2024 14:31:08 +0200 Subject: [PATCH 023/128] navbar adjustments --- admin/src/components/NavBar.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/admin/src/components/NavBar.vue b/admin/src/components/NavBar.vue index bad81f79a..6d6450989 100644 --- a/admin/src/components/NavBar.vue +++ b/admin/src/components/NavBar.vue @@ -12,7 +12,7 @@ {{ $t('navbar.user_search') }} {{ $t('creation') }} - + {{ openCreations.value }} @@ -44,6 +44,7 @@ import { BNavbarBrand, BBadge, BNavbarToggle, + vBColorMode, } from 'bootstrap-vue-next' const store = useStore() From ff86af18b2168af669dc60c09dd4027a3ae1a065 Mon Sep 17 00:00:00 2001 From: Kamila Date: Mon, 22 Jul 2024 09:44:05 +0200 Subject: [PATCH 024/128] add depenedencies --- admin/package.json | 1 + admin/yarn.lock | 26 ++++++++++++++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/admin/package.json b/admin/package.json index dcfab16ac..93c64c286 100644 --- a/admin/package.json +++ b/admin/package.json @@ -50,6 +50,7 @@ "portal-vue": "3.0.0", "qrcanvas-vue": "3.0.0", "regenerator-runtime": "^0.13.9", + "sass": "^1.77.8", "vite": "3.2.10", "vite-plugin-commonjs": "^0.10.1", "vue": "3.4.31", diff --git a/admin/yarn.lock b/admin/yarn.lock index 33fa8e107..798fa4f3c 100644 --- a/admin/yarn.lock +++ b/admin/yarn.lock @@ -3824,7 +3824,7 @@ char-regex@^2.0.0: resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-2.0.1.tgz#6dafdb25f9d3349914079f010ba8d0e6ff9cd01e" integrity sha512-oSvEeo6ZUD7NepqAat3RqoucZ5SeqLJgOvVIwkafu6IP3V0pO38s/ypdVUmDDK6qIIHNlYHJAKX9E7R7HoKElw== -chokidar@^3.6.0: +"chokidar@>=3.0.0 <4.0.0", chokidar@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b" integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw== @@ -5832,6 +5832,11 @@ ignore@^5.1.1, ignore@^5.1.4: resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== +immutable@^4.0.0: + version "4.3.6" + resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.6.tgz#6a05f7858213238e587fb83586ffa3b4b27f0447" + integrity sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ== + import-fresh@^3.0.0, import-fresh@^3.2.1: version "3.3.0" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" @@ -8924,6 +8929,15 @@ sane@^4.0.3: minimist "^1.1.1" walker "~1.0.5" +sass@^1.77.8: + version "1.77.8" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.8.tgz#9f18b449ea401759ef7ec1752a16373e296b52bd" + integrity sha512-4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ== + dependencies: + chokidar ">=3.0.0 <4.0.0" + immutable "^4.0.0" + source-map-js ">=0.6.2 <2.0.0" + saxes@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" @@ -9147,16 +9161,16 @@ snapdragon@^0.8.1: source-map-resolve "^0.5.0" use "^3.1.0" +"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af" + integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg== + source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== -source-map-js@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af" - integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg== - source-map-resolve@^0.5.0, source-map-resolve@^0.5.2: version "0.5.3" resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" From 61bd9f3aa88f335ff4b2703aba65cad803b06e1f Mon Sep 17 00:00:00 2001 From: Kamila Date: Mon, 22 Jul 2024 09:44:40 +0200 Subject: [PATCH 025/128] style adjustment in footer --- admin/src/components/ContentFooter.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/admin/src/components/ContentFooter.vue b/admin/src/components/ContentFooter.vue index a9afe90d7..d1591e242 100644 --- a/admin/src/components/ContentFooter.vue +++ b/admin/src/components/ContentFooter.vue @@ -32,17 +32,16 @@ import CONFIG from '../config' import { BTr } from 'bootstrap-vue-next' - const year = new Date().getFullYear() const version = CONFIG.APP_VERSION const hash = CONFIG.BUILD_COMMIT const shortHash = CONFIG.BUILD_COMMIT_SHORT - From baaf06ca974359510343e244c09f62f24fc8c689 Mon Sep 17 00:00:00 2001 From: Kamila Date: Mon, 22 Jul 2024 09:57:23 +0200 Subject: [PATCH 026/128] composable adjustments --- admin/src/composables/useCreationMonths.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/admin/src/composables/useCreationMonths.js b/admin/src/composables/useCreationMonths.js index f0eeaea19..7e87a7a07 100644 --- a/admin/src/composables/useCreationMonths.js +++ b/admin/src/composables/useCreationMonths.js @@ -1,8 +1,11 @@ import { ref, computed, watch } from 'vue' import { adminOpenCreations } from '../graphql/adminOpenCreations' import { useQuery } from '@vue/apollo-composable' +import { useI18n } from 'vue-i18n' export default () => { + const { d } = useI18n() + const creation = ref([1000, 1000, 1000]) const userId = ref(0) @@ -19,10 +22,10 @@ export default () => { const result = [] creationDates.value.forEach((date) => { result.push({ - short: $d(date, 'month'), - long: $d(date, 'short'), - year: $d(date, 'year'), - date: $d(date, 'short', 'en'), + short: d(date, 'month'), + long: d(date, 'long'), + year: d(date, 'year'), + date: d(date, 'short', 'en'), }) }) return result @@ -38,7 +41,7 @@ export default () => { } const creationLabel = () => { - return creationDates.value.map((date) => $d(date, 'monthShort')).join('|') + return creationDates.value.map((date) => d(date, 'monthShort')).join(' | ') } const { result, error } = useQuery(adminOpenCreations, { userId }, { fetchPolicy: 'no-cache' }) From d2f07ee0c4af4a80cf3421c4e3b62bb82836def7 Mon Sep 17 00:00:00 2001 From: Kamila Date: Mon, 22 Jul 2024 12:51:57 +0200 Subject: [PATCH 027/128] update node version --- admin/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/Dockerfile b/admin/Dockerfile index 029339f10..0658c2053 100644 --- a/admin/Dockerfile +++ b/admin/Dockerfile @@ -1,7 +1,7 @@ ################################################################################## # BASE ########################################################################### ################################################################################## -FROM node:14.17.0-alpine3.10 as base +FROM node:16-alpine3.14 as base # ENVs (available in production aswell, can be overwritten by commandline or env file) ## DOCKER_WORKDIR would be a classical ARG, but that is not multi layer persistent - shame From a35ce52cc91d939ce28186888134073d10b77edc Mon Sep 17 00:00:00 2001 From: Kamila Date: Mon, 22 Jul 2024 14:57:50 +0200 Subject: [PATCH 028/128] rework search and pagination --- admin/src/components/UserQuery.vue | 25 +++++++++++++-------- admin/src/pages/UserSearch.vue | 35 +++++++++++++++++++++++++----- 2 files changed, 45 insertions(+), 15 deletions(-) diff --git a/admin/src/components/UserQuery.vue b/admin/src/components/UserQuery.vue index f6677fa1a..045ad1ff9 100644 --- a/admin/src/components/UserQuery.vue +++ b/admin/src/components/UserQuery.vue @@ -7,7 +7,7 @@ v-model="currentValue" :placeholder="placeholderText" /> -
+
@@ -22,25 +22,32 @@ import { useI18n } from 'vue-i18n' import { BInputGroupText, BFormInput } from 'bootstrap-vue-next' const props = defineProps({ - value: { type: String, default: '' }, + modelValue: { type: String, default: '' }, placeholder: { type: String, default: '' }, }) -const emit = defineEmits(['input']) +const emit = defineEmits(['update:modelValue']) const { t } = useI18n() -const currentValue = ref(props.value) - const placeholderText = computed(() => props.placeholder || t('user_search')) -const clearValue = () => { +const onClear = () => { currentValue.value = '' } +const currentValue = ref(props.modelValue) + watch(currentValue, (newValue) => { - if (props.value !== newValue) { - emit('input', newValue) - } + emit('update:modelValue', newValue) }) + +watch( + () => props.modelValue, + (newValue) => { + if (newValue !== currentValue.value) { + currentValue.value = newValue + } + }, +) diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue index 8aa84c086..a47fef58e 100644 --- a/admin/src/pages/UserSearch.vue +++ b/admin/src/pages/UserSearch.vue @@ -32,13 +32,13 @@ @updateDeletedAt="updateDeletedAt" />
@@ -65,7 +65,7 @@ const currentPage = ref(1) const perPage = ref(25) const response = ref() -const { creationDates, creationLabel } = useCreationMonths() +const { creationLabel } = useCreationMonths() const { result, refetch } = useQuery(searchUsers, { query: criteria.value, @@ -91,7 +91,6 @@ const updateRoles = (userId, roles) => { const updateDeletedAt = (userId, deletedAt) => { searchResult.value.find((obj) => obj.userId === userId).deletedAt = deletedAt // toastSuccess(deletedAt ? $t('user_deleted') : $t('user_recovered')) - refetch() } const unconfirmedRegisterMails = () => { @@ -122,8 +121,32 @@ const fields = computed(() => [ { key: 'status', label: t('status') }, ]) -watch(currentPage, refetch) -watch(criteria, refetch) +watch( + () => currentPage.value, + async (newValue, oldValue) => { + if (newValue !== oldValue) { + await refetch({ + query: criteria.value, + filters: filters, + currentPage: newValue, + pageSize: perPage.value, + order: 'DESC', + fetchPolicy: 'no-cache', + }) + } + }, +) + +watch( + () => criteria.value, + async (newValue, oldValue) => { + if (newValue !== oldValue) { + await refetch({ + query: newValue, + }) + } + }, +) 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 @@