From e2afb96cf557a5450b276532bf3f6c11941186fa Mon Sep 17 00:00:00 2001
From: Titus Kristiansen <titusk@stud.ntnu.no>
Date: Thu, 28 Apr 2022 12:23:41 +0200
Subject: [PATCH] Project folder and file restructuring/renaming 2
---
.../CommunityHome.vue} | 2 +-
.../CommunityList.vue} | 2 +-
.../CommunityListItem.vue} | 0
.../ItemCard.vue | 0
.../MemberList.vue | 0
.../SearchItemList.vue | 2 +-
src/router/index.js | 18 ++++++++++--------
.../CommunityHomeView.vue} | 2 +-
.../CommunityView.vue} | 2 +-
.../MemberListView.vue | 2 +-
.../MyCommunitiesView.vue} | 2 +-
.../SearchItemListView.vue | 2 +-
tests/unit/create-new-group.spec.js | 2 +-
tests/unit/search-item-list.spec.js | 2 +-
14 files changed, 20 insertions(+), 18 deletions(-)
rename src/components/{GroupComponents/GroupHome.vue => CommunityComponents/CommunityHome.vue} (97%)
rename src/components/{GroupComponents/GroupList.vue => CommunityComponents/CommunityList.vue} (77%)
rename src/components/{GroupComponents/GroupListItem.vue => CommunityComponents/CommunityListItem.vue} (100%)
rename src/components/{GroupComponents => CommunityComponents}/ItemCard.vue (100%)
rename src/components/{GroupComponents => CommunityComponents}/MemberList.vue (100%)
rename src/components/{GroupComponents => CommunityComponents}/SearchItemList.vue (97%)
rename src/views/{GroupViews/GroupHomeView.vue => CommunityViews/CommunityHomeView.vue} (71%)
rename src/views/{GroupViews/HomeView.vue => CommunityViews/CommunityView.vue} (91%)
rename src/views/{GroupViews => CommunityViews}/MemberListView.vue (96%)
rename src/views/{GroupViews/MyGroupsView.vue => CommunityViews/MyCommunitiesView.vue} (86%)
rename src/views/{GroupViews => CommunityViews}/SearchItemListView.vue (71%)
diff --git a/src/components/GroupComponents/GroupHome.vue b/src/components/CommunityComponents/CommunityHome.vue
similarity index 97%
rename from src/components/GroupComponents/GroupHome.vue
rename to src/components/CommunityComponents/CommunityHome.vue
index 4d18e19..1d973af 100644
--- a/src/components/GroupComponents/GroupHome.vue
+++ b/src/components/CommunityComponents/CommunityHome.vue
@@ -34,7 +34,7 @@
</template>
<script>
-import ItemCard from "@/components/GroupComponents/ItemCard";
+import ItemCard from "@/components/CommunityComponents/ItemCard";
export default {
name: "SearchItemListComponent",
diff --git a/src/components/GroupComponents/GroupList.vue b/src/components/CommunityComponents/CommunityList.vue
similarity index 77%
rename from src/components/GroupComponents/GroupList.vue
rename to src/components/CommunityComponents/CommunityList.vue
index 58d6a17..045eead 100644
--- a/src/components/GroupComponents/GroupList.vue
+++ b/src/components/CommunityComponents/CommunityList.vue
@@ -7,7 +7,7 @@
</template>
<script>
-import GroupListItem from "@/components/GroupComponents/GroupListItem.vue";
+import GroupListItem from "@/components/CommunityComponents/CommunityListItem.vue";
export default {
name: "GroupList",
diff --git a/src/components/GroupComponents/GroupListItem.vue b/src/components/CommunityComponents/CommunityListItem.vue
similarity index 100%
rename from src/components/GroupComponents/GroupListItem.vue
rename to src/components/CommunityComponents/CommunityListItem.vue
diff --git a/src/components/GroupComponents/ItemCard.vue b/src/components/CommunityComponents/ItemCard.vue
similarity index 100%
rename from src/components/GroupComponents/ItemCard.vue
rename to src/components/CommunityComponents/ItemCard.vue
diff --git a/src/components/GroupComponents/MemberList.vue b/src/components/CommunityComponents/MemberList.vue
similarity index 100%
rename from src/components/GroupComponents/MemberList.vue
rename to src/components/CommunityComponents/MemberList.vue
diff --git a/src/components/GroupComponents/SearchItemList.vue b/src/components/CommunityComponents/SearchItemList.vue
similarity index 97%
rename from src/components/GroupComponents/SearchItemList.vue
rename to src/components/CommunityComponents/SearchItemList.vue
index d7c05f7..51f51ac 100644
--- a/src/components/GroupComponents/SearchItemList.vue
+++ b/src/components/CommunityComponents/SearchItemList.vue
@@ -31,7 +31,7 @@
</template>
<script>
-import ItemCard from "@/components/GroupComponents/ItemCard";
+import ItemCard from "@/components/CommunityComponents/ItemCard";
export default {
name: "SearchItemListComponent",
diff --git a/src/router/index.js b/src/router/index.js
index f323577..8dbc3b8 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,6 +1,6 @@
import store from "@/store";
import { createRouter, createWebHistory } from "vue-router";
-import HomeView from "../views/GroupViews/HomeView.vue";
+import HomeView from "../views/CommunityViews/CommunityView.vue";
import LoginView from "../views/FormViews/LoginView.vue";
import NewPasswordView from "../views/FormViews/NewPasswordView";
@@ -38,7 +38,9 @@ const routes = [
path: "/messages",
name: "messages",
component: () =>
- import(/* webpackChunkName: "register" */ "../views/ChatViews/ChatView.vue"),
+ import(
+ /* webpackChunkName: "register" */ "../views/ChatViews/ChatView.vue"
+ ),
beforeEnter: guardRoute,
},
{
@@ -55,7 +57,7 @@ const routes = [
{
path: "/searchItemList",
name: "searchItemList",
- component: () => import("../views/GroupViews/SearchItemListView.vue"),
+ component: () => import("../views/CommunityViews/SearchItemListView.vue"),
},
{
path: "/resetPassword",
@@ -65,18 +67,18 @@ const routes = [
{
path: "/createNewGroup",
name: "createNewGroup",
- component: () => import("../views/FormViews/CreateNewGroupView.vue"),
+ component: () => import("../views/FormViews/NewCommunityView.vue"),
},
{
path: "/group/:id/memberlist",
name: "memberlist",
- component: () => import("../views/GroupViews/MemberListView.vue"),
+ component: () => import("../views/CommunityViews/MemberListView.vue"),
beforeEnter: guardRoute,
},
{
path: "/addNewItem",
name: "addNewItem",
- component: () => import("../views/FormViews/AddNewItemView.vue"),
+ component: () => import("../views/FormViews/NewItemView.vue"),
beforeEnter: guardRoute,
},
{
@@ -88,12 +90,12 @@ const routes = [
{
path: "/user/:id/groups",
name: "myGroups",
- component: () => import("../views/GroupViews/MyGroupsView.vue"),
+ component: () => import("../views/CommunityViews/MyCommunitiesView.vue"),
},
{
path: "/groupHomePage",
name: "GroupHome",
- component: () => import("../views/GroupViews/GroupHomeView.vue"),
+ component: () => import("../views/CommunityViews/CommunityHomeView.vue"),
beforeEnter: guardRoute,
},
];
diff --git a/src/views/GroupViews/GroupHomeView.vue b/src/views/CommunityViews/CommunityHomeView.vue
similarity index 71%
rename from src/views/GroupViews/GroupHomeView.vue
rename to src/views/CommunityViews/CommunityHomeView.vue
index 7082692..cabfd1b 100644
--- a/src/views/GroupViews/GroupHomeView.vue
+++ b/src/views/CommunityViews/CommunityHomeView.vue
@@ -3,7 +3,7 @@
</template>
<script>
-import GroupHome from "@/components/GroupComponents/GroupHome";
+import GroupHome from "@/components/CommunityComponents/CommunityHome";
export default {
name: "GroupHomeView.vue",
components: {
diff --git a/src/views/GroupViews/HomeView.vue b/src/views/CommunityViews/CommunityView.vue
similarity index 91%
rename from src/views/GroupViews/HomeView.vue
rename to src/views/CommunityViews/CommunityView.vue
index 47f81aa..d608f4b 100644
--- a/src/views/GroupViews/HomeView.vue
+++ b/src/views/CommunityViews/CommunityView.vue
@@ -12,7 +12,7 @@
</template>
<script>
-import GroupList from "@/components/GroupComponents/GroupList.vue";
+import GroupList from "@/components/CommunityComponents/CommunityList.vue";
import { getMyGroups, getVisibleGroups } from "@/utils/apiutil";
export default {
diff --git a/src/views/GroupViews/MemberListView.vue b/src/views/CommunityViews/MemberListView.vue
similarity index 96%
rename from src/views/GroupViews/MemberListView.vue
rename to src/views/CommunityViews/MemberListView.vue
index 4352d97..d250c0d 100644
--- a/src/views/GroupViews/MemberListView.vue
+++ b/src/views/CommunityViews/MemberListView.vue
@@ -58,7 +58,7 @@
</template>
<script>
-import MemberList from "@/components/GroupComponents/MemberList.vue";
+import MemberList from "@/components/CommunityComponents/MemberList.vue";
export default {
data() {
diff --git a/src/views/GroupViews/MyGroupsView.vue b/src/views/CommunityViews/MyCommunitiesView.vue
similarity index 86%
rename from src/views/GroupViews/MyGroupsView.vue
rename to src/views/CommunityViews/MyCommunitiesView.vue
index ff00156..b2abf6c 100644
--- a/src/views/GroupViews/MyGroupsView.vue
+++ b/src/views/CommunityViews/MyCommunitiesView.vue
@@ -8,7 +8,7 @@
</template>
<script>
-import GroupList from "@/components/GroupComponents/GroupList.vue";
+import GroupList from "@/components/CommunityComponents/CommunityList.vue";
import { getMyGroups } from "@/utils/apiutil";
export default {
diff --git a/src/views/GroupViews/SearchItemListView.vue b/src/views/CommunityViews/SearchItemListView.vue
similarity index 71%
rename from src/views/GroupViews/SearchItemListView.vue
rename to src/views/CommunityViews/SearchItemListView.vue
index 553a338..1725bf8 100644
--- a/src/views/GroupViews/SearchItemListView.vue
+++ b/src/views/CommunityViews/SearchItemListView.vue
@@ -3,7 +3,7 @@
</template>
<script>
-import SearchItemListComponent from "@/components/GroupComponents/SearchItemList";
+import SearchItemListComponent from "@/components/CommunityComponents/SearchItemList";
export default {
name: "SearchItemListView",
components: {
diff --git a/tests/unit/create-new-group.spec.js b/tests/unit/create-new-group.spec.js
index c96a64b..78b568f 100644
--- a/tests/unit/create-new-group.spec.js
+++ b/tests/unit/create-new-group.spec.js
@@ -1,5 +1,5 @@
import { shallowMount } from "@vue/test-utils";
-import CreateNewGroup from "@/components/FormComponents/NewGroupForm.vue";
+import CreateNewGroup from "@/components/FormComponents/NewCommunityForm.vue";
describe("CreateNewGroup elements rendering", () => {
it("renders all labels", () => {
diff --git a/tests/unit/search-item-list.spec.js b/tests/unit/search-item-list.spec.js
index 05eca1b..1ad4cff 100644
--- a/tests/unit/search-item-list.spec.js
+++ b/tests/unit/search-item-list.spec.js
@@ -1,5 +1,5 @@
import { shallowMount } from "@vue/test-utils";
-import SearchItemListComponent from "@/components/GroupComponents/SearchItemList.vue";
+import SearchItemListComponent from "@/components/CommunityComponents/SearchItemList.vue";
describe("CreateNewGroup elements rendering", () => {
it("Tests setting values of input field", async () => {
--
GitLab