From fd3221ea12a68031a9ed39d82d083ee0d6b3d352 Mon Sep 17 00:00:00 2001 From: Mehdi104797 <92753457+Mehdi104797@users.noreply.github.com> Date: Mon, 28 Apr 2025 13:21:11 +0330 Subject: [PATCH] =?UTF-8?q?=D8=AA=D8=BA=DB=8C=DB=8C=D8=B1=D8=A7=D8=AA=20?= =?UTF-8?q?=D8=AF=D8=B1=20=D8=A7=DB=8C=D9=85=D9=BE=D9=88=D8=B1=D8=AA=20?= =?UTF-8?q?=D9=87=D8=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/MainSection.vue | 14 ++- components/Navbar.vue | 22 ++-- components/RightSection.vue | 21 ++-- components/SwitchComponent.vue | 210 +++++++++++++++++++++++++++++++++ components/TaskUserReport.vue | 26 ++-- pages/TaskReport.vue | 4 +- pages/TaskTeams.vue | 5 +- 7 files changed, 269 insertions(+), 33 deletions(-) create mode 100644 components/SwitchComponent.vue diff --git a/components/MainSection.vue b/components/MainSection.vue index ea1b39f..45f2d6b 100644 --- a/components/MainSection.vue +++ b/components/MainSection.vue @@ -259,15 +259,18 @@ // import ImageUploader from "vue-image-upload-resize"; // import keyValueApi from "@apis/keyValueApi"; // import { mapActions, mapGetters, mapMutations } from "vuex"; -import taskApi from "@apis/taskApi"; -import HttpService from "@services/httpService"; +import taskApi from "@task/apis/taskApi"; +// import HttpService from "@services/httpService"; // import VuePersianDatetimePicker from "vue-persian-datetime-picker"; import { p2e } from "@plugins/persianNumber"; -import { mapGetters, mapMutations } from "vuex"; +// import { mapGetters, mapMutations } from "vuex"; +import { mapState, mapActions } from "pinia"; +import { useAuthStore } from "~/stores/authStore"; export default { beforeMount() { - this.httpService = new HttpService(); + // this.httpService = new HttpService(); + this.httpService = useNuxtApp()["$http"]; }, mounted() { this.setCurrentUserData(); @@ -293,6 +296,7 @@ export default { data() { return { + httpService: {}, foundUsers: [], selectedUser: { id: undefined, @@ -346,7 +350,7 @@ export default { }; }, computed: { - ...mapGetters(["currentUser", "taskSchemaGetter"]), + ...mapState(useAuthStore,["currentUser", "taskSchemaGetter"]), }, methods: { setCurrentUserData() { diff --git a/components/Navbar.vue b/components/Navbar.vue index dbe7e9b..5d34a4b 100644 --- a/components/Navbar.vue +++ b/components/Navbar.vue @@ -23,9 +23,9 @@ @click.prevent="toggleSidebarMenu()" > باز کردن منوی کنار - + +
+ + +
+ + + + + + + + diff --git a/components/TaskUserReport.vue b/components/TaskUserReport.vue index 450565a..2b00572 100644 --- a/components/TaskUserReport.vue +++ b/components/TaskUserReport.vue @@ -195,16 +195,24 @@ diff --git a/pages/TaskReport.vue b/pages/TaskReport.vue index 3ef2d30..c3a749b 100644 --- a/pages/TaskReport.vue +++ b/pages/TaskReport.vue @@ -96,12 +96,12 @@ export default { }; }, computed: { - ...mapGetters(useEntityStore, ["activeTabGetter"]), + ...mapState(useEntityStore, ["activeTabGetter"]), // ...mapGetters(["isSidebarCollapsed"]), ...mapState(useCommonStore, ["isSidebarCollapsed"]), }, methods: { - ...mapMutations(useEntityStore, ["activeTabSetter"]), + ...mapActions(useEntityStore, ["activeTabSetter"]), setActiveTab(tab) { this.activeTabSetter(tab); if (tab.key == "group") { diff --git a/pages/TaskTeams.vue b/pages/TaskTeams.vue index c248e40..599a9d2 100644 --- a/pages/TaskTeams.vue +++ b/pages/TaskTeams.vue @@ -172,6 +172,7 @@ // import HttpService from "@services/httpService"; import { useCommonStore } from "~/stores/commonStore"; import { usePermitStore } from "~/stores/permitStore"; +import { mapState, mapActions } from "pinia"; import menu from "@task/json/menu.json"; @@ -268,9 +269,9 @@ export default { }; }, computed: { - ...mapGetters(useCommonStore,["isSidebarCollapsed"]), + ...mapState(useCommonStore,["isSidebarCollapsed"]), - ...mapGetters(usePermitStore, ["projectGetter"]), + // ...mapGetters("permit", ["projectGetter"]), }, methods: { ...mapActions(useCommonStore,["checkPermissions"]),