From dcbbf20916dd2376ab14d1cecfaa3a96fc48bb00 Mon Sep 17 00:00:00 2001
From: Daria Golova <danalis969@gmail.com>
Date: Wed, 16 Aug 2023 23:26:10 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=D0=B0=20url=20=D0=BA=D0=B0=D1=80=D1=82=D0=B8=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/LoggedInLayout.vue                         | 8 ++++++--
 src/pages/newCalendar/components/CalendarRecordCard.vue   | 4 ++--
 .../MedicalProtocolCreateModal.vue                        | 6 ++++--
 src/store/index.js                                        | 1 +
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/components/LoggedInLayout.vue b/src/components/LoggedInLayout.vue
index 74337e7..5b015b4 100644
--- a/src/components/LoggedInLayout.vue
+++ b/src/components/LoggedInLayout.vue
@@ -25,7 +25,7 @@
 import TheHeader from "@/components/TheHeader";
 import TheSidebar from "@/components/TheSidebar";
 import TheNotificationProvider from "@/components/Notifications/TheNotificationProvider";
-
+import { mapState } from "vuex";
 export default {
   name: "LoggedInLayout",
   components: { TheNotificationProvider, TheHeader, TheSidebar },
@@ -33,10 +33,14 @@ export default {
     return {
       isOpenForm: false,
       updatedClients: false,
-      url: "https://astra-dev.dopcore.com/api/store/",
       createdClientId: "",
     };
   },
+  computed: {
+    ...mapState({
+      url: (state) => state.imgUrl,
+    }),
+  },
   methods: {
     openForm() {
       this.isOpenForm = true;
diff --git a/src/pages/newCalendar/components/CalendarRecordCard.vue b/src/pages/newCalendar/components/CalendarRecordCard.vue
index 8ac6d7f..7822534 100644
--- a/src/pages/newCalendar/components/CalendarRecordCard.vue
+++ b/src/pages/newCalendar/components/CalendarRecordCard.vue
@@ -83,10 +83,10 @@ export default {
       return !this.bodyClass?.["flex-col"] && !this.expandedType;
     },
     recordingStatus() {
-      const status = statuses[0].data.find(
+      const status = statuses?.[0]?.data?.find(
         (elem) => elem.value === this.record?.status
       );
-      return status || statuses[0].data[0];
+      return status || statuses?.[0]?.data?.[0];
     },
     startTime() {
       return moment.parseZone(this.record?.start);
diff --git a/src/pages/newMedicalCard/components/InitialInspectionProtocol/MedicalProtocolCreateModal.vue b/src/pages/newMedicalCard/components/InitialInspectionProtocol/MedicalProtocolCreateModal.vue
index faa7ce6..0cd2512 100644
--- a/src/pages/newMedicalCard/components/InitialInspectionProtocol/MedicalProtocolCreateModal.vue
+++ b/src/pages/newMedicalCard/components/InitialInspectionProtocol/MedicalProtocolCreateModal.vue
@@ -47,7 +47,7 @@ import BaseAvatar from "@/components/base/BaseAvatar.vue";
 import BaseInputDate from "@/components/base/BaseInputDate.vue";
 import BaseInputTime from "@/components/base/BaseInputTime.vue";
 import * as moment from "moment/moment";
-import { mapGetters, mapActions } from "vuex";
+import { mapGetters, mapActions, mapState } from "vuex";
 import BaseButton from "@/components/base/BaseButton.vue";
 export default {
   name: "MedicalProtocolCreateModal",
@@ -67,10 +67,12 @@ export default {
         date: null,
         startTime: null,
       },
-      url: "https://astra-dev.dopcore.com/api/store/",
     };
   },
   computed: {
+    ...mapState({
+      url: (state) => state.imgUrl,
+    }),
     ...mapGetters({
       userData: "getUserData",
     }),
diff --git a/src/store/index.js b/src/store/index.js
index 130b499..b32e450 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -5,6 +5,7 @@ import calendar from "./modules/calendar";
 export default createStore({
   state: {
     url: "https://astra-dev.dopcore.com",
+    imgUrl: "https://astra-dev.dopcore.com/api/store/",
     routingHistory: window.history,
     userData: {},
   },