Merge pull request #5083 from christianbeeznest/fix-social

Social: Fix links broken in sidebar menu
pull/5086/head
christianbeeznest 2 years ago committed by GitHub
commit 8f537b201b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      assets/vue/components/personalfile/Layout.vue
  2. 4
      assets/vue/components/userreluser/Layout.vue
  3. 3
      assets/vue/router/index.js
  4. 7
      assets/vue/views/social/SocialLayout.vue

@ -1,7 +1,6 @@
<template>
<div class="flex flex-col md:flex-row gap-4">
<div class="md:basis-1/3 lg:basis-1/4 2xl:basis-1/6 flex flex-col">
<UserProfileCard />
<SocialSideMenu />
</div>
<div class="md:basis-2/3 lg:basis-3/4 2xl:basis-5/6">
@ -13,10 +12,9 @@
</template>
<script>
import SocialSideMenu from "../social/SocialSideMenu.vue";
import UserProfileCard from "../userreluser/UserProfileCard.vue";
export default {
name: 'PersonalFileLayout',
components: {UserProfileCard, SocialSideMenu}
components: {SocialSideMenu}
}
</script>

@ -1,7 +1,6 @@
<template>
<div class="flex flex-col md:flex-row gap-4">
<div class="md:basis-1/3 lg:basis-1/4 2xl:basis-1/6 flex flex-col">
<UserProfileCard />
<SocialSideMenu />
</div>
<div class="md:basis-2/3 lg:basis-3/4 2xl:basis-5/6">
@ -14,10 +13,9 @@
<script>
import SocialSideMenu from "../social/SocialSideMenu.vue";
import UserProfileCard from "./UserProfileCard.vue";
export default {
name: 'UserRelUserLayout',
components: {UserProfileCard, SocialSideMenu}
components: {SocialSideMenu}
}
</script>

@ -34,9 +34,7 @@ import Index from "../pages/Index.vue"
import Home from "../pages/Home.vue"
import Login from "../pages/Login.vue"
import Faq from "../pages/Faq.vue"
//import Contact from "../pages/Contact.vue"
import Demo from "../pages/Demo.vue"
import personalDataRoutes from "./personaldata"
import { useCidReqStore } from "../store/cidReq"
import courseService from "../services/courseService";
@ -173,7 +171,6 @@ const router = createRouter({
calendarEventRoutes,
toolIntroRoutes,
pageRoutes,
personalDataRoutes,
],
})

@ -1,7 +1,6 @@
<template>
<div class="flex flex-col md:flex-row gap-4">
<div class="md:basis-1/3 lg:basis-1/4 2xl:basis-1/6 flex flex-col">
<UserProfileCard />
<BaseCard plain>
<img
:src="user.illustrationUrl"
@ -19,9 +18,6 @@
<SocialNetworkWall />
</div>
<div class="md:basis-1/3 lg:basis-1/4 2xl:basis-1/6">
<AddFriendSidebar />
</div>
</div>
</template>
@ -31,8 +27,7 @@ import { onMounted, provide, readonly, ref, watch } from "vue"
import SocialNetworkWall from "./SocialWall.vue"
import { useRoute } from "vue-router"
import SocialSideMenu from "../../components/social/SocialSideMenu.vue"
import AddFriendSidebar from "../../components/userreluser/AddFriendSidebar.vue";
import UserProfileCard from "../../components/userreluser/UserProfileCard.vue";
//import AddFriendSidebar from "../../components/userreluser/AddFriendSidebar.vue";
const store = useStore()
const route = useRoute()

Loading…
Cancel
Save