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: {}, },