From eb695a36210d7b3b47f4004addbc685c89f5b568 Mon Sep 17 00:00:00 2001
From: Titus Kristiansen <titusk@stud.ntnu.no>
Date: Fri, 6 May 2022 15:15:13 +0200
Subject: [PATCH] Routes alphabetized and added guardRoute to admin screen
---
src/router/index.js | 138 ++++++++++++++++++++++++--------------------
1 file changed, 74 insertions(+), 64 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 9f7228c..076a261 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -3,24 +3,32 @@ import { createRouter, createWebHistory } from "vue-router";
import NotFound from "@/views/NotFound.vue";
/**
- * Guards routes. If token is null, no user is logged in and only the
- * login page and the register page will be accessible.
+ * Guards routes.
+ * If token is null, no user is logged in and only the
+ * login, register, reset password, help and listing of public groups and items pages will be accessible.
+ * Without a token the user gets redirected to the login page when trying to access guard routed pages.
*/
function guardRoute(to, from, next) {
let isAuthenticated = store.state.user.token != null;
if (isAuthenticated) {
next(); // allow to enter route
} else {
- next("/login"); // go to '/login';
+ next("/login"); // go to the login page
}
}
+/**
+ * Guards routes for administartors. If token is null or
+ * the user is not the administrator of the group, the user gets sent to the home page.
+ */
function isAdmin(to, from, next) {
if (store.state.user.adminList.includes(parseInt(from.params.communityID)))
- next();
- else next("/");
+ next(); // allow to enter route
+ else
+ next("/"); // go to the home page
}
+
const routes = [
{
path: "/",
@@ -28,37 +36,43 @@ const routes = [
component: () => import("../views/CommunityViews/CommunityView.vue"),
},
{
- path: "/help",
- name: "help",
- component: () => import("../views/HelpView.vue"),
+ path: "/community/:communityID",
+ name: "communityHome",
+ component: () => import("../views/CommunityViews/CommunityHomeView.vue"),
},
{
- path: "/profile/:id",
- name: "profile",
- component: () => import("../views/UserProfileViews/ProfileView.vue"),
- beforeEnter: guardRoute,
+ path: "/community/:communityID/admin",
+ name: "communityAdminPage",
+ component: () => import("@/views/CommunityViews/AdminView.vue"),
+ beforeEnter: [guardRoute, isAdmin],
},
{
- path: "/profile/history",
- name: "history",
- component: () => import("../views/UserProfileViews/RentHistoryView.vue"),
+ path: "/community/:communityID/memberlist",
+ name: "memberlist",
+ component: () => import("../views/CommunityViews/MemberListView.vue"),
beforeEnter: guardRoute,
},
{
- path: "/profile/communities",
- name: "myCommunities",
- component: () => import("../views/UserProfileViews/MyCommunitiesView.vue"),
+ path: "/community/:communityID/private/join",
+ name: "communityRequest",
+ component: () => import("../views/CommunityViews/CommunityRequestView.vue"),
beforeEnter: guardRoute,
},
{
- path: "/register",
- name: "register",
- component: () => import("../views/UserAuthViews/RegisterView.vue"),
+ path: "/help",
+ name: "help",
+ component: () => import("../views/HelpView.vue"),
},
{
- path: "/messages",
- name: "messages",
- component: () => import("../views/ChatViews/ChatView.vue"),
+ path: "/item/:id/edit",
+ name: "editItem",
+ component: () => import("../views/ItemViews/EditItemView.vue"),
+ beforeEnter: guardRoute,
+ },
+ {
+ path: "/itempage/:id",
+ name: "itemInfo",
+ component: () => import("../views/RentingViews/ItemInfoPageView.vue"),
beforeEnter: guardRoute,
},
{
@@ -67,33 +81,17 @@ const routes = [
component: () => import("../views/UserAuthViews/LoginView.vue"),
},
{
- path: "/newPassword",
- name: "newPassword",
- component: () => import("../views/UserAuthViews/NewPasswordView"),
+ path: "/messages",
+ name: "messages",
+ component: () => import("../views/ChatViews/ChatView.vue"),
beforeEnter: guardRoute,
},
- {
- path: "/searchItemList",
- name: "searchItemList",
- component: () => import("../views/ItemViews/SearchItemListView.vue"),
- },
- {
- path: "/resetPassword",
- name: "resetPassword",
- component: () => import("../views/UserAuthViews/ResetPasswordView.vue"),
- },
{
path: "/newCommunity",
name: "newCommunity",
component: () => import("../views/CommunityViews/NewCommunityView.vue"),
beforeEnter: guardRoute,
},
- {
- path: "/community/:communityID/memberlist",
- name: "memberlist",
- component: () => import("../views/CommunityViews/MemberListView.vue"),
- beforeEnter: guardRoute,
- },
{
path: "/newItem",
name: "newItem",
@@ -101,45 +99,57 @@ const routes = [
beforeEnter: guardRoute,
},
{
- path: "/community/:communityID",
- name: "communityHome",
- component: () => import("../views/CommunityViews/CommunityHomeView.vue"),
+ path: "/newPassword",
+ name: "newPassword",
+ component: () => import("../views/UserAuthViews/NewPasswordView"),
+ beforeEnter: guardRoute,
},
{
- path: "/community/:communityID/private/join",
- name: "communityRequest",
- component: () => import("../views/CommunityViews/CommunityRequestView.vue"),
+ path: "/profile/:id",
+ name: "profile",
+ component: () => import("../views/UserProfileViews/ProfileView.vue"),
beforeEnter: guardRoute,
},
{
- path: "/test",
- name: "test",
- component: () => import("../views/TestView.vue"),
+ path: "/profile/communities",
+ name: "myCommunities",
+ component: () => import("../views/UserProfileViews/MyCommunitiesView.vue"),
+ beforeEnter: guardRoute,
},
{
- path: "/community/:communityID/admin",
- name: "CommunityAdminView",
- component: () => import("@/views/CommunityViews/AdminView.vue"),
- beforeEnter: isAdmin,
+ path: "/profile/history",
+ name: "history",
+ component: () => import("../views/UserProfileViews/RentHistoryView.vue"),
+ beforeEnter: guardRoute,
},
{
- path: "/itempage/:id",
- name: "ItemInfo",
- component: () => import("../views/RentingViews/ItemInfoPageView.vue"),
- beforeEnter: guardRoute,
+ path: "/register",
+ name: "register",
+ component: () => import("../views/UserAuthViews/RegisterView.vue"),
},
{
- path: "/item/:id/edit",
- name: "editItem",
- component: () => import("../views/ItemViews/EditItemView.vue"),
+ path: "/resetPassword",
+ name: "resetPassword",
+ component: () => import("../views/UserAuthViews/ResetPasswordView.vue"),
+ },
+ {
+ path: "/searchItemList",
+ name: "searchItemList",
+ component: () => import("../views/ItemViews/SearchItemListView.vue"),
+ },
+ {
+ path: "/test",
+ name: "test",
+ component: () => import("../views/TestView.vue"),
beforeEnter: guardRoute,
},
{
path: "/user/userItems",
- name: "UserItems",
+ name: "userItems",
component: () => import("../views/UserProfileViews/UserItemsView.vue"),
beforeEnter: guardRoute,
},
+
// Make sure it's your last route definition
{ path: "/:pathMatch(.*)*", name: "not-found", component: NotFound },
];
--
GitLab