vikunja
/
frontend
Archived
6
39
Fork 49
Code Issues 1 Pull Requests 4 Projects Releases 26 Activity

Merge branch 'main' into feature/rename-lists-to-projects 

# Conflicts:
#	src/components/list/ListWrapper.vue
#	src/router/index.ts
This commit is contained in:
kolaente 2022-11-13 22:56:23 +01:00
parent 88d64def93 fd1d01164f
commit bc24605711
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
1 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
src/router/index.ts
View File

@ -11,74 +11,74 @@ import {useProjectStore} from '@/stores/projects'
import {useAuthStore} from '@/stores/auth' import {useAuthStore} from '@/stores/auth'
import {useBaseStore} from '@/stores/base' import {useBaseStore} from '@/stores/base'
import HomeComponent from '../views/Home.vue' import HomeComponent from '@/views/Home.vue'
import NotFoundComponent from '../views/404.vue' import NotFoundComponent from '@/views/404.vue'
import About from '../views/About.vue' const About = () => import('@/views/About.vue')
// User Handling // User Handling
import LoginComponent from '../views/user/Login.vue' import LoginComponent from '@/views/user/Login.vue'
import RegisterComponent from '../views/user/Register.vue' import RegisterComponent from '@/views/user/Register.vue'
import OpenIdAuth from '../views/user/OpenIdAuth.vue' import OpenIdAuth from '@/views/user/OpenIdAuth.vue'
import DataExportDownload from '../views/user/DataExportDownload.vue' const DataExportDownload = () => import('@/views/user/DataExportDownload.vue')
// Tasks // Tasks
import UpcomingTasksComponent from '../views/tasks/ShowTasks.vue' import UpcomingTasksComponent from '@/views/tasks/ShowTasks.vue'
import LinkShareAuthComponent from '../views/sharing/LinkSharingAuth.vue' import LinkShareAuthComponent from '@/views/sharing/LinkSharingAuth.vue'
import ProjectNamespaces from '../views/namespaces/ListNamespaces.vue' const ListNamespaces = () => import('@/views/namespaces/ListNamespaces.vue')
const TaskDetailView = () => import('../views/tasks/TaskDetailView.vue') const TaskDetailView = () => import('@/views/tasks/TaskDetailView.vue')
// Team Handling // Team Handling
import ProjectTeamsComponent from '../views/teams/ListTeams.vue' const ListTeamsComponent = () => import('@/views/teams/ListTeams.vue')
// Label Handling // Label Handling
import ProjectLabelsComponent from '../views/labels/ListLabels.vue' const ListLabelsComponent = () => import('@/views/labels/ListLabels.vue')
import NewLabelComponent from '../views/labels/NewLabel.vue' const NewLabelComponent = () => import('@/views/labels/NewLabel.vue')
// Migration // Migration
const MigrationComponent = () => import('@/views/migrate/Migration.vue') const MigrationComponent = () => import('@/views/migrate/Migration.vue')
const MigrationHandlerComponent = () => import('@/views/migrate/MigrationHandler.vue') const MigrationHandlerComponent = () => import('@/views/migrate/MigrationHandler.vue')
// Project Views // Project Views
import ProjectList from '../views/project/ProjectList.vue' const ProjectList = () => import('@/views/project/ProjectList.vue')
const ProjectGantt = () => import('../views/project/ProjectGantt.vue') const ProjectGantt = () => import('@/views/project/ProjectGantt.vue')
import ProjectTable from '../views/project/ProjectTable.vue' const ProjectTable = () => import('@/views/project/ProjectTable.vue')
import ProjectKanban from '../views/project/ProjectKanban.vue' const ProjectKanban = () => import('@/views/project/ProjectKanban.vue')
const ProjectInfo = () => import('../views/project/ProjectInfo.vue') const ProjectInfo = () => import('@/views/project/ProjectInfo.vue')
// Project Settings // Project Settings
import ProjectSettingEdit from '../views/project/settings/edit.vue' const ProjectSettingEdit = () => import('@/views/project/settings/edit.vue')
import ProjectSettingBackground from '../views/project/settings/background.vue' const ProjectSettingBackground = () => import('@/views/project/settings/background.vue')
import ProjectSettingDuplicate from '../views/project/settings/duplicate.vue' const ProjectSettingDuplicate = () => import('@/views/project/settings/duplicate.vue')
import ProjectSettingShare from '../views/project/settings/share.vue' const ProjectSettingShare = () => import('@/views/project/settings/share.vue')
import ProjectSettingDelete from '../views/project/settings/delete.vue' const ProjectSettingDelete = () => import('@/views/project/settings/delete.vue')
import ProjectSettingArchive from '../views/project/settings/archive.vue' const ProjectSettingArchive = () => import('@/views/project/settings/archive.vue')
// Namespace Settings // Namespace Settings
import NamespaceSettingEdit from '../views/namespaces/settings/edit.vue' const NamespaceSettingEdit = () => import('@/views/namespaces/settings/edit.vue')
import NamespaceSettingShare from '../views/namespaces/settings/share.vue' const NamespaceSettingShare = () => import('@/views/namespaces/settings/share.vue')
import NamespaceSettingArchive from '../views/namespaces/settings/archive.vue' const NamespaceSettingArchive = () => import('@/views/namespaces/settings/archive.vue')
import NamespaceSettingDelete from '../views/namespaces/settings/delete.vue' const NamespaceSettingDelete = () => import('@/views/namespaces/settings/delete.vue')
// Saved Filters // Saved Filters
import FilterNew from '@/views/filters/FilterNew.vue' const FilterNew = () => import('@/views/filters/FilterNew.vue')
import FilterEdit from '@/views/filters/FilterEdit.vue' const FilterEdit = () => import('@/views/filters/FilterEdit.vue')
import FilterDelete from '@/views/filters/FilterDelete.vue' const FilterDelete = () => import('@/views/filters/FilterDelete.vue')
const PasswordResetComponent = () => import('../views/user/PasswordReset.vue') const PasswordResetComponent = () => import('@/views/user/PasswordReset.vue')
const GetPasswordResetComponent = () => import('../views/user/RequestPasswordReset.vue') const GetPasswordResetComponent = () => import('@/views/user/RequestPasswordReset.vue')
const UserSettingsComponent = () => import('../views/user/Settings.vue') const UserSettingsComponent = () => import('@/views/user/Settings.vue')
const UserSettingsAvatarComponent = () => import('../views/user/settings/Avatar.vue') const UserSettingsAvatarComponent = () => import('@/views/user/settings/Avatar.vue')
const UserSettingsCaldavComponent = () => import('../views/user/settings/Caldav.vue') const UserSettingsCaldavComponent = () => import('@/views/user/settings/Caldav.vue')
const UserSettingsDataExportComponent = () => import('../views/user/settings/DataExport.vue') const UserSettingsDataExportComponent = () => import('@/views/user/settings/DataExport.vue')
const UserSettingsDeletionComponent = () => import('../views/user/settings/Deletion.vue') const UserSettingsDeletionComponent = () => import('@/views/user/settings/Deletion.vue')
const UserSettingsEmailUpdateComponent = () => import('../views/user/settings/EmailUpdate.vue') const UserSettingsEmailUpdateComponent = () => import('@/views/user/settings/EmailUpdate.vue')
const UserSettingsGeneralComponent = () => import('../views/user/settings/General.vue') const UserSettingsGeneralComponent = () => import('@/views/user/settings/General.vue')
const UserSettingsPasswordUpdateComponent = () => import('../views/user/settings/PasswordUpdate.vue') const UserSettingsPasswordUpdateComponent = () => import('@/views/user/settings/PasswordUpdate.vue')
const UserSettingsTOTPComponent = () => import('../views/user/settings/TOTP.vue') const UserSettingsTOTPComponent = () => import('@/views/user/settings/TOTP.vue')
// Project Handling // Project Handling
const NewProjectComponent = () => import('../views/project/NewProject.vue') const NewProjectComponent = () => import('@/views/project/NewProject.vue')
// Namespace Handling // Namespace Handling
const NewNamespaceComponent = () => import('../views/namespaces/NewNamespace.vue') const NewNamespaceComponent = () => import('@/views/namespaces/NewNamespace.vue')
const EditTeamComponent = () => import('../views/teams/EditTeam.vue') const EditTeamComponent = () => import('@/views/teams/EditTeam.vue')
const NewTeamComponent = () => import('../views/teams/NewTeam.vue') const NewTeamComponent = () => import('@/views/teams/NewTeam.vue')
const router = createRouter({ const router = createRouter({
history: createWebHistory(), history: createWebHistory(),