@@ -31,7 +31,7 @@ import Logo from '@/components/home/Logo.vue'
import PoweredByLink from './PoweredByLink.vue'
const baseStore = useBaseStore()
-const currentList = computed(() => baseStore.currentList)
+const currentProject = computed(() => baseStore.currentProject)
const background = computed(() => baseStore.background)
const logoVisible = computed(() => baseStore.logoVisible)
diff --git a/src/components/home/navigation.vue b/src/components/home/navigation.vue
index 333d668c1..74696dafb 100644
--- a/src/components/home/navigation.vue
+++ b/src/components/home/navigation.vue
@@ -52,37 +52,37 @@
-
-
+
-
-
+
+
-
-
+ @click="projectStore.toggleProjectFavorite(l)"
+ >
+
+
@@ -151,21 +151,21 @@ import draggable from 'zhyswan-vuedraggable'
import type {SortableEvent} from 'sortablejs'
import BaseButton from '@/components/base/BaseButton.vue'
-import ListSettingsDropdown from '@/components/list/list-settings-dropdown.vue'
+import ProjectSettingsDropdown from '@/components/project/project-settings-dropdown.vue'
import NamespaceSettingsDropdown from '@/components/namespace/namespace-settings-dropdown.vue'
import PoweredByLink from '@/components/home/PoweredByLink.vue'
import Logo from '@/components/home/Logo.vue'
import {calculateItemPosition} from '@/helpers/calculateItemPosition'
import {getNamespaceTitle} from '@/helpers/getNamespaceTitle'
-import {getListTitle} from '@/helpers/getListTitle'
+import {getProjectTitle} from '@/helpers/getProjectTitle'
import {useEventListener} from '@vueuse/core'
-import type {IList} from '@/modelTypes/IList'
+import type {IProject} from '@/modelTypes/IProject'
import type {INamespace} from '@/modelTypes/INamespace'
import ColorBubble from '@/components/misc/colorBubble.vue'
import {useBaseStore} from '@/stores/base'
-import {useListStore} from '@/stores/lists'
+import {useProjectStore} from '@/stores/projects'
import {useNamespaceStore} from '@/stores/namespaces'
const drag = ref(false)
@@ -176,7 +176,7 @@ const dragOptions = {
const baseStore = useBaseStore()
const namespaceStore = useNamespaceStore()
-const currentList = computed(() => baseStore.currentList)
+const currentProject = computed(() => baseStore.currentProject)
const menuActive = computed(() => baseStore.menuActive)
const loading = computed(() => namespaceStore.isLoading)
@@ -184,9 +184,9 @@ const loading = computed(() => namespaceStore.isLoading)
const namespaces = computed(() => {
return namespaceStore.namespaces.filter(n => !n.isArchived)
})
-const activeLists = computed(() => {
- return namespaces.value.map(({lists}) => {
- return lists?.filter(item => {
+const activeProjects = computed(() => {
+ return namespaces.value.map(({projects}) => {
+ return projects?.filter(item => {
return typeof item !== 'undefined' && !item.isArchived
})
})
@@ -196,54 +196,54 @@ const namespaceTitles = computed(() => {
return namespaces.value.map((namespace) => getNamespaceTitle(namespace))
})
-const namespaceListsCount = computed(() => {
- return namespaces.value.map((_, index) => activeLists.value[index]?.length ?? 0)
+const namespaceProjectsCount = computed(() => {
+ return namespaces.value.map((_, index) => activeProjects.value[index]?.length ?? 0)
})
useEventListener('resize', resize)
onMounted(() => resize())
-const listStore = useListStore()
+const projectStore = useProjectStore()
function resize() {
// Hide the menu by default on mobile
baseStore.setMenuActive(window.innerWidth >= 770)
}
-function toggleLists(namespaceId: INamespace['id']) {
- listsVisible.value[namespaceId] = !listsVisible.value[namespaceId]
+function toggleProjects(namespaceId: INamespace['id']) {
+ projectsVisible.value[namespaceId] = !projectsVisible.value[namespaceId]
}
-const listsVisible = ref<{ [id: INamespace['id']]: boolean }>({})
+const projectsVisible = ref<{ [id: INamespace['id']]: boolean }>({})
// FIXME: async action will be unfinished when component mounts
onBeforeMount(async () => {
const namespaces = await namespaceStore.loadNamespaces()
namespaces.forEach(n => {
- if (typeof listsVisible.value[n.id] === 'undefined') {
- listsVisible.value[n.id] = true
+ if (typeof projectsVisible.value[n.id] === 'undefined') {
+ projectsVisible.value[n.id] = true
}
})
})
-function updateActiveLists(namespace: INamespace, activeLists: IList[]) {
+function updateActiveProjects(namespace: INamespace, activeProjects: IProject[]) {
// This is a bit hacky: since we do have to filter out the archived items from the list
// for vue draggable updating it is not as simple as replacing it.
- // To work around this, we merge the active lists with the archived ones. Doing so breaks the order
- // because now all archived lists are sorted after the active ones. This is fine because they are sorted
+ // To work around this, we merge the active projects with the archived ones. Doing so breaks the order
+ // because now all archived projects are sorted after the active ones. This is fine because they are sorted
// later when showing them anyway, and it makes the merging happening here a lot easier.
- const lists = [
- ...activeLists,
- ...namespace.lists.filter(l => l.isArchived),
+ const projects = [
+ ...activeProjects,
+ ...namespace.projects.filter(l => l.isArchived),
]
namespaceStore.setNamespaceById({
...namespace,
- lists,
+ projects,
})
}
-const listUpdating = ref<{ [id: INamespace['id']]: boolean }>({})
+const projectUpdating = ref<{ [id: INamespace['id']]: boolean }>({})
async function saveListPosition(e: SortableEvent) {
if (!e.newIndex && e.newIndex !== 0) return
@@ -251,31 +251,31 @@ async function saveListPosition(e: SortableEvent) {
const namespaceId = parseInt(e.to.dataset.namespaceId as string)
const newNamespaceIndex = parseInt(e.to.dataset.namespaceIndex as string)
- const listsActive = activeLists.value[newNamespaceIndex]
- // If the list was dragged to the last position, Safari will report e.newIndex as the size of the listsActive
- // array instead of using the position. Because the index is wrong in that case, dragging the list will fail.
+ const projectsActive = activeProjects.value[newNamespaceIndex]
+ // If the project was dragged to the last position, Safari will report e.newIndex as the size of the projectsActive
+ // array instead of using the position. Because the index is wrong in that case, dragging the project will fail.
// To work around that we're explicitly checking that case here and decrease the index.
- const newIndex = e.newIndex === listsActive.length ? e.newIndex - 1 : e.newIndex
+ const newIndex = e.newIndex === projectsActive.length ? e.newIndex - 1 : e.newIndex
- const list = listsActive[newIndex]
- const listBefore = listsActive[newIndex - 1] ?? null
- const listAfter = listsActive[newIndex + 1] ?? null
- listUpdating.value[list.id] = true
+ const project = projectsActive[newIndex]
+ const projectBefore = projectsActive[newIndex - 1] ?? null
+ const projectAfter = projectsActive[newIndex + 1] ?? null
+ projectUpdating.value[project.id] = true
const position = calculateItemPosition(
- listBefore !== null ? listBefore.position : null,
- listAfter !== null ? listAfter.position : null,
+ projectBefore !== null ? projectBefore.position : null,
+ projectAfter !== null ? projectAfter.position : null,
)
try {
- // create a copy of the list in order to not violate pinia manipulation
- await listStore.updateList({
- ...list,
+ // create a copy of the project in order to not violate pinia manipulation
+ await projectStore.updateProject({
+ ...project,
position,
namespaceId,
})
} finally {
- listUpdating.value[list.id] = false
+ projectUpdating.value[project.id] = false
}
}
@@ -432,7 +432,7 @@ $vikunja-nav-selected-width: 0.4rem;
.top-menu {
margin-top: math.div($navbar-padding, 2);
-
+
.menu-list {
li {
font-weight: 600;
diff --git a/src/components/input/SelectList.vue b/src/components/input/SelectList.vue
deleted file mode 100644
index 808c3b540..000000000
--- a/src/components/input/SelectList.vue
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/src/components/input/SelectProject.vue b/src/components/input/SelectProject.vue
new file mode 100644
index 000000000..b5a946d82
--- /dev/null
+++ b/src/components/input/SelectProject.vue
@@ -0,0 +1,63 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/components/input/editor.vue b/src/components/input/editor.vue
index 07022305a..6affdf96e 100644
--- a/src/components/input/editor.vue
+++ b/src/components/input/editor.vue
@@ -286,11 +286,11 @@ function handleCheckboxClick(e: Event) {
console.debug('no index found')
return
}
- const listPrefix = text.value.substring(index, index + 1)
+ const projectPrefix = text.value.substring(index, index + 1)
- console.debug({index, listPrefix, checked, text: text.value})
+ console.debug({index, projectPrefix, checked, text: text.value})
- text.value = replaceAt(text.value, index, `${listPrefix} ${checked ? '[x]' : '[ ]'} `)
+ text.value = replaceAt(text.value, index, `${projectPrefix} ${checked ? '[x]' : '[ ]'} `)
bubble()
renderPreview()
}
diff --git a/src/components/list/ListWrapper.vue b/src/components/list/ListWrapper.vue
deleted file mode 100644
index b769c13cc..000000000
--- a/src/components/list/ListWrapper.vue
+++ /dev/null
@@ -1,200 +0,0 @@
-
-
-
-
-
- {{ $t('list.list.title') }}
-
-
- {{ $t('list.gantt.title') }}
-
-
- {{ $t('list.table.title') }}
-
-
- {{ $t('list.kanban.title') }}
-
-
-
-
-
-
- {{ $t('list.archived') }}
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/components/list/partials/ListCardGrid.vue b/src/components/list/partials/ListCardGrid.vue
deleted file mode 100644
index 9f357dc59..000000000
--- a/src/components/list/partials/ListCardGrid.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/components/misc/keyboard-shortcuts/shortcuts.ts b/src/components/misc/keyboard-shortcuts/shortcuts.ts
index 2a3423fdb..537da552a 100644
--- a/src/components/misc/keyboard-shortcuts/shortcuts.ts
+++ b/src/components/misc/keyboard-shortcuts/shortcuts.ts
@@ -61,8 +61,8 @@ export const KEYBOARD_SHORTCUTS : ShortcutGroup[] = [
],
},
{
- title: 'list.kanban.title',
- available: (route) => route.name === 'list.kanban',
+ title: 'project.kanban.title',
+ available: (route) => route.name === 'project.kanban',
shortcuts: [
{
title: 'keyboardShortcuts.task.done',
@@ -71,26 +71,26 @@ export const KEYBOARD_SHORTCUTS : ShortcutGroup[] = [
],
},
{
- title: 'keyboardShortcuts.list.title',
- available: (route) => (route.name as string)?.startsWith('list.'),
+ title: 'keyboardShortcuts.project.title',
+ available: (route) => (route.name as string)?.startsWith('project.'),
shortcuts: [
{
- title: 'keyboardShortcuts.list.switchToListView',
+ title: 'keyboardShortcuts.project.switchToProjectView',
keys: ['g', 'l'],
combination: 'then',
},
{
- title: 'keyboardShortcuts.list.switchToGanttView',
+ title: 'keyboardShortcuts.project.switchToGanttView',
keys: ['g', 'g'],
combination: 'then',
},
{
- title: 'keyboardShortcuts.list.switchToTableView',
+ title: 'keyboardShortcuts.project.switchToTableView',
keys: ['g', 't'],
combination: 'then',
},
{
- title: 'keyboardShortcuts.list.switchToKanbanView',
+ title: 'keyboardShortcuts.project.switchToKanbanView',
keys: ['g', 'k'],
combination: 'then',
},
diff --git a/src/components/misc/subscription.vue b/src/components/misc/subscription.vue
index 41beab951..ed32171be 100644
--- a/src/components/misc/subscription.vue
+++ b/src/components/misc/subscription.vue
@@ -73,14 +73,14 @@ const {t} = useI18n({useScope: 'global'})
const tooltipText = computed(() => {
if (disabled.value) {
- if (props.entity === 'list' && subscriptionEntity.value === 'namespace') {
- return t('task.subscription.subscribedListThroughParentNamespace')
+ if (props.entity === 'project' && subscriptionEntity.value === 'namespace') {
+ return t('task.subscription.subscribedProjectThroughParentNamespace')
}
if (props.entity === 'task' && subscriptionEntity.value === 'namespace') {
return t('task.subscription.subscribedTaskThroughParentNamespace')
}
- if (props.entity === 'task' && subscriptionEntity.value === 'list') {
- return t('task.subscription.subscribedTaskThroughParentList')
+ if (props.entity === 'task' && subscriptionEntity.value === 'project') {
+ return t('task.subscription.subscribedTaskThroughParentProject')
}
return ''
@@ -91,10 +91,10 @@ const tooltipText = computed(() => {
return props.modelValue !== null ?
t('task.subscription.subscribedNamespace') :
t('task.subscription.notSubscribedNamespace')
- case 'list':
+ case 'project':
return props.modelValue !== null ?
- t('task.subscription.subscribedList') :
- t('task.subscription.notSubscribedList')
+ t('task.subscription.subscribedProject') :
+ t('task.subscription.notSubscribedProject')
case 'task':
return props.modelValue !== null ?
t('task.subscription.subscribedTask') :
@@ -133,8 +133,8 @@ async function subscribe() {
case 'namespace':
message = t('task.subscription.subscribeSuccessNamespace')
break
- case 'list':
- message = t('task.subscription.subscribeSuccessList')
+ case 'project':
+ message = t('task.subscription.subscribeSuccessProject')
break
case 'task':
message = t('task.subscription.subscribeSuccessTask')
@@ -156,8 +156,8 @@ async function unsubscribe() {
case 'namespace':
message = t('task.subscription.unsubscribeSuccessNamespace')
break
- case 'list':
- message = t('task.subscription.unsubscribeSuccessList')
+ case 'project':
+ message = t('task.subscription.unsubscribeSuccessProject')
break
case 'task':
message = t('task.subscription.unsubscribeSuccessTask')
diff --git a/src/components/namespace/namespace-settings-dropdown.vue b/src/components/namespace/namespace-settings-dropdown.vue
index 8e7a4ba78..6df112eba 100644
--- a/src/components/namespace/namespace-settings-dropdown.vue
+++ b/src/components/namespace/namespace-settings-dropdown.vue
@@ -30,10 +30,10 @@
{{ $t('menu.share') }}
- {{ $t('menu.newList') }}
+ {{ $t('menu.newProject') }}
+
+
+
+
+ {{ $t('project.list.title') }}
+
+
+ {{ $t('project.gantt.title') }}
+
+
+ {{ $t('project.table.title') }}
+
+
+ {{ $t('project.kanban.title') }}
+
+
+
+
+
+
+ {{ $t('project.archived') }}
+
+
+
+
+
-
{{ $t('namespace.archived') }}
+
{{ $t('namespace.archived') }}
-
{{ list.title }}
+
{{ project.title }}
-
@@ -41,30 +41,30 @@
\ No newline at end of file
diff --git a/src/components/list/partials/filter-popup.vue b/src/components/project/partials/filter-popup.vue
similarity index 96%
rename from src/components/list/partials/filter-popup.vue
rename to src/components/project/partials/filter-popup.vue
index 66e130149..acc543c7b 100644
--- a/src/components/list/partials/filter-popup.vue
+++ b/src/components/project/partials/filter-popup.vue
@@ -32,7 +32,7 @@
\ No newline at end of file
diff --git a/src/components/quick-actions/quick-actions.vue b/src/components/quick-actions/quick-actions.vue
index 61bcc1cce..730c3e1fc 100644
--- a/src/components/quick-actions/quick-actions.vue
+++ b/src/components/quick-actions/quick-actions.vue
@@ -63,18 +63,18 @@ import TeamService from '@/services/team'
import NamespaceModel from '@/models/namespace'
import TeamModel from '@/models/team'
-import ListModel from '@/models/list'
+import ProjectModel from '@/models/project'
import BaseButton from '@/components/base/BaseButton.vue'
import QuickAddMagic from '@/components/tasks/partials/quick-add-magic.vue'
import {useBaseStore} from '@/stores/base'
-import {useListStore} from '@/stores/lists'
+import {useProjectStore} from '@/stores/projects'
import {useNamespaceStore} from '@/stores/namespaces'
import {useLabelStore} from '@/stores/labels'
import {useTaskStore} from '@/stores/tasks'
-import {getHistory} from '@/modules/listHistory'
+import {getHistory} from '@/modules/projectHistory'
import {parseTaskText, PrefixMode, PREFIXES} from '@/modules/parseTaskText'
import {getQuickAddMagicMode} from '@/helpers/quickAddMagicMode'
import {success} from '@/message'
@@ -82,13 +82,13 @@ import {success} from '@/message'
import type {ITeam} from '@/modelTypes/ITeam'
import type {ITask} from '@/modelTypes/ITask'
import type {INamespace} from '@/modelTypes/INamespace'
-import type {IList} from '@/modelTypes/IList'
+import type {IProject} from '@/modelTypes/IProject'
const {t} = useI18n({useScope: 'global'})
const router = useRouter()
const baseStore = useBaseStore()
-const listStore = useListStore()
+const projectStore = useProjectStore()
const namespaceStore = useNamespaceStore()
const labelStore = useLabelStore()
const taskStore = useTaskStore()
@@ -98,13 +98,13 @@ type DoAction = { type: ACTION_TYPE } & Type
enum ACTION_TYPE {
CMD = 'cmd',
TASK = 'task',
- LIST = 'list',
+ PROJECT = 'project',
TEAM = 'team',
}
enum COMMAND_TYPE {
NEW_TASK = 'newTask',
- NEW_LIST = 'newList',
+ NEW_PROJECT = 'newProject',
NEW_NAMESPACE = 'newNamespace',
NEW_TEAM = 'newTeam',
}
@@ -112,7 +112,7 @@ enum COMMAND_TYPE {
enum SEARCH_MODE {
ALL = 'all',
TASKS = 'tasks',
- LISTS = 'lists',
+ PROJECTS = 'projects',
TEAMS = 'teams',
}
@@ -137,26 +137,26 @@ function closeQuickActions() {
baseStore.setQuickActionsActive(false)
}
-const foundLists = computed(() => {
- const { list } = parsedQuery.value
+const foundProjects = computed(() => {
+ const { project } = parsedQuery.value
if (
searchMode.value === SEARCH_MODE.ALL ||
- searchMode.value === SEARCH_MODE.LISTS ||
- list === null
+ searchMode.value === SEARCH_MODE.PROJECTS ||
+ project === null
) {
return []
}
- const ncache: { [id: ListModel['id']]: INamespace } = {}
+ const ncache: { [id: ProjectModel['id']]: INamespace } = {}
const history = getHistory()
- const allLists = [
+ const allProjects = [
...new Set([
- ...history.map((l) => listStore.getListById(l.id)),
- ...listStore.searchList(list),
+ ...history.map((l) => projectStore.getProjectById(l.id)),
+ ...projectStore.searchProject(project),
]),
]
- return allLists.filter((l) => {
+ return allProjects.filter((l) => {
if (typeof l === 'undefined' || l === null) {
return false
}
@@ -191,9 +191,9 @@ const results = computed(() => {
items: foundTasks.value,
},
{
- type: ACTION_TYPE.LIST,
- title: t('quickActions.lists'),
- items: foundLists.value,
+ type: ACTION_TYPE.PROJECT,
+ title: t('quickActions.projects'),
+ items: foundProjects.value,
},
{
type: ACTION_TYPE.TEAM,
@@ -206,7 +206,7 @@ const results = computed(() => {
const loading = computed(() =>
taskService.loading ||
namespaceStore.isLoading ||
- listStore.isLoading ||
+ projectStore.isLoading ||
teamService.loading,
)
@@ -224,11 +224,11 @@ const commands = computed<{ [key in COMMAND_TYPE]: Command }>(() => ({
placeholder: t('quickActions.newTask'),
action: newTask,
},
- newList: {
- type: COMMAND_TYPE.NEW_LIST,
- title: t('quickActions.cmds.newList'),
- placeholder: t('quickActions.newList'),
- action: newList,
+ newProject: {
+ type: COMMAND_TYPE.NEW_PROJECT,
+ title: t('quickActions.cmds.newProject'),
+ placeholder: t('quickActions.newProject'),
+ action: newProject,
},
newNamespace: {
type: COMMAND_TYPE.NEW_NAMESPACE,
@@ -246,24 +246,24 @@ const commands = computed<{ [key in COMMAND_TYPE]: Command }>(() => ({
const placeholder = computed(() => selectedCmd.value?.placeholder || t('quickActions.placeholder'))
-const currentList = computed(() => Object.keys(baseStore.currentList).length === 0
+const currentProject = computed(() => Object.keys(baseStore.currentProject).length === 0
? null
- : baseStore.currentList,
+ : baseStore.currentProject,
)
const hintText = computed(() => {
let namespace
- if (selectedCmd.value !== null && currentList.value !== null) {
+ if (selectedCmd.value !== null && currentProject.value !== null) {
switch (selectedCmd.value.type) {
case COMMAND_TYPE.NEW_TASK:
return t('quickActions.createTask', {
- title: currentList.value.title,
+ title: currentProject.value.title,
})
- case COMMAND_TYPE.NEW_LIST:
+ case COMMAND_TYPE.NEW_PROJECT:
namespace = namespaceStore.getNamespaceById(
- currentList.value.namespaceId,
+ currentProject.value.namespaceId,
)
- return t('quickActions.createList', {
+ return t('quickActions.createProject', {
title: namespace?.title,
})
}
@@ -275,8 +275,8 @@ const hintText = computed(() => {
const availableCmds = computed(() => {
const cmds = []
- if (currentList.value !== null) {
- cmds.push(commands.value.newTask, commands.value.newList)
+ if (currentProject.value !== null) {
+ cmds.push(commands.value.newTask, commands.value.newProject)
}
cmds.push(commands.value.newNamespace, commands.value.newTeam)
return cmds
@@ -288,21 +288,21 @@ const searchMode = computed(() => {
if (query.value === '') {
return SEARCH_MODE.ALL
}
- const { text, list, labels, assignees } = parsedQuery.value
+ const { text, project, labels, assignees } = parsedQuery.value
if (assignees.length === 0 && text !== '') {
return SEARCH_MODE.TASKS
}
if (
assignees.length === 0 &&
- list !== null &&
+ project !== null &&
text === '' &&
labels.length === 0
) {
- return SEARCH_MODE.LISTS
+ return SEARCH_MODE.PROJECTS
}
if (
assignees.length > 0 &&
- list === null &&
+ project === null &&
text === '' &&
labels.length === 0
) {
@@ -356,7 +356,7 @@ function searchTasks() {
taskSearchTimeout.value = null
}
- const { text, list: listName, labels } = parsedQuery.value
+ const { text, project: projectName, labels } = parsedQuery.value
const filters: Filter[] = []
@@ -373,10 +373,10 @@ function searchTasks() {
})
}
- if (listName !== null) {
- const list = listStore.findListByExactname(listName)
- if (list !== null) {
- addFilter('listId', list.id, 'equals')
+ if (projectName !== null) {
+ const project = projectStore.findProjectByExactname(projectName)
+ if (project !== null) {
+ addFilter('projectId', project.id, 'equals')
}
}
@@ -396,9 +396,9 @@ function searchTasks() {
const r = await taskService.getAll({}, params) as DoAction[]
foundTasks.value = r.map((t) => {
t.type = ACTION_TYPE.TASK
- const list = listStore.getListById(t.listId)
- if (list !== null) {
- t.title = `${t.title} (${list.title})`
+ const project = projectStore.getProjectById(t.projectId)
+ if (project !== null) {
+ t.title = `${t.title} (${project.title})`
}
return t
})
@@ -444,11 +444,11 @@ const searchInput = ref(null)
async function doAction(type: ACTION_TYPE, item: DoAction) {
switch (type) {
- case ACTION_TYPE.LIST:
+ case ACTION_TYPE.PROJECT:
closeQuickActions()
await router.push({
- name: 'list.index',
- params: { listId: (item as DoAction).id },
+ name: 'project.index',
+ params: { projectId: (item as DoAction).id },
})
break
case ACTION_TYPE.TASK:
@@ -482,29 +482,29 @@ async function doCmd() {
}
async function newTask() {
- if (currentList.value === null) {
+ if (currentProject.value === null) {
return
}
const task = await taskStore.createNewTask({
title: query.value,
- listId: currentList.value.id,
+ projectId: currentProject.value.id,
})
success({ message: t('task.createSuccess') })
await router.push({ name: 'task.detail', params: { id: task.id } })
}
-async function newList() {
- if (currentList.value === null) {
+async function newProject() {
+ if (currentProject.value === null) {
return
}
- const newList = await listStore.createList(new ListModel({
+ const newProject = await projectStore.createProject(new ProjectModel({
title: query.value,
- namespaceId: currentList.value.namespaceId,
+ namespaceId: currentProject.value.namespaceId,
}))
- success({ message: t('list.create.createdSuccess')})
+ success({ message: t('project.create.createdSuccess')})
await router.push({
- name: 'list.index',
- params: { listId: newList.id },
+ name: 'project.index',
+ params: { projectId: newProject.id },
})
}
diff --git a/src/components/sharing/linkSharing.vue b/src/components/sharing/linkSharing.vue
index f6c3c7219..5f763aa1a 100644
--- a/src/components/sharing/linkSharing.vue
+++ b/src/components/sharing/linkSharing.vue
@@ -1,39 +1,39 @@
- {{ $t('list.share.links.title') }}
+ {{ $t('project.share.links.title') }}
- {{ $t('list.share.links.what') }}
+ v-tooltip="$t('project.share.links.explanation')">
+ {{ $t('project.share.links.what') }}
-
+
- {{ $t('list.share.links.create') }}
+ {{ $t('project.share.links.create') }}
- {{ $t('list.share.right.title') }}
+ {{ $t('project.share.right.title') }}
- {{ $t('list.share.right.read') }}
+ {{ $t('project.share.right.read') }}
- {{ $t('list.share.right.readWrite') }}
+ {{ $t('project.share.right.readWrite') }}
- {{ $t('list.share.right.admin') }}
+ {{ $t('project.share.right.admin') }}
@@ -41,21 +41,21 @@
-
- {{ $t('list.share.share') }}
+
+ {{ $t('project.share.share') }}
{{ $t('list.share.links.view') }}
- {{ $t('list.share.attributes.delete') }}
+ {{ $t('project.share.links.view') }}
+ {{ $t('project.share.attributes.delete') }}
@@ -92,7 +92,7 @@
-
+
{{ getDisplayName(s.sharedBy) }}
@@ -102,19 +102,19 @@
- {{ $t('list.share.right.admin') }}
+ {{ $t('project.share.right.admin') }}
- {{ $t('list.share.right.readWrite') }}
+ {{ $t('project.share.right.readWrite') }}
- {{ $t('list.share.right.read') }}
+ {{ $t('project.share.right.read') }}
@@ -172,14 +172,14 @@
- {{ $t('list.share.links.remove') }}
+ {{ $t('project.share.links.remove') }}
- {{ $t('list.share.links.removeText') }}
+ {{ $t('project.share.links.removeText') }}
@@ -193,19 +193,19 @@ import {RIGHTS} from '@/constants/rights'
import LinkShareModel from '@/models/linkShare'
import type {ILinkShare} from '@/modelTypes/ILinkShare'
-import type {IList} from '@/modelTypes/IList'
+import type {IProject} from '@/modelTypes/IProject'
import LinkShareService from '@/services/linkShare'
import {useCopyToClipboard} from '@/composables/useCopyToClipboard'
import {success} from '@/message'
import {getDisplayName} from '@/models/user'
-import type {ListView} from '@/types/ListView'
-import {LIST_VIEWS} from '@/types/ListView'
+import type {ProjectView} from '@/types/ProjectView'
+import {PROJECT_VIEWS} from '@/types/ProjectView'
import {useConfigStore} from '@/stores/config'
const props = defineProps({
- listId: {
+ projectId: {
default: 0,
required: true,
},
@@ -222,20 +222,20 @@ const showDeleteModal = ref(false)
const linkIdToDelete = ref(0)
const showNewForm = ref(false)
-type SelectedViewMapper = Record
+type SelectedViewMapper = Record
const selectedView = ref({})
-const availableViews = computed>(() => ({
- list: t('list.list.title'),
- gantt: t('list.gantt.title'),
- table: t('list.table.title'),
- kanban: t('list.kanban.title'),
+const availableViews = computed>(() => ({
+ list: t('project.list.title'),
+ gantt: t('project.gantt.title'),
+ table: t('project.table.title'),
+ kanban: t('project.kanban.title'),
}))
const copy = useCopyToClipboard()
watch(
- () => props.listId,
+ () => props.projectId,
load,
{immediate: true},
)
@@ -243,23 +243,23 @@ watch(
const configStore = useConfigStore()
const frontendUrl = computed(() => configStore.frontendUrl)
-async function load(listId: IList['id']) {
- // If listId == 0 the list on the calling component wasn't already loaded, so we just bail out here
- if (listId === 0) {
+async function load(projectId: IProject['id']) {
+ // If projectId == 0 the project on the calling component wasn't already loaded, so we just bail out here
+ if (projectId === 0) {
return
}
- const links = await linkShareService.getAll({listId})
+ const links = await linkShareService.getAll({projectId})
links.forEach((l: ILinkShare) => {
- selectedView.value[l.id] = 'list'
+ selectedView.value[l.id] = 'project'
})
linkShares.value = links
}
-async function add(listId: IList['id']) {
+async function add(projectId: IProject['id']) {
const newLinkShare = new LinkShareModel({
right: selectedRight.value,
- listId,
+ projectId,
name: name.value,
password: password.value,
})
@@ -268,31 +268,31 @@ async function add(listId: IList['id']) {
name.value = ''
password.value = ''
showNewForm.value = false
- success({message: t('list.share.links.createSuccess')})
- await load(listId)
+ success({message: t('project.share.links.createSuccess')})
+ await load(projectId)
}
-async function remove(listId: IList['id']) {
+async function remove(projectId: IProject['id']) {
try {
await linkShareService.delete(new LinkShareModel({
id: linkIdToDelete.value,
- listId,
+ projectId,
}))
- success({message: t('list.share.links.deleteSuccess')})
- await load(listId)
+ success({message: t('project.share.links.deleteSuccess')})
+ await load(projectId)
} finally {
showDeleteModal.value = false
}
}
-function getShareLink(hash: string, view: ListView = LIST_VIEWS.LIST) {
+function getShareLink(hash: string, view: ProjectView = PROJECT_VIEWS.LIST) {
return frontendUrl.value + 'share/' + hash + '/auth?view=' + view
}
\ No newline at end of file
diff --git a/src/components/sharing/userTeam.vue b/src/components/sharing/userTeam.vue
index 90ef38978..099887f71 100644
--- a/src/components/sharing/userTeam.vue
+++ b/src/components/sharing/userTeam.vue
@@ -1,7 +1,7 @@
- {{ $t('list.share.userTeam.shared', {type: shareTypeNames}) }}
+ {{ $t('project.share.userTeam.shared', {type: shareTypeNames}) }}
@@ -19,7 +19,7 @@
/>
- {{ $t('list.share.share') }}
+ {{ $t('project.share.share') }}
@@ -31,7 +31,7 @@
{{ getDisplayName(s) }}
- {{ $t('list.share.userTeam.you') }}
+ {{ $t('project.share.userTeam.you') }}
@@ -52,19 +52,19 @@
- {{ $t('list.share.right.admin') }}
+ {{ $t('project.share.right.admin') }}
- {{ $t('list.share.right.readWrite') }}
+ {{ $t('project.share.right.readWrite') }}
- {{ $t('list.share.right.read') }}
+ {{ $t('project.share.right.read') }}
@@ -78,19 +78,19 @@
:selected="s.right === RIGHTS.READ"
:value="RIGHTS.READ"
>
- {{ $t('list.share.right.read') }}
+ {{ $t('project.share.right.read') }}
- {{ $t('list.share.right.readWrite') }}
+ {{ $t('project.share.right.readWrite') }}
- {{ $t('list.share.right.admin') }}
+ {{ $t('project.share.right.admin') }}
@@ -110,7 +110,7 @@
- {{ $t('list.share.userTeam.notShared', {type: shareTypeNames}) }}
+ {{ $t('project.share.userTeam.notShared', {type: shareTypeNames}) }}
{{
- $t('list.share.userTeam.removeHeader', {type: shareTypeName, sharable: sharableName})
+ $t('project.share.userTeam.removeHeader', {type: shareTypeName, sharable: sharableName})
}}
- {{ $t('list.share.userTeam.removeText', {type: shareTypeName, sharable: sharableName}) }}
+ {{ $t('project.share.userTeam.removeText', {type: shareTypeName, sharable: sharableName}) }}
@@ -143,9 +143,9 @@ import UserNamespaceService from '@/services/userNamespace'
import UserNamespaceModel from '@/models/userNamespace'
import type {IUserNamespace} from '@/modelTypes/IUserNamespace'
-import UserListService from '@/services/userList'
-import UserListModel from '@/models/userList'
-import type {IUserList} from '@/modelTypes/IUserList'
+import UserProjectService from '@/services/userProject'
+import UserProjectModel from '@/models/userProject'
+import type {IUserProject} from '@/modelTypes/IUserProject'
import UserService from '@/services/user'
import UserModel, { getDisplayName } from '@/models/user'
@@ -155,9 +155,9 @@ import TeamNamespaceService from '@/services/teamNamespace'
import TeamNamespaceModel from '@/models/teamNamespace'
import type { ITeamNamespace } from '@/modelTypes/ITeamNamespace'
-import TeamListService from '@/services/teamList'
-import TeamListModel from '@/models/teamList'
-import type { ITeamList } from '@/modelTypes/ITeamList'
+import TeamProjectService from '@/services/teamProject'
+import TeamProjectModel from '@/models/teamProject'
+import type { ITeamProject } from '@/modelTypes/ITeamProject'
import TeamService from '@/services/team'
import TeamModel from '@/models/team'
@@ -172,7 +172,7 @@ import {useAuthStore} from '@/stores/auth'
const props = defineProps({
type: {
- type: String as PropType<'list' | 'namespace'>,
+ type: String as PropType<'project' | 'namespace'>,
default: '',
},
shareType: {
@@ -191,9 +191,9 @@ const props = defineProps({
const {t} = useI18n({useScope: 'global'})
-// This user service is either a userNamespaceService or a userListService, depending on the type we are using
-let stuffService: UserNamespaceService | UserListService | TeamListService | TeamNamespaceService
-let stuffModel: IUserNamespace | IUserList | ITeamList | ITeamNamespace
+// This user service is either a userNamespaceService or a userProjectService, depending on the type we are using
+let stuffService: UserNamespaceService | UserProjectService | TeamProjectService | TeamNamespaceService
+let stuffModel: IUserNamespace | IUserProject | ITeamProject | ITeamNamespace
let searchService: UserService | TeamService
let sharable: Ref
@@ -201,7 +201,7 @@ const searchLabel = ref('')
const selectedRight = ref({})
-// This holds either teams or users who this namepace or list is shared with
+// This holds either teams or users who this namepace or project is shared with
const sharables = ref([])
const showDeleteModal = ref(false)
@@ -212,11 +212,11 @@ const userInfo = computed(() => authStore.info)
function createShareTypeNameComputed(count: number) {
return computed(() => {
if (props.shareType === 'user') {
- return t('list.share.userTeam.typeUser', count)
+ return t('project.share.userTeam.typeUser', count)
}
if (props.shareType === 'team') {
- return t('list.share.userTeam.typeTeam', count)
+ return t('project.share.userTeam.typeTeam', count)
}
return ''
@@ -227,8 +227,8 @@ const shareTypeNames = createShareTypeNameComputed(2)
const shareTypeName = createShareTypeNameComputed(1)
const sharableName = computed(() => {
- if (props.type === 'list') {
- return t('list.list.title')
+ if (props.type === 'project') {
+ return t('project.list.title')
}
if (props.shareType === 'namespace') {
@@ -244,9 +244,9 @@ if (props.shareType === 'user') {
sharable = ref(new UserModel())
searchLabel.value = 'username'
- if (props.type === 'list') {
- stuffService = shallowReactive(new UserListService())
- stuffModel = reactive(new UserListModel({listId: props.id}))
+ if (props.type === 'project') {
+ stuffService = shallowReactive(new UserProjectService())
+ stuffModel = reactive(new UserProjectModel({projectId: props.id}))
} else if (props.type === 'namespace') {
stuffService = shallowReactive(new UserNamespaceService())
stuffModel = reactive(new UserNamespaceModel({
@@ -261,9 +261,9 @@ if (props.shareType === 'user') {
sharable = ref(new TeamModel())
searchLabel.value = 'name'
- if (props.type === 'list') {
- stuffService = shallowReactive(new TeamListService())
- stuffModel = reactive(new TeamListModel({listId: props.id}))
+ if (props.type === 'project') {
+ stuffService = shallowReactive(new TeamProjectService())
+ stuffModel = reactive(new TeamProjectModel({projectId: props.id}))
} else if (props.type === 'namespace') {
stuffService = shallowReactive(new TeamNamespaceService())
stuffModel = reactive(new TeamNamespaceModel({
@@ -303,7 +303,7 @@ async function deleteSharable() {
}
}
success({
- message: t('list.share.userTeam.removeSuccess', {
+ message: t('project.share.userTeam.removeSuccess', {
type: shareTypeName.value,
sharable: sharableName.value,
}),
@@ -326,7 +326,7 @@ async function add(admin) {
}
await stuffService.create(stuffModel)
- success({message: t('list.share.userTeam.addedSuccess', {type: shareTypeName.value})})
+ success({message: t('project.share.userTeam.addedSuccess', {type: shareTypeName.value})})
await load()
}
@@ -358,7 +358,7 @@ async function toggleType(sharable) {
sharables.value[i].right = r.right
}
}
- success({message: t('list.share.userTeam.updatedSuccess', {type: shareTypeName.value})})
+ success({message: t('project.share.userTeam.updatedSuccess', {type: shareTypeName.value})})
}
const found = ref([])
diff --git a/src/components/tasks/GanttChart.vue b/src/components/tasks/GanttChart.vue
index 5cca40c93..e9ea8f999 100644
--- a/src/components/tasks/GanttChart.vue
+++ b/src/components/tasks/GanttChart.vue
@@ -50,7 +50,7 @@ import {parseKebabDate} from '@/helpers/time/parseKebabDate'
import type {ITask, ITaskPartialWithId} from '@/modelTypes/ITask'
import type {DateISO} from '@/types/DateISO'
-import type {GanttFilters} from '@/views/list/helpers/useGanttFilters'
+import type {GanttFilters} from '@/views/project/helpers/useGanttFilters'
import {
extendDayjs,
diff --git a/src/components/tasks/add-task.vue b/src/components/tasks/add-task.vue
index 96b7a8156..834709f70 100644
--- a/src/components/tasks/add-task.vue
+++ b/src/components/tasks/add-task.vue
@@ -5,7 +5,7 @@