Merge branch 'develop' into milestone/ff-admin-unit
# Conflicts: # src/stores/admin/navigation.ts
This commit is contained in:
commit
b6e80b358a
62 changed files with 248 additions and 477 deletions
|
@ -15,7 +15,7 @@ const router = createRouter({
|
|||
routes: [
|
||||
{
|
||||
path: "/",
|
||||
redirect: { name: "admin" },
|
||||
redirect: { name: "admin-default" },
|
||||
},
|
||||
{
|
||||
path: "/login",
|
||||
|
@ -76,12 +76,13 @@ const router = createRouter({
|
|||
path: "/admin",
|
||||
name: "admin",
|
||||
component: () => import("@/views/admin/View.vue"),
|
||||
beforeEnter: [isAuthenticated],
|
||||
beforeEnter: [isAuthenticated, abilityAndNavUpdate],
|
||||
children: [
|
||||
{
|
||||
path: "",
|
||||
name: "admin-default",
|
||||
component: () => import("@/views/admin/ViewSelect.vue"),
|
||||
beforeEnter: [abilityAndNavUpdate],
|
||||
},
|
||||
{
|
||||
path: "club",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue