diff --git a/src/App.vue b/src/App.vue
index 28f284a38653ef90ffb4d65080f1b559b8d09ca1..91695eb7395ebb9a45774a95415215684ce798b7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -10,7 +10,7 @@ import { defineComponent } from "vue";
// Components
-import NavBar from "./components/NavBar.vue";
+import NavBar from "./components/NavigationComponents/NavBar.vue";
export default defineComponent({
name: "App",
diff --git a/src/assets/logo.png b/src/assets/logo.png
deleted file mode 100644
index f3d2503fc2a44b5053b0837ebea6e87a2d339a43..0000000000000000000000000000000000000000
Binary files a/src/assets/logo.png and /dev/null differ
diff --git a/src/assets/logo.svg b/src/assets/logo.svg
deleted file mode 100644
index 145b6d13089c81fcb16f68ad8f976e389dcd77e3..0000000000000000000000000000000000000000
--- a/src/assets/logo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 87.5 100"><defs><style>.cls-1{fill:#1697f6;}.cls-2{fill:#7bc6ff;}.cls-3{fill:#1867c0;}.cls-4{fill:#aeddff;}</style></defs><title>Artboard 46</title><polyline class="cls-1" points="43.75 0 23.31 0 43.75 48.32"/><polygon class="cls-2" points="43.75 62.5 43.75 100 0 14.58 22.92 14.58 43.75 62.5"/><polyline class="cls-3" points="43.75 0 64.19 0 43.75 48.32"/><polygon class="cls-4" points="64.58 14.58 87.5 14.58 43.75 100 43.75 62.5 64.58 14.58"/></svg>
diff --git a/src/components/chat/ChatMessage.vue b/src/components/ChatComponents/ChatMessage.vue
similarity index 100%
rename from src/components/chat/ChatMessage.vue
rename to src/components/ChatComponents/ChatMessage.vue
diff --git a/src/components/chat/ChatProfile.vue b/src/components/ChatComponents/ChatProfile.vue
similarity index 100%
rename from src/components/chat/ChatProfile.vue
rename to src/components/ChatComponents/ChatProfile.vue
diff --git a/src/components/chat/CurrentChat.vue b/src/components/ChatComponents/CurrentChat.vue
similarity index 100%
rename from src/components/chat/CurrentChat.vue
rename to src/components/ChatComponents/CurrentChat.vue
diff --git a/src/components/LoginForm.vue b/src/components/FormComponents/LoginForm.vue
similarity index 100%
rename from src/components/LoginForm.vue
rename to src/components/FormComponents/LoginForm.vue
diff --git a/src/components/CreateNewGroup.vue b/src/components/FormComponents/NewGroupForm.vue
similarity index 99%
rename from src/components/CreateNewGroup.vue
rename to src/components/FormComponents/NewGroupForm.vue
index b786dd14e7bb5c37cde346c6c7ecbcc76a8c3d7d..e322ce2c043a9a1349d7fa0e9cb7757150ea6595 100644
--- a/src/components/CreateNewGroup.vue
+++ b/src/components/FormComponents/NewGroupForm.vue
@@ -198,7 +198,7 @@
v-show="imageAdded"
@click="removeImage"
>
- <img src="../assets/removeIcon.png" alt="Remove icon image" />
+ <img src="../../assets/removeIcon.png" alt="Remove icon image" />
</button>
</div>
diff --git a/src/components/AddNewItem.vue b/src/components/FormComponents/NewItemForm.vue
similarity index 100%
rename from src/components/AddNewItem.vue
rename to src/components/FormComponents/NewItemForm.vue
diff --git a/src/components/NewPasswordForm.vue b/src/components/FormComponents/NewPasswordForm.vue
similarity index 100%
rename from src/components/NewPasswordForm.vue
rename to src/components/FormComponents/NewPasswordForm.vue
diff --git a/src/components/NotificationsForm.vue b/src/components/FormComponents/NotificationsForm.vue
similarity index 100%
rename from src/components/NotificationsForm.vue
rename to src/components/FormComponents/NotificationsForm.vue
diff --git a/src/components/RegisterFormComponent.vue b/src/components/FormComponents/RegisterForm.vue
similarity index 100%
rename from src/components/RegisterFormComponent.vue
rename to src/components/FormComponents/RegisterForm.vue
diff --git a/src/components/ResetPassword.vue b/src/components/FormComponents/ResetPasswordForm.vue
similarity index 100%
rename from src/components/ResetPassword.vue
rename to src/components/FormComponents/ResetPasswordForm.vue
diff --git a/src/components/GroupHome.vue b/src/components/GroupComponents/GroupHome.vue
similarity index 97%
rename from src/components/GroupHome.vue
rename to src/components/GroupComponents/GroupHome.vue
index 56eae2ece48f2417fa18beb8dfb4e2ab1ff323ea..4d18e19535e351c355a18a3778ed2532e99f9ef4 100644
--- a/src/components/GroupHome.vue
+++ b/src/components/GroupComponents/GroupHome.vue
@@ -34,7 +34,7 @@
</template>
<script>
-import ItemCard from "@/components/ItemCard";
+import ItemCard from "@/components/GroupComponents/ItemCard";
export default {
name: "SearchItemListComponent",
diff --git a/src/components/GroupeComponents/GroupList.vue b/src/components/GroupComponents/GroupList.vue
similarity index 78%
rename from src/components/GroupeComponents/GroupList.vue
rename to src/components/GroupComponents/GroupList.vue
index 21ef028e5af53aef26aa11d0135f9ea7ae139c7f..58d6a170c583d3fd773862b35458e880ae5dcd65 100644
--- a/src/components/GroupeComponents/GroupList.vue
+++ b/src/components/GroupComponents/GroupList.vue
@@ -7,7 +7,7 @@
</template>
<script>
-import GroupListItem from "@/components/GroupeComponents/GroupListItem.vue";
+import GroupListItem from "@/components/GroupComponents/GroupListItem.vue";
export default {
name: "GroupList",
diff --git a/src/components/GroupeComponents/GroupListItem.vue b/src/components/GroupComponents/GroupListItem.vue
similarity index 100%
rename from src/components/GroupeComponents/GroupListItem.vue
rename to src/components/GroupComponents/GroupListItem.vue
diff --git a/src/components/ItemCard.vue b/src/components/GroupComponents/ItemCard.vue
similarity index 89%
rename from src/components/ItemCard.vue
rename to src/components/GroupComponents/ItemCard.vue
index c7b866eefac807e242c8108a5b9323eb7159040d..44abedf3ca02f74998e51ae0816ea00c1bdf3293 100644
--- a/src/components/ItemCard.vue
+++ b/src/components/GroupComponents/ItemCard.vue
@@ -3,7 +3,7 @@
<div class="w-4/5 rounded bg-gray-200">
<img
class="w-full"
- :src="item.img || require('../assets/default-product.png')"
+ :src="item.img || require('../../assets/default-product.png')"
alt="Item image"
/>
<div class="p-1 m-1">
diff --git a/src/components/GroupeComponents/MemberList.vue b/src/components/GroupComponents/MemberList.vue
similarity index 100%
rename from src/components/GroupeComponents/MemberList.vue
rename to src/components/GroupComponents/MemberList.vue
diff --git a/src/components/SearchItemListComponent.vue b/src/components/GroupComponents/SearchItemList.vue
similarity index 97%
rename from src/components/SearchItemListComponent.vue
rename to src/components/GroupComponents/SearchItemList.vue
index 69950032651b044300e126f2c828d41ae5d950d1..d7c05f7e84a77c419a56aa513628741090a26baa 100644
--- a/src/components/SearchItemListComponent.vue
+++ b/src/components/GroupComponents/SearchItemList.vue
@@ -31,7 +31,7 @@
</template>
<script>
-import ItemCard from "@/components/ItemCard";
+import ItemCard from "@/components/GroupComponents/ItemCard";
export default {
name: "SearchItemListComponent",
diff --git a/src/components/NavBar.vue b/src/components/NavigationComponents/NavBar.vue
similarity index 89%
rename from src/components/NavBar.vue
rename to src/components/NavigationComponents/NavBar.vue
index 7331f35a312d7400c442c2a7a926d548c6bd483d..c440c3555f76aae08a30cb70d29002fdf3bf718a 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavigationComponents/NavBar.vue
@@ -5,7 +5,7 @@
<div class="logo">
<img
class="m-1 ml-4 cursor-pointer h-12"
- src="../assets/logo3.svg"
+ src="../../assets/logo3.svg"
alt="BoCo logo"
@click="$router.push('/')"
/>
@@ -14,7 +14,7 @@
<li>
<img
class="m-6 cursor-pointer h-7"
- src="../assets/additem.png"
+ src="../../assets/additem.png"
alt="Legg til"
@click="$router.push('/addNewItem')"
/>
@@ -22,7 +22,7 @@
<li>
<img
class="m-6 cursor-pointer h-7"
- src="../assets/messages.png"
+ src="../../assets/messages.png"
alt="Meldinger"
@click="$router.push('/messages')"
/>
@@ -30,7 +30,7 @@
<li>
<img
class="m-6 cursor-pointer h-7"
- src="../assets/profile.png"
+ src="../../assets/profile.png"
alt="Profil"
@click="loadProfile"
/>
diff --git a/src/components/UserProfileComponents/LargeProfileCard.vue b/src/components/UserProfileComponents/LargeProfileCard.vue
index c3955059409b1a7896ea9d0df93310823f008a57..19d25964791090645d982f2ee5875a26a6b396e6 100644
--- a/src/components/UserProfileComponents/LargeProfileCard.vue
+++ b/src/components/UserProfileComponents/LargeProfileCard.vue
@@ -101,7 +101,7 @@
</template>
<script>
-import RatingComponent from "@/components/UserProfileComponents/RatingComponent.vue";
+import RatingComponent from "@/components/UserProfileComponents/Rating.vue";
import { parseCurrentUser } from "@/utils/token-utils";
import { getUser, getAverageRating } from "@/utils/apiutil";
diff --git a/src/components/UserProfileComponents/RatingComponent.vue b/src/components/UserProfileComponents/Rating.vue
similarity index 100%
rename from src/components/UserProfileComponents/RatingComponent.vue
rename to src/components/UserProfileComponents/Rating.vue
diff --git a/src/components/UserProfileComponents/UserListItemCard.vue b/src/components/UserProfileComponents/UserListItemCard.vue
index 005646d51d405772521392a452dc100e3ff75375..90180d2df55f207bf11a4ebe1fab595da63bf1f4 100644
--- a/src/components/UserProfileComponents/UserListItemCard.vue
+++ b/src/components/UserProfileComponents/UserListItemCard.vue
@@ -34,7 +34,7 @@
<script>
import { getAverageRating } from "@/utils/apiutil";
-import RatingComponent from "./RatingComponent.vue";
+import RatingComponent from "./Rating.vue";
export default {
name: "UserListItem",
diff --git a/src/router/index.js b/src/router/index.js
index 374df41e1efcd4dc0d04afc4ac9d9417de548d46..f323577815fc196cb68d832c3f5246828b9ecf35 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,8 +1,8 @@
import store from "@/store";
import { createRouter, createWebHistory } from "vue-router";
-import HomeView from "../views/HomeView.vue";
-import LoginView from "../views/LoginView.vue";
-import NewPasswordView from "../views/NewPasswordView";
+import HomeView from "../views/GroupViews/HomeView.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
@@ -23,27 +23,22 @@ const routes = [
name: "home",
component: HomeView,
},
- {
- path: "/about",
- name: "about",
- component: () => import("../views/AboutView.vue"),
- },
{
path: "/profile/:id",
name: "profile",
- component: () => import("../views/ProfileView.vue"),
+ component: () => import("../views/UserProfileViews/ProfileView.vue"),
beforeEnter: guardRoute,
},
{
path: "/register",
name: "register",
- component: () => import("../views/RegisterView.vue"),
+ component: () => import("../views/FormViews/RegisterView.vue"),
},
{
path: "/messages",
name: "messages",
component: () =>
- import(/* webpackChunkName: "register" */ "../views/ChatView.vue"),
+ import(/* webpackChunkName: "register" */ "../views/ChatViews/ChatView.vue"),
beforeEnter: guardRoute,
},
{
@@ -60,45 +55,45 @@ const routes = [
{
path: "/searchItemList",
name: "searchItemList",
- component: () => import("../views/SearchItemListView.vue"),
+ component: () => import("../views/GroupViews/SearchItemListView.vue"),
},
{
path: "/resetPassword",
name: "resetPassword",
- component: () => import("../views/ResetPasswordView.vue"),
+ component: () => import("../views/FormViews/ResetPasswordView.vue"),
},
{
path: "/createNewGroup",
name: "createNewGroup",
- component: () => import("../views/CreateNewGroupView.vue"),
+ component: () => import("../views/FormViews/CreateNewGroupView.vue"),
},
{
path: "/group/:id/memberlist",
name: "memberlist",
- component: () => import("../views/MemberListView.vue"),
+ component: () => import("../views/GroupViews/MemberListView.vue"),
beforeEnter: guardRoute,
},
{
path: "/addNewItem",
name: "addNewItem",
- component: () => import("../views/AddNewItemView.vue"),
+ component: () => import("../views/FormViews/AddNewItemView.vue"),
beforeEnter: guardRoute,
},
{
path: "/notifications",
name: "notifications",
- component: () => import("../views/NotificationView.vue"),
+ component: () => import("../views/FormViews/NotificationView.vue"),
beforeEnter: guardRoute,
},
{
path: "/user/:id/groups",
name: "myGroups",
- component: () => import("../views/MyGroupsView.vue"),
+ component: () => import("../views/GroupViews/MyGroupsView.vue"),
},
{
path: "/groupHomePage",
name: "GroupHome",
- component: () => import("../views/GroupHomeView.vue"),
+ component: () => import("../views/GroupViews/GroupHomeView.vue"),
beforeEnter: guardRoute,
},
];
diff --git a/src/views/AboutView.vue b/src/views/AboutView.vue
deleted file mode 100644
index 989873b7af72325c07d6100a5361faf0177a988d..0000000000000000000000000000000000000000
--- a/src/views/AboutView.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<template>
- <div>This is an about page</div>
-</template>
-
-<script>
-import { defineComponent } from "vue";
-
-// Components
-
-export default defineComponent({
- name: "HomeView",
-
- components: {},
-});
-</script>
diff --git a/src/views/ChatView.vue b/src/views/ChatViews/ChatView.vue
similarity index 92%
rename from src/views/ChatView.vue
rename to src/views/ChatViews/ChatView.vue
index 5ea70942ee3e0858b533e3ce2d84b25fb0feeb64..a8c5eef7738240b1779ff766608661cd8bdbb953 100644
--- a/src/views/ChatView.vue
+++ b/src/views/ChatViews/ChatView.vue
@@ -24,8 +24,8 @@
</template>
<script>
-import ChatProfile from "@/components/chat/ChatProfile.vue";
-import CurrentChat from "@/components/chat/CurrentChat.vue";
+import ChatProfile from "@/components/ChatComponents/ChatProfile.vue";
+import CurrentChat from "@/components/ChatComponents/CurrentChat.vue";
import { parseCurrentUser } from "@/utils/token-utils";
export default {
diff --git a/src/views/AddNewItemView.vue b/src/views/FormViews/AddNewItemView.vue
similarity index 73%
rename from src/views/AddNewItemView.vue
rename to src/views/FormViews/AddNewItemView.vue
index 2724eed8bff21b81d628b0b64715a22026e23568..243c054dc2c74179d892f2d28b31ad7bfd0ca371 100644
--- a/src/views/AddNewItemView.vue
+++ b/src/views/FormViews/AddNewItemView.vue
@@ -3,7 +3,7 @@
</template>
<script>
-import AddNewItem from "@/components/AddNewItem";
+import AddNewItem from "@/components/FormComponents/NewItemForm";
export default {
name: "AddNewItemView.vue",
diff --git a/src/views/CreateNewGroupView.vue b/src/views/FormViews/CreateNewGroupView.vue
similarity index 73%
rename from src/views/CreateNewGroupView.vue
rename to src/views/FormViews/CreateNewGroupView.vue
index d3b69d68220d7cd3a1cc3cd4fa4e3398feafe696..9fcf12fbf0738a897ae01d5babcf941b1e6cbec8 100644
--- a/src/views/CreateNewGroupView.vue
+++ b/src/views/FormViews/CreateNewGroupView.vue
@@ -3,7 +3,7 @@
</template>
<script>
-import CreateNewGroup from "@/components/CreateNewGroup";
+import CreateNewGroup from "@/components/FormComponents/NewGroupForm";
export default {
name: "CreateNewGroupView.vue",
components: {
diff --git a/src/views/LoginView.vue b/src/views/FormViews/LoginView.vue
similarity index 82%
rename from src/views/LoginView.vue
rename to src/views/FormViews/LoginView.vue
index 56cb6978b81d311fc9fed8d3ee6b3da12cda3581..95329c538e3b4796b193048f943bd1be4fee2b88 100644
--- a/src/views/LoginView.vue
+++ b/src/views/FormViews/LoginView.vue
@@ -5,7 +5,7 @@
</template>
<script>
-import LoginForm from "@/components/LoginForm";
+import LoginForm from "@/components/FormComponents/LoginForm";
export default {
name: "LoginView.vue",
components: {
diff --git a/src/views/NewPasswordView.vue b/src/views/FormViews/NewPasswordView.vue
similarity index 81%
rename from src/views/NewPasswordView.vue
rename to src/views/FormViews/NewPasswordView.vue
index bcccd80e96de1cf888b6cc0adb82baa0e48fc8fd..710ce20f0fc1b334635f7703bb2c74902ec93bca 100644
--- a/src/views/NewPasswordView.vue
+++ b/src/views/FormViews/NewPasswordView.vue
@@ -5,7 +5,7 @@
</template>
<script>
-import NewPasswordForm from "@/components/NewPasswordForm";
+import NewPasswordForm from "@/components/FormComponents/NewPasswordForm";
export default {
name: "NewPasswordView.vue",
components: {
diff --git a/src/views/NotificationView.vue b/src/views/FormViews/NotificationView.vue
similarity index 72%
rename from src/views/NotificationView.vue
rename to src/views/FormViews/NotificationView.vue
index f30c038c323a055f83c6c7d38abe59a4494f2fa5..c04c33d78f92104cb38f2b70986f4052d5f006d9 100644
--- a/src/views/NotificationView.vue
+++ b/src/views/FormViews/NotificationView.vue
@@ -5,7 +5,7 @@
</template>
<script>
-import NotificationsForm from "@/components/NotificationsForm";
+import NotificationsForm from "@/components/FormComponents/NotificationsForm";
export default {
name: "NotificationView.vue",
diff --git a/src/views/RegisterView.vue b/src/views/FormViews/RegisterView.vue
similarity index 72%
rename from src/views/RegisterView.vue
rename to src/views/FormViews/RegisterView.vue
index c1478be27a6919308ca75adad5a1df3aca8303a3..e5d5683596755787a0955be481d1b38d91f4a378 100644
--- a/src/views/RegisterView.vue
+++ b/src/views/FormViews/RegisterView.vue
@@ -5,7 +5,7 @@
</template>
<script>
-import RegisterFormComponent from "../components/RegisterFormComponent.vue";
+import RegisterFormComponent from "../../components/FormComponents/RegisterForm.vue";
export default {
components: {
diff --git a/src/views/ResetPasswordView.vue b/src/views/FormViews/ResetPasswordView.vue
similarity index 80%
rename from src/views/ResetPasswordView.vue
rename to src/views/FormViews/ResetPasswordView.vue
index eb2cd8d98a8ffa99dc1c546e02f2198f80e65e49..2345d329aafdc34d561fc78a8a965639e9304c1c 100644
--- a/src/views/ResetPasswordView.vue
+++ b/src/views/FormViews/ResetPasswordView.vue
@@ -5,7 +5,7 @@
</template>
<script>
-import ResetPassword from "@/components/ResetPassword";
+import ResetPassword from "@/components/FormComponents/ResetPasswordForm";
export default {
name: "ResetPasswordView.vue",
components: {
diff --git a/src/views/GroupHomeView.vue b/src/views/GroupViews/GroupHomeView.vue
similarity index 73%
rename from src/views/GroupHomeView.vue
rename to src/views/GroupViews/GroupHomeView.vue
index 36a8905713f69453bc9cffe317227c07fcc44ef9..70826927bddd5e5c7f5087d6542c7ffce3c5ad3b 100644
--- a/src/views/GroupHomeView.vue
+++ b/src/views/GroupViews/GroupHomeView.vue
@@ -3,7 +3,7 @@
</template>
<script>
-import GroupHome from "@/components/GroupHome";
+import GroupHome from "@/components/GroupComponents/GroupHome";
export default {
name: "GroupHomeView.vue",
components: {
diff --git a/src/views/HomeView.vue b/src/views/GroupViews/HomeView.vue
similarity index 91%
rename from src/views/HomeView.vue
rename to src/views/GroupViews/HomeView.vue
index 83573dadf793a786739047ce43eed61c2244de9f..47f81aac3c36cf8924acf4371369e770ac840df6 100644
--- a/src/views/HomeView.vue
+++ b/src/views/GroupViews/HomeView.vue
@@ -12,7 +12,7 @@
</template>
<script>
-import GroupList from "@/components/GroupeComponents/GroupList.vue";
+import GroupList from "@/components/GroupComponents/GroupList.vue";
import { getMyGroups, getVisibleGroups } from "@/utils/apiutil";
export default {
diff --git a/src/views/MemberListView.vue b/src/views/GroupViews/MemberListView.vue
similarity index 97%
rename from src/views/MemberListView.vue
rename to src/views/GroupViews/MemberListView.vue
index efbf16c5ed7ed5db3da33d2a47b5c7124e9b86ea..4352d97bcfb80b23efeece2506e4754ec125b8b3 100644
--- a/src/views/MemberListView.vue
+++ b/src/views/GroupViews/MemberListView.vue
@@ -58,7 +58,7 @@
</template>
<script>
-import MemberList from "@/components/GroupeComponents/MemberList.vue";
+import MemberList from "@/components/GroupComponents/MemberList.vue";
export default {
data() {
diff --git a/src/views/MyGroupsView.vue b/src/views/GroupViews/MyGroupsView.vue
similarity index 87%
rename from src/views/MyGroupsView.vue
rename to src/views/GroupViews/MyGroupsView.vue
index 74714cd8414e2285beaca948cf6f243b98877efa..ff0015601103a9e67fce8f3ea0b3356f2818b7f6 100644
--- a/src/views/MyGroupsView.vue
+++ b/src/views/GroupViews/MyGroupsView.vue
@@ -8,7 +8,7 @@
</template>
<script>
-import GroupList from "@/components/GroupeComponents/GroupList.vue";
+import GroupList from "@/components/GroupComponents/GroupList.vue";
import { getMyGroups } from "@/utils/apiutil";
export default {
diff --git a/src/views/SearchItemListView.vue b/src/views/GroupViews/SearchItemListView.vue
similarity index 72%
rename from src/views/SearchItemListView.vue
rename to src/views/GroupViews/SearchItemListView.vue
index 288fa367f2da5f0df7f164f4538a35ecfca62db1..553a3388b514bccde4dbec5cd04dae602c5afc4f 100644
--- a/src/views/SearchItemListView.vue
+++ b/src/views/GroupViews/SearchItemListView.vue
@@ -3,7 +3,7 @@
</template>
<script>
-import SearchItemListComponent from "@/components/SearchItemListComponent";
+import SearchItemListComponent from "@/components/GroupComponents/SearchItemList";
export default {
name: "SearchItemListView",
components: {
diff --git a/src/views/NavBarView.vue b/src/views/NavigationViews/NavBarView.vue
similarity index 73%
rename from src/views/NavBarView.vue
rename to src/views/NavigationViews/NavBarView.vue
index 9e918114a32bfdd4e090cbecb59b5d32b00d15a8..c15762550bcfa1763085a8adca42ac5f39dd4983 100644
--- a/src/views/NavBarView.vue
+++ b/src/views/NavigationViews/NavBarView.vue
@@ -5,7 +5,7 @@
</template>
<script>
-import Navbar from "@/components/NavBar";
+import Navbar from "@/components/NavigationComponents/NavBar";
export default {
name: "NavBarView",
components: {
diff --git a/src/views/ProfileView.vue b/src/views/UserProfileViews/ProfileView.vue
similarity index 100%
rename from src/views/ProfileView.vue
rename to src/views/UserProfileViews/ProfileView.vue
diff --git a/tests/unit/RegisterUserComponent.spec.js b/tests/unit/RegisterUserComponent.spec.js
index a13d18e437230618a1d38e19b9c7bb00d27c1d7f..b6a4474a3c1a8081c89c0dc2cb3e75b1ea0c513c 100644
--- a/tests/unit/RegisterUserComponent.spec.js
+++ b/tests/unit/RegisterUserComponent.spec.js
@@ -1,5 +1,5 @@
import { mount } from "@vue/test-utils";
-import RegisterFormComponent from "@/components/RegisterFormComponent";
+import RegisterFormComponent from "@/components/FormComponents/RegisterForm";
describe("RegisterFormComponent", () => {
let wrapper;
diff --git a/tests/unit/add-new-item.spec.js b/tests/unit/add-new-item.spec.js
index 930eceba9362b86b5cc0b664dad1b82af987a467..b7424021681dce29a1f52f02324b78f30115c553 100644
--- a/tests/unit/add-new-item.spec.js
+++ b/tests/unit/add-new-item.spec.js
@@ -1,5 +1,5 @@
import { shallowMount } from "@vue/test-utils";
-import AddNewItem from "@/components/AddNewItem.vue";
+import AddNewItem from "@/components/FormComponents/NewItemForm.vue";
describe("addNewItem elements rendering", () => {
it("renders all labels", () => {
diff --git a/tests/unit/create-new-group.spec.js b/tests/unit/create-new-group.spec.js
index dfdceefa87bd978dab619a4c0a80fbb737789825..c96a64b00055bbb2ac6abe90ec7472aaf7cecedc 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/CreateNewGroup.vue";
+import CreateNewGroup from "@/components/FormComponents/NewGroupForm.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 b7d0fbaeefd6dc5a2d634193815c3f51de131642..05eca1b38fc6d70e7bb80af1e07f12fb8702f4f8 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/SearchItemListComponent.vue";
+import SearchItemListComponent from "@/components/GroupComponents/SearchItemList.vue";
describe("CreateNewGroup elements rendering", () => {
it("Tests setting values of input field", async () => {