Skip to content
Snippets Groups Projects
Commit e2afb96c authored by Titus Netland's avatar Titus Netland
Browse files

Project folder and file restructuring/renaming 2

parent 7dc44499
No related branches found
No related tags found
1 merge request!51Project restructure
Pipeline #177608 failed with stages
in 1 minute and 17 seconds
Showing
with 20 additions and 18 deletions
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</template> </template>
<script> <script>
import ItemCard from "@/components/GroupComponents/ItemCard"; import ItemCard from "@/components/CommunityComponents/ItemCard";
export default { export default {
name: "SearchItemListComponent", name: "SearchItemListComponent",
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</template> </template>
<script> <script>
import GroupListItem from "@/components/GroupComponents/GroupListItem.vue"; import GroupListItem from "@/components/CommunityComponents/CommunityListItem.vue";
export default { export default {
name: "GroupList", name: "GroupList",
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</template> </template>
<script> <script>
import ItemCard from "@/components/GroupComponents/ItemCard"; import ItemCard from "@/components/CommunityComponents/ItemCard";
export default { export default {
name: "SearchItemListComponent", name: "SearchItemListComponent",
......
import store from "@/store"; import store from "@/store";
import { createRouter, createWebHistory } from "vue-router"; 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 LoginView from "../views/FormViews/LoginView.vue";
import NewPasswordView from "../views/FormViews/NewPasswordView"; import NewPasswordView from "../views/FormViews/NewPasswordView";
...@@ -38,7 +38,9 @@ const routes = [ ...@@ -38,7 +38,9 @@ const routes = [
path: "/messages", path: "/messages",
name: "messages", name: "messages",
component: () => component: () =>
import(/* webpackChunkName: "register" */ "../views/ChatViews/ChatView.vue"), import(
/* webpackChunkName: "register" */ "../views/ChatViews/ChatView.vue"
),
beforeEnter: guardRoute, beforeEnter: guardRoute,
}, },
{ {
...@@ -55,7 +57,7 @@ const routes = [ ...@@ -55,7 +57,7 @@ const routes = [
{ {
path: "/searchItemList", path: "/searchItemList",
name: "searchItemList", name: "searchItemList",
component: () => import("../views/GroupViews/SearchItemListView.vue"), component: () => import("../views/CommunityViews/SearchItemListView.vue"),
}, },
{ {
path: "/resetPassword", path: "/resetPassword",
...@@ -65,18 +67,18 @@ const routes = [ ...@@ -65,18 +67,18 @@ const routes = [
{ {
path: "/createNewGroup", path: "/createNewGroup",
name: "createNewGroup", name: "createNewGroup",
component: () => import("../views/FormViews/CreateNewGroupView.vue"), component: () => import("../views/FormViews/NewCommunityView.vue"),
}, },
{ {
path: "/group/:id/memberlist", path: "/group/:id/memberlist",
name: "memberlist", name: "memberlist",
component: () => import("../views/GroupViews/MemberListView.vue"), component: () => import("../views/CommunityViews/MemberListView.vue"),
beforeEnter: guardRoute, beforeEnter: guardRoute,
}, },
{ {
path: "/addNewItem", path: "/addNewItem",
name: "addNewItem", name: "addNewItem",
component: () => import("../views/FormViews/AddNewItemView.vue"), component: () => import("../views/FormViews/NewItemView.vue"),
beforeEnter: guardRoute, beforeEnter: guardRoute,
}, },
{ {
...@@ -88,12 +90,12 @@ const routes = [ ...@@ -88,12 +90,12 @@ const routes = [
{ {
path: "/user/:id/groups", path: "/user/:id/groups",
name: "myGroups", name: "myGroups",
component: () => import("../views/GroupViews/MyGroupsView.vue"), component: () => import("../views/CommunityViews/MyCommunitiesView.vue"),
}, },
{ {
path: "/groupHomePage", path: "/groupHomePage",
name: "GroupHome", name: "GroupHome",
component: () => import("../views/GroupViews/GroupHomeView.vue"), component: () => import("../views/CommunityViews/CommunityHomeView.vue"),
beforeEnter: guardRoute, beforeEnter: guardRoute,
}, },
]; ];
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
</template> </template>
<script> <script>
import GroupHome from "@/components/GroupComponents/GroupHome"; import GroupHome from "@/components/CommunityComponents/CommunityHome";
export default { export default {
name: "GroupHomeView.vue", name: "GroupHomeView.vue",
components: { components: {
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
</template> </template>
<script> <script>
import GroupList from "@/components/GroupComponents/GroupList.vue"; import GroupList from "@/components/CommunityComponents/CommunityList.vue";
import { getMyGroups, getVisibleGroups } from "@/utils/apiutil"; import { getMyGroups, getVisibleGroups } from "@/utils/apiutil";
export default { export default {
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</template> </template>
<script> <script>
import MemberList from "@/components/GroupComponents/MemberList.vue"; import MemberList from "@/components/CommunityComponents/MemberList.vue";
export default { export default {
data() { data() {
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
</template> </template>
<script> <script>
import GroupList from "@/components/GroupComponents/GroupList.vue"; import GroupList from "@/components/CommunityComponents/CommunityList.vue";
import { getMyGroups } from "@/utils/apiutil"; import { getMyGroups } from "@/utils/apiutil";
export default { export default {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
</template> </template>
<script> <script>
import SearchItemListComponent from "@/components/GroupComponents/SearchItemList"; import SearchItemListComponent from "@/components/CommunityComponents/SearchItemList";
export default { export default {
name: "SearchItemListView", name: "SearchItemListView",
components: { components: {
......
import { shallowMount } from "@vue/test-utils"; import { shallowMount } from "@vue/test-utils";
import CreateNewGroup from "@/components/FormComponents/NewGroupForm.vue"; import CreateNewGroup from "@/components/FormComponents/NewCommunityForm.vue";
describe("CreateNewGroup elements rendering", () => { describe("CreateNewGroup elements rendering", () => {
it("renders all labels", () => { it("renders all labels", () => {
......
import { shallowMount } from "@vue/test-utils"; import { shallowMount } from "@vue/test-utils";
import SearchItemListComponent from "@/components/GroupComponents/SearchItemList.vue"; import SearchItemListComponent from "@/components/CommunityComponents/SearchItemList.vue";
describe("CreateNewGroup elements rendering", () => { describe("CreateNewGroup elements rendering", () => {
it("Tests setting values of input field", async () => { it("Tests setting values of input field", async () => {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment