Merge branch 'main' of https://gitlab.stud.idi.ntnu.no/idatt2106_2022_02/boco-frontend into renting

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>

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
         >

src/components/CommunityComponents/CommunityHome.vue

@@ -46,7 +46,7 @@
 </template>
 
 <script>
-import ItemCard from "@/components/CommunityComponents/ItemCard";
+import ItemCard from "@/components/ItemComponents/ItemCard";
 import CommunityHeader from "@/components/BaseComponents/CommunityHeader";
 import { GetCommunity, GetListingsInCommunity } from "@/utils/apiutil";
 export default {

src/components/CommunityComponents/SearchItemList.vue → src/components/ItemComponents/SearchItemList.vue

@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import ItemCard from "@/components/CommunityComponents/ItemCard";
+import ItemCard from "@/components/ItemComponents/ItemCard";
 export default {
   name: "SearchItemListComponent",
 

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>

src/router/index.js

 import store from "@/store";
 import { createRouter, createWebHistory } from "vue-router";
-import HomeView from "../views/CommunityViews/CommunityView.vue";
-import LoginView from "../views/FormViews/LoginView.vue";
-import NewPasswordView from "../views/FormViews/NewPasswordView";
 
 /**
  * Guards routes. If token is null, no user is logged in and only the
@@ -21,7 +18,7 @@ const routes = [
   {
     path: "/",
     name: "home",
-    component: HomeView,
+    component: () => import("../views/CommunityViews/CommunityView.vue"),
   },
   {
     path: "/profile/:id",
@@ -37,27 +34,24 @@ const routes = [
   {
     path: "/messages",
     name: "messages",
-    component: () =>
-      import(
-        /* webpackChunkName: "register" */ "../views/ChatViews/ChatView.vue"
-      ),
+    component: () => import("../views/ChatViews/ChatView.vue"),
     beforeEnter: guardRoute,
   },
   {
     path: "/login",
     name: "login",
-    component: LoginView,
+    component: () => import("../views/FormViews/LoginView.vue"),
   },
   {
     path: "/newPassword",
     name: "newPassword",
-    component: NewPasswordView,
+    component: () => import("../views/FormViews/NewPasswordView"),
     beforeEnter: guardRoute,
   },
   {
     path: "/searchItemList",
     name: "searchItemList",
-    component: () => import("../views/CommunityViews/SearchItemListView.vue"),
+    component: () => import("../views/ItemViews/SearchItemListView.vue"),
   },
   {
     path: "/resetPassword",
@@ -65,20 +59,21 @@ const routes = [
     component: () => import("../views/FormViews/ResetPasswordView.vue"),
   },
   {
-    path: "/createNewGroup",
-    name: "createNewGroup",
+    path: "/newCommunity",
+    name: "newCommunity",
     component: () => import("../views/CommunityViews/NewCommunityView.vue"),
+    beforeEnter: guardRoute,
   },
   {
-    path: "/group/:id/memberlist",
+    path: "/community/:id/memberlist",
     name: "memberlist",
     component: () => import("../views/CommunityViews/MemberListView.vue"),
     beforeEnter: guardRoute,
   },
   {
-    path: "/addNewItem",
-    name: "addNewItem",
-    component: () => import("../views/CommunityViews/NewItemView.vue"),
+    path: "/newItem",
+    name: "newItem",
+    component: () => import("../views/ItemViews/NewItemView.vue"),
     beforeEnter: guardRoute,
   },
   {
@@ -89,13 +84,14 @@ const routes = [
     beforeEnter: guardRoute,
   },
   {
-    path: "/user/:id/groups",
-    name: "myGroups",
+    path: "/user/:id/communities",
+    name: "myCommunities",
     component: () => import("../views/CommunityViews/MyCommunitiesView.vue"),
+    beforeEnter: guardRoute,
   },
   {
     path: "/community/:communityID",
-    name: "GroupHome",
+    name: "communityHome",
     component: () => import("../views/CommunityViews/CommunityHomeView.vue"),
   },
   {

src/views/CommunityViews/CommunityView.vue

@@ -2,9 +2,9 @@
   <div v-if="loggedIn">
     <div class="flex flex-row p-4 relative">
       <p class="capitalize font-bold w-full">Mine felleskap</p>
-      <PlusIcon
+      <UserAddIcon
         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"
       />
@@ -18,7 +18,7 @@
 <script>
 import CommunityList from "@/components/CommunityComponents/CommunityList.vue";
 import { getMyGroups, getVisibleGroups } from "@/utils/apiutil";
-import { PlusIcon } from "@heroicons/vue/outline";
+import { UserAddIcon } from "@heroicons/vue/outline";
 
 export default {
   name: "HomeView",
@@ -31,7 +31,7 @@ export default {
   },
   components: {
     CommunityList,
-    PlusIcon,
+    UserAddIcon,
   },
   async created() {
     this.publicCommunities = await getVisibleGroups();

src/views/CommunityViews/NewItemView.vue → src/views/ItemViews/NewItemView.vue

@@ -6,7 +6,7 @@
 </template>
 
 <script>
-import AddNewItem from "@/components/CommunityComponents/NewItemForm";
+import AddNewItem from "@/components/ItemComponents/NewItemForm";
 
 export default {
   name: "AddNewItemView.vue",

src/views/CommunityViews/SearchItemListView.vue → src/views/ItemViews/SearchItemListView.vue

@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import SearchItemListComponent from "@/components/CommunityComponents/SearchItemList";
+import SearchItemListComponent from "@/components/ItemComponents/SearchItemList";
 export default {
   name: "SearchItemListView",
   components: {

tests/unit/component-tests/community-component-tests/add-new-item.spec.js

 import { shallowMount } from "@vue/test-utils";
-import AddNewItem from "@/components/CommunityComponents/NewItemForm.vue";
+import AddNewItem from "@/components/ItemComponents/NewItemForm.vue";
 
 describe("addNewItem elements rendering", () => {
   it("renders all labels", () => {

tests/unit/component-tests/community-component-tests/item-card.spec.js

 import { mount } from "@vue/test-utils";
-import ItemCard from "@/components/CommunityComponents/ItemCard.vue";
+import ItemCard from "@/components/ItemComponents/ItemCard.vue";
 
 describe("ItemCard component", () => {
   let wrapper;

tests/unit/component-tests/community-component-tests/new-item-form.spec.js

 import { mount } from "@vue/test-utils";
-import NewItemForm from "@/components/CommunityComponents/NewItemForm.vue";
+import NewItemForm from "@/components/ItemComponents/NewItemForm.vue";
 
 describe("NewItemForm component", () => {
   let wrapper;

tests/unit/component-tests/community-component-tests/search-item-list.spec.js

 import { shallowMount } from "@vue/test-utils";
-import SearchItemListComponent from "@/components/CommunityComponents/SearchItemList.vue";
+import SearchItemListComponent from "@/components/ItemComponents/SearchItemList.vue";
 
 describe("SearchItemListComponent elements rendering", () => {
   let wrapper;