From 684ae061f598dbea88b28c1f7f448ed0ee31a146 Mon Sep 17 00:00:00 2001 From: Titus Kristiansen <titusk@stud.ntnu.no> Date: Mon, 2 May 2022 12:02:25 +0200 Subject: [PATCH] Refactoring and renaming to standard names --- src/components/BaseComponents/NavBar.vue | 2 +- src/components/CommunityComponents/CommunityHamburger.vue | 6 +++--- src/components/UserProfileComponents/LargeProfileCard.vue | 2 +- src/router/index.js | 2 +- src/views/CommunityViews/CommunityView.vue | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/BaseComponents/NavBar.vue b/src/components/BaseComponents/NavBar.vue index 80dc794..58020e2 100644 --- a/src/components/BaseComponents/NavBar.vue +++ b/src/components/BaseComponents/NavBar.vue @@ -15,7 +15,7 @@ <PlusIcon class="m-6 cursor-pointer h-7" alt="Legg til" - @click="$router.push('/addNewItem')" + @click="$router.push('/newItem')" /> </li> <li> diff --git a/src/components/CommunityComponents/CommunityHamburger.vue b/src/components/CommunityComponents/CommunityHamburger.vue index e060566..2ff2171 100644 --- a/src/components/CommunityComponents/CommunityHamburger.vue +++ b/src/components/CommunityComponents/CommunityHamburger.vue @@ -6,21 +6,21 @@ <ul class="py-1"> <li id="newItem"> <router-link - to="/addNewItem" + to="/newItem" class="block py-2 px-4 text-sm text-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white" >Opprett Utleie</router-link > </li> <li id="getMembers"> <router-link - :to="'/group/' + communityID + '/memberlist'" + :to="'/community/' + communityID + '/memberlist'" class="block py-2 px-4 text-sm text-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white" >Se Medlemmer </router-link> </li> <li id="adminGroup"> <router-link - :to="'/group/' + communityID + '/memberlist'" + :to="'/community/' + communityID + '/memberlist'" class="block py-2 px-4 text-sm text-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white" >Administrer Gruppe</router-link > diff --git a/src/components/UserProfileComponents/LargeProfileCard.vue b/src/components/UserProfileComponents/LargeProfileCard.vue index 4b88012..7ee44e4 100644 --- a/src/components/UserProfileComponents/LargeProfileCard.vue +++ b/src/components/UserProfileComponents/LargeProfileCard.vue @@ -37,7 +37,7 @@ </li> <li> <router-link - :to="'/user/' + id + '/groups'" + :to="'/user/' + id + '/communites'" class="block py-2 px-4 text-sm text-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white" >Mine grupper </router-link> diff --git a/src/router/index.js b/src/router/index.js index 6a1388a..436a688 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -65,7 +65,7 @@ const routes = [ beforeEnter: guardRoute, }, { - path: "/group/:id/memberlist", + path: "/community/:id/memberlist", name: "memberlist", component: () => import("../views/CommunityViews/MemberListView.vue"), beforeEnter: guardRoute, diff --git a/src/views/CommunityViews/CommunityView.vue b/src/views/CommunityViews/CommunityView.vue index 9fd39f5..ec15f92 100644 --- a/src/views/CommunityViews/CommunityView.vue +++ b/src/views/CommunityViews/CommunityView.vue @@ -4,7 +4,7 @@ <p class="capitalize font-bold w-full">Mine felleskap</p> <PlusIcon class="cursor-pointer max-h-6 max-w-6 float-right grow" - @click="$router.push('/createNewGroup')" + @click="$router.push('/newCommunity')" v-if="loggedIn" alt="Lag ett nytt felleskap" /> -- GitLab