Merge branch 'master' into '3-transition-medical-card'

# Conflicts:
#   src/router.js
This commit is contained in:
Kirill Andrusyak
2023-08-15 16:57:17 +00:00
5 changed files with 81 additions and 112 deletions

View File

@@ -7,7 +7,6 @@ import TheLogin from "@/pages/login/TheLogin";
import LoggedInLayout from "@/components/LoggedInLayout";
import TheMedicalCard from "@/pages/newMedicalCard/TheMedicalCard";
import { fetchWrapper } from "@/shared/fetchWrapper";
import TheCreateMedicalCard from "@/pages/createMedicalCard/TheCreateMedicalCard.vue";
const ifNotAuthenticated = async (to, from, next) => {
const data = await fetchWrapper.get("users/me");
@@ -46,7 +45,6 @@ export default createRouter({
path: "medical-card/:id?",
component: TheMedicalCard,
},
{ path: "create-medical-card", component: TheCreateMedicalCard },
],
},
],