.

2025-02-27 08:55:27 +03:30 · 2025-02-27 08:55:27 +03:30 · 0d0fd2dacd
commit 0d0fd2dacd
parent 606d3bdc05
22 changed files with 114 additions and 81 deletions
--- a/assets/permit/scss/permit.scss
+++ b/assets/permit/scss/permit.scss
@ -1,5 +1,7 @@
-@import "src/assets/common/scss/mixin";
-@import "src/assets/common/scss/placeholder";
+// @import "src/assets/common/scss/mixin";
+// @import "src/assets/common/scss/placeholder";
+@import "@/assets/common/scss/mixin";
+@import "@/assets/common/scss/placeholder";

 .admin-system,.task-system,.admin-panel{
  //@import "main";
--- a/assets/user-panel/scss/management.scss
+++ b/assets/user-panel/scss/management.scss
@ -1,5 +1,7 @@
-@import "src/assets/common/scss/mixin";
-@import "src/assets/common/scss/placeholder";
+// @import "src/assets/common/scss/mixin";
+// @import "src/assets/common/scss/placeholder";
+@import "@/assets/common/scss/mixin";
+@import "@/assets/common/scss/placeholder";

 .admin-panel {
  .pages-content-container {
--- a/components/auth/activate.vue
+++ b/components/auth/activate.vue
@ -106,7 +106,9 @@

 <script>
 import authMixin from "~/mixins/authMixin";
-import { required, minLength } from "vuelidate/lib/validators";
+import { required,minLength } from '@vuelidate/validators'
+import useVuelidate from '@vuelidate/core'
+

 import { mapState } from "pinia";

--- a/components/auth/auth-modals/ActivateModal.vue
+++ b/components/auth/auth-modals/ActivateModal.vue
@ -5,13 +5,13 @@
        "{{ userFullname(getFullName) }}" عزیز، خوش آمدید.
      </div>

-      <div v-else> 0{{ getMobile }} </div>
+      <div v-else>0{{ getMobile }}</div>
    </div>
    <div class="m-sign-up__text">رمز پیامک شده را وارد کنید</div>
    <div class="m-sign-up__form">
      <div class="m-sign-up__form-row m-sign-up__simple-input">
        <div
-          class="form-group "
+          class="form-group"
          :class="{ 'form-group--error': $v.code.$error }"
        >
          <input
@ -96,7 +96,7 @@
      </div>
      <div class="m-sign-up__button-container">
        <a @click.prevent="goBack" :href="$t('Back')">{{ $t("Back") }}</a>
-        <button  v-on:click="doActivate">
+        <button v-on:click="doActivate">
          {{ $t("Verify") }}
        </button>
      </div>
@ -106,7 +106,8 @@

 <script>
 import authMixin from "~/mixins/authMixin";
-import { required, minLength } from "vuelidate/lib/validators";
+
+import { required, minLength } from "@vuelidate/validators";
 import { useCommonStore } from "~/stores/commonStore";
 import { useAuthStore } from "~/stores/authStore";
 import { mapState } from "pinia";
@ -147,7 +148,11 @@ export default {
    };
  },
  computed: {
-    ...mapState(useAuthStore,["getMobile", "getFullName", "getResetPasswordState"]),
+    ...mapState(useAuthStore, [
+      "getMobile",
+      "getFullName",
+      "getResetPasswordState",
+    ]),
  },
  methods: {
    resetErrors() {
@ -187,9 +192,9 @@ export default {

            const { $eventBus } = useNuxtApp();
            $eventBus.emit(
-                'authenticated-by-modal',
-                this.$route.query["invite-id"]
-              );
+              "authenticated-by-modal",
+              this.$route.query["invite-id"]
+            );

            // vm.$router.push({
            // name: "dashboard",
@ -226,7 +231,7 @@ export default {
      const vm = this;

      var timeleft = timeInSecond;
-      var downloadTimer = setInterval(function() {
+      var downloadTimer = setInterval(function () {
        if (timeleft <= 0) {
          clearInterval(downloadTimer);
          vm.$refs.countdown.innerHTML = "ارسال مجدد";
@ -250,7 +255,7 @@ export default {
  display: inline-block !important;
  text-align: center !important;
  border: none !important;
-  background:unset !important;
+  background: unset !important;
  &[disabled] {
    min-width: 4em !important;
  }
--- a/components/auth/auth-modals/ForgetModal.vue
+++ b/components/auth/auth-modals/ForgetModal.vue
@ -43,7 +43,7 @@ import {
  minLength,
  maxLength,
  between,
-} from "vuelidate/lib/validators";
+} from "@vuelidate/validators";

 export default {
  name: "forget",
--- a/components/auth/auth-modals/LoginFormModal.vue
+++ b/components/auth/auth-modals/LoginFormModal.vue
@ -156,7 +156,7 @@ import {
  minLength,
  maxLength,
  between,
-} from "vuelidate/lib/validators";
+} from "@vuelidate/validators";

 export default {
  mounted() {
--- a/components/auth/auth-modals/LoginPhoneModal.vue
+++ b/components/auth/auth-modals/LoginPhoneModal.vue
@ -116,7 +116,7 @@ import {
  minLength,
  maxLength,
  between,
-} from "vuelidate/lib/validators";
+} from "@vuelidate/validators";

 import { mapState, mapActions } from "pinia";
 import { useCommonStore } from "~/stores/commonStore";
--- a/components/auth/auth-modals/RegisterFormModal.vue
+++ b/components/auth/auth-modals/RegisterFormModal.vue
@ -207,7 +207,7 @@ import {
  maxLength,
  between,
  sameAs,
-} from "vuelidate/lib/validators";
+} from "@vuelidate/validators";

 export default {
  mounted(){
--- a/components/auth/auth-modals/ResetPassModal.vue
+++ b/components/auth/auth-modals/ResetPassModal.vue
@ -93,7 +93,7 @@ import {
  maxLength,
  between,
  sameAs,
-} from "vuelidate/lib/validators";
+} from "@vuelidate/validators";

 export default {
  validations: {
--- a/components/auth/auth-modals/ResetPassPhoneModal.vue
+++ b/components/auth/auth-modals/ResetPassPhoneModal.vue
@ -110,7 +110,7 @@ import {
  required,
  minLength,
  sameAs,
-} from "vuelidate/lib/validators";
+} from "@vuelidate/validators";
 import { mapState, mapActions } from "pinia";
 import { useCommonStore } from "~/stores/commonStore";
 import { useAuthStore } from "~/stores/authStore";
--- a/components/auth/forget.vue
+++ b/components/auth/forget.vue
@ -34,12 +34,8 @@

 <script>
 import authMixin from "~/mixins/authMixin";
-import {
-  required,
-  minLength,
-  maxLength,
-  between,
-} from "vuelidate/lib/validators";
+
+import { required, minLength, maxLength, between } from "@vuelidate/validators";

 export default {
  name: "forget",
--- a/components/auth/loginphone.vue
+++ b/components/auth/loginphone.vue
@ -116,7 +116,7 @@ import {
  minLength,
  maxLength,
  between,
-} from "vuelidate/lib/validators";
+} from "@vuelidate/validators";

 import { mapState, mapActions } from "pinia";
 import { useCommonStore } from "~/stores/commonStore";
--- a/components/auth/resetpass.vue
+++ b/components/auth/resetpass.vue
@ -146,7 +146,7 @@ import {
  maxLength,
  between,
  sameAs,
-} from "vuelidate/lib/validators";
+} from "@vuelidate/validators";

 export default {
  validations: {
--- a/components/auth/resetpassphone.vue
+++ b/components/auth/resetpassphone.vue
@ -107,7 +107,7 @@ import {
  required,
  minLength,
  sameAs,
-} from "vuelidate/lib/validators";
+} from "@vuelidate/validators";
 import { mapState, mapActions } from "pinia";

 export default {
--- a/components/auth/upname.vue
+++ b/components/auth/upname.vue
@ -44,7 +44,7 @@ import {
  minLength,
  maxLength,
  between,
-} from "vuelidate/lib/validators";
+} from "@vuelidate/validators";

 export default {
  validations: {
--- a/components/forms/HtmlEditor.vue
+++ b/components/forms/HtmlEditor.vue
@ -4,7 +4,7 @@
      >{{ getLabel() }}:</label
    >
    <div>
-      <codemirror
+      <!-- <codemirror
        :options="cmOptions"
        class="markdown-preview"
        v-model="textValue"
@ -12,7 +12,7 @@
        :id="localFormElement.key"
        :name="localFormElement.key"
        ref="myCm"
-      ></codemirror>
+      ></codemirror> -->
    </div>
  </div>
 </template>
@ -21,20 +21,20 @@
 import { mapState } from "pinia";
 import formBuilderMixin from "@mixins/formBuilderMixin";

-import { codemirror } from "vue-codemirror";
-import "vue-codemirror/node_modules/codemirror/lib/codemirror.css";
-import "vue-codemirror/node_modules/codemirror/mode/markdown/markdown.js";
-import "vue-codemirror/node_modules/codemirror/mode/javascript/javascript.js";
-import "vue-codemirror/node_modules/codemirror/mode/css/css.js";
-import "vue-codemirror/node_modules/codemirror/mode/vue/vue.js";
-import "vue-codemirror/node_modules/codemirror/mode/htmlmixed/htmlmixed.js";
-import "vue-codemirror/node_modules/codemirror/addon/edit/closebrackets.js";
-import "vue-codemirror/node_modules/codemirror/addon/edit/matchbrackets.js";
-import "vue-codemirror/node_modules/codemirror/addon/edit/closetag.js";
-import "vue-codemirror/node_modules/codemirror/addon/display/placeholder.js";
-import "vue-codemirror/node_modules/codemirror/addon/scroll/simplescrollbars.js";
-import "vue-codemirror/node_modules/codemirror/addon/scroll/simplescrollbars.css";
-import "vue-codemirror/node_modules/codemirror/addon/selection/active-line.js";
+// import { codemirror } from "vue-codemirror";
+// import "vue-codemirror/node_modules/codemirror/lib/codemirror.css";
+// import "vue-codemirror/node_modules/codemirror/mode/markdown/markdown.js";
+// import "vue-codemirror/node_modules/codemirror/mode/javascript/javascript.js";
+// import "vue-codemirror/node_modules/codemirror/mode/css/css.js";
+// import "vue-codemirror/node_modules/codemirror/mode/vue/vue.js";
+// import "vue-codemirror/node_modules/codemirror/mode/htmlmixed/htmlmixed.js";
+// import "vue-codemirror/node_modules/codemirror/addon/edit/closebrackets.js";
+// import "vue-codemirror/node_modules/codemirror/addon/edit/matchbrackets.js";
+// import "vue-codemirror/node_modules/codemirror/addon/edit/closetag.js";
+// import "vue-codemirror/node_modules/codemirror/addon/display/placeholder.js";
+// import "vue-codemirror/node_modules/codemirror/addon/scroll/simplescrollbars.js";
+// import "vue-codemirror/node_modules/codemirror/addon/scroll/simplescrollbars.css";
+// import "vue-codemirror/node_modules/codemirror/addon/selection/active-line.js";

 export default {
  mixins: [formBuilderMixin],
--- a/components/forms/ImageComponent.vue
+++ b/components/forms/ImageComponent.vue
@ -1,8 +1,8 @@
 <template>
  <div class="row form-group" :key="$attrs.key">
-    <label :for="localFormElement?.key" class="col-md-3">{{
-      localFormElement?.label
-    }}:</label>
+    <label :for="localFormElement?.key" class="col-md-3"
+      >{{ localFormElement?.label }}:</label
+    >

    <div v-if="isInitial" class="dropbox">
      <input
@ -58,7 +58,7 @@ const STATUS_INITIAL = 0,
  STATUS_FAILED = 3;

 import { upload } from "@services/fileUploadService";
-import { wait } from "@utilities/utilities.js";
+import { wait } from "~/manuals/utilities.js";

 import formBuilderMixin from "@mixins/formBuilderMixin";
 export default {
--- a/components/forms/RangeDateComponent.vue
+++ b/components/forms/RangeDateComponent.vue
@ -92,7 +92,7 @@ export default {
    // datePicker: VuePersianDatetimePicker,
    datePicker: () =>
      import(
-         "vue-persian-datetime-picker"
+         "vue3-persian-datetime-picker"
      ),
  },
 };
--- a/package-lock.json
+++ b/package-lock.json
@ -17,6 +17,7 @@
        "@vueup/vue-quill": "^1.2.0",
        "axios": "^1.7.7",
        "bootstrap": "^5.3.3",
+        "codemirror": "^6.0.1",
        "docx": "^9.1.1",
        "echarts": "^5.5.1",
        "echarts-wordcloud": "^2.1.0",
@ -667,7 +668,6 @@
      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.18.3.tgz",
      "integrity": "sha512-1dNIOmiM0z4BIBwxmxEfA1yoxh1MF/6KPBbh20a5vphGV0ictKlgQsbJs6D6SkR6iJpGbpwRsa6PFMNlg9T9pQ==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@codemirror/language": "^6.0.0",
        "@codemirror/state": "^6.0.0",
@ -712,7 +712,6 @@
      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.3.tgz",
      "integrity": "sha512-GSGfKxCo867P7EX1k2LoCrjuQFeqVgPGRRsSl4J4c0KMkD+k1y6WYvTQkzv0iZ8JhLJDujEvlnMchv4CZQLh3Q==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@codemirror/state": "^6.0.0",
        "@codemirror/view": "^6.35.0",
@ -724,7 +723,6 @@
      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.8.tgz",
      "integrity": "sha512-PoWtZvo7c1XFeZWmmyaOp2G0XVbOnm+fJzvghqGAktBW3cufwJUWvSCcNG0ppXiBEM05mZu6RhMtXPv2hpllig==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@codemirror/state": "^6.0.0",
        "@codemirror/view": "^6.0.0",
@ -6845,7 +6843,6 @@
      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz",
      "integrity": "sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@codemirror/autocomplete": "^6.0.0",
        "@codemirror/commands": "^6.0.0",
@ -7112,8 +7109,7 @@
      "version": "1.0.6",
      "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",
      "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
    },
    "node_modules/croner": {
      "version": "9.0.0",
@ -11913,6 +11909,8 @@
    },
    "node_modules/npm/node_modules/@isaacs/cliui/node_modules/string-width": {
      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
      "inBundle": true,
      "license": "MIT",
      "dependencies": {
@ -12571,6 +12569,8 @@
    },
    "node_modules/npm/node_modules/cross-spawn/node_modules/which": {
      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
      "inBundle": true,
      "license": "ISC",
      "dependencies": {
@ -13192,6 +13192,8 @@
    },
    "node_modules/npm/node_modules/minipass-flush/node_modules/minipass": {
      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
      "inBundle": true,
      "license": "ISC",
      "dependencies": {
@ -13214,6 +13216,8 @@
    },
    "node_modules/npm/node_modules/minipass-pipeline/node_modules/minipass": {
      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
      "inBundle": true,
      "license": "ISC",
      "dependencies": {
@ -13236,6 +13240,8 @@
    },
    "node_modules/npm/node_modules/minipass-sized/node_modules/minipass": {
      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
      "inBundle": true,
      "license": "ISC",
      "dependencies": {
@ -13261,6 +13267,8 @@
    },
    "node_modules/npm/node_modules/minizlib/node_modules/minipass": {
      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
      "inBundle": true,
      "license": "ISC",
      "dependencies": {
@ -13395,6 +13403,8 @@
    },
    "node_modules/npm/node_modules/nopt/node_modules/abbrev": {
      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz",
+      "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==",
      "inBundle": true,
      "license": "ISC",
      "engines": {
@ -14015,6 +14025,8 @@
    },
    "node_modules/npm/node_modules/tar/node_modules/fs-minipass": {
      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
      "inBundle": true,
      "license": "ISC",
      "dependencies": {
@ -14026,6 +14038,8 @@
    },
    "node_modules/npm/node_modules/tar/node_modules/fs-minipass/node_modules/minipass": {
      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
      "inBundle": true,
      "license": "ISC",
      "dependencies": {
@ -14037,6 +14051,8 @@
    },
    "node_modules/npm/node_modules/tar/node_modules/minipass": {
      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
+      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
      "inBundle": true,
      "license": "ISC",
      "engines": {
@ -14198,6 +14214,8 @@
    },
    "node_modules/npm/node_modules/wrap-ansi-cjs/node_modules/ansi-styles": {
      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
      "inBundle": true,
      "license": "MIT",
      "dependencies": {
@ -14232,6 +14250,8 @@
    },
    "node_modules/npm/node_modules/wrap-ansi/node_modules/string-width": {
      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
      "inBundle": true,
      "license": "MIT",
      "dependencies": {
--- a/package.json
+++ b/package.json
@ -25,6 +25,7 @@
    "@vueup/vue-quill": "^1.2.0",
    "axios": "^1.7.7",
    "bootstrap": "^5.3.3",
+    "codemirror": "^6.0.1",
    "docx": "^9.1.1",
    "echarts": "^5.5.1",
    "echarts-wordcloud": "^2.1.0",
--- a/plugins/vuelidate.ts
+++ b/plugins/vuelidate.ts
@ -4,23 +4,28 @@
 // createApp.use(Vuelidate);

 import { useVuelidate } from '@vuelidate/core'
-import { required, minLength } from '@vuelidate/validators'
+// import { required, minLength } from '@vuelidate/validators'

-export default defineNuxtPlugin((nuxtApp) => {
-  nuxtApp.vueApp.use(() => {
-//     // Example of global setup, but typically you'd handle this in the component
-//     const state = reactive({
-//       firstName: ''
-//     })
-//     const rules = {
-//       firstName: {
-//         required,
-//         minLength: minLength(2)
-//       }
-//     }
-//     const v$ = useVuelidate(rules, state)
-//     return v$;
-//     // Return the v$ instance or any other necessary setup
-  })
+// export default defineNuxtPlugin((nuxtApp) => {
+//   nuxtApp.vueApp.use((useVuelidate) => {
+// //     // Example of global setup, but typically you'd handle this in the component
+// //     const state = reactive({
+// //       firstName: ''
+// //     })
+// //     const rules = {
+// //       firstName: {
+// //         required,
+// //         minLength: minLength(2)
+// //       }
+// //     }
+// //     const v$ = useVuelidate(rules, state)
+// //     return v$;
+// //     // Return the v$ instance or any other necessary setup
+//   })
+// })
+
+
+
+export default defineNuxtPlugin(nuxtApp => {
+  nuxtApp.provide('vuelidate', useVuelidate)
 })
-
--- a/yarn.lock
+++ b/yarn.lock
@ -3192,7 +3192,7 @@ cluster-key-slot@^1.1.0:
 cmd-shim@^7.0.0:
  version "7.0.0"

-codemirror@6.x:
+codemirror@^6.0.1, codemirror@6.x:
  version "6.0.1"
  resolved "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz"
  integrity sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==