Start implementation of branches, new form element tabledropdown, model improvements

frontend/src/router/adminRoutes.js

@@ -0,0 +1,26 @@
+import AdminInterestsView from '../views/admin/InterestsView.vue';
+import AdminContactsView from '../views/admin/ContactsView.vue';
+import ForumAdminView from '../dialogues/admin/ForumAdminView.vue';
+
+const adminRoutes = [
+    {
+        path: '/admin/interests',
+        name: 'AdminInterests',
+        component: AdminInterestsView,
+        meta: { requiresAuth: true }
+    },
+    {
+        path: '/admin/contacts',
+        name: 'AdminContacts',
+        component: AdminContactsView,
+        meta: { requiresAuth: true }
+    },
+    {
+        path: '/admin/forum',
+        name: 'AdminForums',
+        component: ForumAdminView,
+        meta: { requiresAuth: true }
+    },
+];
+
+export default adminRoutes;

frontend/src/router/authRoutes.js

@@ -0,0 +1,11 @@
+import ActivateView from '../views/auth/ActivateView.vue';
+
+const authRoutes = [
+    {
+        path: '/activate',
+        name: 'Activate page',
+        component: ActivateView
+    },
+];
+
+export default authRoutes;

frontend/src/router/falukantRoutes.js

@@ -0,0 +1,26 @@
+import BranchView from '../views/falukant/BranchView.vue';
+import Createview from '../views/falukant/CreateView.vue';
+import FalukantOverviewView from '../views/falukant/OverviewView.vue';
+
+const falukantRoutes = [
+    {
+        path: '/falukant/create',
+        name: 'FalukantCreate',
+        component: Createview,
+        meta: { requiresAuth: true }
+    },
+    {
+        path: '/falukant/home',
+        name: 'FalukantOverview',
+        component: FalukantOverviewView,
+        meta: { requiresAuth: true }
+    },
+    {
+        path: '/falukant/branch/:branchId?',
+        name: 'BranchView',
+        component: BranchView,
+        meta: { requiresAuth: true },
+    },
+];
+
+export default falukantRoutes;

frontend/src/router/index.js

@@ -1,134 +1,25 @@
 import { createRouter, createWebHistory } from 'vue-router';
 import store from '../store';
 import HomeView from '../views/HomeView.vue';
-import ActivateView from '../views/auth/ActivateView.vue';
-import PeronalSettingsView from '../views/settings/PersonalView.vue';
-import ViewSettingsView from '../views/settings/ViewView.vue';
-import FlirtSettingsView from '../views/settings/FlirtView.vue';
-import SexualitySettingsView from '../views/settings/SexualityView.vue';
-import AccountSettingsView from '../views/settings/AccountView.vue';
-import InterestsView from '../views/settings/InterestsView.vue';
-import AdminInterestsView from '../views/admin/InterestsView.vue';
-import AdminContactsView from '../views/admin/ContactsView.vue';
-import SearchView from '../views/social/SearchView.vue';
-import GalleryView from '../views/social/GalleryView.vue';
-import GuestbookView from '../views/social/GuestbookView.vue';
-import DiaryView from '../views/social/DiaryView.vue';
-import ForumAdminView from '../dialogues/admin/ForumAdminView.vue';
-import ForumView from '../views/social/ForumView.vue';
-import ForumTopicView from '../views/social/ForumTopicView.vue';
-import FriendsView from '../views/social/FriendsView.vue';
+import authRoutes from './authRoutes';
+import socialRoutes from './socialRoutes';
+import settingsRoutes from './settingsRoutes';
+import adminRoutes from './adminRoutes';
+import falukantRoutes from './falukantRoutes';
 
 const routes = [
   {
-    path: '/', 
+    path: '/',
     name: 'Home',
     component: HomeView
   },
-  {
-    path: '/activate', 
-    name: 'Activate page',
-    component: ActivateView
-  },
-  {
-    path: '/friends',
-    name: 'Friends',
-    component: FriendsView,
-    meta: { requiresAuth: true }
-  },
-  {
-    path: '/socialnetwork/guestbook',
-    name: 'Guestbook',
-    component: GuestbookView,
-    meta: { requiresAuth: true }
-  },
-  {
-    path: '/socialnetwork/search',
-    name: 'Search users',
-    component: SearchView,
-    meta: { requiresAuth: true }
-  },
-  {
-    path: '/socialnetwork/gallery',
-    name: 'Gallery',
-    component: GalleryView,
-    meta: { requiresAuth: true }
-  },
-  {
-    path: '/socialnetwork/forum/:id',
-    name: 'Forum',
-    component: ForumView,
-    meta: { requiresAuth: true }
-  },
-  {
-    path: '/socialnetwork/forumtopic/:id',
-    name: 'ForumTopic',
-    component: ForumTopicView,
-    meta: { requiresAuth: true }
-  },
-  {
-    path: '/socialnetwork/diary',
-    name: 'Diary',
-    component: DiaryView,
-    meta: { requiresAuth: true }
-  },
-  {
-    path: '/settings/personal',
-    name: 'Personal settings',
-    component: PeronalSettingsView,
-    meta: { requiresAuth: true }
-  },
-  {
-    path: '/settings/view',
-    name: 'View settings',
-    component: ViewSettingsView,
-    meta: { requiresAuth: true }
-  },
-  {
-    path: '/settings/sexuality',
-    name: 'Sexuality settings',
-    component: SexualitySettingsView,
-    meta: { requiresAuth: true }
-  },
-  {
-    path: '/settings/flirt',
-    name: 'Flirt settings',
-    component: FlirtSettingsView,
-    meta: { requiresAuth: true }
-  },
-  {
-    path: '/settings/account',
-    name: 'Account settings',
-    component: AccountSettingsView,
-    meta: { requiresAuth: true }
-  },
-  {
-    path: '/settings/interests',
-    name: 'Interests',
-    component: InterestsView,
-    meta: { requiresAuth: true }
-  },
-  {
-    path: '/admin/interests',
-    name: 'AdminInterests',
-    component: AdminInterestsView,
-    meta: { requiresAuth: true }
-  },
-  {
-    path: '/admin/contacts',
-    name: 'AdminContacts',
-    component: AdminContactsView,
-    meta: { requiresAuth: true }
-  },
-  {
-    path: '/admin/forum',
-    name: 'AdminForums',
-    component: ForumAdminView,
-    meta: { requiresAuth: true }
-  }
+  ...authRoutes,
+  ...socialRoutes,
+  ...settingsRoutes,
+  ...adminRoutes,
+  ...falukantRoutes,
 ];
 
-
 const router = createRouter({
   history: createWebHistory(import.meta.env.BASE_URL),
   routes
@@ -149,4 +40,3 @@ router.beforeEach((to, from, next) => {
 });
 
 export default router;
-

frontend/src/router/settingsRoutes.js

@@ -0,0 +1,47 @@
+import PeronalSettingsView from '../views/settings/PersonalView.vue';
+import ViewSettingsView from '../views/settings/ViewView.vue';
+import FlirtSettingsView from '../views/settings/FlirtView.vue';
+import SexualitySettingsView from '../views/settings/SexualityView.vue';
+import AccountSettingsView from '../views/settings/AccountView.vue';
+import InterestsView from '../views/settings/InterestsView.vue';
+
+const settingsRoutes = [
+    {
+        path: '/settings/personal',
+        name: 'Personal settings',
+        component: PeronalSettingsView,
+        meta: { requiresAuth: true }
+    },
+    {
+        path: '/settings/view',
+        name: 'View settings',
+        component: ViewSettingsView,
+        meta: { requiresAuth: true }
+    },
+    {
+        path: '/settings/sexuality',
+        name: 'Sexuality settings',
+        component: SexualitySettingsView,
+        meta: { requiresAuth: true }
+    },
+    {
+        path: '/settings/flirt',
+        name: 'Flirt settings',
+        component: FlirtSettingsView,
+        meta: { requiresAuth: true }
+    },
+    {
+        path: '/settings/account',
+        name: 'Account settings',
+        component: AccountSettingsView,
+        meta: { requiresAuth: true }
+    },
+    {
+        path: '/settings/interests',
+        name: 'Interests',
+        component: InterestsView,
+        meta: { requiresAuth: true }
+    },
+];
+
+export default settingsRoutes;

frontend/src/router/socialRoutes.js

@@ -0,0 +1,54 @@
+import FriendsView from '../views/social/FriendsView.vue';
+import SearchView from '../views/social/SearchView.vue';
+import GalleryView from '../views/social/GalleryView.vue';
+import GuestbookView from '../views/social/GuestbookView.vue';
+import DiaryView from '../views/social/DiaryView.vue';
+import ForumView from '../views/social/ForumView.vue';
+import ForumTopicView from '../views/social/ForumTopicView.vue';
+
+const socialRoutes = [
+    {
+        path: '/friends',
+        name: 'Friends',
+        component: FriendsView,
+        meta: { requiresAuth: true }
+    },
+    {
+        path: '/socialnetwork/guestbook',
+        name: 'Guestbook',
+        component: GuestbookView,
+        meta: { requiresAuth: true }
+    },
+    {
+        path: '/socialnetwork/search',
+        name: 'Search users',
+        component: SearchView,
+        meta: { requiresAuth: true }
+    },
+    {
+        path: '/socialnetwork/gallery',
+        name: 'Gallery',
+        component: GalleryView,
+        meta: { requiresAuth: true }
+    },
+    {
+        path: '/socialnetwork/forum/:id',
+        name: 'Forum',
+        component: ForumView,
+        meta: { requiresAuth: true }
+    },
+    {
+        path: '/socialnetwork/forumtopic/:id',
+        name: 'ForumTopic',
+        component: ForumTopicView,
+        meta: { requiresAuth: true }
+    },
+    {
+        path: '/socialnetwork/diary',
+        name: 'Diary',
+        component: DiaryView,
+        meta: { requiresAuth: true }
+    },
+];
+
+export default socialRoutes;