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

feat: rename list to project everywhere

This commit is contained in:
kolaente 2022-11-13 22:04:57 +01:00
parent 34edf0dc5f
commit b8829dfaeb
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
160 changed files with 2494 additions and 2494 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -9,7 +9,7 @@
This is the web frontend for Vikunja, written in Vue.js. This is the web frontend for Vikunja, written in Vue.js.
Take a look at [our roadmap](https://my.vikunja.cloud/share/UrdhKPqumxDXUbYpEGJLSIyNTwAnbBzVlwdDpRbv/auth) (hosted on Vikunja!) for a list of things we're currently working on! Take a look at [our roadmap](https://my.vikunja.cloud/share/UrdhKPqumxDXUbYpEGJLSIyNTwAnbBzVlwdDpRbv/auth) (hosted on Vikunja!) for a project of things we're currently working on!
## Security Reports ## Security Reports

52
cypress/e2e/list/list-history.spec.ts
View File

@ -1,40 +1,40 @@
import {ListFactory} from '../../factories/list' import {ProjectFactory} from '../../factories/project'
import '../../support/authenticateUser' import '../../support/authenticateUser'
import {prepareLists} from './prepareLists' import {prepareProjects} from './prepareProjects'
describe('List History', () => { describe('Project History', () => {
prepareLists() prepareProjects()
it('should show a list history on the home page', () => { it('should show a project history on the home page', () => {
cy.intercept(Cypress.env('API_URL') + '/namespaces*').as('loadNamespaces') cy.intercept(Cypress.env('API_URL') + '/namespaces*').as('loadNamespaces')
cy.intercept(Cypress.env('API_URL') + '/lists/*').as('loadList') cy.intercept(Cypress.env('API_URL') + '/projects/*').as('loadProject')
const lists = ListFactory.create(6) const projects = ProjectFactory.create(6)
cy.visit('/') cy.visit('/')
cy.wait('@loadNamespaces') cy.wait('@loadNamespaces')
cy.get('body') cy.get('body')
.should('not.contain', 'Last viewed') .should('not.contain', 'Last viewed')
cy.visit(`/lists/${lists[0].id}`) cy.visit(`/projects/${projects[0].id}`)
cy.wait('@loadNamespaces') cy.wait('@loadNamespaces')
cy.wait('@loadList') cy.wait('@loadProject')
cy.visit(`/lists/${lists[1].id}`) cy.visit(`/projects/${projects[1].id}`)
cy.wait('@loadNamespaces') cy.wait('@loadNamespaces')
cy.wait('@loadList') cy.wait('@loadProject')
cy.visit(`/lists/${lists[2].id}`) cy.visit(`/projects/${projects[2].id}`)
cy.wait('@loadNamespaces') cy.wait('@loadNamespaces')
cy.wait('@loadList') cy.wait('@loadProject')
cy.visit(`/lists/${lists[3].id}`) cy.visit(`/projects/${projects[3].id}`)
cy.wait('@loadNamespaces') cy.wait('@loadNamespaces')
cy.wait('@loadList') cy.wait('@loadProject')
cy.visit(`/lists/${lists[4].id}`) cy.visit(`/projects/${projects[4].id}`)
cy.wait('@loadNamespaces') cy.wait('@loadNamespaces')
cy.wait('@loadList') cy.wait('@loadProject')
cy.visit(`/lists/${lists[5].id}`) cy.visit(`/projects/${projects[5].id}`)
cy.wait('@loadNamespaces') cy.wait('@loadNamespaces')
cy.wait('@loadList') cy.wait('@loadProject')
// cy.visit('/') // cy.visit('/')
// cy.wait('@loadNamespaces') // cy.wait('@loadNamespaces')
@ -45,12 +45,12 @@ describe('List History', () => {
cy.get('body') cy.get('body')
.should('contain', 'Last viewed') .should('contain', 'Last viewed')
cy.get('.list-cards-wrapper-2-rows') cy.get('.project-cards-wrapper-2-rows')
.should('not.contain', lists[0].title) .should('not.contain', projects[0].title)
.should('contain', lists[1].title) .should('contain', projects[1].title)
.should('contain', lists[2].title) .should('contain', projects[2].title)
.should('contain', lists[3].title) .should('contain', projects[3].title)
.should('contain', lists[4].title) .should('contain', projects[4].title)
.should('contain', lists[5].title) .should('contain', projects[5].title)
}) })
}) })

26
cypress/e2e/list/list-view-gantt.spec.ts
View File

@ -1,15 +1,15 @@
import {formatISO, format} from 'date-fns' import {formatISO, format} from 'date-fns'
import {TaskFactory} from '../../factories/task' import {TaskFactory} from '../../factories/task'
import {prepareLists} from './prepareLists' import {prepareProjects} from './prepareProjects'
import '../../support/authenticateUser' import '../../support/authenticateUser'
describe('List View Gantt', () => { describe('Project View Gantt', () => {
prepareLists() prepareProjects()
it('Hides tasks with no dates', () => { it('Hides tasks with no dates', () => {
const tasks = TaskFactory.create(1) const tasks = TaskFactory.create(1)
cy.visit('/lists/1/gantt') cy.visit('/projects/1/gantt')
cy.get('.g-gantt-rows-container') cy.get('.g-gantt-rows-container')
.should('not.contain', tasks[0].title) .should('not.contain', tasks[0].title)
@ -23,7 +23,7 @@ describe('List View Gantt', () => {
nextMonth.setDate(1) nextMonth.setDate(1)
nextMonth.setMonth(9) nextMonth.setMonth(9)
cy.visit('/lists/1/gantt') cy.visit('/projects/1/gantt')
cy.get('.g-timeunits-container') cy.get('.g-timeunits-container')
.should('contain', format(now, 'MMMM')) .should('contain', format(now, 'MMMM'))
@ -36,7 +36,7 @@ describe('List View Gantt', () => {
start_date: formatISO(now), start_date: formatISO(now),
end_date: formatISO(now.setDate(now.getDate() + 4)), end_date: formatISO(now.setDate(now.getDate() + 4)),
}) })
cy.visit('/lists/1/gantt') cy.visit('/projects/1/gantt')
cy.get('.g-gantt-rows-container') cy.get('.g-gantt-rows-container')
.should('not.be.empty') .should('not.be.empty')
@ -48,7 +48,7 @@ describe('List View Gantt', () => {
start_date: null, start_date: null,
end_date: null, end_date: null,
}) })
cy.visit('/lists/1/gantt') cy.visit('/projects/1/gantt')
cy.get('.gantt-options .fancycheckbox') cy.get('.gantt-options .fancycheckbox')
.contains('Show tasks which don\'t have dates set') .contains('Show tasks which don\'t have dates set')
@ -68,7 +68,7 @@ describe('List View Gantt', () => {
start_date: formatISO(now), start_date: formatISO(now),
end_date: formatISO(now.setDate(now.getDate() + 4)), end_date: formatISO(now.setDate(now.getDate() + 4)),
}) })
cy.visit('/lists/1/gantt') cy.visit('/projects/1/gantt')
cy.get('.g-gantt-rows-container .g-gantt-row .g-gantt-row-bars-container div .g-gantt-bar') cy.get('.g-gantt-rows-container .g-gantt-row .g-gantt-row-bars-container div .g-gantt-bar')
.first() .first()
@ -82,9 +82,9 @@ describe('List View Gantt', () => {
const now = Date.UTC(2022, 10, 9) const now = Date.UTC(2022, 10, 9)
cy.clock(now, ['Date']) cy.clock(now, ['Date'])
cy.visit('/lists/1/gantt') cy.visit('/projects/1/gantt')
cy.get('.list-gantt .gantt-options .field .control input.input.form-control') cy.get('.project-gantt .gantt-options .field .control input.input.form-control')
.click() .click()
cy.get('.flatpickr-calendar .flatpickr-innerContainer .dayContainer .flatpickr-day') cy.get('.flatpickr-calendar .flatpickr-innerContainer .dayContainer .flatpickr-day')
.first() .first()
@ -98,13 +98,13 @@ describe('List View Gantt', () => {
}) })
it('Should change the date range based on date query parameters', () => { it('Should change the date range based on date query parameters', () => {
cy.visit('/lists/1/gantt?dateFrom=2022-09-25&dateTo=2022-11-05') cy.visit('/projects/1/gantt?dateFrom=2022-09-25&dateTo=2022-11-05')
cy.get('.g-timeunits-container') cy.get('.g-timeunits-container')
.should('contain', 'September 2022') .should('contain', 'September 2022')
.should('contain', 'October 2022') .should('contain', 'October 2022')
.should('contain', 'November 2022') .should('contain', 'November 2022')
cy.get('.list-gantt .gantt-options .field .control input.input.form-control') cy.get('.project-gantt .gantt-options .field .control input.input.form-control')
.should('have.value', '25 Sep 2022 to 5 Nov 2022') .should('have.value', '25 Sep 2022 to 5 Nov 2022')
}) })
@ -114,7 +114,7 @@ describe('List View Gantt', () => {
start_date: formatISO(now), start_date: formatISO(now),
end_date: formatISO(now.setDate(now.getDate() + 4)), end_date: formatISO(now.setDate(now.getDate() + 4)),
}) })
cy.visit('/lists/1/gantt') cy.visit('/projects/1/gantt')
cy.get('.gantt-container .g-gantt-chart .g-gantt-row-bars-container .g-gantt-bar') cy.get('.gantt-container .g-gantt-chart .g-gantt-row-bars-container .g-gantt-bar')
.dblclick() .dblclick()

58
cypress/e2e/list/list-view-kanban.spec.ts
View File

@ -1,13 +1,13 @@
import {BucketFactory} from '../../factories/bucket' import {BucketFactory} from '../../factories/bucket'
import {ListFactory} from '../../factories/list' import {ProjectFactory} from '../../factories/project'
import {TaskFactory} from '../../factories/task' import {TaskFactory} from '../../factories/task'
import {prepareLists} from './prepareLists' import {prepareProjects} from './prepareProjects'
import '../../support/authenticateUser' import '../../support/authenticateUser'
describe('List View Kanban', () => { describe('Project View Kanban', () => {
let buckets let buckets
prepareLists() prepareProjects()
beforeEach(() => { beforeEach(() => {
buckets = BucketFactory.create(2) buckets = BucketFactory.create(2)
@ -15,10 +15,10 @@ describe('List View Kanban', () => {
it('Shows all buckets with their tasks', () => { it('Shows all buckets with their tasks', () => {
const data = TaskFactory.create(10, { const data = TaskFactory.create(10, {
list_id: 1, project_id: 1,
bucket_id: 1, bucket_id: 1,
}) })
cy.visit('/lists/1/kanban') cy.visit('/projects/1/kanban')
cy.get('.kanban .bucket .title') cy.get('.kanban .bucket .title')
.contains(buckets[0].title) .contains(buckets[0].title)
@ -33,10 +33,10 @@ describe('List View Kanban', () => {
it('Can add a new task to a bucket', () => { it('Can add a new task to a bucket', () => {
TaskFactory.create(2, { TaskFactory.create(2, {
list_id: 1, project_id: 1,
bucket_id: 1, bucket_id: 1,
}) })
cy.visit('/lists/1/kanban') cy.visit('/projects/1/kanban')
cy.getSettled('.kanban .bucket') cy.getSettled('.kanban .bucket')
.contains(buckets[0].title) .contains(buckets[0].title)
@ -54,7 +54,7 @@ describe('List View Kanban', () => {
}) })
it('Can create a new bucket', () => { it('Can create a new bucket', () => {
cy.visit('/lists/1/kanban') cy.visit('/projects/1/kanban')
cy.get('.kanban .bucket.new-bucket .button') cy.get('.kanban .bucket.new-bucket .button')
.click() .click()
@ -68,7 +68,7 @@ describe('List View Kanban', () => {
}) })
it('Can set a bucket limit', () => { it('Can set a bucket limit', () => {
cy.visit('/lists/1/kanban') cy.visit('/projects/1/kanban')
cy.getSettled('.kanban .bucket .bucket-header .dropdown.options .dropdown-trigger') cy.getSettled('.kanban .bucket .bucket-header .dropdown.options .dropdown-trigger')
.first() .first()
@ -89,7 +89,7 @@ describe('List View Kanban', () => {
}) })
it('Can rename a bucket', () => { it('Can rename a bucket', () => {
cy.visit('/lists/1/kanban') cy.visit('/projects/1/kanban')
cy.getSettled('.kanban .bucket .bucket-header .title') cy.getSettled('.kanban .bucket .bucket-header .title')
.first() .first()
@ -100,7 +100,7 @@ describe('List View Kanban', () => {
}) })
it('Can delete a bucket', () => { it('Can delete a bucket', () => {
cy.visit('/lists/1/kanban') cy.visit('/projects/1/kanban')
cy.getSettled('.kanban .bucket .bucket-header .dropdown.options .dropdown-trigger') cy.getSettled('.kanban .bucket .bucket-header .dropdown.options .dropdown-trigger')
.first() .first()
@ -124,10 +124,10 @@ describe('List View Kanban', () => {
it('Can drag tasks around', () => { it('Can drag tasks around', () => {
const tasks = TaskFactory.create(2, { const tasks = TaskFactory.create(2, {
list_id: 1, project_id: 1,
bucket_id: 1, bucket_id: 1,
}) })
cy.visit('/lists/1/kanban') cy.visit('/projects/1/kanban')
cy.getSettled('.kanban .bucket .tasks .task') cy.getSettled('.kanban .bucket .tasks .task')
.contains(tasks[0].title) .contains(tasks[0].title)
@ -143,10 +143,10 @@ describe('List View Kanban', () => {
it('Should navigate to the task when the task card is clicked', () => { it('Should navigate to the task when the task card is clicked', () => {
const tasks = TaskFactory.create(5, { const tasks = TaskFactory.create(5, {
id: '{increment}', id: '{increment}',
list_id: 1, project_id: 1,
bucket_id: 1, bucket_id: 1,
}) })
cy.visit('/lists/1/kanban') cy.visit('/projects/1/kanban')
cy.getSettled('.kanban .bucket .tasks .task') cy.getSettled('.kanban .bucket .tasks .task')
.contains(tasks[0].title) .contains(tasks[0].title)
@ -157,18 +157,18 @@ describe('List View Kanban', () => {
.should('contain', `/tasks/${tasks[0].id}`, { timeout: 1000 }) .should('contain', `/tasks/${tasks[0].id}`, { timeout: 1000 })
}) })
it('Should remove a task from the kanban board when moving it to another list', () => { it('Should remove a task from the kanban board when moving it to another project', () => {
const lists = ListFactory.create(2) const projects = ProjectFactory.create(2)
BucketFactory.create(2, { BucketFactory.create(2, {
list_id: '{increment}', project_id: '{increment}',
}) })
const tasks = TaskFactory.create(5, { const tasks = TaskFactory.create(5, {
id: '{increment}', id: '{increment}',
list_id: 1, project_id: 1,
bucket_id: 1, bucket_id: 1,
}) })
const task = tasks[0] const task = tasks[0]
cy.visit('/lists/1/kanban') cy.visit('/projects/1/kanban')
cy.getSettled('.kanban .bucket .tasks .task') cy.getSettled('.kanban .bucket .tasks .task')
.contains(task.title) .contains(task.title)
@ -179,7 +179,7 @@ describe('List View Kanban', () => {
.contains('Move') .contains('Move')
.click() .click()
cy.get('.task-view .content.details .field .multiselect.control .input-wrapper input') cy.get('.task-view .content.details .field .multiselect.control .input-wrapper input')
.type(`${lists[1].title}{enter}`) .type(`${projects[1].title}{enter}`)
// The requests happen with a 200ms timeout. Because of that, the results are not yet there when cypress // The requests happen with a 200ms timeout. Because of that, the results are not yet there when cypress
// presses enter and we can't simulate pressing on enter to select the item. // presses enter and we can't simulate pressing on enter to select the item.
cy.get('.task-view .content.details .field .multiselect.control .search-results') cy.get('.task-view .content.details .field .multiselect.control .search-results')
@ -196,26 +196,26 @@ describe('List View Kanban', () => {
it('Shows a button to filter the kanban board', () => { it('Shows a button to filter the kanban board', () => {
const data = TaskFactory.create(10, { const data = TaskFactory.create(10, {
list_id: 1, project_id: 1,
bucket_id: 1, bucket_id: 1,
}) })
cy.visit('/lists/1/kanban') cy.visit('/projects/1/kanban')
cy.get('.list-kanban .filter-container .base-button') cy.get('.project-kanban .filter-container .base-button')
.should('exist') .should('exist')
}) })
it('Should remove a task from the board when deleting it', () => { it('Should remove a task from the board when deleting it', () => {
const lists = ListFactory.create(1) const projects = ProjectFactory.create(1)
const buckets = BucketFactory.create(2, { const buckets = BucketFactory.create(2, {
list_id: lists[0].id, project_id: projects[0].id,
}) })
const tasks = TaskFactory.create(5, { const tasks = TaskFactory.create(5, {
list_id: 1, project_id: 1,
bucket_id: buckets[0].id, bucket_id: buckets[0].id,
}) })
const task = tasks[0] const task = tasks[0]
cy.visit('/lists/1/kanban') cy.visit('/projects/1/kanban')
cy.getSettled('.kanban .bucket .tasks .task') cy.getSettled('.kanban .bucket .tasks .task')
.contains(task.title) .contains(task.title)

56
cypress/e2e/list/list-view-list.spec.ts
View File

@ -1,31 +1,31 @@
import {UserListFactory} from '../../factories/users_list' import {UserProjectFactory} from '../../factories/users_project'
import {TaskFactory} from '../../factories/task' import {TaskFactory} from '../../factories/task'
import {UserFactory} from '../../factories/user' import {UserFactory} from '../../factories/user'
import {ListFactory} from '../../factories/list' import {ProjectFactory} from '../../factories/project'
import {prepareLists} from './prepareLists' import {prepareProjects} from './prepareProjects'
import '../../support/authenticateUser' import '../../support/authenticateUser'
describe('List View List', () => { describe('Project View Project', () => {
prepareLists() prepareProjects()
it('Should be an empty list', () => { it('Should be an empty project', () => {
cy.visit('/lists/1') cy.visit('/projects/1')
cy.url() cy.url()
.should('contain', '/lists/1/list') .should('contain', '/projects/1/project')
cy.get('.list-title h1') cy.get('.project-title h1')
.should('contain', 'First List') .should('contain', 'First Project')
cy.get('.list-title .dropdown') cy.get('.project-title .dropdown')
.should('exist') .should('exist')
cy.get('p') cy.get('p')
.contains('This list is currently empty.') .contains('This project is currently empty.')
.should('exist') .should('exist')
}) })
it('Should create a new task', () => { it('Should create a new task', () => {
const newTaskTitle = 'New task' const newTaskTitle = 'New task'
cy.visit('/lists/1') cy.visit('/projects/1')
cy.get('.task-add textarea') cy.get('.task-add textarea')
.type(newTaskTitle+'{enter}') .type(newTaskTitle+'{enter}')
cy.get('.tasks') cy.get('.tasks')
@ -35,9 +35,9 @@ describe('List View List', () => {
it('Should navigate to the task when the title is clicked', () => { it('Should navigate to the task when the title is clicked', () => {
const tasks = TaskFactory.create(5, { const tasks = TaskFactory.create(5, {
id: '{increment}', id: '{increment}',
list_id: 1, project_id: 1,
}) })
cy.visit('/lists/1/list') cy.visit('/projects/1/project')
cy.get('.tasks .task .tasktext') cy.get('.tasks .task .tasktext')
.contains(tasks[0].title) .contains(tasks[0].title)
@ -48,35 +48,35 @@ describe('List View List', () => {
.should('contain', `/tasks/${tasks[0].id}`) .should('contain', `/tasks/${tasks[0].id}`)
}) })
it('Should not see any elements for a list which is shared read only', () => { it('Should not see any elements for a project which is shared read only', () => {
UserFactory.create(2) UserFactory.create(2)
UserListFactory.create(1, { UserProjectFactory.create(1, {
list_id: 2, project_id: 2,
user_id: 1, user_id: 1,
right: 0, right: 0,
}) })
const lists = ListFactory.create(2, { const projects = ProjectFactory.create(2, {
owner_id: '{increment}', owner_id: '{increment}',
namespace_id: '{increment}', namespace_id: '{increment}',
}) })
cy.visit(`/lists/${lists[1].id}/`) cy.visit(`/projects/${projects[1].id}/`)
cy.get('.list-title .icon') cy.get('.project-title .icon')
.should('not.exist') .should('not.exist')
cy.get('input.input[placeholder="Add a new task..."') cy.get('input.input[placeholder="Add a new task..."')
.should('not.exist') .should('not.exist')
}) })
it('Should only show the color of a list in the navigation and not in the list view', () => { it('Should only show the color of a project in the navigation and not in the project view', () => {
const lists = ListFactory.create(1, { const projects = ProjectFactory.create(1, {
hex_color: '00db60', hex_color: '00db60',
}) })
TaskFactory.create(10, { TaskFactory.create(10, {
list_id: lists[0].id, project_id: projects[0].id,
}) })
cy.visit(`/lists/${lists[0].id}/`) cy.visit(`/projects/${projects[0].id}/`)
cy.get('.menu-list li .list-menu-link .color-bubble') cy.get('.menu-project li .project-menu-link .color-bubble')
.should('have.css', 'background-color', 'rgb(0, 219, 96)') .should('have.css', 'background-color', 'rgb(0, 219, 96)')
cy.get('.tasks-container .tasks .color-bubble') cy.get('.tasks-container .tasks .color-bubble')
.should('not.exist') .should('not.exist')
@ -86,9 +86,9 @@ describe('List View List', () => {
const tasks = TaskFactory.create(100, { const tasks = TaskFactory.create(100, {
id: '{increment}', id: '{increment}',
title: i => `task${i}`, title: i => `task${i}`,
list_id: 1, project_id: 1,
}) })
cy.visit('/lists/1/list') cy.visit('/projects/1/project')
cy.get('.tasks-container .tasks') cy.get('.tasks-container .tasks')
.should('contain', tasks[1].title) .should('contain', tasks[1].title)

26
cypress/e2e/list/list-view-table.spec.ts
View File

@ -2,35 +2,35 @@ import {TaskFactory} from '../../factories/task'
import '../../support/authenticateUser' import '../../support/authenticateUser'
describe('List View Table', () => { describe('Project View Table', () => {
it('Should show a table with tasks', () => { it('Should show a table with tasks', () => {
const tasks = TaskFactory.create(1) const tasks = TaskFactory.create(1)
cy.visit('/lists/1/table') cy.visit('/projects/1/table')
cy.get('.list-table table.table') cy.get('.project-table table.table')
.should('exist') .should('exist')
cy.get('.list-table table.table') cy.get('.project-table table.table')
.should('contain', tasks[0].title) .should('contain', tasks[0].title)
}) })
it('Should have working column switches', () => { it('Should have working column switches', () => {
TaskFactory.create(1) TaskFactory.create(1)
cy.visit('/lists/1/table') cy.visit('/projects/1/table')
cy.get('.list-table .filter-container .items .button') cy.get('.project-table .filter-container .items .button')
.contains('Columns') .contains('Columns')
.click() .click()
cy.get('.list-table .filter-container .card.columns-filter .card-content .fancycheckbox .check') cy.get('.project-table .filter-container .card.columns-filter .card-content .fancycheckbox .check')
.contains('Priority') .contains('Priority')
.click() .click()
cy.get('.list-table .filter-container .card.columns-filter .card-content .fancycheckbox .check') cy.get('.project-table .filter-container .card.columns-filter .card-content .fancycheckbox .check')
.contains('Done') .contains('Done')
.click() .click()
cy.get('.list-table table.table th') cy.get('.project-table table.table th')
.contains('Priority') .contains('Priority')
.should('exist') .should('exist')
cy.get('.list-table table.table th') cy.get('.project-table table.table th')
.contains('Done') .contains('Done')
.should('not.exist') .should('not.exist')
}) })
@ -38,11 +38,11 @@ describe('List View Table', () => {
it('Should navigate to the task when the title is clicked', () => { it('Should navigate to the task when the title is clicked', () => {
const tasks = TaskFactory.create(5, { const tasks = TaskFactory.create(5, {
id: '{increment}', id: '{increment}',
list_id: 1, project_id: 1,
}) })
cy.visit('/lists/1/table') cy.visit('/projects/1/table')
cy.get('.list-table table.table') cy.get('.project-table table.table')
.contains(tasks[0].title) .contains(tasks[0].title)
.click() .click()

98
cypress/e2e/list/list.spec.ts
View File

@ -1,88 +1,88 @@
import {TaskFactory} from '../../factories/task' import {TaskFactory} from '../../factories/task'
import {prepareLists} from './prepareLists' import {prepareProjects} from './prepareProjects'
import '../../support/authenticateUser' import '../../support/authenticateUser'
describe('Lists', () => { describe('Projects', () => {
let lists let projects
prepareLists((newLists) => (lists = newLists)) prepareProjects((newProjects) => (projects = newProjects))
it('Should create a new list', () => { it('Should create a new project', () => {
cy.visit('/') cy.visit('/')
cy.get('.namespace-title .dropdown-trigger') cy.get('.namespace-title .dropdown-trigger')
.click() .click()
cy.get('.namespace-title .dropdown .dropdown-item') cy.get('.namespace-title .dropdown .dropdown-item')
.contains('New list') .contains('New project')
.click() .click()
cy.url() cy.url()
.should('contain', '/lists/new/1') .should('contain', '/projects/new/1')
cy.get('.card-header-title') cy.get('.card-header-title')
.contains('New list') .contains('New project')
cy.get('input.input') cy.get('input.input')
.type('New List') .type('New Project')
cy.get('.button') cy.get('.button')
.contains('Create') .contains('Create')
.click() .click()
cy.get('.global-notification', { timeout: 1000 }) // Waiting until the request to create the new list is done cy.get('.global-notification', { timeout: 1000 }) // Waiting until the request to create the new project is done
.should('contain', 'Success') .should('contain', 'Success')
cy.url() cy.url()
.should('contain', '/lists/') .should('contain', '/projects/')
cy.get('.list-title h1') cy.get('.project-title h1')
.should('contain', 'New List') .should('contain', 'New Project')
}) })
it('Should redirect to a specific list view after visited', () => { it('Should redirect to a specific project view after visited', () => {
cy.visit('/lists/1/kanban') cy.visit('/projects/1/kanban')
cy.url() cy.url()
.should('contain', '/lists/1/kanban') .should('contain', '/projects/1/kanban')
cy.visit('/lists/1') cy.visit('/projects/1')
cy.url() cy.url()
.should('contain', '/lists/1/kanban') .should('contain', '/projects/1/kanban')
}) })
it('Should rename the list in all places', () => { it('Should rename the project in all places', () => {
TaskFactory.create(5, { TaskFactory.create(5, {
id: '{increment}', id: '{increment}',
list_id: 1, project_id: 1,
}) })
const newListName = 'New list name' const newProjectName = 'New project name'
cy.visit('/lists/1') cy.visit('/projects/1')
cy.get('.list-title h1') cy.get('.project-title h1')
.should('contain', 'First List') .should('contain', 'First Project')
cy.get('.namespace-container .menu.namespaces-lists .menu-list li:first-child .dropdown .dropdown-trigger') cy.get('.namespace-container .menu.namespaces-projects .menu-project li:first-child .dropdown .dropdown-trigger')
.click() .click()
cy.get('.namespace-container .menu.namespaces-lists .menu-list li:first-child .dropdown .dropdown-content') cy.get('.namespace-container .menu.namespaces-projects .menu-project li:first-child .dropdown .dropdown-content')
.contains('Edit') .contains('Edit')
.click() .click()
cy.get('#title') cy.get('#title')
.type(`{selectall}${newListName}`) .type(`{selectall}${newProjectName}`)
cy.get('footer.card-footer .button') cy.get('footer.card-footer .button')
.contains('Save') .contains('Save')
.click() .click()
cy.get('.global-notification') cy.get('.global-notification')
.should('contain', 'Success') .should('contain', 'Success')
cy.get('.list-title h1') cy.get('.project-title h1')
.should('contain', newListName) .should('contain', newProjectName)
.should('not.contain', lists[0].title) .should('not.contain', projects[0].title)
cy.get('.namespace-container .menu.namespaces-lists .menu-list li:first-child') cy.get('.namespace-container .menu.namespaces-projects .menu-project li:first-child')
.should('contain', newListName) .should('contain', newProjectName)
.should('not.contain', lists[0].title) .should('not.contain', projects[0].title)
cy.visit('/') cy.visit('/')
cy.get('.card-content') cy.get('.card-content')
.should('contain', newListName) .should('contain', newProjectName)
.should('not.contain', lists[0].title) .should('not.contain', projects[0].title)
}) })
it('Should remove a list', () => { it('Should remove a project', () => {
cy.visit(`/lists/${lists[0].id}`) cy.visit(`/projects/${projects[0].id}`)
cy.get('.namespace-container .menu.namespaces-lists .menu-list li:first-child .dropdown .dropdown-trigger') cy.get('.namespace-container .menu.namespaces-projects .menu-project li:first-child .dropdown .dropdown-trigger')
.click() .click()
cy.get('.namespace-container .menu.namespaces-lists .menu-list li:first-child .dropdown .dropdown-content') cy.get('.namespace-container .menu.namespaces-projects .menu-project li:first-child .dropdown .dropdown-content')
.contains('Delete') .contains('Delete')
.click() .click()
cy.url() cy.url()
@ -93,28 +93,28 @@ describe('Lists', () => {
cy.get('.global-notification') cy.get('.global-notification')
.should('contain', 'Success') .should('contain', 'Success')
cy.get('.namespace-container .menu.namespaces-lists .menu-list') cy.get('.namespace-container .menu.namespaces-projects .menu-project')
.should('not.contain', lists[0].title) .should('not.contain', projects[0].title)
cy.location('pathname') cy.location('pathname')
.should('equal', '/') .should('equal', '/')
}) })
it('Should archive a list', () => { it('Should archive a project', () => {
cy.visit(`/lists/${lists[0].id}`) cy.visit(`/projects/${projects[0].id}`)
cy.get('.list-title .dropdown') cy.get('.project-title .dropdown')
.click() .click()
cy.get('.list-title .dropdown .dropdown-menu .dropdown-item') cy.get('.project-title .dropdown .dropdown-menu .dropdown-item')
.contains('Archive') .contains('Archive')
.click() .click()
cy.get('.modal-content') cy.get('.modal-content')
.should('contain.text', 'Archive this list') .should('contain.text', 'Archive this project')
cy.get('.modal-content [data-cy=modalPrimary]') cy.get('.modal-content [data-cy=modalPrimary]')
.click() .click()
cy.get('.namespace-container .menu.namespaces-lists .menu-list') cy.get('.namespace-container .menu.namespaces-projects .menu-project')
.should('not.contain', lists[0].title) .should('not.contain', projects[0].title)
cy.get('main.app-content') cy.get('main.app-content')
.should('contain.text', 'This list is archived. It is not possible to create new or edit tasks for it.') .should('contain.text', 'This project is archived. It is not possible to create new or edit tasks for it.')
}) })
}) })

24
cypress/e2e/list/namespaces.spec.ts
View File

@ -1,7 +1,7 @@
import {UserFactory} from '../../factories/user' import {UserFactory} from '../../factories/user'
import '../../support/authenticateUser' import '../../support/authenticateUser'
import {ListFactory} from '../../factories/list' import {ProjectFactory} from '../../factories/project'
import {NamespaceFactory} from '../../factories/namespace' import {NamespaceFactory} from '../../factories/namespace'
describe('Namepaces', () => { describe('Namepaces', () => {
@ -10,7 +10,7 @@ describe('Namepaces', () => {
beforeEach(() => { beforeEach(() => {
UserFactory.create(1) UserFactory.create(1)
namespaces = NamespaceFactory.create(1) namespaces = NamespaceFactory.create(1)
ListFactory.create(1) ProjectFactory.create(1)
}) })
it('Should be all there', () => { it('Should be all there', () => {
@ -51,9 +51,9 @@ describe('Namepaces', () => {
cy.visit('/namespaces') cy.visit('/namespaces')
cy.get(`.namespace-container .menu.namespaces-lists .namespace-title:contains(${newNamespaces[0].title}) .dropdown .dropdown-trigger`) cy.get(`.namespace-container .menu.namespaces-projects .namespace-title:contains(${newNamespaces[0].title}) .dropdown .dropdown-trigger`)
.click() .click()
cy.get('.namespace-container .menu.namespaces-lists .namespace-title .dropdown .dropdown-content') cy.get('.namespace-container .menu.namespaces-projects .namespace-title .dropdown .dropdown-content')
.contains('Edit') .contains('Edit')
.click() .click()
cy.url() cy.url()
@ -69,10 +69,10 @@ describe('Namepaces', () => {
cy.get('.global-notification', { timeout: 1000 }) cy.get('.global-notification', { timeout: 1000 })
.should('contain', 'Success') .should('contain', 'Success')
cy.get('.namespace-container .menu.namespaces-lists') cy.get('.namespace-container .menu.namespaces-projects')
.should('contain', newNamespaceName) .should('contain', newNamespaceName)
.should('not.contain', newNamespaces[0].title) .should('not.contain', newNamespaces[0].title)
cy.get('[data-cy="namespaces-list"]') cy.get('[data-cy="namespaces-project"]')
.should('contain', newNamespaceName) .should('contain', newNamespaceName)
.should('not.contain', newNamespaces[0].title) .should('not.contain', newNamespaces[0].title)
}) })
@ -82,9 +82,9 @@ describe('Namepaces', () => {
cy.visit('/') cy.visit('/')
cy.get(`.namespace-container .menu.namespaces-lists .namespace-title:contains(${newNamespaces[0].title}) .dropdown .dropdown-trigger`) cy.get(`.namespace-container .menu.namespaces-projects .namespace-title:contains(${newNamespaces[0].title}) .dropdown .dropdown-trigger`)
.click() .click()
cy.get('.namespace-container .menu.namespaces-lists .namespace-title .dropdown .dropdown-content') cy.get('.namespace-container .menu.namespaces-projects .namespace-title .dropdown .dropdown-content')
.contains('Delete') .contains('Delete')
.click() .click()
cy.url() cy.url()
@ -95,21 +95,21 @@ describe('Namepaces', () => {
cy.get('.global-notification') cy.get('.global-notification')
.should('contain', 'Success') .should('contain', 'Success')
cy.get('.namespace-container .menu.namespaces-lists') cy.get('.namespace-container .menu.namespaces-projects')
.should('not.contain', newNamespaces[0].title) .should('not.contain', newNamespaces[0].title)
}) })
it('Should not show archived lists & namespaces if the filter is not checked', () => { it('Should not show archived projects & namespaces if the filter is not checked', () => {
const n = NamespaceFactory.create(1, { const n = NamespaceFactory.create(1, {
id: 2, id: 2,
is_archived: true, is_archived: true,
}, false) }, false)
ListFactory.create(1, { ProjectFactory.create(1, {
id: 2, id: 2,
namespace_id: n[0].id, namespace_id: n[0].id,
}, false) }, false)
ListFactory.create(1, { ProjectFactory.create(1, {
id: 3, id: 3,
is_archived: true, is_archived: true,
}, false) }, false)

16
cypress/e2e/list/prepareLists.ts
View File

@ -1,21 +1,21 @@
import {ListFactory} from '../../factories/list' import {ProjectFactory} from '../../factories/project'
import {UserFactory} from '../../factories/user' import {UserFactory} from '../../factories/user'
import {NamespaceFactory} from '../../factories/namespace' import {NamespaceFactory} from '../../factories/namespace'
import {TaskFactory} from '../../factories/task' import {TaskFactory} from '../../factories/task'
export function createLists() { export function createProjects() {
UserFactory.create(1) UserFactory.create(1)
NamespaceFactory.create(1) NamespaceFactory.create(1)
const lists = ListFactory.create(1, { const projects = ProjectFactory.create(1, {
title: 'First List' title: 'First Project'
}) })
TaskFactory.truncate() TaskFactory.truncate()
return lists return projects
} }
export function prepareLists(setLists = () => {}) { export function prepareProjects(setProjects = () => {}) {
beforeEach(() => { beforeEach(() => {
const lists = createLists() const projects = createProjects()
setLists(lists) setProjects(projects)
}) })
} }

8
cypress/e2e/misc/editor.spec.ts
View File

@ -1,16 +1,16 @@
import {TaskFactory} from '../../factories/task' import {TaskFactory} from '../../factories/task'
import {ListFactory} from '../../factories/list' import {ProjectFactory} from '../../factories/project'
import {NamespaceFactory} from '../../factories/namespace' import {NamespaceFactory} from '../../factories/namespace'
import {UserListFactory} from '../../factories/users_list' import {UserProjectFactory} from '../../factories/users_project'
import '../../support/authenticateUser' import '../../support/authenticateUser'
describe('Editor', () => { describe('Editor', () => {
beforeEach(() => { beforeEach(() => {
NamespaceFactory.create(1) NamespaceFactory.create(1)
const lists = ListFactory.create(1) const projects = ProjectFactory.create(1)
TaskFactory.truncate() TaskFactory.truncate()
UserListFactory.truncate() UserProjectFactory.truncate()
}) })
it('Has a preview with checkable checkboxes', () => { it('Has a preview with checkable checkboxes', () => {

10
cypress/e2e/sharing/linkShare.spec.ts
View File

@ -1,22 +1,22 @@
import {LinkShareFactory} from '../../factories/link_sharing' import {LinkShareFactory} from '../../factories/link_sharing'
import {ListFactory} from '../../factories/list' import {ProjectFactory} from '../../factories/project'
import {TaskFactory} from '../../factories/task' import {TaskFactory} from '../../factories/task'
describe('Link shares', () => { describe('Link shares', () => {
it('Can view a link share', () => { it('Can view a link share', () => {
const lists = ListFactory.create(1) const projects = ProjectFactory.create(1)
const tasks = TaskFactory.create(10, { const tasks = TaskFactory.create(10, {
list_id: lists[0].id project_id: projects[0].id
}) })
const linkShares = LinkShareFactory.create(1, { const linkShares = LinkShareFactory.create(1, {
list_id: lists[0].id, project_id: projects[0].id,
right: 0, right: 0,
}) })
cy.visit(`/share/${linkShares[0].hash}/auth`) cy.visit(`/share/${linkShares[0].hash}/auth`)
cy.get('h1.title') cy.get('h1.title')
.should('contain', lists[0].title) .should('contain', projects[0].title)
cy.get('input.input[placeholder="Add a new task..."') cy.get('input.input[placeholder="Add a new task..."')
.should('not.exist') .should('not.exist')
cy.get('.tasks') cy.get('.tasks')

32
cypress/e2e/task/overview.spec.ts
View File

@ -1,4 +1,4 @@
import {ListFactory} from '../../factories/list' import {ProjectFactory} from '../../factories/project'
import {seed} from '../../support/seed' import {seed} from '../../support/seed'
import {TaskFactory} from '../../factories/task' import {TaskFactory} from '../../factories/task'
import {formatISO} from 'date-fns' import {formatISO} from 'date-fns'
@ -12,9 +12,9 @@ import '../../support/authenticateUser'
function seedTasks(numberOfTasks = 100, startDueDate = new Date()) { function seedTasks(numberOfTasks = 100, startDueDate = new Date()) {
UserFactory.create(1) UserFactory.create(1)
NamespaceFactory.create(1) NamespaceFactory.create(1)
const list = ListFactory.create()[0] const project = ProjectFactory.create()[0]
BucketFactory.create(1, { BucketFactory.create(1, {
list_id: list.id, project_id: project.id,
}) })
const tasks = [] const tasks = []
let dueDate = startDueDate let dueDate = startDueDate
@ -23,7 +23,7 @@ function seedTasks(numberOfTasks = 100, startDueDate = new Date()) {
dueDate = (new Date(dueDate.valueOf())).setDate((new Date(dueDate.valueOf())).getDate() + 2) dueDate = (new Date(dueDate.valueOf())).setDate((new Date(dueDate.valueOf())).getDate() + 2)
tasks.push({ tasks.push({
id: i + 1, id: i + 1,
list_id: list.id, project_id: project.id,
done: false, done: false,
created_by_id: 1, created_by_id: 1,
title: 'Test Task ' + i, title: 'Test Task ' + i,
@ -34,7 +34,7 @@ function seedTasks(numberOfTasks = 100, startDueDate = new Date()) {
}) })
} }
seed(TaskFactory.table, tasks) seed(TaskFactory.table, tasks)
return {tasks, list} return {tasks, project}
} }
describe('Home Page Task Overview', () => { describe('Home Page Task Overview', () => {
@ -71,7 +71,7 @@ describe('Home Page Task Overview', () => {
due_date: formatISO(new Date()), due_date: formatISO(new Date()),
}, false) }, false)
cy.visit(`/lists/${tasks[0].list_id}/list`) cy.visit(`/projects/${tasks[0].project_id}/project`)
cy.get('.tasks .task') cy.get('.tasks .task')
.first() .first()
.should('contain.text', newTaskTitle) .should('contain.text', newTaskTitle)
@ -88,7 +88,7 @@ describe('Home Page Task Overview', () => {
cy.visit('/') cy.visit('/')
cy.visit(`/lists/${tasks[0].list_id}/list`) cy.visit(`/projects/${tasks[0].project_id}/project`)
cy.get('.task-add textarea') cy.get('.task-add textarea')
.type(newTaskTitle+'{enter}') .type(newTaskTitle+'{enter}')
cy.visit('/') cy.visit('/')
@ -111,10 +111,10 @@ describe('Home Page Task Overview', () => {
.should('contain.text', newTaskTitle) .should('contain.text', newTaskTitle)
}) })
it('Should show a task without a due date added via default list at the bottom', () => { it('Should show a task without a due date added via default project at the bottom', () => {
const {list} = seedTasks(40) const {project} = seedTasks(40)
updateUserSettings({ updateUserSettings({
default_list_id: list.id, default_project_id: project.id,
overdue_tasks_reminders_time: '9:00', overdue_tasks_reminders_time: '9:00',
}) })
@ -129,23 +129,23 @@ describe('Home Page Task Overview', () => {
.should('contain.text', newTaskTitle) .should('contain.text', newTaskTitle)
}) })
it('Should show the cta buttons for new list when there are no tasks', () => { it('Should show the cta buttons for new project when there are no tasks', () => {
TaskFactory.truncate() TaskFactory.truncate()
cy.visit('/') cy.visit('/')
cy.get('.home.app-content .content') cy.get('.home.app-content .content')
.should('contain.text', 'You can create a new list for your new tasks:') .should('contain.text', 'You can create a new project for your new tasks:')
.should('contain.text', 'Or import your lists and tasks from other services into Vikunja:') .should('contain.text', 'Or import your projects and tasks from other services into Vikunja:')
}) })
it('Should not show the cta buttons for new list when there are tasks', () => { it('Should not show the cta buttons for new project when there are tasks', () => {
seedTasks() seedTasks()
cy.visit('/') cy.visit('/')
cy.get('.home.app-content .content') cy.get('.home.app-content .content')
.should('not.contain.text', 'You can create a new list for your new tasks:') .should('not.contain.text', 'You can create a new project for your new tasks:')
.should('not.contain.text', 'Or import your lists and tasks from other services into Vikunja:') .should('not.contain.text', 'Or import your projects and tasks from other services into Vikunja:')
}) })
}) })

78
cypress/e2e/task/task.spec.ts
View File

@ -1,11 +1,11 @@
import {formatISO} from 'date-fns' import {formatISO} from 'date-fns'
import {TaskFactory} from '../../factories/task' import {TaskFactory} from '../../factories/task'
import {ListFactory} from '../../factories/list' import {ProjectFactory} from '../../factories/project'
import {TaskCommentFactory} from '../../factories/task_comment' import {TaskCommentFactory} from '../../factories/task_comment'
import {UserFactory} from '../../factories/user' import {UserFactory} from '../../factories/user'
import {NamespaceFactory} from '../../factories/namespace' import {NamespaceFactory} from '../../factories/namespace'
import {UserListFactory} from '../../factories/users_list' import {UserProjectFactory} from '../../factories/users_project'
import {TaskAssigneeFactory} from '../../factories/task_assignee' import {TaskAssigneeFactory} from '../../factories/task_assignee'
import {LabelFactory} from '../../factories/labels' import {LabelFactory} from '../../factories/labels'
import {LabelTaskFactory} from '../../factories/label_task' import {LabelTaskFactory} from '../../factories/label_task'
@ -47,22 +47,22 @@ function uploadAttachmentAndVerify(taskId: number) {
describe('Task', () => { describe('Task', () => {
let namespaces let namespaces
let lists let projects
let buckets let buckets
beforeEach(() => { beforeEach(() => {
UserFactory.create(1) UserFactory.create(1)
namespaces = NamespaceFactory.create(1) namespaces = NamespaceFactory.create(1)
lists = ListFactory.create(1) projects = ProjectFactory.create(1)
buckets = BucketFactory.create(1, { buckets = BucketFactory.create(1, {
list_id: lists[0].id, project_id: projects[0].id,
}) })
TaskFactory.truncate() TaskFactory.truncate()
UserListFactory.truncate() UserProjectFactory.truncate()
}) })
it('Should be created new', () => { it('Should be created new', () => {
cy.visit('/lists/1/list') cy.visit('/projects/1/project')
cy.get('.input[placeholder="Add a new task…"') cy.get('.input[placeholder="Add a new task…"')
.type('New Task') .type('New Task')
cy.get('.button') cy.get('.button')
@ -73,11 +73,11 @@ describe('Task', () => {
.should('contain', 'New Task') .should('contain', 'New Task')
}) })
it('Inserts new tasks at the top of the list', () => { it('Inserts new tasks at the top of the project', () => {
TaskFactory.create(1) TaskFactory.create(1)
cy.visit('/lists/1/list') cy.visit('/projects/1/project')
cy.get('.list-is-empty-notice') cy.get('.project-is-empty-notice')
.should('not.exist') .should('not.exist')
cy.get('.input[placeholder="Add a new task…"') cy.get('.input[placeholder="Add a new task…"')
.type('New Task') .type('New Task')
@ -94,7 +94,7 @@ describe('Task', () => {
it('Marks a task as done', () => { it('Marks a task as done', () => {
TaskFactory.create(1) TaskFactory.create(1)
cy.visit('/lists/1/list') cy.visit('/projects/1/project')
cy.get('.tasks .task .fancycheckbox label.check') cy.get('.tasks .task .fancycheckbox label.check')
.first() .first()
.click() .click()
@ -105,11 +105,11 @@ describe('Task', () => {
it('Can add a task to favorites', () => { it('Can add a task to favorites', () => {
TaskFactory.create(1) TaskFactory.create(1)
cy.visit('/lists/1/list') cy.visit('/projects/1/project')
cy.get('.tasks .task .favorite') cy.get('.tasks .task .favorite')
.first() .first()
.click() .click()
cy.get('.menu.namespaces-lists') cy.get('.menu.namespaces-projects')
.should('contain', 'Favorites') .should('contain', 'Favorites')
}) })
@ -133,7 +133,7 @@ describe('Task', () => {
.should('contain', '#1') .should('contain', '#1')
cy.get('.task-view h6.subtitle') cy.get('.task-view h6.subtitle')
.should('contain', namespaces[0].title) .should('contain', namespaces[0].title)
.should('contain', lists[0].title) .should('contain', projects[0].title)
cy.get('.task-view .details.content.description') cy.get('.task-view .details.content.description')
.should('contain', tasks[0].description) .should('contain', tasks[0].description)
cy.get('.task-view .action-buttons p.created') cy.get('.task-view .action-buttons p.created')
@ -178,21 +178,21 @@ describe('Task', () => {
.should('contain', 'Mark as undone') .should('contain', 'Mark as undone')
}) })
it('Shows a task identifier since the list has one', () => { it('Shows a task identifier since the project has one', () => {
const lists = ListFactory.create(1, { const projects = ProjectFactory.create(1, {
id: 1, id: 1,
identifier: 'TEST', identifier: 'TEST',
}) })
const tasks = TaskFactory.create(1, { const tasks = TaskFactory.create(1, {
id: 1, id: 1,
list_id: lists[0].id, project_id: projects[0].id,
index: 1, index: 1,
}) })
cy.visit(`/tasks/${tasks[0].id}`) cy.visit(`/tasks/${tasks[0].id}`)
cy.get('.task-view h1.title.task-id') cy.get('.task-view h1.title.task-id')
.should('contain', `${lists[0].identifier}-${tasks[0].index}`) .should('contain', `${projects[0].identifier}-${tasks[0].index}`)
}) })
it('Can edit the description', () => { it('Can edit the description', () => {
@ -235,14 +235,14 @@ describe('Task', () => {
.should('contain', 'Success') .should('contain', 'Success')
}) })
it('Can move a task to another list', () => { it('Can move a task to another project', () => {
const lists = ListFactory.create(2) const projects = ProjectFactory.create(2)
BucketFactory.create(2, { BucketFactory.create(2, {
list_id: '{increment}' project_id: '{increment}'
}) })
const tasks = TaskFactory.create(1, { const tasks = TaskFactory.create(1, {
id: 1, id: 1,
list_id: lists[0].id, project_id: projects[0].id,
}) })
cy.visit(`/tasks/${tasks[0].id}`) cy.visit(`/tasks/${tasks[0].id}`)
@ -250,7 +250,7 @@ describe('Task', () => {
.contains('Move') .contains('Move')
.click() .click()
cy.get('.task-view .content.details .field .multiselect.control .input-wrapper input') cy.get('.task-view .content.details .field .multiselect.control .input-wrapper input')
.type(`${lists[1].title}{enter}`) .type(`${projects[1].title}{enter}`)
// The requests happen with a 200ms timeout. Because of that, the results are not yet there when cypress // The requests happen with a 200ms timeout. Because of that, the results are not yet there when cypress
// presses enter and we can't simulate pressing on enter to select the item. // presses enter and we can't simulate pressing on enter to select the item.
cy.get('.task-view .content.details .field .multiselect.control .search-results') cy.get('.task-view .content.details .field .multiselect.control .search-results')
@ -260,7 +260,7 @@ describe('Task', () => {
cy.get('.task-view h6.subtitle') cy.get('.task-view h6.subtitle')
.should('contain', namespaces[0].title) .should('contain', namespaces[0].title)
.should('contain', lists[1].title) .should('contain', projects[1].title)
cy.get('.global-notification') cy.get('.global-notification')
.should('contain', 'Success') .should('contain', 'Success')
}) })
@ -268,7 +268,7 @@ describe('Task', () => {
it('Can delete a task', () => { it('Can delete a task', () => {
const tasks = TaskFactory.create(1, { const tasks = TaskFactory.create(1, {
id: 1, id: 1,
list_id: 1, project_id: 1,
}) })
cy.visit(`/tasks/${tasks[0].id}`) cy.visit(`/tasks/${tasks[0].id}`)
@ -285,17 +285,17 @@ describe('Task', () => {
cy.get('.global-notification') cy.get('.global-notification')
.should('contain', 'Success') .should('contain', 'Success')
cy.url() cy.url()
.should('contain', `/lists/${tasks[0].list_id}/`) .should('contain', `/projects/${tasks[0].project_id}/`)
}) })
it('Can add an assignee to a task', () => { it('Can add an assignee to a task', () => {
const users = UserFactory.create(5) const users = UserFactory.create(5)
const tasks = TaskFactory.create(1, { const tasks = TaskFactory.create(1, {
id: 1, id: 1,
list_id: 1, project_id: 1,
}) })
UserListFactory.create(5, { UserProjectFactory.create(5, {
list_id: 1, project_id: 1,
user_id: '{increment}', user_id: '{increment}',
}) })
@ -320,10 +320,10 @@ describe('Task', () => {
const users = UserFactory.create(2) const users = UserFactory.create(2)
const tasks = TaskFactory.create(1, { const tasks = TaskFactory.create(1, {
id: 1, id: 1,
list_id: 1, project_id: 1,
}) })
UserListFactory.create(5, { UserProjectFactory.create(5, {
list_id: 1, project_id: 1,
user_id: '{increment}', user_id: '{increment}',
}) })
TaskAssigneeFactory.create(1, { TaskAssigneeFactory.create(1, {
@ -346,7 +346,7 @@ describe('Task', () => {
it('Can add a new label to a task', () => { it('Can add a new label to a task', () => {
const tasks = TaskFactory.create(1, { const tasks = TaskFactory.create(1, {
id: 1, id: 1,
list_id: 1, project_id: 1,
}) })
LabelFactory.truncate() LabelFactory.truncate()
const newLabelText = 'some new label' const newLabelText = 'some new label'
@ -374,7 +374,7 @@ describe('Task', () => {
it('Can add an existing label to a task', () => { it('Can add an existing label to a task', () => {
const tasks = TaskFactory.create(1, { const tasks = TaskFactory.create(1, {
id: 1, id: 1,
list_id: 1, project_id: 1,
}) })
const labels = LabelFactory.create(1) const labels = LabelFactory.create(1)
LabelTaskFactory.truncate() LabelTaskFactory.truncate()
@ -387,13 +387,13 @@ describe('Task', () => {
it('Can add a label to a task and it shows up on the kanban board afterwards', () => { it('Can add a label to a task and it shows up on the kanban board afterwards', () => {
const tasks = TaskFactory.create(1, { const tasks = TaskFactory.create(1, {
id: 1, id: 1,
list_id: lists[0].id, project_id: projects[0].id,
bucket_id: buckets[0].id, bucket_id: buckets[0].id,
}) })
const labels = LabelFactory.create(1) const labels = LabelFactory.create(1)
LabelTaskFactory.truncate() LabelTaskFactory.truncate()
cy.visit(`/lists/${lists[0].id}/kanban`) cy.visit(`/projects/${projects[0].id}/kanban`)
cy.get('.bucket .task') cy.get('.bucket .task')
.contains(tasks[0].title) .contains(tasks[0].title)
@ -411,7 +411,7 @@ describe('Task', () => {
it('Can remove a label from a task', () => { it('Can remove a label from a task', () => {
const tasks = TaskFactory.create(1, { const tasks = TaskFactory.create(1, {
id: 1, id: 1,
list_id: 1, project_id: 1,
}) })
const labels = LabelFactory.create(1) const labels = LabelFactory.create(1)
LabelTaskFactory.create(1, { LabelTaskFactory.create(1, {
@ -526,13 +526,13 @@ describe('Task', () => {
TaskAttachmentFactory.truncate() TaskAttachmentFactory.truncate()
const tasks = TaskFactory.create(1, { const tasks = TaskFactory.create(1, {
id: 1, id: 1,
list_id: lists[0].id, project_id: projects[0].id,
bucket_id: buckets[0].id, bucket_id: buckets[0].id,
}) })
const labels = LabelFactory.create(1) const labels = LabelFactory.create(1)
LabelTaskFactory.truncate() LabelTaskFactory.truncate()
cy.visit(`/lists/${lists[0].id}/kanban`) cy.visit(`/projects/${projects[0].id}/kanban`)
cy.get('.bucket .task') cy.get('.bucket .task')
.contains(tasks[0].title) .contains(tasks[0].title)

14
cypress/e2e/user/logout.spec.ts
View File

@ -1,5 +1,5 @@
import '../../support/authenticateUser' import '../../support/authenticateUser'
import {createLists} from '../list/prepareLists' import {createProjects} from '../project/prepareProjects'
function logout() { function logout() {
cy.get('.navbar .user .username') cy.get('.navbar .user .username')
@ -24,21 +24,21 @@ describe('Log out', () => {
}) })
}) })
it.skip('Should clear the list history after logging the user out', () => { it.skip('Should clear the project history after logging the user out', () => {
const lists = createLists() const projects = createProjects()
cy.visit(`/lists/${lists[0].id}`) cy.visit(`/projects/${projects[0].id}`)
.then(() => { .then(() => {
expect(localStorage.getItem('listHistory')).to.not.eq(null) expect(localStorage.getItem('projectHistory')).to.not.eq(null)
}) })
logout() logout()
cy.wait(1000) // This makes re-loading of the list and associated entities (and the resulting error) visible cy.wait(1000) // This makes re-loading of the project and associated entities (and the resulting error) visible
cy.url() cy.url()
.should('contain', '/login') .should('contain', '/login')
.then(() => { .then(() => {
expect(localStorage.getItem('listHistory')).to.eq(null) expect(localStorage.getItem('projectHistory')).to.eq(null)
}) })
}) })
}) })

2
cypress/factories/bucket.ts
View File

@ -11,7 +11,7 @@ export class BucketFactory extends Factory {
return { return {
id: '{increment}', id: '{increment}',
title: faker.lorem.words(3), title: faker.lorem.words(3),
list_id: 1, project_id: 1,
created_by_id: 1, created_by_id: 1,
created: formatISO(now), created: formatISO(now),
updated: formatISO(now) updated: formatISO(now)

2
cypress/factories/link_sharing.ts
View File

@ -11,7 +11,7 @@ export class LinkShareFactory extends Factory {
return { return {
id: '{increment}', id: '{increment}',
hash: faker.random.word(32), hash: faker.random.word(32),
list_id: 1, project_id: 1,
right: 0, right: 0,
sharing_type: 0, sharing_type: 0,
shared_by_id: 1, shared_by_id: 1,

4
cypress/factories/list.ts
View File

@ -2,8 +2,8 @@ import {Factory} from '../support/factory'
import {formatISO} from "date-fns" import {formatISO} from "date-fns"
import {faker} from '@faker-js/faker' import {faker} from '@faker-js/faker'
export class ListFactory extends Factory { export class ProjectFactory extends Factory {
static table = 'lists' static table = 'projects'
static factory() { static factory() {
const now = new Date() const now = new Date()

2
cypress/factories/task.ts
View File

@ -12,7 +12,7 @@ export class TaskFactory extends Factory {
id: '{increment}', id: '{increment}',
title: faker.lorem.words(3), title: faker.lorem.words(3),
done: false, done: false,
list_id: 1, project_id: 1,
created_by_id: 1, created_by_id: 1,
index: '{increment}', index: '{increment}',
position: '{increment}', position: '{increment}',

6
cypress/factories/users_list.ts
View File

@ -1,15 +1,15 @@
import {Factory} from '../support/factory' import {Factory} from '../support/factory'
import {formatISO} from "date-fns" import {formatISO} from "date-fns"
export class UserListFactory extends Factory { export class UserProjectFactory extends Factory {
static table = 'users_lists' static table = 'users_projects'
static factory() { static factory() {
const now = new Date() const now = new Date()
return { return {
id: '{increment}', id: '{increment}',
list_id: 1, project_id: 1,
user_id: 1, user_id: 1,
right: 0, right: 0,
created: formatISO(now), created: formatISO(now),

18
docs/models-services.md
View File

@ -30,21 +30,21 @@ A basic service can look like this:
```javascript ```javascript
import AbstractService from './abstractService' import AbstractService from './abstractService'
import ListModel from '../models/list' import ProjectModel from '../models/project'
export default class ListService extends AbstractService { export default class ProjectService extends AbstractService {
constructor() { constructor() {
super({ super({
getAll: '/lists', getAll: '/projects',
get: '/lists/{id}', get: '/projects/{id}',
create: '/namespaces/{namespaceID}/lists', create: '/namespaces/{namespaceID}/projects',
update: '/lists/{id}', update: '/projects/{id}',
delete: '/lists/{id}', delete: '/projects/{id}',
}) })
} }
modelFactory(data) { modelFactory(data) {
return new ListModel(data) return new ProjectModel(data)
} }
} }
``` ```
@ -132,7 +132,7 @@ import AbstractModel from './abstractModel'
import TaskModel from './task' import TaskModel from './task'
import UserModel from './user' import UserModel from './user'
export default class ListModel extends AbstractModel { export default class ProjectModel extends AbstractModel {
constructor(data) { constructor(data) {
// The constructor of AbstractModel handles all the default parsing. // The constructor of AbstractModel handles all the default parsing.

4
scripts/run.sh
View File

@ -18,8 +18,8 @@ sed -i "s/'\/api\/v1/'$VIKUNJA_API_URL/g" /usr/share/nginx/html/index.html
sed -i "s/\.SENTRY_ENABLED = false/\.SENTRY_ENABLED = $VIKUNJA_SENTRY_ENABLED/g" /usr/share/nginx/html/index.html sed -i "s/\.SENTRY_ENABLED = false/\.SENTRY_ENABLED = $VIKUNJA_SENTRY_ENABLED/g" /usr/share/nginx/html/index.html
sed -i "s|\.SENTRY_DSN = '.*'|\.SENTRY_DSN = '$VIKUNJA_SENTRY_DSN'|g" /usr/share/nginx/html/index.html sed -i "s|\.SENTRY_DSN = '.*'|\.SENTRY_DSN = '$VIKUNJA_SENTRY_DSN'|g" /usr/share/nginx/html/index.html
sed -i "s/listen 80/listen $VIKUNJA_HTTP_PORT/g" /etc/nginx/nginx.conf sed -i "s/projecten 80/projecten $VIKUNJA_HTTP_PORT/g" /etc/nginx/nginx.conf
sed -i "s/listen 443/listen $VIKUNJA_HTTPS_PORT/g" /etc/nginx/nginx.conf sed -i "s/projecten 443/projecten $VIKUNJA_HTTPS_PORT/g" /etc/nginx/nginx.conf
# Set the uid and gid of the nginx run user # Set the uid and gid of the nginx run user
usermod --non-unique --uid ${PUID} nginx usermod --non-unique --uid ${PUID} nginx

2
scripts/serve-dist.js
View File

@ -10,7 +10,7 @@ app.use(express.static(p))
app.get('*', (request, response, next) => { app.get('*', (request, response, next) => {
response.sendFile(`${p}/index.html`) response.sendFile(`${p}/index.html`)
}) })
app.listen(port, '127.0.0.1', () => { app.projecten(port, '127.0.0.1', () => {
console.log(`Serving files from ${p}`) console.log(`Serving files from ${p}`)
console.log(`Server started on port ${port}`) console.log(`Server started on port ${port}`)
}) })

28
src/components/home/TheNavigation.vue
View File

@ -8,19 +8,19 @@
<Logo width="164" height="48"/> <Logo width="164" height="48"/>
</router-link> </router-link>
<MenuButton class="menu-button"/> <MenuButton class="menu-button"/>
<div class="list-title" ref="listTitle" v-show="currentList.id"> <div class="project-title" ref="projectTitle" v-show="currentProject.id">
<template v-if="currentList.id"> <template v-if="currentProject.id">
<h1 <h1
:style="{ 'opacity': currentList.title === '' ? '0': '1' }" :style="{ 'opacity': currentProject.title === '' ? '0': '1' }"
class="title"> class="title">
{{ currentList.title === '' ? $t('misc.loading') : getListTitle(currentList) }} {{ currentProject.title === '' ? $t('misc.loading') : getProjectTitle(currentProject) }}
</h1> </h1>
<BaseButton :to="{name: 'list.info', params: {listId: currentList.id}}" class="info-button"> <BaseButton :to="{name: 'project.info', params: {projectId: currentProject.id}}" class="info-button">
<icon icon="circle-info"/> <icon icon="circle-info"/>
</BaseButton> </BaseButton>
<list-settings-dropdown v-if="canWriteCurrentList && currentList.id !== -1" :list="currentList"/> <project-settings-dropdown v-if="canWriteCurrentProject && currentProject.id !== -1" :project="currentProject"/>
</template> </template>
</div> </div>
@ -96,7 +96,7 @@ import {ref, computed, onMounted, nextTick} from 'vue'
import {RIGHTS as Rights} from '@/constants/rights' import {RIGHTS as Rights} from '@/constants/rights'
import Update from '@/components/home/update.vue' import Update from '@/components/home/update.vue'
import ListSettingsDropdown from '@/components/list/list-settings-dropdown.vue' import ProjectSettingsDropdown from '@/components/project/project-settings-dropdown.vue'
import Dropdown from '@/components/misc/dropdown.vue' import Dropdown from '@/components/misc/dropdown.vue'
import DropdownItem from '@/components/misc/dropdown-item.vue' import DropdownItem from '@/components/misc/dropdown-item.vue'
import Notifications from '@/components/notifications/notifications.vue' import Notifications from '@/components/notifications/notifications.vue'
@ -104,16 +104,16 @@ import Logo from '@/components/home/Logo.vue'
import BaseButton from '@/components/base/BaseButton.vue' import BaseButton from '@/components/base/BaseButton.vue'
import MenuButton from '@/components/home/MenuButton.vue' import MenuButton from '@/components/home/MenuButton.vue'
import {getListTitle} from '@/helpers/getListTitle' import {getProjectTitle} from '@/helpers/getProjectTitle'
import {useBaseStore} from '@/stores/base' import {useBaseStore} from '@/stores/base'
import {useConfigStore} from '@/stores/config' import {useConfigStore} from '@/stores/config'
import {useAuthStore} from '@/stores/auth' import {useAuthStore} from '@/stores/auth'
const baseStore = useBaseStore() const baseStore = useBaseStore()
const currentList = computed(() => baseStore.currentList) const currentProject = computed(() => baseStore.currentProject)
const background = computed(() => baseStore.background) const background = computed(() => baseStore.background)
const canWriteCurrentList = computed(() => baseStore.currentList.maxRight > Rights.READ) const canWriteCurrentProject = computed(() => baseStore.currentProject.maxRight > Rights.READ)
const menuActive = computed(() => baseStore.menuActive) const menuActive = computed(() => baseStore.menuActive)
const authStore = useAuthStore() const authStore = useAuthStore()
@ -123,15 +123,15 @@ const imprintUrl = computed(() => configStore.legal.imprintUrl)
const privacyPolicyUrl = computed(() => configStore.legal.privacyPolicyUrl) const privacyPolicyUrl = computed(() => configStore.legal.privacyPolicyUrl)
const usernameDropdown = ref() const usernameDropdown = ref()
const listTitle = ref() const projectTitle = ref()
onMounted(async () => { onMounted(async () => {
await nextTick() await nextTick()
if (typeof usernameDropdown.value === 'undefined' || typeof listTitle.value === 'undefined') { if (typeof usernameDropdown.value === 'undefined' || typeof projectTitle.value === 'undefined') {
return return
} }
const usernameWidth = usernameDropdown.value.$el.clientWidth const usernameWidth = usernameDropdown.value.$el.clientWidth
listTitle.value.style.setProperty('--nav-username-width', `${usernameWidth}px`) projectTitle.value.style.setProperty('--nav-username-width', `${usernameWidth}px`)
}) })
function openQuickActions() { function openQuickActions() {
@ -259,7 +259,7 @@ $hamburger-menu-icon-width: 28px;
} }
} }
.list-title { .project-title {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;

6
src/components/home/contentAuth.vue
View File

@ -33,7 +33,7 @@
<quick-actions/> <quick-actions/>
<router-view :route="routeWithModal" v-slot="{ Component }"> <router-view :route="routeWithModal" v-slot="{ Component }">
<keep-alive :include="['list.list', 'list.gantt', 'list.table', 'list.kanban']"> <keep-alive :include="['project.project', 'project.gantt', 'project.table', 'project.kanban']">
<component :is="Component"/> <component :is="Component"/>
</keep-alive> </keep-alive>
</router-view> </router-view>
@ -90,7 +90,7 @@ const route = useRoute()
watch(() => route.fullPath, () => window.innerWidth < 769 && baseStore.setMenuActive(false)) watch(() => route.fullPath, () => window.innerWidth < 769 && baseStore.setMenuActive(false))
// FIXME: this is really error prone // FIXME: this is really error prone
// Reset the current list highlight in menu if the current route is not list related. // Reset the current project highlight in menu if the current route is not project related.
watch(() => route.name as string, (routeName) => { watch(() => route.name as string, (routeName) => {
if ( if (
routeName && routeName &&
@ -109,7 +109,7 @@ watch(() => route.name as string, (routeName) => {
routeName.startsWith('user.settings') routeName.startsWith('user.settings')
) )
) { ) {
baseStore.handleSetCurrentList({list: null}) baseStore.handleSetCurrentProject({project: null})
} }
}) })

6
src/components/home/contentLinkShare.vue
View File

@ -9,9 +9,9 @@
<Logo class="logo" v-if="logoVisible"/> <Logo class="logo" v-if="logoVisible"/>
<h1 <h1
:class="{'m-0': !logoVisible}" :class="{'m-0': !logoVisible}"
:style="{ 'opacity': currentList.title === '' ? '0': '1' }" :style="{ 'opacity': currentProject.title === '' ? '0': '1' }"
class="title"> class="title">
{{ currentList.title === '' ? $t('misc.loading') : currentList.title }} {{ currentProject.title === '' ? $t('misc.loading') : currentProject.title }}
</h1> </h1>
<div class="box has-text-left view"> <div class="box has-text-left view">
<router-view/> <router-view/>
@ -31,7 +31,7 @@ import Logo from '@/components/home/Logo.vue'
import PoweredByLink from './PoweredByLink.vue' import PoweredByLink from './PoweredByLink.vue'
const baseStore = useBaseStore() const baseStore = useBaseStore()
const currentList = computed(() => baseStore.currentList) const currentProject = computed(() => baseStore.currentProject)
const background = computed(() => baseStore.background) const background = computed(() => baseStore.background)
const logoVisible = computed(() => baseStore.logoVisible) const logoVisible = computed(() => baseStore.logoVisible)
</script> </script>

160
src/components/home/navigation.vue
View File

@ -4,7 +4,7 @@
<router-link :to="{name: 'home'}" class="logo"> <router-link :to="{name: 'home'}" class="logo">
<Logo width="164" height="48"/> <Logo width="164" height="48"/>
</router-link> </router-link>
<ul class="menu-list"> <ul class="menu-project">
<li> <li>
<router-link :to="{ name: 'home'}" v-shortcut="'g o'"> <router-link :to="{ name: 'home'}" v-shortcut="'g o'">
<span class="icon"> <span class="icon">
@ -48,11 +48,11 @@
</ul> </ul>
</nav> </nav>
<nav class="menu namespaces-lists loader-container is-loading-small" :class="{'is-loading': loading}"> <nav class="menu namespaces-projects loader-container is-loading-small" :class="{'is-loading': loading}">
<template v-for="(n, nk) in namespaces" :key="n.id"> <template v-for="(n, nk) in namespaces" :key="n.id">
<div class="namespace-title" :class="{'has-menu': n.id > 0}"> <div class="namespace-title" :class="{'has-menu': n.id > 0}">
<BaseButton <BaseButton
@click="toggleLists(n.id)" @click="toggleProjects(n.id)"
class="menu-label" class="menu-label"
v-tooltip="namespaceTitles[nk]" v-tooltip="namespaceTitles[nk]"
> >
@ -63,29 +63,29 @@
/> />
<span class="name">{{ namespaceTitles[nk] }}</span> <span class="name">{{ namespaceTitles[nk] }}</span>
<div <div
class="icon is-small toggle-lists-icon pl-2" class="icon is-small toggle-projects-icon pl-2"
:class="{'active': typeof listsVisible[n.id] !== 'undefined' ? listsVisible[n.id] : true}" :class="{'active': typeof projectsVisible[n.id] !== 'undefined' ? projectsVisible[n.id] : true}"
> >
<icon icon="chevron-down"/> <icon icon="chevron-down"/>
</div> </div>
<span class="count" :class="{'ml-2 mr-0': n.id > 0}"> <span class="count" :class="{'ml-2 mr-0': n.id > 0}">
({{ namespaceListsCount[nk] }}) ({{ namespaceProjectsCount[nk] }})
</span> </span>
</BaseButton> </BaseButton>
<namespace-settings-dropdown :namespace="n" v-if="n.id > 0"/> <namespace-settings-dropdown :namespace="n" v-if="n.id > 0"/>
</div> </div>
<!-- <!--
NOTE: a v-model / computed setter is not possible, since the updateActiveLists function NOTE: a v-model / computed setter is not possible, since the updateActiveProjects function
triggered by the change needs to have access to the current namespace triggered by the change needs to have access to the current namespace
--> -->
<draggable <draggable
v-if="listsVisible[n.id] ?? true" v-if="projectsVisible[n.id] ?? true"
v-bind="dragOptions" v-bind="dragOptions"
:modelValue="activeLists[nk]" :modelValue="activeProjects[nk]"
@update:modelValue="(lists) => updateActiveLists(n, lists)" @update:modelValue="(projects) => updateActiveProjects(n, projects)"
group="namespace-lists" group="namespace-projects"
@start="() => drag = true" @start="() => drag = true"
@end="saveListPosition" @end="saveProjectPosition"
handle=".handle" handle=".handle"
:disabled="n.id < 0 || undefined" :disabled="n.id < 0 || undefined"
tag="ul" tag="ul"
@ -94,22 +94,22 @@
:data-namespace-index="nk" :data-namespace-index="nk"
:component-data="{ :component-data="{
type: 'transition-group', type: 'transition-group',
name: !drag ? 'flip-list' : null, name: !drag ? 'flip-project' : null,
class: [ class: [
'menu-list can-be-hidden', 'menu-project can-be-hidden',
{ 'dragging-disabled': n.id < 0 } { 'dragging-disabled': n.id < 0 }
] ]
}" }"
> >
<template #item="{element: l}"> <template #item="{element: l}">
<li <li
class="list-menu loader-container is-loading-small" class="project-menu loader-container is-loading-small"
:class="{'is-loading': listUpdating[l.id]}" :class="{'is-loading': projectUpdating[l.id]}"
> >
<BaseButton <BaseButton
:to="{ name: 'list.index', params: { listId: l.id} }" :to="{ name: 'project.index', params: { projectId: l.id} }"
class="list-menu-link" class="project-menu-link"
:class="{'router-link-exact-active': currentList.id === l.id}" :class="{'router-link-exact-active': currentProject.id === l.id}"
> >
<span class="icon handle"> <span class="icon handle">
<icon icon="grip-lines"/> <icon icon="grip-lines"/>
@ -119,17 +119,17 @@
:color="l.hexColor" :color="l.hexColor"
class="mr-1" class="mr-1"
/> />
<span class="list-menu-title">{{ getListTitle(l) }}</span> <span class="project-menu-title">{{ getProjectTitle(l) }}</span>
</BaseButton> </BaseButton>
<BaseButton <BaseButton
class="favorite" class="favorite"
:class="{'is-favorite': l.isFavorite}" :class="{'is-favorite': l.isFavorite}"
@click="listStore.toggleListFavorite(l)" @click="projectStore.toggleProjectFavorite(l)"
> >
<icon :icon="l.isFavorite ? 'star' : ['far', 'star']"/> <icon :icon="l.isFavorite ? 'star' : ['far', 'star']"/>
</BaseButton> </BaseButton>
<list-settings-dropdown :list="l" v-if="l.id > 0"/> <project-settings-dropdown :project="l" v-if="l.id > 0"/>
<span class="list-setting-spacer" v-else></span> <span class="project-setting-spacer" v-else></span>
</li> </li>
</template> </template>
</draggable> </draggable>
@ -145,21 +145,21 @@ import draggable from 'zhyswan-vuedraggable'
import type {SortableEvent} from 'sortablejs' import type {SortableEvent} from 'sortablejs'
import BaseButton from '@/components/base/BaseButton.vue' 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 NamespaceSettingsDropdown from '@/components/namespace/namespace-settings-dropdown.vue'
import PoweredByLink from '@/components/home/PoweredByLink.vue' import PoweredByLink from '@/components/home/PoweredByLink.vue'
import Logo from '@/components/home/Logo.vue' import Logo from '@/components/home/Logo.vue'
import {calculateItemPosition} from '@/helpers/calculateItemPosition' import {calculateItemPosition} from '@/helpers/calculateItemPosition'
import {getNamespaceTitle} from '@/helpers/getNamespaceTitle' import {getNamespaceTitle} from '@/helpers/getNamespaceTitle'
import {getListTitle} from '@/helpers/getListTitle' import {getProjectTitle} from '@/helpers/getProjectTitle'
import {useEventListener} from '@vueuse/core' import {useEventListener} from '@vueuse/core'
import type {IList} from '@/modelTypes/IList' import type {IProject} from '@/modelTypes/IProject'
import type {INamespace} from '@/modelTypes/INamespace' import type {INamespace} from '@/modelTypes/INamespace'
import ColorBubble from '@/components/misc/colorBubble.vue' import ColorBubble from '@/components/misc/colorBubble.vue'
import {useBaseStore} from '@/stores/base' import {useBaseStore} from '@/stores/base'
import {useListStore} from '@/stores/lists' import {useProjectStore} from '@/stores/projects'
import {useNamespaceStore} from '@/stores/namespaces' import {useNamespaceStore} from '@/stores/namespaces'
const drag = ref(false) const drag = ref(false)
@ -170,7 +170,7 @@ const dragOptions = {
const baseStore = useBaseStore() const baseStore = useBaseStore()
const namespaceStore = useNamespaceStore() const namespaceStore = useNamespaceStore()
const currentList = computed(() => baseStore.currentList) const currentProject = computed(() => baseStore.currentProject)
const menuActive = computed(() => baseStore.menuActive) const menuActive = computed(() => baseStore.menuActive)
const loading = computed(() => namespaceStore.isLoading) const loading = computed(() => namespaceStore.isLoading)
@ -178,9 +178,9 @@ const loading = computed(() => namespaceStore.isLoading)
const namespaces = computed(() => { const namespaces = computed(() => {
return namespaceStore.namespaces.filter(n => !n.isArchived) return namespaceStore.namespaces.filter(n => !n.isArchived)
}) })
const activeLists = computed(() => { const activeProjects = computed(() => {
return namespaces.value.map(({lists}) => { return namespaces.value.map(({projects}) => {
return lists?.filter(item => { return projects?.filter(item => {
return typeof item !== 'undefined' && !item.isArchived return typeof item !== 'undefined' && !item.isArchived
}) })
}) })
@ -190,86 +190,86 @@ const namespaceTitles = computed(() => {
return namespaces.value.map((namespace) => getNamespaceTitle(namespace)) return namespaces.value.map((namespace) => getNamespaceTitle(namespace))
}) })
const namespaceListsCount = computed(() => { const namespaceProjectsCount = computed(() => {
return namespaces.value.map((_, index) => activeLists.value[index]?.length ?? 0) return namespaces.value.map((_, index) => activeProjects.value[index]?.length ?? 0)
}) })
useEventListener('resize', resize) useEventListener('resize', resize)
onMounted(() => resize()) onMounted(() => resize())
const listStore = useListStore() const projectStore = useProjectStore()
function resize() { function resize() {
// Hide the menu by default on mobile // Hide the menu by default on mobile
baseStore.setMenuActive(window.innerWidth >= 770) baseStore.setMenuActive(window.innerWidth >= 770)
} }
function toggleLists(namespaceId: INamespace['id']) { function toggleProjects(namespaceId: INamespace['id']) {
listsVisible.value[namespaceId] = !listsVisible.value[namespaceId] 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 // FIXME: async action will be unfinished when component mounts
onBeforeMount(async () => { onBeforeMount(async () => {
const namespaces = await namespaceStore.loadNamespaces() const namespaces = await namespaceStore.loadNamespaces()
namespaces.forEach(n => { namespaces.forEach(n => {
if (typeof listsVisible.value[n.id] === 'undefined') { if (typeof projectsVisible.value[n.id] === 'undefined') {
listsVisible.value[n.id] = true 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 // This is a bit hacky: since we do have to filter out the archived items from the project
// for vue draggable updating it is not as simple as replacing it. // 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 // To work around this, we merge the active projects 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 // 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. // later when showing them anyway, and it makes the merging happening here a lot easier.
const lists = [ const projects = [
...activeLists, ...activeProjects,
...namespace.lists.filter(l => l.isArchived), ...namespace.projects.filter(l => l.isArchived),
] ]
namespaceStore.setNamespaceById({ namespaceStore.setNamespaceById({
...namespace, ...namespace,
lists, projects,
}) })
} }
const listUpdating = ref<{ [id: INamespace['id']]: boolean }>({}) const projectUpdating = ref<{ [id: INamespace['id']]: boolean }>({})
async function saveListPosition(e: SortableEvent) { async function saveProjectPosition(e: SortableEvent) {
if (!e.newIndex && e.newIndex !== 0) return if (!e.newIndex && e.newIndex !== 0) return
const namespaceId = parseInt(e.to.dataset.namespaceId as string) const namespaceId = parseInt(e.to.dataset.namespaceId as string)
const newNamespaceIndex = parseInt(e.to.dataset.namespaceIndex as string) const newNamespaceIndex = parseInt(e.to.dataset.namespaceIndex as string)
const listsActive = activeLists.value[newNamespaceIndex] const projectsActive = activeProjects.value[newNamespaceIndex]
// If the list was dragged to the last position, Safari will report e.newIndex as the size of the listsActive // 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 list will fail. // 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. // 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 project = projectsActive[newIndex]
const listBefore = listsActive[newIndex - 1] ?? null const projectBefore = projectsActive[newIndex - 1] ?? null
const listAfter = listsActive[newIndex + 1] ?? null const projectAfter = projectsActive[newIndex + 1] ?? null
listUpdating.value[list.id] = true projectUpdating.value[project.id] = true
const position = calculateItemPosition( const position = calculateItemPosition(
listBefore !== null ? listBefore.position : null, projectBefore !== null ? projectBefore.position : null,
listAfter !== null ? listAfter.position : null, projectAfter !== null ? projectAfter.position : null,
) )
try { try {
// create a copy of the list in order to not violate pinia manipulation // create a copy of the project in order to not violate pinia manipulation
await listStore.updateList({ await projectStore.updateProject({
...list, ...project,
position, position,
namespaceId, namespaceId,
}) })
} finally { } finally {
listUpdating.value[list.id] = false projectUpdating.value[project.id] = false
} }
} }
</script> </script>
@ -320,14 +320,14 @@ $vikunja-nav-selected-width: 0.4rem;
} }
.menu-label, .menu-label,
.menu-list .list-menu-link, .menu-project .project-menu-link,
.menu-list a { .menu-project a {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
cursor: pointer; cursor: pointer;
.list-menu-title { .project-menu-title {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
width: 100%; width: 100%;
@ -351,7 +351,7 @@ $vikunja-nav-selected-width: 0.4rem;
} }
.favorite.is-favorite, .favorite.is-favorite,
.list-menu:hover .favorite { .project-menu:hover .favorite {
opacity: 1; opacity: 1;
} }
@ -396,7 +396,7 @@ $vikunja-nav-selected-width: 0.4rem;
cursor: pointer; cursor: pointer;
} }
.toggle-lists-icon { .toggle-projects-icon {
svg { svg {
transition: all $transition; transition: all $transition;
transform: rotate(90deg); transform: rotate(90deg);
@ -409,23 +409,23 @@ $vikunja-nav-selected-width: 0.4rem;
} }
} }
&:hover .toggle-lists-icon svg { &:hover .toggle-projects-icon svg {
opacity: 1; opacity: 1;
} }
&:not(.has-menu) .toggle-lists-icon { &:not(.has-menu) .toggle-projects-icon {
padding-right: 1rem; padding-right: 1rem;
} }
} }
.menu-label, .menu-label,
.nsettings, .nsettings,
.menu-list .list-menu-link, .menu-project .project-menu-link,
.menu-list a { .menu-project a {
color: $vikunja-nav-color; color: $vikunja-nav-color;
} }
.menu-list { .menu-project {
li { li {
height: 44px; height: 44px;
display: flex; display: flex;
@ -447,7 +447,7 @@ $vikunja-nav-selected-width: 0.4rem;
} }
} }
.flip-list-move { .flip-project-move {
transition: transform $transition-duration; transition: transform $transition-duration;
} }
@ -463,7 +463,7 @@ $vikunja-nav-selected-width: 0.4rem;
background: transparent; background: transparent;
} }
.list-menu-link, li > a { .project-menu-link, li > a {
padding: 0.75rem .5rem 0.75rem ($navbar-padding * 1.5 - 1.75rem); padding: 0.75rem .5rem 0.75rem ($navbar-padding * 1.5 - 1.75rem);
transition: all 0.2s ease; transition: all 0.2s ease;
@ -518,7 +518,7 @@ $vikunja-nav-selected-width: 0.4rem;
} }
} }
&.namespaces-lists { &.namespaces-projects {
padding-top: math.div($navbar-padding, 2); padding-top: math.div($navbar-padding, 2);
} }
@ -530,13 +530,13 @@ $vikunja-nav-selected-width: 0.4rem;
.top-menu { .top-menu {
margin-top: math.div($navbar-padding, 2); margin-top: math.div($navbar-padding, 2);
.menu-list { .menu-project {
li { li {
font-weight: 500; font-weight: 500;
font-family: $vikunja-font; font-family: $vikunja-font;
} }
.list-menu-link, li > a { .project-menu-link, li > a {
padding-left: 2rem; padding-left: 2rem;
display: inline-block; display: inline-block;
@ -548,12 +548,12 @@ $vikunja-nav-selected-width: 0.4rem;
} }
} }
.list-setting-spacer { .project-setting-spacer {
width: 2.5rem; width: 2.5rem;
flex-shrink: 0; flex-shrink: 0;
} }
.namespaces-list.loader-container.is-loading { .namespaces-project.loader-container.is-loading {
min-height: calc(100vh - #{$navbar-height + 1.5rem + 1rem + 1.5rem}); min-height: calc(100vh - #{$navbar-height + 1.5rem + 1rem + 1.5rem});
} }
</style> </style>

63
src/components/input/SelectList.vue
View File

@ -1,63 +0,0 @@
<template>
<multiselect
v-model="selectedLists"
:search-results="foundLists"
:loading="listService.loading"
:multiple="true"
:placeholder="$t('list.search')"
label="title"
@search="findLists"
/>
</template>
<script setup lang="ts">
import {computed, ref, shallowReactive, watchEffect, type PropType} from 'vue'
import Multiselect from '@/components/input/multiselect.vue'
import type {IList} from '@/modelTypes/IList'
import ListService from '@/services/list'
import {includesById} from '@/helpers/utils'
const props = defineProps({
modelValue: {
type: Array as PropType<IList[]>,
default: () => [],
},
})
const emit = defineEmits<{
(e: 'update:modelValue', value: IList[]): void
}>()
const lists = ref<IList[]>([])
watchEffect(() => {
lists.value = props.modelValue
})
const selectedLists = computed({
get() {
return lists.value
},
set: (value) => {
lists.value = value
emit('update:modelValue', value)
},
})
const listService = shallowReactive(new ListService())
const foundLists = ref<IList[]>([])
async function findLists(query: string) {
if (query === '') {
foundLists.value = []
return
}
const response = await listService.getAll({}, {s: query}) as IList[]
// Filter selected items from the results
foundLists.value = response.filter(({id}) => !includesById(lists.value, id))
}
</script>

63
src/components/input/SelectProject.vue Normal file
View File

@ -0,0 +1,63 @@
<template>
<multiselect
v-model="selectedProjects"
:search-results="foundProjects"
:loading="projectService.loading"
:multiple="true"
:placeholder="$t('project.search')"
label="title"
@search="findProjects"
/>
</template>
<script setup lang="ts">
import {computed, ref, shallowReactive, watchEffect, type PropType} from 'vue'
import Multiselect from '@/components/input/multiselect.vue'
import type {IProject} from '@/modelTypes/IProject'
import ProjectService from '@/services/project'
import {includesById} from '@/helpers/utils'
const props = defineProps({
modelValue: {
type: Array as PropType<IProject[]>,
default: () => [],
},
})
const emit = defineEmits<{
(e: 'update:modelValue', value: IProject[]): void
}>()
const projects = ref<IProject[]>([])
watchEffect(() => {
projects.value = props.modelValue
})
const selectedProjects = computed({
get() {
return projects.value
},
set: (value) => {
projects.value = value
emit('update:modelValue', value)
},
})
const projectService = shallowReactive(new ProjectService())
const foundProjects = ref<IProject[]>([])
async function findProjects(query: string) {
if (query === '') {
foundProjects.value = []
return
}
const response = await projectService.getAll({}, {s: query}) as IProject[]
// Filter selected items from the results
foundProjects.value = response.filter(({id}) => !includesById(projects.value, id))
}
</script>

6
src/components/input/editor.vue
View File

@ -286,11 +286,11 @@ function handleCheckboxClick(e: Event) {
console.debug('no index found') console.debug('no index found')
return 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() bubble()
renderPreview() renderPreview()
} }

12
src/components/input/editorConfig.ts
View File

@ -72,15 +72,15 @@ export function createEasyMDEConfig({ placeholder, uploadImage, imageUploadFunct
icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M19.373 5.16357H5.62695C4.79102 5.16357 4.11133 5.84326 4.11133 6.6792V16.2095C4.11133 17.0464 4.79102 17.7261 5.62695 17.7261H6.8877V21.1245C6.8877 21.3667 7.0332 21.5854 7.25684 21.6782C7.33203 21.7095 7.41016 21.7241 7.4873 21.7241C7.64258 21.7241 7.7959 21.6636 7.91113 21.5493L11.748 17.7261H19.373C20.209 17.7261 20.8887 17.0464 20.8887 16.2095V6.6792C20.8887 5.84326 20.209 5.16357 19.373 5.16357ZM19.6895 16.2095C19.6895 16.3843 19.5469 16.5269 19.373 16.5269H11.5C11.3408 16.5269 11.1895 16.5894 11.0762 16.7017L8.08691 19.6802V17.1265C8.08691 16.7954 7.81836 16.5269 7.4873 16.5269H5.62695C5.45312 16.5269 5.31055 16.3843 5.31055 16.2095V6.6792C5.31055 6.50537 5.45312 6.36279 5.62695 6.36279H19.373C19.5469 6.36279 19.6895 6.50537 19.6895 6.6792V16.2095ZM10.3431 8.45264C9.46326 8.45264 8.75 9.16589 8.75 10.0458C8.75 10.9257 9.46326 11.639 10.3431 11.639C10.4775 11.639 10.6058 11.6173 10.7305 11.5861V11.6195C10.7305 12.1322 10.3135 12.5492 9.75586 12.5492C9.4248 12.5492 9.17871 12.8177 9.17871 13.1488C9.17871 13.4799 9.46973 13.7484 9.80078 13.7484C10.9746 13.7484 11.9297 12.7933 11.9297 11.6195V10.1176L11.9294 10.1165L11.9292 10.1155C11.9297 10.1049 11.9312 10.0946 11.9326 10.0843L11.9326 10.0843C11.9345 10.0716 11.9363 10.059 11.9363 10.0458C11.9363 9.16589 11.223 8.45264 10.3431 8.45264ZM13.0637 10.0458C13.0637 9.16589 13.7771 8.45264 14.657 8.45264C15.5369 8.45264 16.2501 9.16589 16.2501 10.0458C16.2501 10.0584 16.2484 10.0706 16.2466 10.0828C16.2452 10.0929 16.2437 10.103 16.2433 10.1134C16.2433 10.1149 16.2441 10.1161 16.2441 10.1176V11.6195C16.2441 12.7933 15.2891 13.7484 14.1152 13.7484C13.7842 13.7484 13.4922 13.4799 13.4922 13.1488C13.4922 12.8177 13.7383 12.5492 14.0693 12.5492C14.6279 12.5492 15.0449 12.1322 15.0449 11.6195V11.5858C14.9202 11.6173 14.7915 11.639 14.657 11.639C13.7771 11.639 13.0637 10.9257 13.0637 10.0458Z"/></svg>', icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M19.373 5.16357H5.62695C4.79102 5.16357 4.11133 5.84326 4.11133 6.6792V16.2095C4.11133 17.0464 4.79102 17.7261 5.62695 17.7261H6.8877V21.1245C6.8877 21.3667 7.0332 21.5854 7.25684 21.6782C7.33203 21.7095 7.41016 21.7241 7.4873 21.7241C7.64258 21.7241 7.7959 21.6636 7.91113 21.5493L11.748 17.7261H19.373C20.209 17.7261 20.8887 17.0464 20.8887 16.2095V6.6792C20.8887 5.84326 20.209 5.16357 19.373 5.16357ZM19.6895 16.2095C19.6895 16.3843 19.5469 16.5269 19.373 16.5269H11.5C11.3408 16.5269 11.1895 16.5894 11.0762 16.7017L8.08691 19.6802V17.1265C8.08691 16.7954 7.81836 16.5269 7.4873 16.5269H5.62695C5.45312 16.5269 5.31055 16.3843 5.31055 16.2095V6.6792C5.31055 6.50537 5.45312 6.36279 5.62695 6.36279H19.373C19.5469 6.36279 19.6895 6.50537 19.6895 6.6792V16.2095ZM10.3431 8.45264C9.46326 8.45264 8.75 9.16589 8.75 10.0458C8.75 10.9257 9.46326 11.639 10.3431 11.639C10.4775 11.639 10.6058 11.6173 10.7305 11.5861V11.6195C10.7305 12.1322 10.3135 12.5492 9.75586 12.5492C9.4248 12.5492 9.17871 12.8177 9.17871 13.1488C9.17871 13.4799 9.46973 13.7484 9.80078 13.7484C10.9746 13.7484 11.9297 12.7933 11.9297 11.6195V10.1176L11.9294 10.1165L11.9292 10.1155C11.9297 10.1049 11.9312 10.0946 11.9326 10.0843L11.9326 10.0843C11.9345 10.0716 11.9363 10.059 11.9363 10.0458C11.9363 9.16589 11.223 8.45264 10.3431 8.45264ZM13.0637 10.0458C13.0637 9.16589 13.7771 8.45264 14.657 8.45264C15.5369 8.45264 16.2501 9.16589 16.2501 10.0458C16.2501 10.0584 16.2484 10.0706 16.2466 10.0828C16.2452 10.0929 16.2437 10.103 16.2433 10.1134C16.2433 10.1149 16.2441 10.1161 16.2441 10.1176V11.6195C16.2441 12.7933 15.2891 13.7484 14.1152 13.7484C13.7842 13.7484 13.4922 13.4799 13.4922 13.1488C13.4922 12.8177 13.7383 12.5492 14.0693 12.5492C14.6279 12.5492 15.0449 12.1322 15.0449 11.6195V11.5858C14.9202 11.6173 14.7915 11.639 14.657 11.639C13.7771 11.639 13.0637 10.9257 13.0637 10.0458Z"/></svg>',
}, },
{ {
name: 'unordered-list', name: 'unordered-project',
action: EasyMDE.toggleUnorderedList, action: EasyMDE.toggleUnorderedProject,
title: i18n.global.t('input.editor.unorderedList'), title: i18n.global.t('input.editor.unorderedProject'),
icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M6.5281 3.7002H3.5281C3.1981 3.7002 2.9281 3.9702 2.9281 4.3002V7.3002C2.9281 7.6302 3.1981 7.9002 3.5281 7.9002H6.5281C6.8581 7.9002 7.1281 7.6302 7.1281 7.3002V4.3002C7.1281 3.9702 6.8581 3.7002 6.5281 3.7002ZM5.9281 6.7002H4.1281V4.9002H5.9281V6.7002ZM3.5281 9.90015H6.5281C6.8581 9.90015 7.1281 10.1701 7.1281 10.5001V13.5001C7.1281 13.8301 6.8581 14.1001 6.5281 14.1001H3.5281C3.1981 14.1001 2.9281 13.8301 2.9281 13.5001V10.5001C2.9281 10.1701 3.1981 9.90015 3.5281 9.90015ZM4.1281 12.9001H5.9281V11.1001H4.1281V12.9001ZM3.5281 16.1001H6.5281C6.8581 16.1001 7.1281 16.3701 7.1281 16.7001V19.7001C7.1281 20.0301 6.8581 20.3001 6.5281 20.3001H3.5281C3.1981 20.3001 2.9281 20.0301 2.9281 19.7001V16.7001C2.9281 16.3701 3.1981 16.1001 3.5281 16.1001ZM4.1281 19.1001H5.9281V17.3001H4.1281V19.1001ZM9.72817 6.4002H20.7282C21.0582 6.4002 21.3282 6.1302 21.3282 5.8002C21.3282 5.4702 21.0582 5.2002 20.7282 5.2002H9.72817C9.39817 5.2002 9.12817 5.4702 9.12817 5.8002C9.12817 6.1302 9.39817 6.4002 9.72817 6.4002ZM9.72817 11.4001H20.7282C21.0582 11.4001 21.3282 11.6701 21.3282 12.0001C21.3282 12.3301 21.0582 12.6001 20.7282 12.6001H9.72817C9.39817 12.6001 9.12817 12.3301 9.12817 12.0001C9.12817 11.6701 9.39817 11.4001 9.72817 11.4001ZM9.72817 17.6001H20.7282C21.0582 17.6001 21.3282 17.8701 21.3282 18.2001C21.3282 18.5301 21.0582 18.8001 20.7282 18.8001H9.72817C9.39817 18.8001 9.12817 18.5301 9.12817 18.2001C9.12817 17.8701 9.39817 17.6001 9.72817 17.6001Z"/></svg>', icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M6.5281 3.7002H3.5281C3.1981 3.7002 2.9281 3.9702 2.9281 4.3002V7.3002C2.9281 7.6302 3.1981 7.9002 3.5281 7.9002H6.5281C6.8581 7.9002 7.1281 7.6302 7.1281 7.3002V4.3002C7.1281 3.9702 6.8581 3.7002 6.5281 3.7002ZM5.9281 6.7002H4.1281V4.9002H5.9281V6.7002ZM3.5281 9.90015H6.5281C6.8581 9.90015 7.1281 10.1701 7.1281 10.5001V13.5001C7.1281 13.8301 6.8581 14.1001 6.5281 14.1001H3.5281C3.1981 14.1001 2.9281 13.8301 2.9281 13.5001V10.5001C2.9281 10.1701 3.1981 9.90015 3.5281 9.90015ZM4.1281 12.9001H5.9281V11.1001H4.1281V12.9001ZM3.5281 16.1001H6.5281C6.8581 16.1001 7.1281 16.3701 7.1281 16.7001V19.7001C7.1281 20.0301 6.8581 20.3001 6.5281 20.3001H3.5281C3.1981 20.3001 2.9281 20.0301 2.9281 19.7001V16.7001C2.9281 16.3701 3.1981 16.1001 3.5281 16.1001ZM4.1281 19.1001H5.9281V17.3001H4.1281V19.1001ZM9.72817 6.4002H20.7282C21.0582 6.4002 21.3282 6.1302 21.3282 5.8002C21.3282 5.4702 21.0582 5.2002 20.7282 5.2002H9.72817C9.39817 5.2002 9.12817 5.4702 9.12817 5.8002C9.12817 6.1302 9.39817 6.4002 9.72817 6.4002ZM9.72817 11.4001H20.7282C21.0582 11.4001 21.3282 11.6701 21.3282 12.0001C21.3282 12.3301 21.0582 12.6001 20.7282 12.6001H9.72817C9.39817 12.6001 9.12817 12.3301 9.12817 12.0001C9.12817 11.6701 9.39817 11.4001 9.72817 11.4001ZM9.72817 17.6001H20.7282C21.0582 17.6001 21.3282 17.8701 21.3282 18.2001C21.3282 18.5301 21.0582 18.8001 20.7282 18.8001H9.72817C9.39817 18.8001 9.12817 18.5301 9.12817 18.2001C9.12817 17.8701 9.39817 17.6001 9.72817 17.6001Z"/></svg>',
}, },
{ {
name: 'ordered-list', name: 'ordered-project',
action: EasyMDE.toggleOrderedList, action: EasyMDE.toggleOrderedProject,
title: i18n.global.t('input.editor.orderedList'), title: i18n.global.t('input.editor.orderedProject'),
icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M4.19494 8.29994H5.99494C6.26494 8.29994 6.49494 8.07995 6.49494 7.79994C6.49494 7.51995 6.27494 7.29994 5.99494 7.29994H5.59494V3.79994C5.59494 3.62994 5.50494 3.46994 5.36494 3.37994C5.22494 3.28994 5.04494 3.26994 4.89494 3.33994L3.89494 3.76994C3.64494 3.87994 3.52494 4.17994 3.63494 4.42994C3.74494 4.67994 4.03494 4.79994 4.29494 4.68994L4.59494 4.55994V7.29994H4.19494C3.91494 7.29994 3.69494 7.51995 3.69494 7.79994C3.69494 8.07995 3.91494 8.29994 4.19494 8.29994ZM20.195 6.39995H9.19497C8.86497 6.39995 8.59497 6.12995 8.59497 5.79995C8.59497 5.46995 8.86497 5.19995 9.19497 5.19995H20.195C20.525 5.19995 20.795 5.46995 20.795 5.79995C20.795 6.12995 20.525 6.39995 20.195 6.39995ZM3.78486 14.36H6.37486C6.65486 14.36 6.87486 14.14 6.87486 13.86C6.87486 13.58 6.65486 13.36 6.37486 13.36H4.88486C5.00486 13.23 5.12486 13.09 5.23486 12.95C5.26626 12.9151 5.29645 12.8802 5.32626 12.8458L5.32629 12.8457C5.38192 12.7814 5.43627 12.7186 5.49486 12.66C5.73486 12.4 5.98486 12.12 6.17486 11.79C6.47486 11.25 6.41486 10.63 6.01486 10.17C5.57486 9.66 4.86486 9.5 4.24486 9.74C3.74486 9.95 3.39486 10.35 3.22486 10.91C3.14486 11.18 3.29486 11.46 3.56486 11.54C3.82486 11.61 4.10486 11.46 4.18486 11.2C4.29486 10.85 4.48486 10.73 4.62486 10.67C4.88486 10.57 5.13486 10.68 5.26486 10.82C5.38486 10.96 5.40486 11.12 5.30486 11.29C5.17595 11.5202 4.99618 11.7165 4.80458 11.9257L4.75486 11.98C4.67298 12.0801 4.58283 12.1801 4.49946 12.2727L4.49945 12.2727L4.47486 12.3C4.12486 12.72 3.76486 13.13 3.40486 13.53C3.27486 13.68 3.23486 13.9 3.32486 14.07C3.41486 14.24 3.58486 14.36 3.78486 14.36ZM3.68486 20.3699C4.04486 20.5899 4.46486 20.6999 4.87486 20.6999C5.13486 20.6999 5.38486 20.6499 5.61486 20.5499C6.31486 20.2799 6.73486 19.5599 6.60486 18.8799C6.53486 18.5499 6.35486 18.2899 6.12486 18.0899C6.32486 17.8999 6.45486 17.6499 6.50486 17.3799C6.57486 17.0099 6.49486 16.6299 6.27486 16.3099C5.85486 15.6899 5.07486 15.5199 4.10486 15.8299C3.83486 15.9199 3.69486 16.1999 3.77486 16.4599C3.86486 16.7299 4.14486 16.8699 4.40486 16.7899C4.70486 16.6999 5.24486 16.5799 5.45486 16.8899C5.51486 16.9899 5.54486 17.0999 5.52486 17.1999C5.51486 17.2699 5.47486 17.3599 5.36486 17.4299C5.26486 17.4999 5.12486 17.5399 4.95486 17.5799L4.77486 17.6299C4.54486 17.6999 4.40486 17.9099 4.41486 18.1499C4.42486 18.3899 4.61486 18.5799 4.84486 18.6099C5.20486 18.6599 5.58486 18.8299 5.63486 19.0799C5.67486 19.2999 5.46486 19.5499 5.25486 19.6299C4.94486 19.7599 4.52486 19.7099 4.21486 19.5199C3.97486 19.3699 3.67486 19.4399 3.52486 19.6799C3.37486 19.9199 3.44486 20.2299 3.68486 20.3699ZM20.195 18.7999H9.19497C8.86497 18.7999 8.59497 18.5299 8.59497 18.1999C8.59497 17.8699 8.86497 17.5999 9.19497 17.5999H20.195C20.525 17.5999 20.795 17.8699 20.795 18.1999C20.795 18.5299 20.525 18.7999 20.195 18.7999ZM9.19497 12.5999H20.195C20.525 12.5999 20.795 12.3299 20.795 11.9999C20.795 11.6699 20.525 11.3999 20.195 11.3999H9.19497C8.86497 11.3999 8.59497 11.6699 8.59497 11.9999C8.59497 12.3299 8.86497 12.5999 9.19497 12.5999Z"/></svg>', icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M4.19494 8.29994H5.99494C6.26494 8.29994 6.49494 8.07995 6.49494 7.79994C6.49494 7.51995 6.27494 7.29994 5.99494 7.29994H5.59494V3.79994C5.59494 3.62994 5.50494 3.46994 5.36494 3.37994C5.22494 3.28994 5.04494 3.26994 4.89494 3.33994L3.89494 3.76994C3.64494 3.87994 3.52494 4.17994 3.63494 4.42994C3.74494 4.67994 4.03494 4.79994 4.29494 4.68994L4.59494 4.55994V7.29994H4.19494C3.91494 7.29994 3.69494 7.51995 3.69494 7.79994C3.69494 8.07995 3.91494 8.29994 4.19494 8.29994ZM20.195 6.39995H9.19497C8.86497 6.39995 8.59497 6.12995 8.59497 5.79995C8.59497 5.46995 8.86497 5.19995 9.19497 5.19995H20.195C20.525 5.19995 20.795 5.46995 20.795 5.79995C20.795 6.12995 20.525 6.39995 20.195 6.39995ZM3.78486 14.36H6.37486C6.65486 14.36 6.87486 14.14 6.87486 13.86C6.87486 13.58 6.65486 13.36 6.37486 13.36H4.88486C5.00486 13.23 5.12486 13.09 5.23486 12.95C5.26626 12.9151 5.29645 12.8802 5.32626 12.8458L5.32629 12.8457C5.38192 12.7814 5.43627 12.7186 5.49486 12.66C5.73486 12.4 5.98486 12.12 6.17486 11.79C6.47486 11.25 6.41486 10.63 6.01486 10.17C5.57486 9.66 4.86486 9.5 4.24486 9.74C3.74486 9.95 3.39486 10.35 3.22486 10.91C3.14486 11.18 3.29486 11.46 3.56486 11.54C3.82486 11.61 4.10486 11.46 4.18486 11.2C4.29486 10.85 4.48486 10.73 4.62486 10.67C4.88486 10.57 5.13486 10.68 5.26486 10.82C5.38486 10.96 5.40486 11.12 5.30486 11.29C5.17595 11.5202 4.99618 11.7165 4.80458 11.9257L4.75486 11.98C4.67298 12.0801 4.58283 12.1801 4.49946 12.2727L4.49945 12.2727L4.47486 12.3C4.12486 12.72 3.76486 13.13 3.40486 13.53C3.27486 13.68 3.23486 13.9 3.32486 14.07C3.41486 14.24 3.58486 14.36 3.78486 14.36ZM3.68486 20.3699C4.04486 20.5899 4.46486 20.6999 4.87486 20.6999C5.13486 20.6999 5.38486 20.6499 5.61486 20.5499C6.31486 20.2799 6.73486 19.5599 6.60486 18.8799C6.53486 18.5499 6.35486 18.2899 6.12486 18.0899C6.32486 17.8999 6.45486 17.6499 6.50486 17.3799C6.57486 17.0099 6.49486 16.6299 6.27486 16.3099C5.85486 15.6899 5.07486 15.5199 4.10486 15.8299C3.83486 15.9199 3.69486 16.1999 3.77486 16.4599C3.86486 16.7299 4.14486 16.8699 4.40486 16.7899C4.70486 16.6999 5.24486 16.5799 5.45486 16.8899C5.51486 16.9899 5.54486 17.0999 5.52486 17.1999C5.51486 17.2699 5.47486 17.3599 5.36486 17.4299C5.26486 17.4999 5.12486 17.5399 4.95486 17.5799L4.77486 17.6299C4.54486 17.6999 4.40486 17.9099 4.41486 18.1499C4.42486 18.3899 4.61486 18.5799 4.84486 18.6099C5.20486 18.6599 5.58486 18.8299 5.63486 19.0799C5.67486 19.2999 5.46486 19.5499 5.25486 19.6299C4.94486 19.7599 4.52486 19.7099 4.21486 19.5199C3.97486 19.3699 3.67486 19.4399 3.52486 19.6799C3.37486 19.9199 3.44486 20.2299 3.68486 20.3699ZM20.195 18.7999H9.19497C8.86497 18.7999 8.59497 18.5299 8.59497 18.1999C8.59497 17.8699 8.86497 17.5999 9.19497 17.5999H20.195C20.525 17.5999 20.795 17.8699 20.795 18.1999C20.795 18.5299 20.525 18.7999 20.195 18.7999ZM9.19497 12.5999H20.195C20.525 12.5999 20.795 12.3299 20.795 11.9999C20.795 11.6699 20.525 11.3999 20.195 11.3999H9.19497C8.86497 11.3999 8.59497 11.6699 8.59497 11.9999C8.59497 12.3299 8.86497 12.5999 9.19497 12.5999Z"/></svg>',
}, },
'|', '|',

199
src/components/list/ListWrapper.vue
View File

@ -1,199 +0,0 @@
<template>
<div
:class="{ 'is-loading': listService.loading, 'is-archived': currentList.isArchived}"
class="loader-container"
>
<div class="switch-view-container">
<div class="switch-view">
<BaseButton
v-shortcut="'g l'"
:title="$t('keyboardShortcuts.list.switchToListView')"
class="switch-view-button"
:class="{'is-active': viewName === 'list'}"
:to="{ name: 'list.list', params: { listId } }"
>
{{ $t('list.list.title') }}
</BaseButton>
<BaseButton
v-shortcut="'g g'"
:title="$t('keyboardShortcuts.list.switchToGanttView')"
class="switch-view-button"
:class="{'is-active': viewName === 'gantt'}"
:to="{ name: 'list.gantt', params: { listId } }"
>
{{ $t('list.gantt.title') }}
</BaseButton>
<BaseButton
v-shortcut="'g t'"
:title="$t('keyboardShortcuts.list.switchToTableView')"
class="switch-view-button"
:class="{'is-active': viewName === 'table'}"
:to="{ name: 'list.table', params: { listId } }"
>
{{ $t('list.table.title') }}
</BaseButton>
<BaseButton
v-shortcut="'g k'"
:title="$t('keyboardShortcuts.list.switchToKanbanView')"
class="switch-view-button"
:class="{'is-active': viewName === 'kanban'}"
:to="{ name: 'list.kanban', params: { listId } }"
>
{{ $t('list.kanban.title') }}
</BaseButton>
</div>
<slot name="header" />
</div>
<transition name="fade">
<Message variant="warning" v-if="currentList.isArchived" class="mb-4">
{{ $t('list.archived') }}
</Message>
</transition>
<slot v-if="loadedListId"/>
</div>
</template>
<script setup lang="ts">
import {ref, computed, watch} from 'vue'
import {useRoute} from 'vue-router'
import BaseButton from '@/components/base/BaseButton.vue'
import Message from '@/components/misc/message.vue'
import ListModel from '@/models/list'
import ListService from '@/services/list'
import {getListTitle} from '@/helpers/getListTitle'
import {saveListToHistory} from '@/modules/listHistory'
import {useTitle} from '@/composables/useTitle'
import {useBaseStore} from '@/stores/base'
import {useListStore} from '@/stores/lists'
const props = defineProps({
listId: {
type: Number,
required: true,
},
viewName: {
type: String,
required: true,
},
})
const route = useRoute()
const baseStore = useBaseStore()
const listStore = useListStore()
const listService = ref(new ListService())
const loadedListId = ref(0)
const currentList = computed(() => {
return typeof baseStore.currentList === 'undefined' ? {
id: 0,
title: '',
isArchived: false,
maxRight: null,
} : baseStore.currentList
})
useTitle(() => currentList.value.id ? getListTitle(currentList.value) : '')
// watchEffect would be called every time the prop would get a value assigned, even if that value was the same as before.
// This resulted in loading and setting the list multiple times, even when navigating away from it.
// This caused wired bugs where the list background would be set on the home page but only right after setting a new
// list background and then navigating to home. It also highlighted the list in the menu and didn't allow changing any
// of it, most likely due to the rights not being properly populated.
watch(
() => props.listId,
// loadList
async (listIdToLoad: number) => {
const listData = {id: listIdToLoad}
saveListToHistory(listData)
// Don't load the list if we either already loaded it or aren't dealing with a list at all currently and
// the currently loaded list has the right set.
if (
(
listIdToLoad === loadedListId.value ||
typeof listIdToLoad === 'undefined' ||
listIdToLoad === currentList.value.id
)
&& typeof currentList.value !== 'undefined' && currentList.value.maxRight !== null
) {
loadedListId.value = props.listId
return
}
console.debug(`Loading list, props.viewName = ${props.viewName}, $route.params =`, route.params, `, loadedListId = ${loadedListId.value}, currentList = `, currentList.value)
// Set the current list to the one we're about to load so that the title is already shown at the top
loadedListId.value = 0
const listFromStore = listStore.getListById(listData.id)
if (listFromStore !== null) {
baseStore.setBackground(null)
baseStore.setBlurHash(null)
baseStore.handleSetCurrentList({list: listFromStore})
}
// We create an extra list object instead of creating it in list.value because that would trigger a ui update which would result in bad ux.
const list = new ListModel(listData)
try {
const loadedList = await listService.value.get(list)
await baseStore.handleSetCurrentList({list: loadedList})
} finally {
loadedListId.value = props.listId
}
},
{immediate: true},
)
</script>
<style lang="scss" scoped>
.switch-view-container {
@media screen and (max-width: $tablet) {
display: flex;
justify-content: center;
flex-direction: column;
}
}
.switch-view {
background: var(--white);
display: inline-flex;
border-radius: $radius;
font-size: .75rem;
box-shadow: var(--shadow-sm);
height: $switch-view-height;
margin: 0 auto 1rem;
padding: .5rem;
}
.switch-view-button {
padding: .25rem .5rem;
display: block;
border-radius: $radius;
transition: all 100ms;
&:not(:last-child) {
margin-right: .5rem;
}
&:hover {
color: var(--switch-view-color);
background: var(--primary);
}
&.is-active {
color: var(--switch-view-color);
background: var(--primary);
font-weight: bold;
box-shadow: var(--shadow-xs);
}
}
// FIXME: this should be in notification and set via a prop
.is-archived .notification.is-warning {
margin-bottom: 1rem;
}
</style>

4
src/components/misc/keyboard-shortcuts/index.vue
View File

@ -16,7 +16,7 @@
}} }}
</message> </message>
<dl class="shortcut-list"> <dl class="shortcut-project">
<template v-for="(sc, si) in s.shortcuts" :key="si"> <template v-for="(sc, si) in s.shortcuts" :key="si">
<dt class="shortcut-title">{{ $t(sc.title) }}</dt> <dt class="shortcut-title">{{ $t(sc.title) }}</dt>
<shortcut <shortcut
@ -58,7 +58,7 @@ function close() {
padding: .75rem; padding: .75rem;
} }
.shortcut-list { .shortcut-project {
display: grid; display: grid;
grid-template-columns: 2fr 1fr; grid-template-columns: 2fr 1fr;
} }

16
src/components/misc/keyboard-shortcuts/shortcuts.ts
View File

@ -61,8 +61,8 @@ export const KEYBOARD_SHORTCUTS : ShortcutGroup[] = [
], ],
}, },
{ {
title: 'list.kanban.title', title: 'project.kanban.title',
available: (route) => route.name === 'list.kanban', available: (route) => route.name === 'project.kanban',
shortcuts: [ shortcuts: [
{ {
title: 'keyboardShortcuts.task.done', title: 'keyboardShortcuts.task.done',
@ -71,26 +71,26 @@ export const KEYBOARD_SHORTCUTS : ShortcutGroup[] = [
], ],
}, },
{ {
title: 'keyboardShortcuts.list.title', title: 'keyboardShortcuts.project.title',
available: (route) => (route.name as string)?.startsWith('list.'), available: (route) => (route.name as string)?.startsWith('project.'),
shortcuts: [ shortcuts: [
{ {
title: 'keyboardShortcuts.list.switchToListView', title: 'keyboardShortcuts.project.switchToProjectView',
keys: ['g', 'l'], keys: ['g', 'l'],
combination: 'then', combination: 'then',
}, },
{ {
title: 'keyboardShortcuts.list.switchToGanttView', title: 'keyboardShortcuts.project.switchToGanttView',
keys: ['g', 'g'], keys: ['g', 'g'],
combination: 'then', combination: 'then',
}, },
{ {
title: 'keyboardShortcuts.list.switchToTableView', title: 'keyboardShortcuts.project.switchToTableView',
keys: ['g', 't'], keys: ['g', 't'],
combination: 'then', combination: 'then',
}, },
{ {
title: 'keyboardShortcuts.list.switchToKanbanView', title: 'keyboardShortcuts.project.switchToKanbanView',
keys: ['g', 'k'], keys: ['g', 'k'],
combination: 'then', combination: 'then',
}, },

2
src/components/misc/pagination.vue
View File

@ -17,7 +17,7 @@
class="pagination-next"> class="pagination-next">
{{ $t('misc.next') }} {{ $t('misc.next') }}
</router-link> </router-link>
<ul class="pagination-list"> <ul class="pagination-project">
<li :key="`page-${i}`" v-for="(p, i) in pages"> <li :key="`page-${i}`" v-for="(p, i) in pages">
<span class="pagination-ellipsis" v-if="p.isEllipsis">&hellip;</span> <span class="pagination-ellipsis" v-if="p.isEllipsis">&hellip;</span>
<router-link <router-link

22
src/components/misc/subscription.vue
View File

@ -73,14 +73,14 @@ const {t} = useI18n({useScope: 'global'})
const tooltipText = computed(() => { const tooltipText = computed(() => {
if (disabled.value) { if (disabled.value) {
if (props.entity === 'list' && subscriptionEntity.value === 'namespace') { if (props.entity === 'project' && subscriptionEntity.value === 'namespace') {
return t('task.subscription.subscribedListThroughParentNamespace') return t('task.subscription.subscribedProjectThroughParentNamespace')
} }
if (props.entity === 'task' && subscriptionEntity.value === 'namespace') { if (props.entity === 'task' && subscriptionEntity.value === 'namespace') {
return t('task.subscription.subscribedTaskThroughParentNamespace') return t('task.subscription.subscribedTaskThroughParentNamespace')
} }
if (props.entity === 'task' && subscriptionEntity.value === 'list') { if (props.entity === 'task' && subscriptionEntity.value === 'project') {
return t('task.subscription.subscribedTaskThroughParentList') return t('task.subscription.subscribedTaskThroughParentProject')
} }
return '' return ''
@ -91,10 +91,10 @@ const tooltipText = computed(() => {
return props.modelValue !== null ? return props.modelValue !== null ?
t('task.subscription.subscribedNamespace') : t('task.subscription.subscribedNamespace') :
t('task.subscription.notSubscribedNamespace') t('task.subscription.notSubscribedNamespace')
case 'list': case 'project':
return props.modelValue !== null ? return props.modelValue !== null ?
t('task.subscription.subscribedList') : t('task.subscription.subscribedProject') :
t('task.subscription.notSubscribedList') t('task.subscription.notSubscribedProject')
case 'task': case 'task':
return props.modelValue !== null ? return props.modelValue !== null ?
t('task.subscription.subscribedTask') : t('task.subscription.subscribedTask') :
@ -133,8 +133,8 @@ async function subscribe() {
case 'namespace': case 'namespace':
message = t('task.subscription.subscribeSuccessNamespace') message = t('task.subscription.subscribeSuccessNamespace')
break break
case 'list': case 'project':
message = t('task.subscription.subscribeSuccessList') message = t('task.subscription.subscribeSuccessProject')
break break
case 'task': case 'task':
message = t('task.subscription.subscribeSuccessTask') message = t('task.subscription.subscribeSuccessTask')
@ -156,8 +156,8 @@ async function unsubscribe() {
case 'namespace': case 'namespace':
message = t('task.subscription.unsubscribeSuccessNamespace') message = t('task.subscription.unsubscribeSuccessNamespace')
break break
case 'list': case 'project':
message = t('task.subscription.unsubscribeSuccessList') message = t('task.subscription.unsubscribeSuccessProject')
break break
case 'task': case 'task':
message = t('task.subscription.unsubscribeSuccessTask') message = t('task.subscription.unsubscribeSuccessTask')

4
src/components/namespace/namespace-settings-dropdown.vue
View File

@ -22,10 +22,10 @@
{{ $t('menu.share') }} {{ $t('menu.share') }}
</dropdown-item> </dropdown-item>
<dropdown-item <dropdown-item
:to="{ name: 'list.create', params: { namespaceId: namespace.id } }" :to="{ name: 'project.create', params: { namespaceId: namespace.id } }"
icon="plus" icon="plus"
> >
{{ $t('menu.newList') }} {{ $t('menu.newProject') }}
</dropdown-item> </dropdown-item>
<dropdown-item <dropdown-item
:to="{ name: 'namespace.settings.archive', params: { id: namespace.id } }" :to="{ name: 'namespace.settings.archive', params: { id: namespace.id } }"

8
src/components/notifications/notifications.vue
View File

@ -8,7 +8,7 @@
</div> </div>
<transition name="fade"> <transition name="fade">
<div class="notifications-list" v-if="showNotifications" ref="popup"> <div class="notifications-project" v-if="showNotifications" ref="popup">
<span class="head">{{ $t('notification.title') }}</span> <span class="head">{{ $t('notification.title') }}</span>
<div <div
v-for="(n, index) in notifications" v-for="(n, index) in notifications"
@ -116,9 +116,9 @@ function to(n, index) {
case names.TASK_DELETED: case names.TASK_DELETED:
// Nothing // Nothing
break break
case names.LIST_CREATED: case names.PROJECT_CREATED:
to.name = 'task.index' to.name = 'task.index'
to.params.listId = n.notification.list.id to.params.projectId = n.notification.project.id
break break
case names.TEAM_MEMBER_ADDED: case names.TEAM_MEMBER_ADDED:
to.name = 'teams.edit' to.name = 'teams.edit'
@ -154,7 +154,7 @@ function to(n, index) {
border: 2px solid var(--white); border: 2px solid var(--white);
} }
.notifications-list { .notifications-project {
position: fixed; position: fixed;
right: 1rem; right: 1rem;
margin-top: 1rem; margin-top: 1rem;

199
src/components/project/ProjectWrapper.vue Normal file
View File

@ -0,0 +1,199 @@
<template>
<div
:class="{ 'is-loading': projectService.loading, 'is-archived': currentProject.isArchived}"
class="loader-container"
>
<div class="switch-view-container">
<div class="switch-view">
<BaseButton
v-shortcut="'g l'"
:title="$t('keyboardShortcuts.project.switchToProjectView')"
class="switch-view-button"
:class="{'is-active': viewName === 'project'}"
:to="{ name: 'project.project', params: { projectId } }"
>
{{ $t('project.project.title') }}
</BaseButton>
<BaseButton
v-shortcut="'g g'"
:title="$t('keyboardShortcuts.project.switchToGanttView')"
class="switch-view-button"
:class="{'is-active': viewName === 'gantt'}"
:to="{ name: 'project.gantt', params: { projectId } }"
>
{{ $t('project.gantt.title') }}
</BaseButton>
<BaseButton
v-shortcut="'g t'"
:title="$t('keyboardShortcuts.project.switchToTableView')"
class="switch-view-button"
:class="{'is-active': viewName === 'table'}"
:to="{ name: 'project.table', params: { projectId } }"
>
{{ $t('project.table.title') }}
</BaseButton>
<BaseButton
v-shortcut="'g k'"
:title="$t('keyboardShortcuts.project.switchToKanbanView')"
class="switch-view-button"
:class="{'is-active': viewName === 'kanban'}"
:to="{ name: 'project.kanban', params: { projectId } }"
>
{{ $t('project.kanban.title') }}
</BaseButton>
</div>
<slot name="header" />
</div>
<transition name="fade">
<Message variant="warning" v-if="currentProject.isArchived" class="mb-4">
{{ $t('project.archived') }}
</Message>
</transition>
<slot v-if="loadedProjectId"/>
</div>
</template>
<script setup lang="ts">
import {ref, computed, watch} from 'vue'
import {useRoute} from 'vue-router'
import BaseButton from '@/components/base/BaseButton.vue'
import Message from '@/components/misc/message.vue'
import ProjectModel from '@/models/project'
import ProjectService from '@/services/project'
import {getProjectTitle} from '@/helpers/getProjectTitle'
import {saveProjectToHistory} from '@/modules/projectHistory'
import {useTitle} from '@/composables/useTitle'
import {useBaseStore} from '@/stores/base'
import {useProjectStore} from '@/stores/projects'
const props = defineProps({
projectId: {
type: Number,
required: true,
},
viewName: {
type: String,
required: true,
},
})
const route = useRoute()
const baseStore = useBaseStore()
const projectStore = useProjectStore()
const projectService = ref(new ProjectService())
const loadedProjectId = ref(0)
const currentProject = computed(() => {
return typeof baseStore.currentProject === 'undefined' ? {
id: 0,
title: '',
isArchived: false,
maxRight: null,
} : baseStore.currentProject
})
useTitle(() => currentProject.value.id ? getProjectTitle(currentProject.value) : '')
// watchEffect would be called every time the prop would get a value assigned, even if that value was the same as before.
// This resulted in loading and setting the project multiple times, even when navigating away from it.
// This caused wired bugs where the project background would be set on the home page but only right after setting a new
// project background and then navigating to home. It also highlighted the project in the menu and didn't allow changing any
// of it, most likely due to the rights not being properly populated.
watch(
() => props.projectId,
// loadProject
async (projectIdToLoad: number) => {
const projectData = {id: projectIdToLoad}
saveProjectToHistory(projectData)
// Don't load the project if we either already loaded it or aren't dealing with a project at all currently and
// the currently loaded project has the right set.
if (
(
projectIdToLoad === loadedProjectId.value ||
typeof projectIdToLoad === 'undefined' ||
projectIdToLoad === currentProject.value.id
)
&& typeof currentProject.value !== 'undefined' && currentProject.value.maxRight !== null
) {
loadedProjectId.value = props.projectId
return
}
console.debug(`Loading project, props.viewName = ${props.viewName}, $route.params =`, route.params, `, loadedProjectId = ${loadedProjectId.value}, currentProject = `, currentProject.value)
// Set the current project to the one we're about to load so that the title is already shown at the top
loadedProjectId.value = 0
const projectFromStore = projectStore.getProjectById(projectData.id)
if (projectFromStore !== null) {
baseStore.setBackground(null)
baseStore.setBlurHash(null)
baseStore.handleSetCurrentProject({project: projectFromStore})
}
// We create an extra project object instead of creating it in project.value because that would trigger a ui update which would result in bad ux.
const project = new ProjectModel(projectData)
try {
const loadedProject = await projectService.value.get(project)
await baseStore.handleSetCurrentProject({project: loadedProject})
} finally {
loadedProjectId.value = props.projectId
}
},
{immediate: true},
)
</script>
<style lang="scss" scoped>
.switch-view-container {
@media screen and (max-width: $tablet) {
display: flex;
justify-content: center;
flex-direction: column;
}
}
.switch-view {
background: var(--white);
display: inline-flex;
border-radius: $radius;
font-size: .75rem;
box-shadow: var(--shadow-sm);
height: $switch-view-height;
margin: 0 auto 1rem;
padding: .5rem;
}
.switch-view-button {
padding: .25rem .5rem;
display: block;
border-radius: $radius;
transition: all 100ms;
&:not(:last-child) {
margin-right: .5rem;
}
&:hover {
color: var(--switch-view-color);
background: var(--primary);
}
&.is-active {
color: var(--switch-view-color);
background: var(--primary);
font-weight: bold;
box-shadow: var(--shadow-xs);
}
}
// FIXME: this should be in notification and set via a prop
.is-archived .notification.is-warning {
margin-bottom: 1rem;
}
</style>

2
src/components/list/partials/filter-popup.vue → src/components/project/partials/filter-popup.vue
View File

@ -32,7 +32,7 @@
<script setup lang="ts"> <script setup lang="ts">
import {computed, ref, watch} from 'vue' import {computed, ref, watch} from 'vue'
import Filters from '@/components/list/partials/filters.vue' import Filters from '@/components/project/partials/filters.vue'
import {getDefaultParams} from '@/composables/useTaskList' import {getDefaultParams} from '@/composables/useTaskList'

34
src/components/list/partials/filters.vue → src/components/project/partials/filters.vue
View File

@ -20,7 +20,7 @@
{{ $t('filters.attributes.showDoneTasks') }} {{ $t('filters.attributes.showDoneTasks') }}
</fancycheckbox> </fancycheckbox>
<fancycheckbox <fancycheckbox
v-if="!['list.kanban', 'list.table'].includes($route.name as string)" v-if="!['project.kanban', 'project.table'].includes($route.name as string)"
v-model="sortAlphabetically" v-model="sortAlphabetically"
@update:model-value="change()" @update:model-value="change()"
> >
@ -154,14 +154,14 @@
</div> </div>
<template <template
v-if="['filters.create', 'list.edit', 'filter.settings.edit'].includes($route.name as string)"> v-if="['filters.create', 'project.edit', 'filter.settings.edit'].includes($route.name as string)">
<div class="field"> <div class="field">
<label class="label">{{ $t('list.lists') }}</label> <label class="label">{{ $t('project.projects') }}</label>
<div class="control"> <div class="control">
<SelectList <SelectProject
v-model="entities.lists" v-model="entities.projects"
@select="changeMultiselectFilter('lists', 'list_id')" @select="changeMultiselectFilter('projects', 'project_id')"
@remove="changeMultiselectFilter('lists', 'list_id')" @remove="changeMultiselectFilter('projects', 'project_id')"
/> />
</div> </div>
</div> </div>
@ -190,7 +190,7 @@ import {camelCase} from 'camel-case'
import type {ILabel} from '@/modelTypes/ILabel' import type {ILabel} from '@/modelTypes/ILabel'
import type {IUser} from '@/modelTypes/IUser' import type {IUser} from '@/modelTypes/IUser'
import type {INamespace} from '@/modelTypes/INamespace' import type {INamespace} from '@/modelTypes/INamespace'
import type {IList} from '@/modelTypes/IList' import type {IProject} from '@/modelTypes/IProject'
import {useLabelStore} from '@/stores/labels' import {useLabelStore} from '@/stores/labels'
@ -200,7 +200,7 @@ import PercentDoneSelect from '@/components/tasks/partials/percentDoneSelect.vue
import EditLabels from '@/components/tasks/partials/editLabels.vue' import EditLabels from '@/components/tasks/partials/editLabels.vue'
import Fancycheckbox from '@/components/input/fancycheckbox.vue' import Fancycheckbox from '@/components/input/fancycheckbox.vue'
import SelectUser from '@/components/input/SelectUser.vue' import SelectUser from '@/components/input/SelectUser.vue'
import SelectList from '@/components/input/SelectList.vue' import SelectProject from '@/components/input/SelectProject.vue'
import SelectNamespace from '@/components/input/SelectNamespace.vue' import SelectNamespace from '@/components/input/SelectNamespace.vue'
import {parseDateOrString} from '@/helpers/time/parseDateOrString' import {parseDateOrString} from '@/helpers/time/parseDateOrString'
@ -208,13 +208,13 @@ import {dateIsValid, formatISO} from '@/helpers/time/formatDate'
import {objectToSnakeCase} from '@/helpers/case' import {objectToSnakeCase} from '@/helpers/case'
import UserService from '@/services/user' import UserService from '@/services/user'
import ListService from '@/services/list' import ProjectService from '@/services/project'
import NamespaceService from '@/services/namespace' import NamespaceService from '@/services/namespace'
// FIXME: do not use this here for now. instead create new version from DEFAULT_PARAMS // FIXME: do not use this here for now. instead create new version from DEFAULT_PARAMS
import {getDefaultParams} from '@/composables/useTaskList' import {getDefaultParams} from '@/composables/useTaskList'
// FIXME: merge with DEFAULT_PARAMS in taskList.js // FIXME: merge with DEFAULT_PARAMS in taskProject.js
const DEFAULT_PARAMS = { const DEFAULT_PARAMS = {
sort_by: [], sort_by: [],
order_by: [], order_by: [],
@ -239,7 +239,7 @@ const DEFAULT_FILTERS = {
reminders: '', reminders: '',
assignees: '', assignees: '',
labels: '', labels: '',
list_id: '', project_id: '',
namespace: '', namespace: '',
} as const } as const
@ -264,23 +264,23 @@ const filters = ref({...DEFAULT_FILTERS})
const services = { const services = {
users: shallowReactive(new UserService()), users: shallowReactive(new UserService()),
lists: shallowReactive(new ListService()), projects: shallowReactive(new ProjectService()),
namespace: shallowReactive(new NamespaceService()), namespace: shallowReactive(new NamespaceService()),
} }
interface Entities { interface Entities {
users: IUser[] users: IUser[]
labels: ILabel[] labels: ILabel[]
lists: IList[] projects: IProject[]
namespace: INamespace[] namespace: INamespace[]
} }
type EntityType = 'users' | 'labels' | 'lists' | 'namespace' type EntityType = 'users' | 'labels' | 'projects' | 'namespace'
const entities: Entities = reactive({ const entities: Entities = reactive({
users: [], users: [],
labels: [], labels: [],
lists: [], projects: [],
namespace: [], namespace: [],
}) })
@ -327,7 +327,7 @@ function prepareFilters() {
prepareSingleValue('percent_done', 'percentDone', 'usePercentDone', true) prepareSingleValue('percent_done', 'percentDone', 'usePercentDone', true)
prepareDate('reminders') prepareDate('reminders')
prepareRelatedObjectFilter('users', 'assignees') prepareRelatedObjectFilter('users', 'assignees')
prepareRelatedObjectFilter('lists', 'list_id') prepareRelatedObjectFilter('projects', 'project_id')
prepareRelatedObjectFilter('namespace') prepareRelatedObjectFilter('namespace')
prepareSingleValue('labels') prepareSingleValue('labels')

76
src/components/list/partials/list-card.vue → src/components/project/partials/project-card.vue
View File

@ -1,36 +1,36 @@
<template> <template>
<router-link <router-link
:class="{ :class="{
'has-light-text': !colorIsDark(list.hexColor) || background !== null, 'has-light-text': !colorIsDark(project.hexColor) || background !== null,
'has-background': blurHashUrl !== '' || background !== null, 'has-background': blurHashUrl !== '' || background !== null,
}" }"
:style="{ :style="{
'background-color': list.hexColor, 'background-color': project.hexColor,
'background-image': blurHashUrl !== null ? `url(${blurHashUrl})` : false, 'background-image': blurHashUrl !== null ? `url(${blurHashUrl})` : false,
}" }"
:to="{ name: 'list.index', params: { listId: list.id} }" :to="{ name: 'project.index', params: { projectId: project.id} }"
class="list-card" class="project-card"
v-if="list !== null && (showArchived ? true : !list.isArchived)" v-if="project !== null && (showArchived ? true : !project.isArchived)"
> >
<div <div
class="list-background background-fade-in" class="project-background background-fade-in"
:class="{'is-visible': background}" :class="{'is-visible': background}"
:style="{'background-image': background !== null ? `url(${background})` : undefined}" :style="{'background-image': background !== null ? `url(${background})` : undefined}"
/> />
<div class="list-content"> <div class="project-content">
<span class="is-archived" v-if="list.isArchived"> <span class="is-archived" v-if="project.isArchived">
{{ $t('namespace.archived') }} {{ $t('namespace.archived') }}
</span> </span>
<BaseButton <BaseButton
v-else v-else
:class="{'is-favorite': list.isFavorite}" :class="{'is-favorite': project.isFavorite}"
@click.stop="listStore.toggleListFavorite(list)" @click.stop="projectStore.toggleProjectFavorite(project)"
class="favorite" class="favorite"
> >
<icon :icon="list.isFavorite ? 'star' : ['far', 'star']"/> <icon :icon="project.isFavorite ? 'star' : ['far', 'star']"/>
</BaseButton> </BaseButton>
<div class="title">{{ list.title }}</div> <div class="title">{{ project.title }}</div>
</div> </div>
</router-link> </router-link>
</template> </template>
@ -38,22 +38,22 @@
<script lang="ts" setup> <script lang="ts" setup>
import {type PropType, ref, watch} from 'vue' import {type PropType, ref, watch} from 'vue'
import ListService from '@/services/list' import ProjectService from '@/services/project'
import {getBlobFromBlurHash} from '@/helpers/getBlobFromBlurHash' import {getBlobFromBlurHash} from '@/helpers/getBlobFromBlurHash'
import {colorIsDark} from '@/helpers/color/colorIsDark' import {colorIsDark} from '@/helpers/color/colorIsDark'
import BaseButton from '@/components/base/BaseButton.vue' import BaseButton from '@/components/base/BaseButton.vue'
import type {IList} from '@/modelTypes/IList' import type {IProject} from '@/modelTypes/IProject'
import {useListStore} from '@/stores/lists' import {useProjectStore} from '@/stores/projects'
const background = ref<string | null>(null) const background = ref<string | null>(null)
const backgroundLoading = ref(false) const backgroundLoading = ref(false)
const blurHashUrl = ref('') const blurHashUrl = ref('')
const props = defineProps({ const props = defineProps({
list: { project: {
type: Object as PropType<IList>, type: Object as PropType<IProject>,
required: true, required: true,
}, },
showArchived: { showArchived: {
@ -62,38 +62,38 @@ const props = defineProps({
}, },
}) })
watch(props.list, loadBackground, {immediate: true}) watch(props.project, loadBackground, {immediate: true})
async function loadBackground() { async function loadBackground() {
if (props.list === null || !props.list.backgroundInformation || backgroundLoading.value) { if (props.project === null || !props.project.backgroundInformation || backgroundLoading.value) {
return return
} }
const blurHash = await getBlobFromBlurHash(props.list.backgroundBlurHash) const blurHash = await getBlobFromBlurHash(props.project.backgroundBlurHash)
if (blurHash) { if (blurHash) {
blurHashUrl.value = window.URL.createObjectURL(blurHash) blurHashUrl.value = window.URL.createObjectURL(blurHash)
} }
backgroundLoading.value = true backgroundLoading.value = true
const listService = new ListService() const projectService = new ProjectService()
try { try {
background.value = await listService.background(props.list) background.value = await projectService.background(props.project)
} finally { } finally {
backgroundLoading.value = false backgroundLoading.value = false
} }
} }
const listStore = useListStore() const projectStore = useProjectStore()
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.list-card { .project-card {
cursor: pointer; cursor: pointer;
width: calc((100% - #{($lists-per-row - 1) * 1rem}) / #{$lists-per-row}); width: calc((100% - #{($projects-per-row - 1) * 1rem}) / #{$projects-per-row});
height: $list-height; height: $project-height;
background: var(--white); background: var(--white);
margin: 0 $list-spacing $list-spacing 0; margin: 0 $project-spacing $project-spacing 0;
border-radius: $radius; border-radius: $radius;
box-shadow: var(--shadow-sm); box-shadow: var(--shadow-sm);
transition: box-shadow $transition; transition: box-shadow $transition;
@ -105,7 +105,7 @@ const listStore = useListStore()
} }
&.has-background, &.has-background,
.list-background { .project-background {
background-size: cover; background-size: cover;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
@ -116,7 +116,7 @@ const listStore = useListStore()
color: var(--white); color: var(--white);
} }
.list-background { .project-background {
position: absolute; position: absolute;
top: 0; top: 0;
right: 0; right: 0;
@ -135,42 +135,42 @@ const listStore = useListStore()
} }
@media screen and (min-width: $widescreen) { @media screen and (min-width: $widescreen) {
&:nth-child(#{$lists-per-row}n) { &:nth-child(#{$projects-per-row}n) {
margin-right: 0; margin-right: 0;
} }
} }
@media screen and (max-width: $widescreen) and (min-width: $tablet) { @media screen and (max-width: $widescreen) and (min-width: $tablet) {
$lists-per-row: 3; $projects-per-row: 3;
& { & {
width: calc((100% - #{($lists-per-row - 1) * 1rem}) / #{$lists-per-row}); width: calc((100% - #{($projects-per-row - 1) * 1rem}) / #{$projects-per-row});
} }
&:nth-child(#{$lists-per-row}n) { &:nth-child(#{$projects-per-row}n) {
margin-right: 0; margin-right: 0;
} }
} }
@media screen and (max-width: $tablet) { @media screen and (max-width: $tablet) {
$lists-per-row: 2; $projects-per-row: 2;
& { & {
width: calc((100% - #{($lists-per-row - 1) * 1rem}) / #{$lists-per-row}); width: calc((100% - #{($projects-per-row - 1) * 1rem}) / #{$projects-per-row});
} }
&:nth-child(#{$lists-per-row}n) { &:nth-child(#{$projects-per-row}n) {
margin-right: 0; margin-right: 0;
} }
} }
@media screen and (max-width: $mobile) { @media screen and (max-width: $mobile) {
$lists-per-row: 1; $projects-per-row: 1;
& { & {
width: 100%; width: 100%;
margin-right: 0; margin-right: 0;
} }
} }
.list-content { .project-content {
display: flex; display: flex;
align-content: space-between; align-content: space-between;
flex-wrap: wrap; flex-wrap: wrap;

48
src/components/list/list-settings-dropdown.vue → src/components/project/project-settings-dropdown.vue
View File

@ -1,23 +1,23 @@
<template> <template>
<dropdown> <dropdown>
<template v-if="isSavedFilter(list)"> <template v-if="isSavedFilter(project)">
<dropdown-item <dropdown-item
:to="{ name: 'filter.settings.edit', params: { listId: list.id } }" :to="{ name: 'filter.settings.edit', params: { projectId: project.id } }"
icon="pen" icon="pen"
> >
{{ $t('menu.edit') }} {{ $t('menu.edit') }}
</dropdown-item> </dropdown-item>
<dropdown-item <dropdown-item
:to="{ name: 'filter.settings.delete', params: { listId: list.id } }" :to="{ name: 'filter.settings.delete', params: { projectId: project.id } }"
icon="trash-alt" icon="trash-alt"
> >
{{ $t('misc.delete') }} {{ $t('misc.delete') }}
</dropdown-item> </dropdown-item>
</template> </template>
<template v-else-if="list.isArchived"> <template v-else-if="project.isArchived">
<dropdown-item <dropdown-item
:to="{ name: 'list.settings.archive', params: { listId: list.id } }" :to="{ name: 'project.settings.archive', params: { projectId: project.id } }"
icon="archive" icon="archive"
> >
{{ $t('menu.unarchive') }} {{ $t('menu.unarchive') }}
@ -25,32 +25,32 @@
</template> </template>
<template v-else> <template v-else>
<dropdown-item <dropdown-item
:to="{ name: 'list.settings.edit', params: { listId: list.id } }" :to="{ name: 'project.settings.edit', params: { projectId: project.id } }"
icon="pen" icon="pen"
> >
{{ $t('menu.edit') }} {{ $t('menu.edit') }}
</dropdown-item> </dropdown-item>
<dropdown-item <dropdown-item
v-if="backgroundsEnabled" v-if="backgroundsEnabled"
:to="{ name: 'list.settings.background', params: { listId: list.id } }" :to="{ name: 'project.settings.background', params: { projectId: project.id } }"
icon="image" icon="image"
> >
{{ $t('menu.setBackground') }} {{ $t('menu.setBackground') }}
</dropdown-item> </dropdown-item>
<dropdown-item <dropdown-item
:to="{ name: 'list.settings.share', params: { listId: list.id } }" :to="{ name: 'project.settings.share', params: { projectId: project.id } }"
icon="share-alt" icon="share-alt"
> >
{{ $t('menu.share') }} {{ $t('menu.share') }}
</dropdown-item> </dropdown-item>
<dropdown-item <dropdown-item
:to="{ name: 'list.settings.duplicate', params: { listId: list.id } }" :to="{ name: 'project.settings.duplicate', params: { projectId: project.id } }"
icon="paste" icon="paste"
> >
{{ $t('menu.duplicate') }} {{ $t('menu.duplicate') }}
</dropdown-item> </dropdown-item>
<dropdown-item <dropdown-item
:to="{ name: 'list.settings.archive', params: { listId: list.id } }" :to="{ name: 'project.settings.archive', params: { projectId: project.id } }"
icon="archive" icon="archive"
> >
{{ $t('menu.archive') }} {{ $t('menu.archive') }}
@ -58,14 +58,14 @@
<Subscription <Subscription
class="has-no-shadow" class="has-no-shadow"
:is-button="false" :is-button="false"
entity="list" entity="project"
:entity-id="list.id" :entity-id="project.id"
:model-value="list.subscription" :model-value="project.subscription"
@update:model-value="setSubscriptionInStore" @update:model-value="setSubscriptionInStore"
type="dropdown" type="dropdown"
/> />
<dropdown-item <dropdown-item
:to="{ name: 'list.settings.delete', params: { listId: list.id } }" :to="{ name: 'project.settings.delete', params: { projectId: project.id } }"
icon="trash-alt" icon="trash-alt"
class="has-text-danger" class="has-text-danger"
> >
@ -81,26 +81,26 @@ import {ref, computed, watchEffect, type PropType} from 'vue'
import Dropdown from '@/components/misc/dropdown.vue' import Dropdown from '@/components/misc/dropdown.vue'
import DropdownItem from '@/components/misc/dropdown-item.vue' import DropdownItem from '@/components/misc/dropdown-item.vue'
import Subscription from '@/components/misc/subscription.vue' import Subscription from '@/components/misc/subscription.vue'
import type {IList} from '@/modelTypes/IList' import type {IProject} from '@/modelTypes/IProject'
import type {ISubscription} from '@/modelTypes/ISubscription' import type {ISubscription} from '@/modelTypes/ISubscription'
import {isSavedFilter} from '@/services/savedFilter' import {isSavedFilter} from '@/services/savedFilter'
import {useConfigStore} from '@/stores/config' import {useConfigStore} from '@/stores/config'
import {useListStore} from '@/stores/lists' import {useProjectStore} from '@/stores/projects'
import {useNamespaceStore} from '@/stores/namespaces' import {useNamespaceStore} from '@/stores/namespaces'
const props = defineProps({ const props = defineProps({
list: { project: {
type: Object as PropType<IList>, type: Object as PropType<IProject>,
required: true, required: true,
}, },
}) })
const listStore = useListStore() const projectStore = useProjectStore()
const namespaceStore = useNamespaceStore() const namespaceStore = useNamespaceStore()
const subscription = ref<ISubscription | null>(null) const subscription = ref<ISubscription | null>(null)
watchEffect(() => { watchEffect(() => {
subscription.value = props.list.subscription ?? null subscription.value = props.project.subscription ?? null
}) })
const configStore = useConfigStore() const configStore = useConfigStore()
@ -108,11 +108,11 @@ const backgroundsEnabled = computed(() => configStore.enabledBackgroundProviders
function setSubscriptionInStore(sub: ISubscription) { function setSubscriptionInStore(sub: ISubscription) {
subscription.value = sub subscription.value = sub
const updatedList = { const updatedProject = {
...props.list, ...props.project,
subscription: sub, subscription: sub,
} }
listStore.setList(updatedList) projectStore.setProject(updatedProject)
namespaceStore.setListInNamespaceById(updatedList) namespaceStore.setProjectInNamespaceById(updatedProject)
} }
</script> </script>

118
src/components/quick-actions/quick-actions.vue
View File

@ -63,18 +63,18 @@ import TeamService from '@/services/team'
import NamespaceModel from '@/models/namespace' import NamespaceModel from '@/models/namespace'
import TeamModel from '@/models/team' import TeamModel from '@/models/team'
import ListModel from '@/models/list' import ProjectModel from '@/models/project'
import BaseButton from '@/components/base/BaseButton.vue' import BaseButton from '@/components/base/BaseButton.vue'
import QuickAddMagic from '@/components/tasks/partials/quick-add-magic.vue' import QuickAddMagic from '@/components/tasks/partials/quick-add-magic.vue'
import {useBaseStore} from '@/stores/base' import {useBaseStore} from '@/stores/base'
import {useListStore} from '@/stores/lists' import {useProjectStore} from '@/stores/projects'
import {useNamespaceStore} from '@/stores/namespaces' import {useNamespaceStore} from '@/stores/namespaces'
import {useLabelStore} from '@/stores/labels' import {useLabelStore} from '@/stores/labels'
import {useTaskStore} from '@/stores/tasks' import {useTaskStore} from '@/stores/tasks'
import {getHistory} from '@/modules/listHistory' import {getHistory} from '@/modules/projectHistory'
import {parseTaskText, PrefixMode, PREFIXES} from '@/modules/parseTaskText' import {parseTaskText, PrefixMode, PREFIXES} from '@/modules/parseTaskText'
import {getQuickAddMagicMode} from '@/helpers/quickAddMagicMode' import {getQuickAddMagicMode} from '@/helpers/quickAddMagicMode'
import {success} from '@/message' import {success} from '@/message'
@ -82,13 +82,13 @@ import {success} from '@/message'
import type {ITeam} from '@/modelTypes/ITeam' import type {ITeam} from '@/modelTypes/ITeam'
import type {ITask} from '@/modelTypes/ITask' import type {ITask} from '@/modelTypes/ITask'
import type {INamespace} from '@/modelTypes/INamespace' import type {INamespace} from '@/modelTypes/INamespace'
import type {IList} from '@/modelTypes/IList' import type {IProject} from '@/modelTypes/IProject'
const {t} = useI18n({useScope: 'global'}) const {t} = useI18n({useScope: 'global'})
const router = useRouter() const router = useRouter()
const baseStore = useBaseStore() const baseStore = useBaseStore()
const listStore = useListStore() const projectStore = useProjectStore()
const namespaceStore = useNamespaceStore() const namespaceStore = useNamespaceStore()
const labelStore = useLabelStore() const labelStore = useLabelStore()
const taskStore = useTaskStore() const taskStore = useTaskStore()
@ -98,13 +98,13 @@ type DoAction<Type = any> = { type: ACTION_TYPE } & Type
enum ACTION_TYPE { enum ACTION_TYPE {
CMD = 'cmd', CMD = 'cmd',
TASK = 'task', TASK = 'task',
LIST = 'list', PROJECT = 'project',
TEAM = 'team', TEAM = 'team',
} }
enum COMMAND_TYPE { enum COMMAND_TYPE {
NEW_TASK = 'newTask', NEW_TASK = 'newTask',
NEW_LIST = 'newList', NEW_PROJECT = 'newProject',
NEW_NAMESPACE = 'newNamespace', NEW_NAMESPACE = 'newNamespace',
NEW_TEAM = 'newTeam', NEW_TEAM = 'newTeam',
} }
@ -112,7 +112,7 @@ enum COMMAND_TYPE {
enum SEARCH_MODE { enum SEARCH_MODE {
ALL = 'all', ALL = 'all',
TASKS = 'tasks', TASKS = 'tasks',
LISTS = 'lists', PROJECTS = 'projects',
TEAMS = 'teams', TEAMS = 'teams',
} }
@ -137,26 +137,26 @@ function closeQuickActions() {
baseStore.setQuickActionsActive(false) baseStore.setQuickActionsActive(false)
} }
const foundLists = computed(() => { const foundProjects = computed(() => {
const { list } = parsedQuery.value const { project } = parsedQuery.value
if ( if (
searchMode.value === SEARCH_MODE.ALL || searchMode.value === SEARCH_MODE.ALL ||
searchMode.value === SEARCH_MODE.LISTS || searchMode.value === SEARCH_MODE.PROJECTS ||
list === null project === null
) { ) {
return [] return []
} }
const ncache: { [id: ListModel['id']]: INamespace } = {} const ncache: { [id: ProjectModel['id']]: INamespace } = {}
const history = getHistory() const history = getHistory()
const allLists = [ const allProjects = [
...new Set([ ...new Set([
...history.map((l) => listStore.getListById(l.id)), ...history.map((l) => projectStore.getProjectById(l.id)),
...listStore.searchList(list), ...projectStore.searchProject(project),
]), ]),
] ]
return allLists.filter((l) => { return allProjects.filter((l) => {
if (typeof l === 'undefined' || l === null) { if (typeof l === 'undefined' || l === null) {
return false return false
} }
@ -191,9 +191,9 @@ const results = computed<Result[]>(() => {
items: foundTasks.value, items: foundTasks.value,
}, },
{ {
type: ACTION_TYPE.LIST, type: ACTION_TYPE.PROJECT,
title: t('quickActions.lists'), title: t('quickActions.projects'),
items: foundLists.value, items: foundProjects.value,
}, },
{ {
type: ACTION_TYPE.TEAM, type: ACTION_TYPE.TEAM,
@ -206,7 +206,7 @@ const results = computed<Result[]>(() => {
const loading = computed(() => const loading = computed(() =>
taskService.loading || taskService.loading ||
namespaceStore.isLoading || namespaceStore.isLoading ||
listStore.isLoading || projectStore.isLoading ||
teamService.loading, teamService.loading,
) )
@ -224,11 +224,11 @@ const commands = computed<{ [key in COMMAND_TYPE]: Command }>(() => ({
placeholder: t('quickActions.newTask'), placeholder: t('quickActions.newTask'),
action: newTask, action: newTask,
}, },
newList: { newProject: {
type: COMMAND_TYPE.NEW_LIST, type: COMMAND_TYPE.NEW_PROJECT,
title: t('quickActions.cmds.newList'), title: t('quickActions.cmds.newProject'),
placeholder: t('quickActions.newList'), placeholder: t('quickActions.newProject'),
action: newList, action: newProject,
}, },
newNamespace: { newNamespace: {
type: COMMAND_TYPE.NEW_NAMESPACE, 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 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 ? null
: baseStore.currentList, : baseStore.currentProject,
) )
const hintText = computed(() => { const hintText = computed(() => {
let namespace let namespace
if (selectedCmd.value !== null && currentList.value !== null) { if (selectedCmd.value !== null && currentProject.value !== null) {
switch (selectedCmd.value.type) { switch (selectedCmd.value.type) {
case COMMAND_TYPE.NEW_TASK: case COMMAND_TYPE.NEW_TASK:
return t('quickActions.createTask', { 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( namespace = namespaceStore.getNamespaceById(
currentList.value.namespaceId, currentProject.value.namespaceId,
) )
return t('quickActions.createList', { return t('quickActions.createProject', {
title: namespace?.title, title: namespace?.title,
}) })
} }
@ -275,8 +275,8 @@ const hintText = computed(() => {
const availableCmds = computed(() => { const availableCmds = computed(() => {
const cmds = [] const cmds = []
if (currentList.value !== null) { if (currentProject.value !== null) {
cmds.push(commands.value.newTask, commands.value.newList) cmds.push(commands.value.newTask, commands.value.newProject)
} }
cmds.push(commands.value.newNamespace, commands.value.newTeam) cmds.push(commands.value.newNamespace, commands.value.newTeam)
return cmds return cmds
@ -288,21 +288,21 @@ const searchMode = computed(() => {
if (query.value === '') { if (query.value === '') {
return SEARCH_MODE.ALL return SEARCH_MODE.ALL
} }
const { text, list, labels, assignees } = parsedQuery.value const { text, project, labels, assignees } = parsedQuery.value
if (assignees.length === 0 && text !== '') { if (assignees.length === 0 && text !== '') {
return SEARCH_MODE.TASKS return SEARCH_MODE.TASKS
} }
if ( if (
assignees.length === 0 && assignees.length === 0 &&
list !== null && project !== null &&
text === '' && text === '' &&
labels.length === 0 labels.length === 0
) { ) {
return SEARCH_MODE.LISTS return SEARCH_MODE.PROJECTS
} }
if ( if (
assignees.length > 0 && assignees.length > 0 &&
list === null && project === null &&
text === '' && text === '' &&
labels.length === 0 labels.length === 0
) { ) {
@ -356,7 +356,7 @@ function searchTasks() {
taskSearchTimeout.value = null taskSearchTimeout.value = null
} }
const { text, list: listName, labels } = parsedQuery.value const { text, project: projectName, labels } = parsedQuery.value
const filters: Filter[] = [] const filters: Filter[] = []
@ -373,10 +373,10 @@ function searchTasks() {
}) })
} }
if (listName !== null) { if (projectName !== null) {
const list = listStore.findListByExactname(listName) const project = projectStore.findProjectByExactname(projectName)
if (list !== null) { if (project !== null) {
addFilter('listId', list.id, 'equals') addFilter('projectId', project.id, 'equals')
} }
} }
@ -396,9 +396,9 @@ function searchTasks() {
const r = await taskService.getAll({}, params) as DoAction<ITask>[] const r = await taskService.getAll({}, params) as DoAction<ITask>[]
foundTasks.value = r.map((t) => { foundTasks.value = r.map((t) => {
t.type = ACTION_TYPE.TASK t.type = ACTION_TYPE.TASK
const list = listStore.getListById(t.listId) const project = projectStore.getProjectById(t.projectId)
if (list !== null) { if (project !== null) {
t.title = `${t.title} (${list.title})` t.title = `${t.title} (${project.title})`
} }
return t return t
}) })
@ -444,11 +444,11 @@ const searchInput = ref<HTMLElement | null>(null)
async function doAction(type: ACTION_TYPE, item: DoAction) { async function doAction(type: ACTION_TYPE, item: DoAction) {
switch (type) { switch (type) {
case ACTION_TYPE.LIST: case ACTION_TYPE.PROJECT:
closeQuickActions() closeQuickActions()
await router.push({ await router.push({
name: 'list.index', name: 'project.index',
params: { listId: (item as DoAction<IList>).id }, params: { projectId: (item as DoAction<IProject>).id },
}) })
break break
case ACTION_TYPE.TASK: case ACTION_TYPE.TASK:
@ -482,29 +482,29 @@ async function doCmd() {
} }
async function newTask() { async function newTask() {
if (currentList.value === null) { if (currentProject.value === null) {
return return
} }
const task = await taskStore.createNewTask({ const task = await taskStore.createNewTask({
title: query.value, title: query.value,
listId: currentList.value.id, projectId: currentProject.value.id,
}) })
success({ message: t('task.createSuccess') }) success({ message: t('task.createSuccess') })
await router.push({ name: 'task.detail', params: { id: task.id } }) await router.push({ name: 'task.detail', params: { id: task.id } })
} }
async function newList() { async function newProject() {
if (currentList.value === null) { if (currentProject.value === null) {
return return
} }
const newList = await listStore.createList(new ListModel({ const newProject = await projectStore.createProject(new ProjectModel({
title: query.value, 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({ await router.push({
name: 'list.index', name: 'project.index',
params: { listId: newList.id }, params: { projectId: newProject.id },
}) })
} }

104
src/components/sharing/linkSharing.vue
View File

@ -1,39 +1,39 @@
<template> <template>
<div> <div>
<p class="has-text-weight-bold"> <p class="has-text-weight-bold">
{{ $t('list.share.links.title') }} {{ $t('project.share.links.title') }}
<span <span
class="is-size-7 has-text-grey is-italic ml-3" class="is-size-7 has-text-grey is-italic ml-3"
v-tooltip="$t('list.share.links.explanation')"> v-tooltip="$t('project.share.links.explanation')">
{{ $t('list.share.links.what') }} {{ $t('project.share.links.what') }}
</span> </span>
</p> </p>
<div class="sharables-list"> <div class="sharables-project">
<x-button <x-button
v-if="!(linkShares.length === 0 || showNewForm)" v-if="!(linkShares.length === 0 || showNewForm)"
@click="showNewForm = true" @click="showNewForm = true"
icon="plus" icon="plus"
class="mb-4"> class="mb-4">
{{ $t('list.share.links.create') }} {{ $t('project.share.links.create') }}
</x-button> </x-button>
<div class="p-4" v-if="linkShares.length === 0 || showNewForm"> <div class="p-4" v-if="linkShares.length === 0 || showNewForm">
<div class="field"> <div class="field">
<label class="label" for="linkShareRight"> <label class="label" for="linkShareRight">
{{ $t('list.share.right.title') }} {{ $t('project.share.right.title') }}
</label> </label>
<div class="control"> <div class="control">
<div class="select"> <div class="select">
<select v-model="selectedRight" id="linkShareRight"> <select v-model="selectedRight" id="linkShareRight">
<option :value="RIGHTS.READ"> <option :value="RIGHTS.READ">
{{ $t('list.share.right.read') }} {{ $t('project.share.right.read') }}
</option> </option>
<option :value="RIGHTS.READ_WRITE"> <option :value="RIGHTS.READ_WRITE">
{{ $t('list.share.right.readWrite') }} {{ $t('project.share.right.readWrite') }}
</option> </option>
<option :value="RIGHTS.ADMIN"> <option :value="RIGHTS.ADMIN">
{{ $t('list.share.right.admin') }} {{ $t('project.share.right.admin') }}
</option> </option>
</select> </select>
</div> </div>
@ -41,21 +41,21 @@
</div> </div>
<div class="field"> <div class="field">
<label class="label" for="linkShareName"> <label class="label" for="linkShareName">
{{ $t('list.share.links.name') }} {{ $t('project.share.links.name') }}
</label> </label>
<div class="control"> <div class="control">
<input <input
id="linkShareName" id="linkShareName"
class="input" class="input"
:placeholder="$t('list.share.links.namePlaceholder')" :placeholder="$t('project.share.links.namePlaceholder')"
v-tooltip="$t('list.share.links.nameExplanation')" v-tooltip="$t('project.share.links.nameExplanation')"
v-model="name" v-model="name"
/> />
</div> </div>
</div> </div>
<div class="field"> <div class="field">
<label class="label" for="linkSharePassword"> <label class="label" for="linkSharePassword">
{{ $t('list.share.links.password') }} {{ $t('project.share.links.password') }}
</label> </label>
<div class="control"> <div class="control">
<input <input
@ -63,25 +63,25 @@
type="password" type="password"
class="input" class="input"
:placeholder="$t('user.auth.passwordPlaceholder')" :placeholder="$t('user.auth.passwordPlaceholder')"
v-tooltip="$t('list.share.links.passwordExplanation')" v-tooltip="$t('project.share.links.passwordExplanation')"
v-model="password" v-model="password"
/> />
</div> </div>
</div> </div>
<x-button @click="add(listId)" icon="plus"> <x-button @click="add(projectId)" icon="plus">
{{ $t('list.share.share') }} {{ $t('project.share.share') }}
</x-button> </x-button>
</div> </div>
<table <table
class="table has-actions is-striped is-hoverable is-fullwidth link-share-list" class="table has-actions is-striped is-hoverable is-fullwidth link-share-project"
v-if="linkShares.length > 0" v-if="linkShares.length > 0"
> >
<thead> <thead>
<tr> <tr>
<th></th> <th></th>
<th>{{ $t('list.share.links.view') }}</th> <th>{{ $t('project.share.links.view') }}</th>
<th>{{ $t('list.share.attributes.delete') }}</th> <th>{{ $t('project.share.attributes.delete') }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -92,7 +92,7 @@
</p> </p>
<p class="mb-2"> <p class="mb-2">
<i18n-t keypath="list.share.links.sharedBy" scope="global"> <i18n-t keypath="project.share.links.sharedBy" scope="global">
<strong>{{ getDisplayName(s.sharedBy) }}</strong> <strong>{{ getDisplayName(s.sharedBy) }}</strong>
</i18n-t> </i18n-t>
</p> </p>
@ -102,19 +102,19 @@
<span class="icon is-small"> <span class="icon is-small">
<icon icon="lock"/> <icon icon="lock"/>
</span>&nbsp; </span>&nbsp;
{{ $t('list.share.right.admin') }} {{ $t('project.share.right.admin') }}
</template> </template>
<template v-else-if="s.right === RIGHTS.READ_WRITE"> <template v-else-if="s.right === RIGHTS.READ_WRITE">
<span class="icon is-small"> <span class="icon is-small">
<icon icon="pen"/> <icon icon="pen"/>
</span>&nbsp; </span>&nbsp;
{{ $t('list.share.right.readWrite') }} {{ $t('project.share.right.readWrite') }}
</template> </template>
<template v-else> <template v-else>
<span class="icon is-small"> <span class="icon is-small">
<icon icon="users"/> <icon icon="users"/>
</span>&nbsp; </span>&nbsp;
{{ $t('list.share.right.read') }} {{ $t('project.share.right.read') }}
</template> </template>
</p> </p>
@ -172,15 +172,15 @@
<transition name="modal"> <transition name="modal">
<modal <modal
@close="showDeleteModal = false" @close="showDeleteModal = false"
@submit="remove(listId)" @submit="remove(projectId)"
v-if="showDeleteModal" v-if="showDeleteModal"
> >
<template #header> <template #header>
<span>{{ $t('list.share.links.remove') }}</span> <span>{{ $t('project.share.links.remove') }}</span>
</template> </template>
<template #text> <template #text>
<p>{{ $t('list.share.links.removeText') }}</p> <p>{{ $t('project.share.links.removeText') }}</p>
</template> </template>
</modal> </modal>
</transition> </transition>
@ -195,19 +195,19 @@ import {RIGHTS} from '@/constants/rights'
import LinkShareModel from '@/models/linkShare' import LinkShareModel from '@/models/linkShare'
import type {ILinkShare} from '@/modelTypes/ILinkShare' import type {ILinkShare} from '@/modelTypes/ILinkShare'
import type {IList} from '@/modelTypes/IList' import type {IProject} from '@/modelTypes/IProject'
import LinkShareService from '@/services/linkShare' import LinkShareService from '@/services/linkShare'
import {useCopyToClipboard} from '@/composables/useCopyToClipboard' import {useCopyToClipboard} from '@/composables/useCopyToClipboard'
import {success} from '@/message' import {success} from '@/message'
import {getDisplayName} from '@/models/user' import {getDisplayName} from '@/models/user'
import type {ListView} from '@/types/ListView' import type {ProjectView} from '@/types/ProjectView'
import {LIST_VIEWS} from '@/types/ListView' import {PROJECT_VIEWS} from '@/types/ProjectView'
import {useConfigStore} from '@/stores/config' import {useConfigStore} from '@/stores/config'
const props = defineProps({ const props = defineProps({
listId: { projectId: {
default: 0, default: 0,
required: true, required: true,
}, },
@ -224,20 +224,20 @@ const showDeleteModal = ref(false)
const linkIdToDelete = ref(0) const linkIdToDelete = ref(0)
const showNewForm = ref(false) const showNewForm = ref(false)
type SelectedViewMapper = Record<IList['id'], ListView> type SelectedViewMapper = Record<IProject['id'], ProjectView>
const selectedView = ref<SelectedViewMapper>({}) const selectedView = ref<SelectedViewMapper>({})
const availableViews = computed<Record<ListView, string>>(() => ({ const availableViews = computed<Record<ProjectView, string>>(() => ({
list: t('list.list.title'), project: t('project.project.title'),
gantt: t('list.gantt.title'), gantt: t('project.gantt.title'),
table: t('list.table.title'), table: t('project.table.title'),
kanban: t('list.kanban.title'), kanban: t('project.kanban.title'),
})) }))
const copy = useCopyToClipboard() const copy = useCopyToClipboard()
watch( watch(
() => props.listId, () => props.projectId,
load, load,
{immediate: true}, {immediate: true},
) )
@ -245,23 +245,23 @@ watch(
const configStore = useConfigStore() const configStore = useConfigStore()
const frontendUrl = computed(() => configStore.frontendUrl) const frontendUrl = computed(() => configStore.frontendUrl)
async function load(listId: IList['id']) { async function load(projectId: IProject['id']) {
// If listId == 0 the list on the calling component wasn't already loaded, so we just bail out here // If projectId == 0 the project on the calling component wasn't already loaded, so we just bail out here
if (listId === 0) { if (projectId === 0) {
return return
} }
const links = await linkShareService.getAll({listId}) const links = await linkShareService.getAll({projectId})
links.forEach((l: ILinkShare) => { links.forEach((l: ILinkShare) => {
selectedView.value[l.id] = 'list' selectedView.value[l.id] = 'project'
}) })
linkShares.value = links linkShares.value = links
} }
async function add(listId: IList['id']) { async function add(projectId: IProject['id']) {
const newLinkShare = new LinkShareModel({ const newLinkShare = new LinkShareModel({
right: selectedRight.value, right: selectedRight.value,
listId, projectId,
name: name.value, name: name.value,
password: password.value, password: password.value,
}) })
@ -270,31 +270,31 @@ async function add(listId: IList['id']) {
name.value = '' name.value = ''
password.value = '' password.value = ''
showNewForm.value = false showNewForm.value = false
success({message: t('list.share.links.createSuccess')}) success({message: t('project.share.links.createSuccess')})
await load(listId) await load(projectId)
} }
async function remove(listId: IList['id']) { async function remove(projectId: IProject['id']) {
try { try {
await linkShareService.delete(new LinkShareModel({ await linkShareService.delete(new LinkShareModel({
id: linkIdToDelete.value, id: linkIdToDelete.value,
listId, projectId,
})) }))
success({message: t('list.share.links.deleteSuccess')}) success({message: t('project.share.links.deleteSuccess')})
await load(listId) await load(projectId)
} finally { } finally {
showDeleteModal.value = false showDeleteModal.value = false
} }
} }
function getShareLink(hash: string, view: ListView = LIST_VIEWS.LIST) { function getShareLink(hash: string, view: ProjectView = PROJECT_VIEWS.PROJECT) {
return frontendUrl.value + 'share/' + hash + '/auth?view=' + view return frontendUrl.value + 'share/' + hash + '/auth?view=' + view
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
// FIXME: I think this is not needed // FIXME: I think this is not needed
.sharables-list:not(.card-content) { .sharables-project:not(.card-content) {
overflow-y: auto overflow-y: auto
} }

72
src/components/sharing/userTeam.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<p class="has-text-weight-bold"> <p class="has-text-weight-bold">
{{ $t('list.share.userTeam.shared', {type: shareTypeNames}) }} {{ $t('project.share.userTeam.shared', {type: shareTypeNames}) }}
</p> </p>
<div v-if="userIsAdmin"> <div v-if="userIsAdmin">
<div class="field has-addons"> <div class="field has-addons">
@ -19,7 +19,7 @@
/> />
</p> </p>
<p class="control"> <p class="control">
<x-button @click="add()">{{ $t('list.share.share') }}</x-button> <x-button @click="add()">{{ $t('project.share.share') }}</x-button>
</p> </p>
</div> </div>
</div> </div>
@ -31,7 +31,7 @@
<td>{{ getDisplayName(s) }}</td> <td>{{ getDisplayName(s) }}</td>
<td> <td>
<template v-if="s.id === userInfo.id"> <template v-if="s.id === userInfo.id">
<b class="is-success">{{ $t('list.share.userTeam.you') }}</b> <b class="is-success">{{ $t('project.share.userTeam.you') }}</b>
</template> </template>
</td> </td>
</template> </template>
@ -52,19 +52,19 @@
<span class="icon is-small"> <span class="icon is-small">
<icon icon="lock"/> <icon icon="lock"/>
</span> </span>
{{ $t('list.share.right.admin') }} {{ $t('project.share.right.admin') }}
</template> </template>
<template v-else-if="s.right === RIGHTS.READ_WRITE"> <template v-else-if="s.right === RIGHTS.READ_WRITE">
<span class="icon is-small"> <span class="icon is-small">
<icon icon="pen"/> <icon icon="pen"/>
</span> </span>
{{ $t('list.share.right.readWrite') }} {{ $t('project.share.right.readWrite') }}
</template> </template>
<template v-else> <template v-else>
<span class="icon is-small"> <span class="icon is-small">
<icon icon="users"/> <icon icon="users"/>
</span> </span>
{{ $t('list.share.right.read') }} {{ $t('project.share.right.read') }}
</template> </template>
</td> </td>
<td class="actions" v-if="userIsAdmin"> <td class="actions" v-if="userIsAdmin">
@ -78,19 +78,19 @@
:selected="s.right === RIGHTS.READ" :selected="s.right === RIGHTS.READ"
:value="RIGHTS.READ" :value="RIGHTS.READ"
> >
{{ $t('list.share.right.read') }} {{ $t('project.share.right.read') }}
</option> </option>
<option <option
:selected="s.right === RIGHTS.READ_WRITE" :selected="s.right === RIGHTS.READ_WRITE"
:value="RIGHTS.READ_WRITE" :value="RIGHTS.READ_WRITE"
> >
{{ $t('list.share.right.readWrite') }} {{ $t('project.share.right.readWrite') }}
</option> </option>
<option <option
:selected="s.right === RIGHTS.ADMIN" :selected="s.right === RIGHTS.ADMIN"
:value="RIGHTS.ADMIN" :value="RIGHTS.ADMIN"
> >
{{ $t('list.share.right.admin') }} {{ $t('project.share.right.admin') }}
</option> </option>
</select> </select>
</div> </div>
@ -110,7 +110,7 @@
</table> </table>
<nothing v-else> <nothing v-else>
{{ $t('list.share.userTeam.notShared', {type: shareTypeNames}) }} {{ $t('project.share.userTeam.notShared', {type: shareTypeNames}) }}
</nothing> </nothing>
<transition name="modal"> <transition name="modal">
@ -121,11 +121,11 @@
> >
<template #header> <template #header>
<span>{{ <span>{{
$t('list.share.userTeam.removeHeader', {type: shareTypeName, sharable: sharableName}) $t('project.share.userTeam.removeHeader', {type: shareTypeName, sharable: sharableName})
}}</span> }}</span>
</template> </template>
<template #text> <template #text>
<p>{{ $t('list.share.userTeam.removeText', {type: shareTypeName, sharable: sharableName}) }}</p> <p>{{ $t('project.share.userTeam.removeText', {type: shareTypeName, sharable: sharableName}) }}</p>
</template> </template>
</modal> </modal>
</transition> </transition>
@ -145,9 +145,9 @@ import UserNamespaceService from '@/services/userNamespace'
import UserNamespaceModel from '@/models/userNamespace' import UserNamespaceModel from '@/models/userNamespace'
import type {IUserNamespace} from '@/modelTypes/IUserNamespace' import type {IUserNamespace} from '@/modelTypes/IUserNamespace'
import UserListService from '@/services/userList' import UserProjectService from '@/services/userProject'
import UserListModel from '@/models/userList' import UserProjectModel from '@/models/userProject'
import type {IUserList} from '@/modelTypes/IUserList' import type {IUserProject} from '@/modelTypes/IUserProject'
import UserService from '@/services/user' import UserService from '@/services/user'
import UserModel, { getDisplayName } from '@/models/user' import UserModel, { getDisplayName } from '@/models/user'
@ -157,9 +157,9 @@ import TeamNamespaceService from '@/services/teamNamespace'
import TeamNamespaceModel from '@/models/teamNamespace' import TeamNamespaceModel from '@/models/teamNamespace'
import type { ITeamNamespace } from '@/modelTypes/ITeamNamespace' import type { ITeamNamespace } from '@/modelTypes/ITeamNamespace'
import TeamListService from '@/services/teamList' import TeamProjectService from '@/services/teamProject'
import TeamListModel from '@/models/teamList' import TeamProjectModel from '@/models/teamProject'
import type { ITeamList } from '@/modelTypes/ITeamList' import type { ITeamProject } from '@/modelTypes/ITeamProject'
import TeamService from '@/services/team' import TeamService from '@/services/team'
import TeamModel from '@/models/team' import TeamModel from '@/models/team'
@ -174,7 +174,7 @@ import {useAuthStore} from '@/stores/auth'
const props = defineProps({ const props = defineProps({
type: { type: {
type: String as PropType<'list' | 'namespace'>, type: String as PropType<'project' | 'namespace'>,
default: '', default: '',
}, },
shareType: { shareType: {
@ -193,9 +193,9 @@ const props = defineProps({
const {t} = useI18n({useScope: 'global'}) const {t} = useI18n({useScope: 'global'})
// This user service is either a userNamespaceService or a userListService, depending on the type we are using // This user service is either a userNamespaceService or a userProjectService, depending on the type we are using
let stuffService: UserNamespaceService | UserListService | TeamListService | TeamNamespaceService let stuffService: UserNamespaceService | UserProjectService | TeamProjectService | TeamNamespaceService
let stuffModel: IUserNamespace | IUserList | ITeamList | ITeamNamespace let stuffModel: IUserNamespace | IUserProject | ITeamProject | ITeamNamespace
let searchService: UserService | TeamService let searchService: UserService | TeamService
let sharable: Ref<IUser | ITeam> let sharable: Ref<IUser | ITeam>
@ -203,7 +203,7 @@ const searchLabel = ref('')
const selectedRight = 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 sharables = ref([])
const showDeleteModal = ref(false) const showDeleteModal = ref(false)
@ -214,11 +214,11 @@ const userInfo = computed(() => authStore.info)
function createShareTypeNameComputed(count: number) { function createShareTypeNameComputed(count: number) {
return computed(() => { return computed(() => {
if (props.shareType === 'user') { if (props.shareType === 'user') {
return t('list.share.userTeam.typeUser', count) return t('project.share.userTeam.typeUser', count)
} }
if (props.shareType === 'team') { if (props.shareType === 'team') {
return t('list.share.userTeam.typeTeam', count) return t('project.share.userTeam.typeTeam', count)
} }
return '' return ''
@ -229,8 +229,8 @@ const shareTypeNames = createShareTypeNameComputed(2)
const shareTypeName = createShareTypeNameComputed(1) const shareTypeName = createShareTypeNameComputed(1)
const sharableName = computed(() => { const sharableName = computed(() => {
if (props.type === 'list') { if (props.type === 'project') {
return t('list.list.title') return t('project.project.title')
} }
if (props.shareType === 'namespace') { if (props.shareType === 'namespace') {
@ -246,9 +246,9 @@ if (props.shareType === 'user') {
sharable = ref(new UserModel()) sharable = ref(new UserModel())
searchLabel.value = 'username' searchLabel.value = 'username'
if (props.type === 'list') { if (props.type === 'project') {
stuffService = shallowReactive(new UserListService()) stuffService = shallowReactive(new UserProjectService())
stuffModel = reactive(new UserListModel({listId: props.id})) stuffModel = reactive(new UserProjectModel({projectId: props.id}))
} else if (props.type === 'namespace') { } else if (props.type === 'namespace') {
stuffService = shallowReactive(new UserNamespaceService()) stuffService = shallowReactive(new UserNamespaceService())
stuffModel = reactive(new UserNamespaceModel({ stuffModel = reactive(new UserNamespaceModel({
@ -263,9 +263,9 @@ if (props.shareType === 'user') {
sharable = ref(new TeamModel()) sharable = ref(new TeamModel())
searchLabel.value = 'name' searchLabel.value = 'name'
if (props.type === 'list') { if (props.type === 'project') {
stuffService = shallowReactive(new TeamListService()) stuffService = shallowReactive(new TeamProjectService())
stuffModel = reactive(new TeamListModel({listId: props.id})) stuffModel = reactive(new TeamProjectModel({projectId: props.id}))
} else if (props.type === 'namespace') { } else if (props.type === 'namespace') {
stuffService = shallowReactive(new TeamNamespaceService()) stuffService = shallowReactive(new TeamNamespaceService())
stuffModel = reactive(new TeamNamespaceModel({ stuffModel = reactive(new TeamNamespaceModel({
@ -305,7 +305,7 @@ async function deleteSharable() {
} }
} }
success({ success({
message: t('list.share.userTeam.removeSuccess', { message: t('project.share.userTeam.removeSuccess', {
type: shareTypeName.value, type: shareTypeName.value,
sharable: sharableName.value, sharable: sharableName.value,
}), }),
@ -328,7 +328,7 @@ async function add(admin) {
} }
await stuffService.create(stuffModel) 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() await load()
} }
@ -360,7 +360,7 @@ async function toggleType(sharable) {
sharables.value[i].right = r.right 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([]) const found = ref([])

2
src/components/tasks/GanttChart.vue
View File

@ -52,7 +52,7 @@ import {parseKebabDate} from '@/helpers/time/parseKebabDate'
import type {ITask, ITaskPartialWithId} from '@/modelTypes/ITask' import type {ITask, ITaskPartialWithId} from '@/modelTypes/ITask'
import type {DateISO} from '@/types/DateISO' import type {DateISO} from '@/types/DateISO'
import type {GanttFilters} from '@/views/list/helpers/useGanttFilters' import type {GanttFilters} from '@/views/project/helpers/useGanttFilters'
import { import {
extendDayjs, extendDayjs,

16
src/components/tasks/add-task.vue
View File

@ -6,7 +6,7 @@
:disabled="loading || undefined" :disabled="loading || undefined"
class="add-task-textarea input" class="add-task-textarea input"
:class="{'textarea-empty': newTaskTitle === ''}" :class="{'textarea-empty': newTaskTitle === ''}"
:placeholder="$t('list.list.addPlaceholder')" :placeholder="$t('project.project.addPlaceholder')"
rows="1" rows="1"
v-focus v-focus
v-model="newTaskTitle" v-model="newTaskTitle"
@ -25,10 +25,10 @@
@click="addTask()" @click="addTask()"
icon="plus" icon="plus"
:loading="loading" :loading="loading"
:aria-label="$t('list.list.add')" :aria-label="$t('project.project.add')"
> >
<span class="button-text"> <span class="button-text">
{{ $t('list.list.add') }} {{ $t('project.project.add') }}
</span> </span>
</x-button> </x-button>
</p> </p>
@ -152,7 +152,7 @@ function resetEmptyTitleError(e) {
const loading = computed(() => taskStore.isLoading) const loading = computed(() => taskStore.isLoading)
async function addTask() { async function addTask() {
if (newTaskTitle.value === '') { if (newTaskTitle.value === '') {
errorMessage.value = t('list.create.addTitleRequired') errorMessage.value = t('project.create.addTitleRequired')
return return
} }
errorMessage.value = '' errorMessage.value = ''
@ -173,7 +173,7 @@ async function addTask() {
const task = await taskStore.createNewTask({ const task = await taskStore.createNewTask({
title, title,
listId: authStore.settings.defaultListId, projectId: authStore.settings.defaultProjectId,
position: props.defaultPosition, position: props.defaultPosition,
}) })
createdTasks[title] = task createdTasks[title] = task
@ -208,7 +208,7 @@ async function addTask() {
})) }))
createdTask.relatedTasks[RELATION_KIND.PARENTTASK] = [createdParentTask] createdTask.relatedTasks[RELATION_KIND.PARENTTASK] = [createdParentTask]
// we're only emitting here so that the relation shows up in the task list // we're only emitting here so that the relation shows up in the project
emit('taskAdded', createdTask) emit('taskAdded', createdTask)
return rel return rel
@ -216,8 +216,8 @@ async function addTask() {
await Promise.all(relations) await Promise.all(relations)
} catch (e: any) { } catch (e: any) {
newTaskTitle.value = taskTitleBackup newTaskTitle.value = taskTitleBackup
if (e?.message === 'NO_LIST') { if (e?.message === 'NO_PROJECT') {
errorMessage.value = t('list.create.addListRequired') errorMessage.value = t('project.create.addProjectRequired')
return return
} }
throw e throw e

2
src/components/tasks/edit-task.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<card <card
class="taskedit" class="taskedit"
:title="$t('list.list.editTask')" :title="$t('project.project.editTask')"
@close="$emit('close')" @close="$emit('close')"
:has-close="true" :has-close="true"
> >

12
src/components/tasks/partials/editAssignees.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<Multiselect <Multiselect
:loading="listUserService.loading" :loading="projectUserService.loading"
:placeholder="$t('task.assignee.placeholder')" :placeholder="$t('task.assignee.placeholder')"
:multiple="true" :multiple="true"
@search="findUser" @search="findUser"
@ -30,7 +30,7 @@ import Multiselect from '@/components/input/multiselect.vue'
import BaseButton from '@/components/base/BaseButton.vue' import BaseButton from '@/components/base/BaseButton.vue'
import {includesById} from '@/helpers/utils' import {includesById} from '@/helpers/utils'
import ListUserService from '@/services/listUsers' import ProjectUserService from '@/services/projectUsers'
import {success} from '@/message' import {success} from '@/message'
import {useTaskStore} from '@/stores/tasks' import {useTaskStore} from '@/stores/tasks'
@ -42,7 +42,7 @@ const props = defineProps({
type: Number, type: Number,
required: true, required: true,
}, },
listId: { projectId: {
type: Number, type: Number,
required: true, required: true,
}, },
@ -59,7 +59,7 @@ const emit = defineEmits(['update:modelValue'])
const taskStore = useTaskStore() const taskStore = useTaskStore()
const {t} = useI18n({useScope: 'global'}) const {t} = useI18n({useScope: 'global'})
const listUserService = shallowReactive(new ListUserService()) const projectUserService = shallowReactive(new ProjectUserService())
const foundUsers = ref<IUser[]>([]) const foundUsers = ref<IUser[]>([])
const assignees = ref<IUser[]>([]) const assignees = ref<IUser[]>([])
let isAdding = false let isAdding = false
@ -94,7 +94,7 @@ async function addAssignee(user: IUser) {
async function removeAssignee(user: IUser) { async function removeAssignee(user: IUser) {
await taskStore.removeAssignee({user: user, taskId: props.taskId}) await taskStore.removeAssignee({user: user, taskId: props.taskId})
// Remove the assignee from the list // Remove the assignee from the project
for (const a in assignees.value) { for (const a in assignees.value) {
if (assignees.value[a].id === user.id) { if (assignees.value[a].id === user.id) {
assignees.value.splice(a, 1) assignees.value.splice(a, 1)
@ -109,7 +109,7 @@ async function findUser(query: string) {
return return
} }
const response = await listUserService.getAll({listId: props.listId}, {s: query}) as IUser[] const response = await projectUserService.getAll({projectId: props.projectId}, {s: query}) as IUser[]
// Filter the results to not include users who are already assigned // Filter the results to not include users who are already assigned
foundUsers.value = response foundUsers.value = response

46
src/components/tasks/partials/listSearch.vue → src/components/tasks/partials/projectSearch.vue
View File

@ -1,18 +1,18 @@
<template> <template>
<Multiselect <Multiselect
class="control is-expanded" class="control is-expanded"
:placeholder="$t('list.search')" :placeholder="$t('project.search')"
:search-results="foundLists" :search-results="foundProjects"
label="title" label="title"
:select-placeholder="$t('list.searchSelect')" :select-placeholder="$t('project.searchSelect')"
:model-value="list" :model-value="project"
@update:model-value="Object.assign(list, $event)" @update:model-value="Object.assign(project, $event)"
@select="select" @select="select"
@search="findLists" @search="findProjects"
> >
<template #searchResult="{option}"> <template #searchResult="{option}">
<span class="list-namespace-title search-result">{{ namespace((option as IList).namespaceId) }} ></span> <span class="project-namespace-title search-result">{{ namespace((option as IProject).namespaceId) }} ></span>
{{ (option as IList).title }} {{ (option as IProject).title }}
</template> </template>
</Multiselect> </Multiselect>
</template> </template>
@ -22,19 +22,19 @@ import {reactive, ref, watch} from 'vue'
import type {PropType} from 'vue' import type {PropType} from 'vue'
import {useI18n} from 'vue-i18n' import {useI18n} from 'vue-i18n'
import type {IList} from '@/modelTypes/IList' import type {IProject} from '@/modelTypes/IProject'
import type {INamespace} from '@/modelTypes/INamespace' import type {INamespace} from '@/modelTypes/INamespace'
import {useListStore} from '@/stores/lists' import {useProjectStore} from '@/stores/projects'
import {useNamespaceStore} from '@/stores/namespaces' import {useNamespaceStore} from '@/stores/namespaces'
import ListModel from '@/models/list' import ProjectModel from '@/models/project'
import Multiselect from '@/components/input/multiselect.vue' import Multiselect from '@/components/input/multiselect.vue'
const props = defineProps({ const props = defineProps({
modelValue: { modelValue: {
type: Object as PropType<IList>, type: Object as PropType<IProject>,
required: false, required: false,
}, },
}) })
@ -42,45 +42,45 @@ const emit = defineEmits(['update:modelValue'])
const {t} = useI18n({useScope: 'global'}) const {t} = useI18n({useScope: 'global'})
const list: IList = reactive(new ListModel()) const project: IProject = reactive(new ProjectModel())
watch( watch(
() => props.modelValue, () => props.modelValue,
(newList) => Object.assign(list, newList), (newProject) => Object.assign(project, newProject),
{ {
immediate: true, immediate: true,
deep: true, deep: true,
}, },
) )
const listStore = useListStore() const projectStore = useProjectStore()
const namespaceStore = useNamespaceStore() const namespaceStore = useNamespaceStore()
const foundLists = ref<IList[]>([]) const foundProjects = ref<IProject[]>([])
function findLists(query: string) { function findProjects(query: string) {
if (query === '') { if (query === '') {
select(null) select(null)
} }
foundLists.value = listStore.searchList(query) foundProjects.value = projectStore.searchProject(query)
} }
function select(l: IList | null) { function select(l: IProject | null) {
if (l === null) { if (l === null) {
return return
} }
Object.assign(list, l) Object.assign(project, l)
emit('update:modelValue', list) emit('update:modelValue', project)
} }
function namespace(namespaceId: INamespace['id']) { function namespace(namespaceId: INamespace['id']) {
const namespace = namespaceStore.getNamespaceById(namespaceId) const namespace = namespaceStore.getNamespaceById(namespaceId)
return namespace !== null return namespace !== null
? namespace.title ? namespace.title
: t('list.shared') : t('project.shared')
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.list-namespace-title { .project-namespace-title {
color: var(--grey-500); color: var(--grey-500);
} }
</style> </style>

10
src/components/tasks/partials/quick-add-magic.vue
View File

@ -37,14 +37,14 @@
{{ $t('task.quickAddMagic.multiple') }} {{ $t('task.quickAddMagic.multiple') }}
</p> </p>
<h3>{{ $t('list.list.title') }}</h3> <h3>{{ $t('project.project.title') }}</h3>
<p> <p>
{{ $t('task.quickAddMagic.list1', {prefix: prefixes.list}) }} {{ $t('task.quickAddMagic.project1', {prefix: prefixes.project}) }}
{{ $t('task.quickAddMagic.list2') }} {{ $t('task.quickAddMagic.project2') }}
</p> </p>
<p> <p>
{{ $t('task.quickAddMagic.list3') }} {{ $t('task.quickAddMagic.project3') }}
{{ $t('task.quickAddMagic.list4', {prefix: prefixes.list}) }} {{ $t('task.quickAddMagic.project4', {prefix: prefixes.project}) }}
</p> </p>
<h3>{{ $t('task.quickAddMagic.dateAndTime') }}</h3> <h3>{{ $t('task.quickAddMagic.dateAndTime') }}</h3>

44
src/components/tasks/partials/relatedTasks.vue
View File

@ -43,8 +43,8 @@
:class="{'is-strikethrough': task.done}" :class="{'is-strikethrough': task.done}"
> >
<span <span
class="different-list" class="different-project"
v-if="task.listId !== listId" v-if="task.projectId !== projectId"
> >
<span <span
v-if="task.differentNamespace !== null" v-if="task.differentNamespace !== null"
@ -52,9 +52,9 @@
{{ task.differentNamespace }} > {{ task.differentNamespace }} >
</span> </span>
<span <span
v-if="task.differentList !== null" v-if="task.differentProject !== null"
v-tooltip="$t('task.relation.differentList')"> v-tooltip="$t('task.relation.differentProject')">
{{ task.differentList }} > {{ task.differentProject }} >
</span> </span>
</span> </span>
{{ task.title }} {{ task.title }}
@ -98,8 +98,8 @@
:class="{ 'is-strikethrough': t.done}" :class="{ 'is-strikethrough': t.done}"
> >
<span <span
class="different-list" class="different-project"
v-if="t.listId !== listId" v-if="t.projectId !== projectId"
> >
<span <span
v-if="t.differentNamespace !== null" v-if="t.differentNamespace !== null"
@ -107,9 +107,9 @@
{{ t.differentNamespace }} > {{ t.differentNamespace }} >
</span> </span>
<span <span
v-if="t.differentList !== null" v-if="t.differentProject !== null"
v-tooltip="$t('task.relation.differentList')"> v-tooltip="$t('task.relation.differentProject')">
{{ t.differentList }} > {{ t.differentProject }} >
</span> </span>
</span> </span>
{{ t.title }} {{ t.title }}
@ -185,7 +185,7 @@ const props = defineProps({
type: Boolean, type: Boolean,
default: false, default: false,
}, },
listId: { projectId: {
type: Number, type: Number,
default: 0, default: 0,
}, },
@ -229,17 +229,17 @@ async function findTasks(newQuery: string) {
foundTasks.value = await taskService.getAll({}, {s: newQuery}) foundTasks.value = await taskService.getAll({}, {s: newQuery})
} }
const getListAndNamespaceById = (listId: number) => namespaceStore.getListAndNamespaceById(listId, true) const getProjectAndNamespaceById = (projectId: number) => namespaceStore.getProjectAndNamespaceById(projectId, true)
const namespace = computed(() => getListAndNamespaceById(props.listId)?.namespace) const namespace = computed(() => getProjectAndNamespaceById(props.projectId)?.namespace)
function mapRelatedTasks(tasks: ITask[]) { function mapRelatedTasks(tasks: ITask[]) {
return tasks.map(task => { return tasks.map(task => {
// by doing this here once we can save a lot of duplicate calls in the template // by doing this here once we can save a lot of duplicate calls in the template
const { const {
list, project,
namespace: taskNamespace, namespace: taskNamespace,
} = getListAndNamespaceById(task.listId) || {list: null, namespace: null} } = getProjectAndNamespaceById(task.projectId) || {project: null, namespace: null}
return { return {
...task, ...task,
@ -247,10 +247,10 @@ function mapRelatedTasks(tasks: ITask[]) {
(taskNamespace !== null && (taskNamespace !== null &&
taskNamespace.id !== namespace.value.id && taskNamespace.id !== namespace.value.id &&
taskNamespace?.title) || null, taskNamespace?.title) || null,
differentList: differentProject:
(list !== null && (project !== null &&
task.listId !== props.listId && task.projectId !== props.projectId &&
list?.title) || null, project?.title) || null,
} }
}) })
} }
@ -342,7 +342,7 @@ async function removeTaskRelation() {
} }
async function createAndRelateTask(title: string) { async function createAndRelateTask(title: string) {
const newTask = await taskService.create(new TaskModel({title, listId: props.listId})) const newTask = await taskService.create(new TaskModel({title, projectId: props.projectId}))
newTaskRelation.task = newTask newTaskRelation.task = newTask
await addTaskRelation() await addTaskRelation()
} }
@ -350,7 +350,7 @@ async function createAndRelateTask(title: string) {
async function toggleTaskDone(task: ITask) { async function toggleTaskDone(task: ITask) {
await taskStore.update(task) await taskStore.update(task)
// Find the task in the list and update it so that it is correctly strike through // Find the task in the project and update it so that it is correctly strike through
Object.entries(relatedTasks.value).some(([kind, tasks]) => { Object.entries(relatedTasks.value).some(([kind, tasks]) => {
return (tasks as ITask[]).some((t, key) => { return (tasks as ITask[]).some((t, key) => {
const found = t.id === task.id const found = t.id === task.id
@ -378,7 +378,7 @@ async function toggleTaskDone(task: ITask) {
} }
} }
.different-list { .different-project {
color: var(--grey-500); color: var(--grey-500);
width: auto; width: auto;
} }

52
src/components/tasks/partials/singleTaskInList.vue → src/components/tasks/partials/singleTaskInProject.vue
View File

@ -7,8 +7,8 @@
/> />
<ColorBubble <ColorBubble
v-if="showListColor && listColor !== ''" v-if="showProjectColor && projectColor !== ''"
:color="listColor" :color="projectColor"
class="mr-1" class="mr-1"
/> />
@ -19,12 +19,12 @@
> >
<span> <span>
<router-link <router-link
v-if="showList && taskList !== null" v-if="showProject && taskProject !== null"
:to="{ name: 'list.list', params: { listId: task.listId } }" :to="{ name: 'project.project', params: { projectId: task.projectId } }"
class="task-list" class="task-project"
:class="{'mr-2': task.hexColor !== ''}" :class="{'mr-2': task.hexColor !== ''}"
v-tooltip="$t('task.detail.belongsToList', {list: taskList.title})"> v-tooltip="$t('task.detail.belongsToProject', {project: taskProject.title})">
{{ taskList.title }} {{ taskProject.title }}
</router-link> </router-link>
<ColorBubble <ColorBubble
@ -81,13 +81,13 @@
<priority-label :priority="task.priority" :done="task.done"/> <priority-label :priority="task.priority" :done="task.done"/>
<span> <span>
<span class="list-task-icon" v-if="task.attachments.length > 0"> <span class="project-task-icon" v-if="task.attachments.length > 0">
<icon icon="paperclip"/> <icon icon="paperclip"/>
</span> </span>
<span class="list-task-icon" v-if="task.description"> <span class="project-task-icon" v-if="task.description">
<icon icon="align-left"/> <icon icon="align-left"/>
</span> </span>
<span class="list-task-icon" v-if="task.repeatAfter.amount > 0"> <span class="project-task-icon" v-if="task.repeatAfter.amount > 0">
<icon icon="history"/> <icon icon="history"/>
</span> </span>
</span> </span>
@ -104,12 +104,12 @@
</progress> </progress>
<router-link <router-link
v-if="!showList && currentList.id !== task.listId && taskList !== null" v-if="!showProject && currentProject.id !== task.projectId && taskProject !== null"
:to="{ name: 'list.list', params: { listId: task.listId } }" :to="{ name: 'project.project', params: { projectId: task.projectId } }"
class="task-list" class="task-project"
v-tooltip="$t('task.detail.belongsToList', {list: taskList.title})" v-tooltip="$t('task.detail.belongsToProject', {project: taskProject.title})"
> >
{{ taskList.title }} {{ taskProject.title }}
</router-link> </router-link>
<BaseButton <BaseButton
@ -147,7 +147,7 @@ import {closeWhenClickedOutside} from '@/helpers/closeWhenClickedOutside'
import {formatDateSince, formatISO, formatDateLong} from '@/helpers/time/formatDate' import {formatDateSince, formatISO, formatDateLong} from '@/helpers/time/formatDate'
import {success} from '@/message' import {success} from '@/message'
import {useListStore} from '@/stores/lists' import {useProjectStore} from '@/stores/projects'
import {useNamespaceStore} from '@/stores/namespaces' import {useNamespaceStore} from '@/stores/namespaces'
import {useBaseStore} from '@/stores/base' import {useBaseStore} from '@/stores/base'
import {useTaskStore} from '@/stores/tasks' import {useTaskStore} from '@/stores/tasks'
@ -161,7 +161,7 @@ const props = defineProps({
type: Boolean, type: Boolean,
default: false, default: false,
}, },
showList: { showProject: {
type: Boolean, type: Boolean,
default: false, default: false,
}, },
@ -169,7 +169,7 @@ const props = defineProps({
type: Boolean, type: Boolean,
default: false, default: false,
}, },
showListColor: { showProjectColor: {
type: Boolean, type: Boolean,
default: true, default: true,
}, },
@ -206,18 +206,18 @@ onBeforeUnmount(() => {
}) })
const baseStore = useBaseStore() const baseStore = useBaseStore()
const listStore = useListStore() const projectStore = useProjectStore()
const taskStore = useTaskStore() const taskStore = useTaskStore()
const namespaceStore = useNamespaceStore() const namespaceStore = useNamespaceStore()
const taskList = computed(() => listStore.getListById(task.value.listId)) const taskProject = computed(() => projectStore.getProjectById(task.value.projectId))
const listColor = computed(() => taskList.value !== null ? taskList.value.hexColor : '') const projectColor = computed(() => taskProject.value !== null ? taskProject.value.hexColor : '')
const currentList = computed(() => { const currentProject = computed(() => {
return typeof baseStore.currentList === 'undefined' ? { return typeof baseStore.currentProject === 'undefined' ? {
id: 0, id: 0,
title: '', title: '',
} : baseStore.currentList } : baseStore.currentProject
}) })
const taskDetailRoute = computed(() => ({ const taskDetailRoute = computed(() => ({
@ -306,7 +306,7 @@ function hideDeferDueDatePopup(e) {
} }
} }
.task-list { .task-project {
width: auto; width: auto;
color: var(--grey-400); color: var(--grey-400);
font-size: .9rem; font-size: .9rem;
@ -321,7 +321,7 @@ function hideDeferDueDatePopup(e) {
width: 27px; width: 27px;
} }
.list-task-icon { .project-task-icon {
margin-left: 6px; margin-left: 6px;
&:not(:first-of-type) { &:not(:first-of-type) {

8
src/composables/useTaskList.ts
View File

@ -42,9 +42,9 @@ const SORT_BY_DEFAULT = {
} }
/** /**
* This mixin provides a base set of methods and properties to get tasks on a list. * This mixin provides a base set of methods and properties to get tasks on a project.
*/ */
export function useTaskList(listId, sortByDefault = SORT_BY_DEFAULT) { export function useTaskList(projectId, sortByDefault = SORT_BY_DEFAULT) {
const params = ref({...getDefaultParams()}) const params = ref({...getDefaultParams()})
const search = ref('') const search = ref('')
@ -64,7 +64,7 @@ export function useTaskList(listId, sortByDefault = SORT_BY_DEFAULT) {
loadParams = formatSortOrder(sortBy.value, loadParams) loadParams = formatSortOrder(sortBy.value, loadParams)
return [ return [
{listId: listId.value}, {projectId: projectId.value},
loadParams, loadParams,
page.value || 1, page.value || 1,
] ]
@ -98,7 +98,7 @@ export function useTaskList(listId, sortByDefault = SORT_BY_DEFAULT) {
}, { immediate: true }) }, { immediate: true })
// Only listen for query path changes // Only projecten for query path changes
watch(() => JSON.stringify(getAllTasksParams.value), (newParams, oldParams) => { watch(() => JSON.stringify(getAllTasksParams.value), (newParams, oldParams) => {
if (oldParams === newParams) { if (oldParams === newParams) {
return return

9
src/helpers/getListTitle.ts
View File

@ -1,9 +0,0 @@
import {i18n} from '@/i18n'
import type {IList} from '@/modelTypes/IList'
export function getListTitle(l: IList) {
if (l.id === -1) {
return i18n.global.t('list.pseudo.favorites.title')
}
return l.title
}

2
src/helpers/getNamespaceTitle.ts
View File

@ -3,7 +3,7 @@ import type {INamespace} from '@/modelTypes/INamespace'
export const getNamespaceTitle = (n: INamespace) => { export const getNamespaceTitle = (n: INamespace) => {
if (n.id === -1) { if (n.id === -1) {
return i18n.global.t('namespace.pseudo.sharedLists.title') return i18n.global.t('namespace.pseudo.sharedProjects.title')
} }
if (n.id === -2) { if (n.id === -2) {
return i18n.global.t('namespace.pseudo.favorites.title') return i18n.global.t('namespace.pseudo.favorites.title')

9
src/helpers/getProjectTitle.ts Normal file
View File

@ -0,0 +1,9 @@
import {i18n} from '@/i18n'
import type {IProject} from '@/modelTypes/IProject'
export function getProjectTitle(l: IProject) {
if (l.id === -1) {
return i18n.global.t('project.pseudo.favorites.title')
}
return l.title
}

18
src/helpers/saveCollapsedBucketState.ts
View File

@ -1,5 +1,5 @@
import type {IBucket} from '@/modelTypes/IBucket' import type {IBucket} from '@/modelTypes/IBucket'
import type {IList} from '@/modelTypes/IList' import type {IProject} from '@/modelTypes/IProject'
const key = 'collapsedBuckets' const key = 'collapsedBuckets'
@ -13,22 +13,22 @@ function getAllState() {
} }
export const saveCollapsedBucketState = ( export const saveCollapsedBucketState = (
listId: IList['id'], projectId: IProject['id'],
collapsedBuckets: CollapsedBuckets, collapsedBuckets: CollapsedBuckets,
) => { ) => {
const state = getAllState() const state = getAllState()
state[listId] = collapsedBuckets state[projectId] = collapsedBuckets
for (const bucketId in state[listId]) { for (const bucketId in state[projectId]) {
if (!state[listId][bucketId]) { if (!state[projectId][bucketId]) {
delete state[listId][bucketId] delete state[projectId][bucketId]
} }
} }
localStorage.setItem(key, JSON.stringify(state)) localStorage.setItem(key, JSON.stringify(state))
} }
export function getCollapsedBucketState(listId : IList['id']) { export function getCollapsedBucketState(projectId : IProject['id']) {
const state = getAllState() const state = getAllState()
return typeof state[listId] !== 'undefined' return typeof state[projectId] !== 'undefined'
? state[listId] ? state[projectId]
: {} : {}
} }

53
src/helpers/saveListView.ts
View File

@ -1,53 +0,0 @@
import type { IList } from '@/modelTypes/IList'
type ListView = Record<IList['id'], string>
const DEFAULT_LIST_VIEW = 'list.list' as const
/**
* Save the current list view to local storage
*/
export function saveListView(listId: IList['id'], routeName: string) {
if (routeName.includes('settings.')) {
return
}
if (!listId) {
return
}
// We use local storage and not the store here to make it persistent across reloads.
const savedListView = localStorage.getItem('listView')
let savedListViewJson: ListView | false = false
if (savedListView !== null) {
savedListViewJson = JSON.parse(savedListView) as ListView
}
let listView: ListView = {}
if (savedListViewJson) {
listView = savedListViewJson
}
listView[listId] = routeName
localStorage.setItem('listView', JSON.stringify(listView))
}
export const getListView = (listId: IList['id']) => {
// Remove old stored settings
const savedListView = localStorage.getItem('listView')
if (savedListView !== null && savedListView.startsWith('list.')) {
localStorage.removeItem('listView')
}
if (!savedListView) {
return DEFAULT_LIST_VIEW
}
const savedListViewJson: ListView = JSON.parse(savedListView)
if (!savedListViewJson[listId]) {
return DEFAULT_LIST_VIEW
}
return savedListViewJson[listId]
}

53
src/helpers/saveProjectView.ts Normal file
View File

@ -0,0 +1,53 @@
import type { IProject } from '@/modelTypes/IProject'
type ProjectView = Record<IProject['id'], string>
const DEFAULT_PROJECT_VIEW = 'project.project' as const
/**
* Save the current project view to local storage
*/
export function saveProjectView(projectId: IProject['id'], routeName: string) {
if (routeName.includes('settings.')) {
return
}
if (!projectId) {
return
}
// We use local storage and not the store here to make it persistent across reloads.
const savedProjectView = localStorage.getItem('projectView')
let savedProjectViewJson: ProjectView | false = false
if (savedProjectView !== null) {
savedProjectViewJson = JSON.parse(savedProjectView) as ProjectView
}
let projectView: ProjectView = {}
if (savedProjectViewJson) {
projectView = savedProjectViewJson
}
projectView[projectId] = routeName
localStorage.setItem('projectView', JSON.stringify(projectView))
}
export const getProjectView = (projectId: IProject['id']) => {
// Remove old stored settings
const savedProjectView = localStorage.getItem('projectView')
if (savedProjectView !== null && savedProjectView.startsWith('project.')) {
localStorage.removeItem('projectView')
}
if (!savedProjectView) {
return DEFAULT_PROJECT_VIEW
}
const savedProjectViewJson: ProjectView = JSON.parse(savedProjectView)
if (!savedProjectViewJson[projectId]) {
return DEFAULT_PROJECT_VIEW
}
return savedProjectViewJson[projectId]
}

222
src/i18n/lang/en.json
View File

@ -5,10 +5,10 @@
"welcomeDay": "Hi {username}!", "welcomeDay": "Hi {username}!",
"welcomeEvening": "Good Evening {username}!", "welcomeEvening": "Good Evening {username}!",
"lastViewed": "Last viewed", "lastViewed": "Last viewed",
"list": { "project": {
"newText": "You can create a new list for your new tasks:", "newText": "You can create a new project for your new tasks:",
"new": "New list", "new": "New project",
"importText": "Or import your lists and tasks from other services into Vikunja:", "importText": "Or import your projects and tasks from other services into Vikunja:",
"import": "Import your data into Vikunja" "import": "Import your data into Vikunja"
} }
}, },
@ -85,7 +85,7 @@
"weekStartSunday": "Sunday", "weekStartSunday": "Sunday",
"weekStartMonday": "Monday", "weekStartMonday": "Monday",
"language": "Language", "language": "Language",
"defaultList": "Default List", "defaultProject": "Default Project",
"timezone": "Time Zone", "timezone": "Time Zone",
"overdueTasksRemindersTime": "Overdue tasks reminder email time" "overdueTasksRemindersTime": "Overdue tasks reminder email time"
}, },
@ -143,7 +143,7 @@
}, },
"deletion": { "deletion": {
"title": "Delete your Vikunja Account", "title": "Delete your Vikunja Account",
"text1": "The deletion of your account is permanent and cannot be undone. We will delete all your namespaces, lists, tasks and everything associated with it.", "text1": "The deletion of your account is permanent and cannot be undone. We will delete all your namespaces, projects, tasks and everything associated with it.",
"text2": "To proceed, please enter your password. You will receive an email with further instructions.", "text2": "To proceed, please enter your password. You will receive an email with further instructions.",
"confirm": "Delete my account", "confirm": "Delete my account",
"requestSuccess": "The request was successful. You'll receive an email with further instructions.", "requestSuccess": "The request was successful. You'll receive an email with further instructions.",
@ -157,40 +157,40 @@
}, },
"export": { "export": {
"title": "Export your Vikunja data", "title": "Export your Vikunja data",
"description": "You can request a copy of all your Vikunja data. This include Namespaces, Lists, Tasks and everything associated to them. You can import this data in any Vikunja instance through the migration function.", "description": "You can request a copy of all your Vikunja data. This include Namespaces, Projects, Tasks and everything associated to them. You can import this data in any Vikunja instance through the migration function.",
"descriptionPasswordRequired": "Please enter your password to proceed:", "descriptionPasswordRequired": "Please enter your password to proceed:",
"request": "Request a copy of my Vikunja Data", "request": "Request a copy of my Vikunja Data",
"success": "You've successfully requested your Vikunja Data! We will send you an email once it's ready to download.", "success": "You've successfully requested your Vikunja Data! We will send you an email once it's ready to download.",
"downloadTitle": "Download your exported Vikunja data" "downloadTitle": "Download your exported Vikunja data"
} }
}, },
"list": { "project": {
"archived": "This list is archived. It is not possible to create new or edit tasks for it.", "archived": "This project is archived. It is not possible to create new or edit tasks for it.",
"title": "List Title", "title": "Project Title",
"color": "Color", "color": "Color",
"lists": "Lists", "projects": "Projects",
"list": "List", "project": "Project",
"search": "Type to search for a list…", "search": "Type to search for a project…",
"searchSelect": "Click or press enter to select this list", "searchSelect": "Click or press enter to select this project",
"shared": "Shared Lists", "shared": "Shared Projects",
"noDescriptionAvailable": "No list description is available.", "noDescriptionAvailable": "No project description is available.",
"create": { "create": {
"header": "New list", "header": "New project",
"titlePlaceholder": "The list's title goes here…", "titlePlaceholder": "The project's title goes here…",
"addTitleRequired": "Please specify a title.", "addTitleRequired": "Please specify a title.",
"createdSuccess": "The list was successfully created.", "createdSuccess": "The project was successfully created.",
"addListRequired": "Please specify a list or set a default list in the settings." "addProjectRequired": "Please specify a project or set a default project in the settings."
}, },
"archive": { "archive": {
"title": "Archive \"{list}\"", "title": "Archive \"{project}\"",
"archive": "Archive this list", "archive": "Archive this project",
"unarchive": "Un-Archive this list", "unarchive": "Un-Archive this project",
"unarchiveText": "You will be able to create new tasks or edit it.", "unarchiveText": "You will be able to create new tasks or edit it.",
"archiveText": "You won't be able to edit this list or create new tasks until you un-archive it.", "archiveText": "You won't be able to edit this project or create new tasks until you un-archive it.",
"success": "The list was successfully archived." "success": "The project was successfully archived."
}, },
"background": { "background": {
"title": "Set list background", "title": "Set project background",
"remove": "Remove Background", "remove": "Remove Background",
"upload": "Choose a background from your pc", "upload": "Choose a background from your pc",
"searchPlaceholder": "Search for a background…", "searchPlaceholder": "Search for a background…",
@ -200,40 +200,40 @@
"removeSuccess": "The background has been removed successfully!" "removeSuccess": "The background has been removed successfully!"
}, },
"delete": { "delete": {
"title": "Delete \"{list}\"", "title": "Delete \"{project}\"",
"header": "Delete this list", "header": "Delete this project",
"text1": "Are you sure you want to delete this list and all of its contents?", "text1": "Are you sure you want to delete this project and all of its contents?",
"text2": "This includes all tasks and CANNOT BE UNDONE!", "text2": "This includes all tasks and CANNOT BE UNDONE!",
"success": "The list was successfully deleted.", "success": "The project was successfully deleted.",
"tasksToDelete": "This will irrevocably remove approx. {count} tasks.", "tasksToDelete": "This will irrevocably remove approx. {count} tasks.",
"noTasksToDelete": "This list does not contain any tasks, it should be safe to delete." "noTasksToDelete": "This project does not contain any tasks, it should be safe to delete."
}, },
"duplicate": { "duplicate": {
"title": "Duplicate this list", "title": "Duplicate this project",
"label": "Duplicate", "label": "Duplicate",
"text": "Select a namespace which should hold the duplicated list:", "text": "Select a namespace which should hold the duplicated project:",
"success": "The list was successfully duplicated." "success": "The project was successfully duplicated."
}, },
"edit": { "edit": {
"header": "Edit This List", "header": "Edit This Project",
"title": "Edit \"{list}\"", "title": "Edit \"{project}\"",
"titlePlaceholder": "The list title goes here…", "titlePlaceholder": "The project title goes here…",
"identifierTooltip": "The list identifier can be used to uniquely identify a task across lists. You can set it to empty to disable it.", "identifierTooltip": "The project identifier can be used to uniquely identify a task across projects. You can set it to empty to disable it.",
"identifier": "List Identifier", "identifier": "Project Identifier",
"identifierPlaceholder": "The list identifier goes here…", "identifierPlaceholder": "The project identifier goes here…",
"description": "Description", "description": "Description",
"descriptionPlaceholder": "The lists description goes here…", "descriptionPlaceholder": "The projects description goes here…",
"color": "Color", "color": "Color",
"success": "The list was successfully updated." "success": "The project was successfully updated."
}, },
"share": { "share": {
"header": "Share this list", "header": "Share this project",
"title": "Share \"{list}\"", "title": "Share \"{project}\"",
"share": "Share", "share": "Share",
"links": { "links": {
"title": "Share Links", "title": "Share Links",
"what": "What is a share link?", "what": "What is a share link?",
"explanation": "Share Links allow you to easily share a list with other users who don't have an account on Vikunja.", "explanation": "Share Links allow you to easily share a project with other users who don't have an account on Vikunja.",
"create": "Create a new link share", "create": "Create a new link share",
"name": "Name (optional)", "name": "Name (optional)",
"namePlaceholder": "e.g. Lorem Ipsum", "namePlaceholder": "e.g. Lorem Ipsum",
@ -242,7 +242,7 @@
"passwordExplanation": "When authenticating, the user will be required to enter this password.", "passwordExplanation": "When authenticating, the user will be required to enter this password.",
"noName": "No name set", "noName": "No name set",
"remove": "Remove a link share", "remove": "Remove a link share",
"removeText": "Are you sure you want to remove this link share? It will no longer be possible to access this list with this link share. This cannot be undone!", "removeText": "Are you sure you want to remove this link share? It will no longer be possible to access this project with this link share. This cannot be undone!",
"createSuccess": "The link share was successfully created.", "createSuccess": "The link share was successfully created.",
"deleteSuccess": "The link share was successfully deleted", "deleteSuccess": "The link share was successfully deleted",
"view": "View", "view": "View",
@ -271,11 +271,11 @@
"delete": "Delete" "delete": "Delete"
} }
}, },
"list": { "project": {
"title": "List", "title": "Project",
"add": "Add", "add": "Add",
"addPlaceholder": "Add a new task…", "addPlaceholder": "Add a new task…",
"empty": "This list is currently empty.", "empty": "This project is currently empty.",
"newTaskCta": "Create a new task.", "newTaskCta": "Create a new task.",
"editTask": "Edit Task" "editTask": "Edit Task"
}, },
@ -323,36 +323,36 @@
} }
}, },
"namespace": { "namespace": {
"title": "Namespaces & Lists", "title": "Namespaces & Projects",
"namespace": "Namespace", "namespace": "Namespace",
"showArchived": "Show Archived", "showArchived": "Show Archived",
"noneAvailable": "You don't have any namespaces right now.", "noneAvailable": "You don't have any namespaces right now.",
"unarchive": "Un-Archive", "unarchive": "Un-Archive",
"archived": "Archived", "archived": "Archived",
"noLists": "This namespace does not contain any lists.", "noProjects": "This namespace does not contain any projects.",
"createList": "Create a new list in this namespace.", "createProject": "Create a new project in this namespace.",
"namespaces": "Namespaces", "namespaces": "Namespaces",
"search": "Type to search for a namespace…", "search": "Type to search for a namespace…",
"create": { "create": {
"title": "New namespace", "title": "New namespace",
"titleRequired": "Please specify a title.", "titleRequired": "Please specify a title.",
"explanation": "A namespace is a collection of lists you can share and use to organize your lists with. In fact, every list belongs to a namespace.", "explanation": "A namespace is a collection of projects you can share and use to organize your projects with. In fact, every project belongs to a namespace.",
"tooltip": "What's a namespace?", "tooltip": "What's a namespace?",
"success": "The namespace was successfully created." "success": "The namespace was successfully created."
}, },
"archive": { "archive": {
"titleArchive": "Archive \"{namespace}\"", "titleArchive": "Archive \"{namespace}\"",
"titleUnarchive": "Un-Archive \"{namespace}\"", "titleUnarchive": "Un-Archive \"{namespace}\"",
"archiveText": "You won't be able to edit this namespace or create new lists until you un-archive it. This will also archive all lists in this namespace.", "archiveText": "You won't be able to edit this namespace or create new projects until you un-archive it. This will also archive all projects in this namespace.",
"unarchiveText": "You will be able to create new lists or edit it.", "unarchiveText": "You will be able to create new projects or edit it.",
"success": "The namespace was successfully archived.", "success": "The namespace was successfully archived.",
"unarchiveSuccess": "The namespace was successfully un-archived.", "unarchiveSuccess": "The namespace was successfully un-archived.",
"description": "If a namespace is archived, you cannot create new lists or edit it." "description": "If a namespace is archived, you cannot create new projects or edit it."
}, },
"delete": { "delete": {
"title": "Delete \"{namespace}\"", "title": "Delete \"{namespace}\"",
"text1": "Are you sure you want to delete this namespace and all of its contents?", "text1": "Are you sure you want to delete this namespace and all of its contents?",
"text2": "This includes all lists and tasks and CANNOT BE UNDONE!", "text2": "This includes all projects and tasks and CANNOT BE UNDONE!",
"success": "The namespace was successfully deleted." "success": "The namespace was successfully deleted."
}, },
"edit": { "edit": {
@ -372,8 +372,8 @@
"isArchived": "This namespace is archived" "isArchived": "This namespace is archived"
}, },
"pseudo": { "pseudo": {
"sharedLists": { "sharedProjects": {
"title": "Shared Lists" "title": "Shared Projects"
}, },
"favorites": { "favorites": {
"title": "Favorites" "title": "Favorites"
@ -404,7 +404,7 @@
}, },
"create": { "create": {
"title": "New Saved Filter", "title": "New Saved Filter",
"description": "A saved filter is a virtual list which is computed from a set of filters each time it is accessed. Once created, it will appear in a special namespace.", "description": "A saved filter is a virtual project which is computed from a set of filters each time it is accessed. Once created, it will appear in a special namespace.",
"action": "Create new saved filter" "action": "Create new saved filter"
}, },
"delete": { "delete": {
@ -422,7 +422,7 @@
"titleService": "Import your data from {name} into Vikunja", "titleService": "Import your data from {name} into Vikunja",
"import": "Import your data into Vikunja", "import": "Import your data into Vikunja",
"description": "Click on the logo of one of the third-party services below to get started.", "description": "Click on the logo of one of the third-party services below to get started.",
"descriptionDo": "Vikunja will import all lists, tasks, notes, reminders and files you have access to.", "descriptionDo": "Vikunja will import all projects, tasks, notes, reminders and files you have access to.",
"authorize": "To authorize Vikunja to access your {name} Account, click the button below.", "authorize": "To authorize Vikunja to access your {name} Account, click the button below.",
"getStarted": "Get Started", "getStarted": "Get Started",
"inProgress": "Importing in progress…", "inProgress": "Importing in progress…",
@ -435,7 +435,7 @@
"label": { "label": {
"title": "Labels", "title": "Labels",
"manage": "Manage labels", "manage": "Manage labels",
"description": "Click on a label to edit it. You can edit all labels you created, you can use all labels which are associated with a task to whose list you have access.", "description": "Click on a label to edit it. You can edit all labels you created, you can use all labels which are associated with a task to whose project you have access.",
"newCTA": "You currently do not have any labels.", "newCTA": "You currently do not have any labels.",
"search": "Type to search for a label…", "search": "Type to search for a label…",
"create": { "create": {
@ -460,7 +460,7 @@
}, },
"sharing": { "sharing": {
"authenticating": "Authenticating…", "authenticating": "Authenticating…",
"passwordRequired": "This shared list requires a password. Please enter it below:", "passwordRequired": "This shared project requires a password. Please enter it below:",
"error": "An error occured.", "error": "An error occured.",
"invalidPassword": "The password is invalid." "invalidPassword": "The password is invalid."
}, },
@ -528,8 +528,8 @@
"strikethrough": "Strikethrough", "strikethrough": "Strikethrough",
"code": "Code", "code": "Code",
"quote": "Quote", "quote": "Quote",
"unorderedList": "Unordered List", "unorderedProject": "Unordered Project",
"orderedList": "Ordered List", "orderedProject": "Ordered Project",
"cleanBlock": "Clean Block", "cleanBlock": "Clean Block",
"link": "Link", "link": "Link",
"image": "Image", "image": "Image",
@ -621,7 +621,7 @@
"chooseDueDate": "Click here to set a due date", "chooseDueDate": "Click here to set a due date",
"chooseStartDate": "Click here to set a start date", "chooseStartDate": "Click here to set a start date",
"chooseEndDate": "Click here to set an end date", "chooseEndDate": "Click here to set an end date",
"move": "Move task to a different list", "move": "Move task to a different project",
"done": "Mark task done!", "done": "Mark task done!",
"undone": "Mark as undone", "undone": "Mark as undone",
"created": "Created {0} by {1}", "created": "Created {0} by {1}",
@ -629,7 +629,7 @@
"doneAt": "Done {0}", "doneAt": "Done {0}",
"updateSuccess": "The task was saved successfully.", "updateSuccess": "The task was saved successfully.",
"deleteSuccess": "The task has been deleted successfully.", "deleteSuccess": "The task has been deleted successfully.",
"belongsToList": "This task belongs to list '{list}'", "belongsToProject": "This task belongs to project '{project}'",
"due": "Due {at}", "due": "Due {at}",
"closePopup": "Close popup", "closePopup": "Close popup",
"delete": { "delete": {
@ -649,7 +649,7 @@
"percentDone": "Set Progress", "percentDone": "Set Progress",
"attachments": "Add Attachments", "attachments": "Add Attachments",
"relatedTasks": "Add Relation", "relatedTasks": "Add Relation",
"moveList": "Move", "moveProject": "Move",
"color": "Set Color", "color": "Set Color",
"delete": "Delete", "delete": "Delete",
"favorite": "Add to Favorites", "favorite": "Add to Favorites",
@ -676,21 +676,21 @@
"updated": "Updated" "updated": "Updated"
}, },
"subscription": { "subscription": {
"subscribedListThroughParentNamespace": "You can't unsubscribe here because you are subscribed to this list through its namespace.", "subscribedProjectThroughParentNamespace": "You can't unsubscribe here because you are subscribed to this project through its namespace.",
"subscribedTaskThroughParentNamespace": "You can't unsubscribe here because you are subscribed to this task through its namespace.", "subscribedTaskThroughParentNamespace": "You can't unsubscribe here because you are subscribed to this task through its namespace.",
"subscribedTaskThroughParentList": "You can't unsubscribe here because you are subscribed to this task through its list.", "subscribedTaskThroughParentProject": "You can't unsubscribe here because you are subscribed to this task through its project.",
"subscribedNamespace": "You are currently subscribed to this namespace and will receive notifications for changes.", "subscribedNamespace": "You are currently subscribed to this namespace and will receive notifications for changes.",
"notSubscribedNamespace": "You are not subscribed to this namespace and won't receive notifications for changes.", "notSubscribedNamespace": "You are not subscribed to this namespace and won't receive notifications for changes.",
"subscribedList": "You are currently subscribed to this list and will receive notifications for changes.", "subscribedProject": "You are currently subscribed to this project and will receive notifications for changes.",
"notSubscribedList": "You are not subscribed to this list and won't receive notifications for changes.", "notSubscribedProject": "You are not subscribed to this project and won't receive notifications for changes.",
"subscribedTask": "You are currently subscribed to this task and will receive notifications for changes.", "subscribedTask": "You are currently subscribed to this task and will receive notifications for changes.",
"notSubscribedTask": "You are not subscribed to this task and won't receive notifications for changes.", "notSubscribedTask": "You are not subscribed to this task and won't receive notifications for changes.",
"subscribe": "Subscribe", "subscribe": "Subscribe",
"unsubscribe": "Unsubscribe", "unsubscribe": "Unsubscribe",
"subscribeSuccessNamespace": "You are now subscribed to this namespace", "subscribeSuccessNamespace": "You are now subscribed to this namespace",
"unsubscribeSuccessNamespace": "You are now unsubscribed to this namespace", "unsubscribeSuccessNamespace": "You are now unsubscribed to this namespace",
"subscribeSuccessList": "You are now subscribed to this list", "subscribeSuccessProject": "You are now subscribed to this project",
"unsubscribeSuccessList": "You are now unsubscribed to this list", "unsubscribeSuccessProject": "You are now unsubscribed to this project",
"subscribeSuccessTask": "You are now subscribed to this task", "subscribeSuccessTask": "You are now subscribed to this task",
"unsubscribeSuccessTask": "You are now unsubscribed to this task" "unsubscribeSuccessTask": "You are now unsubscribed to this task"
}, },
@ -764,7 +764,7 @@
"new": "New Task Relation", "new": "New Task Relation",
"searchPlaceholder": "Type search for a new task to add as related…", "searchPlaceholder": "Type search for a new task to add as related…",
"createPlaceholder": "Add this as new related task", "createPlaceholder": "Add this as new related task",
"differentList": "This task belongs to a different list.", "differentProject": "This task belongs to a different project.",
"differentNamespace": "This task belongs to a different namespace.", "differentNamespace": "This task belongs to a different namespace.",
"noneYet": "No task relations yet.", "noneYet": "No task relations yet.",
"delete": "Delete Task Relation", "delete": "Delete Task Relation",
@ -814,10 +814,10 @@
"priority1": "To set a task's priority, add a number 1-5, prefixed with a {prefix}.", "priority1": "To set a task's priority, add a number 1-5, prefixed with a {prefix}.",
"priority2": "The higher the number, the higher the priority.", "priority2": "The higher the number, the higher the priority.",
"assignees": "To directly assign the task to a user, add their username prefixed with {prefix} to the task.", "assignees": "To directly assign the task to a user, add their username prefixed with {prefix} to the task.",
"list1": "To set a list for the task to appear in, enter its name prefixed with {prefix}.", "project1": "To set a project for the task to appear in, enter its name prefixed with {prefix}.",
"list2": "This will return an error if the list does not exist.", "project2": "This will return an error if the project does not exist.",
"list3": "To use spaces, simply add a \" or ' around the list name.", "project3": "To use spaces, simply add a \" or ' around the project name.",
"list4": "For example: {prefix}\"List with spaces\".", "project4": "For example: {prefix}\"Project with spaces\".",
"dateAndTime": "Date and time", "dateAndTime": "Date and time",
"date": "Any date will be used as the due date of the new task. You can use dates in any of these formats:", "date": "Any date will be used as the due date of the new task. You can use dates in any of these formats:",
"dateWeekday": "any weekday, will use the next date with that date", "dateWeekday": "any weekday, will use the next date with that date",
@ -850,19 +850,19 @@
"delete": { "delete": {
"header": "Delete the team", "header": "Delete the team",
"text1": "Are you sure you want to delete this team and all of its members?", "text1": "Are you sure you want to delete this team and all of its members?",
"text2": "All team members will lose access to lists and namespaces shared with this team. This CANNOT BE UNDONE!", "text2": "All team members will lose access to projects and namespaces shared with this team. This CANNOT BE UNDONE!",
"success": "The team was successfully deleted." "success": "The team was successfully deleted."
}, },
"deleteUser": { "deleteUser": {
"header": "Remove a user from the team", "header": "Remove a user from the team",
"text1": "Are you sure you want to remove this user from the team?", "text1": "Are you sure you want to remove this user from the team?",
"text2": "They will lose access to all lists and namespaces this team has access to. This CANNOT BE UNDONE!", "text2": "They will lose access to all projects and namespaces this team has access to. This CANNOT BE UNDONE!",
"success": "The user was successfully deleted from the team." "success": "The user was successfully deleted from the team."
}, },
"leave": { "leave": {
"title": "Leave team", "title": "Leave team",
"text1": "Are you sure you want to leave this team?", "text1": "Are you sure you want to leave this team?",
"text2": "You will lose access to all lists and namespaces this team has access to. If you change your mind you'll need a team admin to add you again.", "text2": "You will lose access to all projects and namespaces this team has access to. If you change your mind you'll need a team admin to add you again.",
"success": "You have successfully left the team." "success": "You have successfully left the team."
} }
}, },
@ -894,13 +894,13 @@
"attachment": "Add an attachment to this task", "attachment": "Add an attachment to this task",
"related": "Modify related tasks of this task", "related": "Modify related tasks of this task",
"color": "Change the color of this task", "color": "Change the color of this task",
"move": "Move this task to another list", "move": "Move this task to another project",
"reminder": "Manage reminders of this task", "reminder": "Manage reminders of this task",
"description": "Toggle editing of the task description" "description": "Toggle editing of the task description"
}, },
"list": { "project": {
"title": "List Views", "title": "Project Views",
"switchToListView": "Switch to list view", "switchToProjectView": "Switch to project view",
"switchToGanttView": "Switch to gantt view", "switchToGanttView": "Switch to gantt view",
"switchToKanbanView": "Switch to kanban view", "switchToKanbanView": "Switch to kanban view",
"switchToTableView": "Switch to table view" "switchToTableView": "Switch to table view"
@ -909,7 +909,7 @@
"title": "Navigation", "title": "Navigation",
"overview": "Navigate to overview", "overview": "Navigate to overview",
"upcoming": "Navigate to upcoming tasks", "upcoming": "Navigate to upcoming tasks",
"namespaces": "Navigate to namespaces & lists", "namespaces": "Navigate to namespaces & projects",
"labels": "Navigate to labels", "labels": "Navigate to labels",
"teams": "Navigate to teams" "teams": "Navigate to teams"
} }
@ -926,7 +926,7 @@
"unarchive": "Un-Archive", "unarchive": "Un-Archive",
"setBackground": "Set background", "setBackground": "Set background",
"share": "Share", "share": "Share",
"newList": "New list" "newProject": "New project"
}, },
"apiConfig": { "apiConfig": {
"url": "Vikunja URL", "url": "Vikunja URL",
@ -945,24 +945,24 @@
"notification": { "notification": {
"title": "Notifications", "title": "Notifications",
"none": "You don't have any notifications. Have a nice day!", "none": "You don't have any notifications. Have a nice day!",
"explainer": "Notifications will appear here when actions on namespaces, lists or tasks you subscribed to happen." "explainer": "Notifications will appear here when actions on namespaces, projects or tasks you subscribed to happen."
}, },
"quickActions": { "quickActions": {
"commands": "Commands", "commands": "Commands",
"placeholder": "Type a command or search…", "placeholder": "Type a command or search…",
"hint": "You can use {list} to limit the search to a list. Combine {list} or {label} (labels) with a search query to search for a task with these labels or on that list. Use {assignee} to only search for teams.", "hint": "You can use {project} to limit the search to a project. Combine {project} or {label} (labels) with a search query to search for a task with these labels or on that project. Use {assignee} to only search for teams.",
"tasks": "Tasks", "tasks": "Tasks",
"lists": "Lists", "projects": "Projects",
"teams": "Teams", "teams": "Teams",
"newList": "Enter the title of the new list…", "newProject": "Enter the title of the new project…",
"newTask": "Enter the title of the new task…", "newTask": "Enter the title of the new task…",
"newNamespace": "Enter the title of the new namespace…", "newNamespace": "Enter the title of the new namespace…",
"newTeam": "Enter the name of the new team…", "newTeam": "Enter the name of the new team…",
"createTask": "Create a task in the current list ({title})", "createTask": "Create a task in the current project ({title})",
"createList": "Create a list in the current namespace ({title})", "createProject": "Create a project in the current namespace ({title})",
"cmds": { "cmds": {
"newTask": "New task", "newTask": "New task",
"newList": "New list", "newProject": "New project",
"newNamespace": "New namespace", "newNamespace": "New namespace",
"newTeam": "New team" "newTeam": "New team"
} }
@ -994,15 +994,15 @@
"1018": "The user avatar type setting is invalid.", "1018": "The user avatar type setting is invalid.",
"2001": "ID cannot be empty or 0.", "2001": "ID cannot be empty or 0.",
"2002": "Some of the request data was invalid.", "2002": "Some of the request data was invalid.",
"3001": "The list does not exist.", "3001": "The project does not exist.",
"3004": "You need to have read permissions on that list to perform that action.", "3004": "You need to have read permissions on that project to perform that action.",
"3005": "The list title cannot be empty.", "3005": "The project title cannot be empty.",
"3006": "The list share does not exist.", "3006": "The project share does not exist.",
"3007": "A list with this identifier already exists.", "3007": "A project with this identifier already exists.",
"3008": "The list is archived and can therefore only be accessed read only. This is also true for all tasks associated with this list.", "3008": "The project is archived and can therefore only be accessed read only. This is also true for all tasks associated with this project.",
"4001": "The list task text cannot be empty.", "4001": "The project task text cannot be empty.",
"4002": "The list task does not exist.", "4002": "The project task does not exist.",
"4003": "All bulk editing tasks must belong to the same list.", "4003": "All bulk editing tasks must belong to the same project.",
"4004": "Need at least one task when bulk editing tasks.", "4004": "Need at least one task when bulk editing tasks.",
"4005": "You do not have the right to see the task.", "4005": "You do not have the right to see the task.",
"4006": "You can't set a parent task as the task itself.", "4006": "You can't set a parent task as the task itself.",
@ -1028,21 +1028,21 @@
"5012": "The namespace is archived and can therefore only be accessed read only.", "5012": "The namespace is archived and can therefore only be accessed read only.",
"6001": "The team name cannot be empty.", "6001": "The team name cannot be empty.",
"6002": "The team does not exist.", "6002": "The team does not exist.",
"6004": "The team already has access to that namespace or list.", "6004": "The team already has access to that namespace or project.",
"6005": "The user is already a member of that team.", "6005": "The user is already a member of that team.",
"6006": "Cannot delete the last team member.", "6006": "Cannot delete the last team member.",
"6007": "The team does not have access to the list to perform that action.", "6007": "The team does not have access to the project to perform that action.",
"7002": "The user already has access to that list.", "7002": "The user already has access to that project.",
"7003": "You do not have access to that list.", "7003": "You do not have access to that project.",
"8001": "This label already exists on that task.", "8001": "This label already exists on that task.",
"8002": "The label does not exist.", "8002": "The label does not exist.",
"8003": "You do not have access to this label.", "8003": "You do not have access to this label.",
"9001": "The right is invalid.", "9001": "The right is invalid.",
"10001": "The bucket does not exist.", "10001": "The bucket does not exist.",
"10002": "The bucket does not belong to that list.", "10002": "The bucket does not belong to that project.",
"10003": "You cannot remove the last bucket on a list.", "10003": "You cannot remove the last bucket on a project.",
"10004": "You cannot add the task to this bucket as it already exceeded the limit of tasks it can hold.", "10004": "You cannot add the task to this bucket as it already exceeded the limit of tasks it can hold.",
"10005": "There can be only one done bucket per list.", "10005": "There can be only one done bucket per project.",
"11001": "The saved filter does not exist.", "11001": "The saved filter does not exist.",
"11002": "Saved filters are not available for link shares.", "11002": "Saved filters are not available for link shares.",
"12001": "The subscription entity type is invalid.", "12001": "The subscription entity type is invalid.",

2
src/modelTypes/IBucket.ts
View File

@ -5,7 +5,7 @@ import type {ITask} from './ITask'
export interface IBucket extends IAbstract { export interface IBucket extends IAbstract {
id: number id: number
title: string title: string
listId: number projectId: number
limit: number limit: number
tasks: ITask[] tasks: ITask[]
isDoneBucket: boolean isDoneBucket: boolean

2
src/modelTypes/ILabel.ts
View File

@ -7,7 +7,7 @@ export interface ILabel extends IAbstract {
hexColor: string hexColor: string
description: string description: string
createdBy: IUser createdBy: IUser
listId: number projectId: number
textColor: string textColor: string
created: Date created: Date

2
src/modelTypes/ILinkShare.ts
View File

@ -8,7 +8,7 @@ export interface ILinkShare extends IAbstract {
right: Right right: Right
sharedBy: IUser sharedBy: IUser
sharingType: number // FIXME: use correct numbers sharingType: number // FIXME: use correct numbers
listId: number projectId: number
name: string name: string
password: string password: string

9
src/modelTypes/IListDuplicate.ts
View File

@ -1,9 +0,0 @@
import type {IAbstract} from './IAbstract'
import type {IList} from './IList'
import type {INamespace} from './INamespace'
export interface IListDuplicate extends IAbstract {
listId: number
namespaceId: INamespace['id']
list: IList
}

4
src/modelTypes/INamespace.ts
View File

@ -1,5 +1,5 @@
import type {IAbstract} from './IAbstract' import type {IAbstract} from './IAbstract'
import type {IList} from './IList' import type {IProject} from './IProject'
import type {IUser} from './IUser' import type {IUser} from './IUser'
import type {ISubscription} from './ISubscription' import type {ISubscription} from './ISubscription'
@ -8,7 +8,7 @@ export interface INamespace extends IAbstract {
title: string title: string
description: string description: string
owner: IUser owner: IUser
lists: IList[] projects: IProject[]
isArchived: boolean isArchived: boolean
hexColor: string hexColor: string
subscription: ISubscription subscription: ISubscription

6
src/modelTypes/INotification.ts
View File

@ -3,13 +3,13 @@ import type {IUser} from './IUser'
import type {ITask} from './ITask' import type {ITask} from './ITask'
import type {ITaskComment} from './ITaskComment' import type {ITaskComment} from './ITaskComment'
import type {ITeam} from './ITeam' import type {ITeam} from './ITeam'
import type { IList } from './IList' import type { IProject } from './IProject'
export const NOTIFICATION_NAMES = { export const NOTIFICATION_NAMES = {
'TASK_COMMENT': 'task.comment', 'TASK_COMMENT': 'task.comment',
'TASK_ASSIGNED': 'task.assigned', 'TASK_ASSIGNED': 'task.assigned',
'TASK_DELETED': 'task.deleted', 'TASK_DELETED': 'task.deleted',
'LIST_CREATED': 'list.created', 'PROJECT_CREATED': 'project.created',
'TEAM_MEMBER_ADDED': 'team.member.added', 'TEAM_MEMBER_ADDED': 'team.member.added',
} as const } as const
@ -32,7 +32,7 @@ interface NotificationDeleted extends Notification {
interface NotificationCreated extends Notification { interface NotificationCreated extends Notification {
task: ITask task: ITask
list: IList project: IProject
} }
interface NotificationMemberAdded extends Notification { interface NotificationMemberAdded extends Notification {

2
src/modelTypes/IList.ts → src/modelTypes/IProject.ts
View File

@ -5,7 +5,7 @@ import type {ISubscription} from './ISubscription'
import type {INamespace} from './INamespace' import type {INamespace} from './INamespace'
export interface IList extends IAbstract { export interface IProject extends IAbstract {
id: number id: number
title: string title: string
description: string description: string

9
src/modelTypes/IProjectDuplicate.ts Normal file
View File

@ -0,0 +1,9 @@
import type {IAbstract} from './IAbstract'
import type {IProject} from './IProject'
import type {INamespace} from './INamespace'
export interface IProjectDuplicate extends IAbstract {
projectId: number
namespaceId: INamespace['id']
project: IProject
}

4
src/modelTypes/ITask.ts
View File

@ -5,7 +5,7 @@ import type {IUser} from './IUser'
import type {ILabel} from './ILabel' import type {ILabel} from './ILabel'
import type {IAttachment} from './IAttachment' import type {IAttachment} from './IAttachment'
import type {ISubscription} from './ISubscription' import type {ISubscription} from './ISubscription'
import type {IList} from './IList' import type {IProject} from './IProject'
import type {IBucket} from './IBucket' import type {IBucket} from './IBucket'
import type {IRelationKind} from '@/types/IRelationKind' import type {IRelationKind} from '@/types/IRelationKind'
@ -49,7 +49,7 @@ export interface ITask extends IAbstract {
created: Date created: Date
updated: Date updated: Date
listId: IList['id'] // Meta, only used when creating a new task projectId: IProject['id'] // Meta, only used when creating a new task
bucketId: IBucket['id'] bucketId: IBucket['id']
} }

6
src/modelTypes/ITeamList.ts
View File

@ -1,6 +0,0 @@
import type {ITeamShareBase} from './ITeamShareBase'
import type {IList} from './IList'
export interface ITeamList extends ITeamShareBase {
listId: IList['id']
}

4
src/modelTypes/ITeamMember.ts
View File

@ -1,7 +1,7 @@
import type {IUser} from './IUser' import type {IUser} from './IUser'
import type {IList} from './IList' import type {IProject} from './IProject'
export interface ITeamMember extends IUser { export interface ITeamMember extends IUser {
admin: boolean admin: boolean
teamId: IList['id'] teamId: IProject['id']
} }

6
src/modelTypes/ITeamProject.ts Normal file
View File

@ -0,0 +1,6 @@
import type {ITeamShareBase} from './ITeamShareBase'
import type {IProject} from './IProject'
export interface ITeamProject extends ITeamShareBase {
projectId: IProject['id']
}

6
src/modelTypes/IUserList.ts
View File

@ -1,6 +0,0 @@
import type {IUserShareBase} from './IUserShareBase'
import type {IList} from './IList'
export interface IUserList extends IUserShareBase {
listId: IList['id']
}

6
src/modelTypes/IUserProject.ts Normal file
View File

@ -0,0 +1,6 @@
import type {IUserShareBase} from './IUserShareBase'
import type {IProject} from './IProject'
export interface IUserProject extends IUserShareBase {
projectId: IProject['id']
}

4
src/modelTypes/IUserSettings.ts
View File

@ -1,6 +1,6 @@
import type {IAbstract} from './IAbstract' import type {IAbstract} from './IAbstract'
import type {IList} from './IList' import type {IProject} from './IProject'
export interface IUserSettings extends IAbstract { export interface IUserSettings extends IAbstract {
name: string name: string
@ -9,7 +9,7 @@ export interface IUserSettings extends IAbstract {
discoverableByEmail: boolean discoverableByEmail: boolean
overdueTasksRemindersEnabled: boolean overdueTasksRemindersEnabled: boolean
overdueTasksRemindersTime: any overdueTasksRemindersTime: any
defaultListId: undefined | IList['id'] defaultProjectId: undefined | IProject['id']
weekStart: 0 | 1 | 2 | 3 | 4 | 5 | 6 weekStart: 0 | 1 | 2 | 3 | 4 | 5 | 6
timezone: string timezone: string
language: string language: string

2
src/models/bucket.ts
View File

@ -9,7 +9,7 @@ import type {IUser} from '@/modelTypes/IUser'
export default class BucketModel extends AbstractModel<IBucket> implements IBucket { export default class BucketModel extends AbstractModel<IBucket> implements IBucket {
id = 0 id = 0
title = '' title = ''
listId = '' projectId = ''
limit = 0 limit = 0
tasks: ITask[] = [] tasks: ITask[] = []
isDoneBucket = false isDoneBucket = false

2
src/models/label.ts
View File

@ -16,7 +16,7 @@ export default class LabelModel extends AbstractModel<ILabel> implements ILabel
hexColor = DEFAULT_LABEL_BACKGROUND_COLOR hexColor = DEFAULT_LABEL_BACKGROUND_COLOR
description = '' description = ''
createdBy: IUser createdBy: IUser
listId = 0 projectId = 0
textColor = '' textColor = ''
created: Date = null created: Date = null

2
src/models/linkShare.ts
View File

@ -11,7 +11,7 @@ export default class LinkShareModel extends AbstractModel<ILinkShare> implements
right: Right = RIGHTS.READ right: Right = RIGHTS.READ
sharedBy: IUser = UserModel sharedBy: IUser = UserModel
sharingType = 0 // FIXME: use correct numbers sharingType = 0 // FIXME: use correct numbers
listId = 0 projectId = 0
name: '' name: ''
password: '' password: ''
created: Date = null created: Date = null

19
src/models/listDuplicateModel.ts
View File

@ -1,19 +0,0 @@
import AbstractModel from './abstractModel'
import ListModel from './list'
import type {IListDuplicate} from '@/modelTypes/IListDuplicate'
import type {INamespace} from '@/modelTypes/INamespace'
import type {IList} from '@/modelTypes/IList'
export default class ListDuplicateModel extends AbstractModel<IListDuplicate> implements IListDuplicate {
listId = 0
namespaceId: INamespace['id'] = 0
list: IList = ListModel
constructor(data : Partial<IListDuplicate>) {
super()
this.assignData(data)
this.list = new ListModel(this.list)
}
}

10
src/models/namespace.ts
View File

@ -1,11 +1,11 @@
import AbstractModel from './abstractModel' import AbstractModel from './abstractModel'
import ListModel from './list' import ProjectModel from './project'
import UserModel from './user' import UserModel from './user'
import SubscriptionModel from '@/models/subscription' import SubscriptionModel from '@/models/subscription'
import type {INamespace} from '@/modelTypes/INamespace' import type {INamespace} from '@/modelTypes/INamespace'
import type {IUser} from '@/modelTypes/IUser' import type {IUser} from '@/modelTypes/IUser'
import type {IList} from '@/modelTypes/IList' import type {IProject} from '@/modelTypes/IProject'
import type {ISubscription} from '@/modelTypes/ISubscription' import type {ISubscription} from '@/modelTypes/ISubscription'
export default class NamespaceModel extends AbstractModel<INamespace> implements INamespace { export default class NamespaceModel extends AbstractModel<INamespace> implements INamespace {
@ -13,7 +13,7 @@ export default class NamespaceModel extends AbstractModel<INamespace> implements
title = '' title = ''
description = '' description = ''
owner: IUser = UserModel owner: IUser = UserModel
lists: IList[] = [] projects: IProject[] = []
isArchived = false isArchived = false
hexColor = '' hexColor = ''
subscription: ISubscription = null subscription: ISubscription = null
@ -29,8 +29,8 @@ export default class NamespaceModel extends AbstractModel<INamespace> implements
this.hexColor = '#' + this.hexColor this.hexColor = '#' + this.hexColor
} }
this.lists = this.lists.map(l => { this.projects = this.projects.map(l => {
return new ListModel(l) return new ProjectModel(l)
}) })
this.owner = new UserModel(this.owner) this.owner = new UserModel(this.owner)

10
src/models/notification.ts
View File

@ -3,7 +3,7 @@ import {parseDateOrNull} from '@/helpers/parseDateOrNull'
import UserModel, {getDisplayName} from '@/models/user' import UserModel, {getDisplayName} from '@/models/user'
import TaskModel from '@/models/task' import TaskModel from '@/models/task'
import TaskCommentModel from '@/models/taskComment' import TaskCommentModel from '@/models/taskComment'
import ListModel from '@/models/list' import ProjectModel from '@/models/project'
import TeamModel from '@/models/team' import TeamModel from '@/models/team'
import {NOTIFICATION_NAMES, type INotification} from '@/modelTypes/INotification' import {NOTIFICATION_NAMES, type INotification} from '@/modelTypes/INotification'
@ -43,10 +43,10 @@ export default class NotificationModel extends AbstractModel<INotification> impl
task: new TaskModel(this.notification.task), task: new TaskModel(this.notification.task),
} }
break break
case NOTIFICATION_NAMES.LIST_CREATED: case NOTIFICATION_NAMES.PROJECT_CREATED:
this.notification = { this.notification = {
doer: new UserModel(this.notification.doer), doer: new UserModel(this.notification.doer),
list: new ListModel(this.notification.list), project: new ProjectModel(this.notification.project),
} }
break break
case NOTIFICATION_NAMES.TEAM_MEMBER_ADDED: case NOTIFICATION_NAMES.TEAM_MEMBER_ADDED:
@ -78,8 +78,8 @@ export default class NotificationModel extends AbstractModel<INotification> impl
return `assigned ${who} to ${this.notification.task.getTextIdentifier()}` return `assigned ${who} to ${this.notification.task.getTextIdentifier()}`
case NOTIFICATION_NAMES.TASK_DELETED: case NOTIFICATION_NAMES.TASK_DELETED:
return `deleted ${this.notification.task.getTextIdentifier()}` return `deleted ${this.notification.task.getTextIdentifier()}`
case NOTIFICATION_NAMES.LIST_CREATED: case NOTIFICATION_NAMES.PROJECT_CREATED:
return `created ${this.notification.list.title}` return `created ${this.notification.project.title}`
case NOTIFICATION_NAMES.TEAM_MEMBER_ADDED: case NOTIFICATION_NAMES.TEAM_MEMBER_ADDED:
who = `${getDisplayName(this.notification.member)}` who = `${getDisplayName(this.notification.member)}`

6
src/models/list.ts → src/models/project.ts
View File

@ -3,13 +3,13 @@ import TaskModel from '@/models/task'
import UserModel from '@/models/user' import UserModel from '@/models/user'
import SubscriptionModel from '@/models/subscription' import SubscriptionModel from '@/models/subscription'
import type {IList} from '@/modelTypes/IList' import type {IProject} from '@/modelTypes/IProject'
import type {IUser} from '@/modelTypes/IUser' import type {IUser} from '@/modelTypes/IUser'
import type {ITask} from '@/modelTypes/ITask' import type {ITask} from '@/modelTypes/ITask'
import type {INamespace} from '@/modelTypes/INamespace' import type {INamespace} from '@/modelTypes/INamespace'
import type {ISubscription} from '@/modelTypes/ISubscription' import type {ISubscription} from '@/modelTypes/ISubscription'
export default class ListModel extends AbstractModel<IList> implements IList { export default class ProjectModel extends AbstractModel<IProject> implements IProject {
id = 0 id = 0
title = '' title = ''
description = '' description = ''
@ -28,7 +28,7 @@ export default class ListModel extends AbstractModel<IList> implements IList {
created: Date = null created: Date = null
updated: Date = null updated: Date = null
constructor(data: Partial<IList> = {}) { constructor(data: Partial<IProject> = {}) {
super() super()
this.assignData(data) this.assignData(data)

19
src/models/projectDuplicateModel.ts Normal file
View File

@ -0,0 +1,19 @@
import AbstractModel from './abstractModel'
import ProjectModel from './project'
import type {IProjectDuplicate} from '@/modelTypes/IProjectDuplicate'
import type {INamespace} from '@/modelTypes/INamespace'
import type {IProject} from '@/modelTypes/IProject'
export default class ProjectDuplicateModel extends AbstractModel<IProjectDuplicate> implements IProjectDuplicate {
projectId = 0
namespaceId: INamespace['id'] = 0
project: IProject = ProjectModel
constructor(data : Partial<IProjectDuplicate>) {
super()
this.assignData(data)
this.project = new ProjectModel(this.project)
}
}

8
src/models/task.ts
View File

@ -5,7 +5,7 @@ import type {ITask} from '@/modelTypes/ITask'
import type {ILabel} from '@/modelTypes/ILabel' import type {ILabel} from '@/modelTypes/ILabel'
import type {IUser} from '@/modelTypes/IUser' import type {IUser} from '@/modelTypes/IUser'
import type {IAttachment} from '@/modelTypes/IAttachment' import type {IAttachment} from '@/modelTypes/IAttachment'
import type {IList} from '@/modelTypes/IList' import type {IProject} from '@/modelTypes/IProject'
import type {ISubscription} from '@/modelTypes/ISubscription' import type {ISubscription} from '@/modelTypes/ISubscription'
import type {IBucket} from '@/modelTypes/IBucket' import type {IBucket} from '@/modelTypes/IBucket'
@ -93,7 +93,7 @@ export default class TaskModel extends AbstractModel<ITask> implements ITask {
created: Date = null created: Date = null
updated: Date = null updated: Date = null
listId: IList['id'] = 0 projectId: IProject['id'] = 0
bucketId: IBucket['id'] = 0 bucketId: IBucket['id'] = 0
constructor(data: Partial<ITask> = {}) { constructor(data: Partial<ITask> = {}) {
@ -142,7 +142,7 @@ export default class TaskModel extends AbstractModel<ITask> implements ITask {
// Make all attachments to attachment models // Make all attachments to attachment models
this.attachments = this.attachments.map(a => new AttachmentModel(a)) this.attachments = this.attachments.map(a => new AttachmentModel(a))
// Set the task identifier to empty if the list does not have one // Set the task identifier to empty if the project does not have one
if (this.identifier === `-${this.index}`) { if (this.identifier === `-${this.index}`) {
this.identifier = '' this.identifier = ''
} }
@ -155,7 +155,7 @@ export default class TaskModel extends AbstractModel<ITask> implements ITask {
this.created = new Date(this.created) this.created = new Date(this.created)
this.updated = new Date(this.updated) this.updated = new Date(this.updated)
this.listId = Number(this.listId) this.projectId = Number(this.projectId)
} }
getTextIdentifier() { getTextIdentifier() {

13
src/models/teamList.ts
View File

@ -1,13 +0,0 @@
import TeamShareBaseModel from './teamShareBase'
import type {ITeamList} from '@/modelTypes/ITeamList'
import type {IList} from '@/modelTypes/IList'
export default class TeamListModel extends TeamShareBaseModel implements ITeamList {
listId: IList['id'] = 0
constructor(data: Partial<ITeamList>) {
super(data)
this.assignData(data)
}
}

4
src/models/teamMember.ts
View File

@ -1,11 +1,11 @@
import UserModel from './user' import UserModel from './user'
import type {ITeamMember} from '@/modelTypes/ITeamMember' import type {ITeamMember} from '@/modelTypes/ITeamMember'
import type {IList} from '@/modelTypes/IList' import type {IProject} from '@/modelTypes/IProject'
export default class TeamMemberModel extends UserModel implements ITeamMember { export default class TeamMemberModel extends UserModel implements ITeamMember {
admin = false admin = false
teamId: IList['id'] = 0 teamId: IProject['id'] = 0
constructor(data: Partial<ITeamMember>) { constructor(data: Partial<ITeamMember>) {
super(data) super(data)

13
src/models/teamProject.ts Normal file
View File

@ -0,0 +1,13 @@
import TeamShareBaseModel from './teamShareBase'
import type {ITeamProject} from '@/modelTypes/ITeamProject'
import type {IProject} from '@/modelTypes/IProject'
export default class TeamProjectModel extends TeamShareBaseModel implements ITeamProject {
projectId: IProject['id'] = 0
constructor(data: Partial<ITeamProject>) {
super(data)
this.assignData(data)
}
}

2
src/models/teamShareBase.ts
View File

@ -6,7 +6,7 @@ import type {ITeam} from '@/modelTypes/ITeam'
/** /**
* This class is a base class for common team sharing model. * This class is a base class for common team sharing model.
* It is extended in a way so it can be used for namespaces as well for lists. * It is extended in a way so it can be used for namespaces as well for projects.
*/ */
export default class TeamShareBaseModel extends AbstractModel<ITeamShareBase> implements ITeamShareBase { export default class TeamShareBaseModel extends AbstractModel<ITeamShareBase> implements ITeamShareBase {
teamId: ITeam['id'] = 0 teamId: ITeam['id'] = 0

14
src/models/userList.ts
View File

@ -1,14 +0,0 @@
import UserShareBaseModel from './userShareBase'
import type {IUserList} from '@/modelTypes/IUserList'
import type {IList} from '@/modelTypes/IList'
// This class extends the user share model with a 'rights' parameter which is used in sharing
export default class UserListModel extends UserShareBaseModel implements IUserList {
listId: IList['id'] = 0
constructor(data: Partial<IUserList>) {
super(data)
this.assignData(data)
}
}

14
src/models/userProject.ts Normal file
View File

@ -0,0 +1,14 @@
import UserShareBaseModel from './userShareBase'
import type {IUserProject} from '@/modelTypes/IUserProject'
import type {IProject} from '@/modelTypes/IProject'
// This class extends the user share model with a 'rights' parameter which is used in sharing
export default class UserProjectModel extends UserShareBaseModel implements IUserProject {
projectId: IProject['id'] = 0
constructor(data: Partial<IUserProject>) {
super(data)
this.assignData(data)
}
}

2
src/models/userSettings.ts
View File

@ -10,7 +10,7 @@ export default class UserSettingsModel extends AbstractModel<IUserSettings> impl
discoverableByEmail = false discoverableByEmail = false
overdueTasksRemindersEnabled = true overdueTasksRemindersEnabled = true
overdueTasksRemindersTime = undefined overdueTasksRemindersTime = undefined
defaultListId = undefined defaultProjectId = undefined
weekStart = 0 as IUserSettings['weekStart'] weekStart = 0 as IUserSettings['weekStart']
timezone = '' timezone = ''
language = getCurrentLanguage() language = getCurrentLanguage()

82
src/modules/listHistory.test.ts
View File

@ -1,82 +0,0 @@
import {test, expect, vi} from 'vitest'
import {getHistory, removeListFromHistory, saveListToHistory} from './listHistory'
test('return an empty history when none was saved', () => {
Storage.prototype.getItem = vi.fn(() => null)
const h = getHistory()
expect(h).toStrictEqual([])
})
test('return a saved history', () => {
const saved = [{id: 1}, {id: 2}]
Storage.prototype.getItem = vi.fn(() => JSON.stringify(saved))
const h = getHistory()
expect(h).toStrictEqual(saved)
})
test('store list in history', () => {
let saved = {}
Storage.prototype.getItem = vi.fn(() => null)
Storage.prototype.setItem = vi.fn((key, lists) => {
saved = lists
})
saveListToHistory({id: 1})
expect(saved).toBe('[{"id":1}]')
})
test('store only the last 5 lists in history', () => {
let saved: string | null = null
Storage.prototype.getItem = vi.fn(() => saved)
Storage.prototype.setItem = vi.fn((key: string, lists: string) => {
saved = lists
})
saveListToHistory({id: 1})
saveListToHistory({id: 2})
saveListToHistory({id: 3})
saveListToHistory({id: 4})
saveListToHistory({id: 5})
saveListToHistory({id: 6})
expect(saved).toBe('[{"id":6},{"id":5},{"id":4},{"id":3},{"id":2}]')
})
test('don\'t store the same list twice', () => {
let saved: string | null = null
Storage.prototype.getItem = vi.fn(() => saved)
Storage.prototype.setItem = vi.fn((key: string, lists: string) => {
saved = lists
})
saveListToHistory({id: 1})
saveListToHistory({id: 1})
expect(saved).toBe('[{"id":1}]')
})
test('move a list to the beginning when storing it multiple times', () => {
let saved: string | null = null
Storage.prototype.getItem = vi.fn(() => saved)
Storage.prototype.setItem = vi.fn((key: string, lists: string) => {
saved = lists
})
saveListToHistory({id: 1})
saveListToHistory({id: 2})
saveListToHistory({id: 1})
expect(saved).toBe('[{"id":1},{"id":2}]')
})
test('remove list from history', () => {
let saved: string | null = '[{"id": 1}]'
Storage.prototype.getItem = vi.fn(() => null)
Storage.prototype.setItem = vi.fn((key: string, lists: string) => {
saved = lists
})
Storage.prototype.removeItem = vi.fn((key: string) => {
saved = null
})
removeListFromHistory({id: 1})
expect(saved).toBeNull()
})

51
src/modules/listHistory.ts
View File

@ -1,51 +0,0 @@
export interface ListHistory {
id: number;
}
export function getHistory(): ListHistory[] {
const savedHistory = localStorage.getItem('listHistory')
if (savedHistory === null) {
return []
}
return JSON.parse(savedHistory)
}
function saveHistory(history: ListHistory[]) {
if (history.length === 0) {
localStorage.removeItem('listHistory')
return
}
localStorage.setItem('listHistory', JSON.stringify(history))
}
export function saveListToHistory(list: ListHistory) {
const history: ListHistory[] = getHistory()
// Remove the element if it already exists in history, preventing duplicates and essentially moving it to the beginning
history.forEach((l, i) => {
if (l.id === list.id) {
history.splice(i, 1)
}
})
// Add the new list to the beginning of the list
history.unshift(list)
if (history.length > 5) {
history.pop()
}
saveHistory(history)
}
export function removeListFromHistory(list: ListHistory) {
const history: ListHistory[] = getHistory()
history.forEach((l, i) => {
if (l.id === list.id) {
history.splice(i, 1)
}
})
saveHistory(history)
}

38
src/modules/parseTaskText.test.ts
View File

@ -21,14 +21,14 @@ describe('Parse Task Text', () => {
}) })
it('should not parse text when disabled', () => { it('should not parse text when disabled', () => {
const text = 'Lorem Ipsum today *label +list !2 @user' const text = 'Lorem Ipsum today *label +project !2 @user'
const result = parseTaskText(text, PrefixMode.Disabled) const result = parseTaskText(text, PrefixMode.Disabled)
expect(result.text).toBe(text) expect(result.text).toBe(text)
}) })
it('should parse text in todoist mode when configured', () => { it('should parse text in todoist mode when configured', () => {
const result = parseTaskText('Lorem Ipsum today @label #list !2 +user', PrefixMode.Todoist) const result = parseTaskText('Lorem Ipsum today @label #project !2 +user', PrefixMode.Todoist)
expect(result.text).toBe('Lorem Ipsum') expect(result.text).toBe('Lorem Ipsum')
const now = new Date() const now = new Date()
@ -37,7 +37,7 @@ describe('Parse Task Text', () => {
expect(result?.date?.getDate()).toBe(now.getDate()) expect(result?.date?.getDate()).toBe(now.getDate())
expect(result.labels).toHaveLength(1) expect(result.labels).toHaveLength(1)
expect(result.labels[0]).toBe('label') expect(result.labels[0]).toBe('label')
expect(result.list).toBe('list') expect(result.project).toBe('project')
expect(result.priority).toBe(2) expect(result.priority).toBe(2)
expect(result.assignees).toHaveLength(1) expect(result.assignees).toHaveLength(1)
expect(result.assignees[0]).toBe('user') expect(result.assignees[0]).toBe('user')
@ -575,36 +575,36 @@ describe('Parse Task Text', () => {
}) })
}) })
describe('List', () => { describe('Project', () => {
it('should parse a list', () => { it('should parse a project', () => {
const result = parseTaskText('Lorem Ipsum +list') const result = parseTaskText('Lorem Ipsum +project')
expect(result.text).toBe('Lorem Ipsum') expect(result.text).toBe('Lorem Ipsum')
expect(result.list).toBe('list') expect(result.project).toBe('project')
}) })
it('should parse a list with a space in it', () => { it('should parse a project with a space in it', () => {
const result = parseTaskText(`Lorem Ipsum +'list with long name'`) const result = parseTaskText(`Lorem Ipsum +'project with long name'`)
expect(result.text).toBe('Lorem Ipsum') expect(result.text).toBe('Lorem Ipsum')
expect(result.list).toBe('list with long name') expect(result.project).toBe('project with long name')
}) })
it('should parse a list with a space in it and "', () => { it('should parse a project with a space in it and "', () => {
const result = parseTaskText(`Lorem Ipsum +"list with long name"`) const result = parseTaskText(`Lorem Ipsum +"project with long name"`)
expect(result.text).toBe('Lorem Ipsum') expect(result.text).toBe('Lorem Ipsum')
expect(result.list).toBe('list with long name') expect(result.project).toBe('project with long name')
}) })
it('should parse only the first list', () => { it('should parse only the first project', () => {
const result = parseTaskText(`Lorem Ipsum +list1 +list2 +list3`) const result = parseTaskText(`Lorem Ipsum +project1 +project2 +project3`)
expect(result.text).toBe('Lorem Ipsum +list2 +list3') expect(result.text).toBe('Lorem Ipsum +project2 +project3')
expect(result.list).toBe('list1') expect(result.project).toBe('project1')
}) })
it('should parse a list that\'s called like a date as list', () => { it('should parse a project that\'s called like a date as project', () => {
const result = parseTaskText(`Lorem Ipsum +today`) const result = parseTaskText(`Lorem Ipsum +today`)
expect(result.text).toBe('Lorem Ipsum') expect(result.text).toBe('Lorem Ipsum')
expect(result.list).toBe('today') expect(result.project).toBe('today')
}) })
}) })

20
src/modules/parseTaskText.ts
View File

@ -4,14 +4,14 @@ import {REPEAT_TYPES, type IRepeatAfter, type IRepeatType} from '@/types/IRepeat
const VIKUNJA_PREFIXES: Prefixes = { const VIKUNJA_PREFIXES: Prefixes = {
label: '*', label: '*',
list: '+', project: '+',
priority: '!', priority: '!',
assignee: '@', assignee: '@',
} }
const TODOIST_PREFIXES: Prefixes = { const TODOIST_PREFIXES: Prefixes = {
label: '@', label: '@',
list: '#', project: '#',
priority: '!', priority: '!',
assignee: '+', assignee: '+',
} }
@ -37,7 +37,7 @@ export interface ParsedTaskText {
text: string, text: string,
date: Date | null, date: Date | null,
labels: string[], labels: string[],
list: string | null, project: string | null,
priority: number | null, priority: number | null,
assignees: string[], assignees: string[],
repeats: IRepeatAfter | null, repeats: IRepeatAfter | null,
@ -45,13 +45,13 @@ export interface ParsedTaskText {
interface Prefixes { interface Prefixes {
label: string, label: string,
list: string, project: string,
priority: string, priority: string,
assignee: string, assignee: string,
} }
/** /**
* Parses task text for dates, assignees, labels, lists, priorities and returns an object with all found intents. * Parses task text for dates, assignees, labels, projects, priorities and returns an object with all found intents.
* *
* @param text * @param text
*/ */
@ -60,7 +60,7 @@ export const parseTaskText = (text: string, prefixesMode: PrefixMode = PrefixMod
text: text, text: text,
date: null, date: null,
labels: [], labels: [],
list: null, project: null,
priority: null, priority: null,
assignees: [], assignees: [],
repeats: null, repeats: null,
@ -74,9 +74,9 @@ export const parseTaskText = (text: string, prefixesMode: PrefixMode = PrefixMod
result.labels = getItemsFromPrefix(text, prefixes.label) result.labels = getItemsFromPrefix(text, prefixes.label)
result.text = cleanupItemText(result.text, result.labels, prefixes.label) result.text = cleanupItemText(result.text, result.labels, prefixes.label)
const lists: string[] = getItemsFromPrefix(result.text, prefixes.list) const projects: string[] = getItemsFromPrefix(result.text, prefixes.project)
result.list = lists.length > 0 ? lists[0] : null result.project = projects.length > 0 ? projects[0] : null
result.text = result.list !== null ? cleanupItemText(result.text, [result.list], prefixes.list) : result.text result.text = result.project !== null ? cleanupItemText(result.text, [result.project], prefixes.project) : result.text
result.priority = getPriority(result.text, prefixes.priority) result.priority = getPriority(result.text, prefixes.priority)
result.text = result.priority !== null ? cleanupItemText(result.text, [String(result.priority)], prefixes.priority) : result.text result.text = result.priority !== null ? cleanupItemText(result.text, [String(result.priority)], prefixes.priority) : result.text
@ -269,7 +269,7 @@ const cleanupItemText = (text: string, items: string[], prefix: string): string
const cleanupResult = (result: ParsedTaskText, prefixes: Prefixes): ParsedTaskText => { const cleanupResult = (result: ParsedTaskText, prefixes: Prefixes): ParsedTaskText => {
result.text = cleanupItemText(result.text, result.labels, prefixes.label) result.text = cleanupItemText(result.text, result.labels, prefixes.label)
result.text = result.list !== null ? cleanupItemText(result.text, [result.list], prefixes.list) : result.text result.text = result.project !== null ? cleanupItemText(result.text, [result.project], prefixes.project) : result.text
result.text = result.priority !== null ? cleanupItemText(result.text, [String(result.priority)], prefixes.priority) : result.text result.text = result.priority !== null ? cleanupItemText(result.text, [String(result.priority)], prefixes.priority) : result.text
result.text = cleanupItemText(result.text, result.assignees, prefixes.assignee) result.text = cleanupItemText(result.text, result.assignees, prefixes.assignee)
result.text = result.text.trim() result.text = result.text.trim()

82
src/modules/projectHistory.test.ts Normal file
View File

@ -0,0 +1,82 @@
import {test, expect, vi} from 'vitest'
import {getHistory, removeProjectFromHistory, saveProjectToHistory} from './projectHistory'
test('return an empty history when none was saved', () => {
Storage.prototype.getItem = vi.fn(() => null)
const h = getHistory()
expect(h).toStrictEqual([])
})
test('return a saved history', () => {
const saved = [{id: 1}, {id: 2}]
Storage.prototype.getItem = vi.fn(() => JSON.stringify(saved))
const h = getHistory()
expect(h).toStrictEqual(saved)
})
test('store project in history', () => {
let saved = {}
Storage.prototype.getItem = vi.fn(() => null)
Storage.prototype.setItem = vi.fn((key, projects) => {
saved = projects
})
saveProjectToHistory({id: 1})
expect(saved).toBe('[{"id":1}]')
})
test('store only the last 5 projects in history', () => {
let saved: string | null = null
Storage.prototype.getItem = vi.fn(() => saved)
Storage.prototype.setItem = vi.fn((key: string, projects: string) => {
saved = projects
})
saveProjectToHistory({id: 1})
saveProjectToHistory({id: 2})
saveProjectToHistory({id: 3})
saveProjectToHistory({id: 4})
saveProjectToHistory({id: 5})
saveProjectToHistory({id: 6})
expect(saved).toBe('[{"id":6},{"id":5},{"id":4},{"id":3},{"id":2}]')
})
test('don\'t store the same project twice', () => {
let saved: string | null = null
Storage.prototype.getItem = vi.fn(() => saved)
Storage.prototype.setItem = vi.fn((key: string, projects: string) => {
saved = projects
})
saveProjectToHistory({id: 1})
saveProjectToHistory({id: 1})
expect(saved).toBe('[{"id":1}]')
})
test('move a project to the beginning when storing it multiple times', () => {
let saved: string | null = null
Storage.prototype.getItem = vi.fn(() => saved)
Storage.prototype.setItem = vi.fn((key: string, projects: string) => {
saved = projects
})
saveProjectToHistory({id: 1})
saveProjectToHistory({id: 2})
saveProjectToHistory({id: 1})
expect(saved).toBe('[{"id":1},{"id":2}]')
})
test('remove project from history', () => {
let saved: string | null = '[{"id": 1}]'
Storage.prototype.getItem = vi.fn(() => null)
Storage.prototype.setItem = vi.fn((key: string, projects: string) => {
saved = projects
})
Storage.prototype.removeItem = vi.fn((key: string) => {
saved = null
})
removeProjectFromHistory({id: 1})
expect(saved).toBeNull()
})

51
src/modules/projectHistory.ts Normal file
View File

@ -0,0 +1,51 @@
export interface ProjectHistory {
id: number;
}
export function getHistory(): ProjectHistory[] {
const savedHistory = localStorage.getItem('projectHistory')
if (savedHistory === null) {
return []
}
return JSON.parse(savedHistory)
}
function saveHistory(history: ProjectHistory[]) {
if (history.length === 0) {
localStorage.removeItem('projectHistory')
return
}
localStorage.setItem('projectHistory', JSON.stringify(history))
}
export function saveProjectToHistory(project: ProjectHistory) {
const history: ProjectHistory[] = getHistory()
// Remove the element if it already exists in history, preventing duplicates and essentially moving it to the beginning
history.forEach((l, i) => {
if (l.id === project.id) {
history.splice(i, 1)
}
})
// Add the new project to the beginning of the project
history.unshift(project)
if (history.length > 5) {
history.pop()
}
saveHistory(history)
}
export function removeProjectFromHistory(project: ProjectHistory) {
const history: ProjectHistory[] = getHistory()
history.forEach((l, i) => {
if (l.id === project.id) {
history.splice(i, 1)
}
})
saveHistory(history)
}

170
src/router/index.ts
View File

@ -2,12 +2,12 @@ import { createRouter, createWebHistory } from 'vue-router'
import type { RouteLocation } from 'vue-router' import type { RouteLocation } from 'vue-router'
import {saveLastVisited} from '@/helpers/saveLastVisited' import {saveLastVisited} from '@/helpers/saveLastVisited'
import {saveListView, getListView} from '@/helpers/saveListView' import {saveProjectView, getProjectView} from '@/helpers/saveProjectView'
import {parseDateOrString} from '@/helpers/time/parseDateOrString' import {parseDateOrString} from '@/helpers/time/parseDateOrString'
import {getNextWeekDate} from '@/helpers/time/getNextWeekDate' import {getNextWeekDate} from '@/helpers/time/getNextWeekDate'
import {setTitle} from '@/helpers/setTitle' import {setTitle} from '@/helpers/setTitle'
import {useListStore} from '@/stores/lists' 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'
@ -22,31 +22,31 @@ import DataExportDownload from '../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 ListNamespaces from '../views/namespaces/ListNamespaces.vue' import ProjectNamespaces from '../views/namespaces/ListNamespaces.vue'
const TaskDetailView = () => import('../views/tasks/TaskDetailView.vue') const TaskDetailView = () => import('../views/tasks/TaskDetailView.vue')
// Team Handling // Team Handling
import ListTeamsComponent from '../views/teams/ListTeams.vue' import ProjectTeamsComponent from '../views/teams/ListTeams.vue'
// Label Handling // Label Handling
import ListLabelsComponent from '../views/labels/ListLabels.vue' import ProjectLabelsComponent from '../views/labels/ListLabels.vue'
import NewLabelComponent from '../views/labels/NewLabel.vue' import NewLabelComponent from '../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')
// List Views // Project Views
import ListList from '../views/list/ListList.vue' import ProjectList from '../views/project/ProjectList.vue'
const ListGantt = () => import('../views/list/ListGantt.vue') const ProjectGantt = () => import('../views/project/ProjectGantt.vue')
import ListTable from '../views/list/ListTable.vue' import ProjectTable from '../views/project/ProjectTable.vue'
import ListKanban from '../views/list/ListKanban.vue' import ProjectKanban from '../views/project/ProjectKanban.vue'
const ListInfo = () => import('../views/list/ListInfo.vue') const ProjectInfo = () => import('../views/project/ProjectInfo.vue')
// List Settings // Project Settings
import ListSettingEdit from '../views/list/settings/edit.vue' import ProjectSettingEdit from '../views/project/settings/edit.vue'
import ListSettingBackground from '../views/list/settings/background.vue' import ProjectSettingBackground from '../views/project/settings/background.vue'
import ListSettingDuplicate from '../views/list/settings/duplicate.vue' import ProjectSettingDuplicate from '../views/project/settings/duplicate.vue'
import ListSettingShare from '../views/list/settings/share.vue' import ProjectSettingShare from '../views/project/settings/share.vue'
import ListSettingDelete from '../views/list/settings/delete.vue' import ProjectSettingDelete from '../views/project/settings/delete.vue'
import ListSettingArchive from '../views/list/settings/archive.vue' import ProjectSettingArchive from '../views/project/settings/archive.vue'
// Namespace Settings // Namespace Settings
import NamespaceSettingEdit from '../views/namespaces/settings/edit.vue' import NamespaceSettingEdit from '../views/namespaces/settings/edit.vue'
@ -71,8 +71,8 @@ const UserSettingsGeneralComponent = () => import('../views/user/settings/Genera
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')
// List Handling // Project Handling
const NewListComponent = () => import('../views/list/NewList.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')
@ -206,7 +206,7 @@ const router = createRouter({
{ {
path: '/namespaces', path: '/namespaces',
name: 'namespaces.index', name: 'namespaces.index',
component: ListNamespaces, component: ProjectNamespaces,
}, },
{ {
path: '/namespaces/new', path: '/namespaces/new',
@ -269,147 +269,147 @@ const router = createRouter({
}), }),
}, },
{ {
path: '/lists/new/:namespaceId/', path: '/projects/new/:namespaceId/',
name: 'list.create', name: 'project.create',
component: NewListComponent, component: NewProjectComponent,
meta: { meta: {
showAsModal: true, showAsModal: true,
}, },
}, },
{ {
path: '/lists/:listId/settings/edit', path: '/projects/:projectId/settings/edit',
name: 'list.settings.edit', name: 'project.settings.edit',
component: ListSettingEdit, component: ProjectSettingEdit,
props: route => ({ listId: Number(route.params.listId as string) }), props: route => ({ projectId: Number(route.params.projectId as string) }),
meta: { meta: {
showAsModal: true, showAsModal: true,
}, },
}, },
{ {
path: '/lists/:listId/settings/background', path: '/projects/:projectId/settings/background',
name: 'list.settings.background', name: 'project.settings.background',
component: ListSettingBackground, component: ProjectSettingBackground,
meta: { meta: {
showAsModal: true, showAsModal: true,
}, },
}, },
{ {
path: '/lists/:listId/settings/duplicate', path: '/projects/:projectId/settings/duplicate',
name: 'list.settings.duplicate', name: 'project.settings.duplicate',
component: ListSettingDuplicate, component: ProjectSettingDuplicate,
meta: { meta: {
showAsModal: true, showAsModal: true,
}, },
}, },
{ {
path: '/lists/:listId/settings/share', path: '/projects/:projectId/settings/share',
name: 'list.settings.share', name: 'project.settings.share',
component: ListSettingShare, component: ProjectSettingShare,
meta: { meta: {
showAsModal: true, showAsModal: true,
}, },
}, },
{ {
path: '/lists/:listId/settings/delete', path: '/projects/:projectId/settings/delete',
name: 'list.settings.delete', name: 'project.settings.delete',
component: ListSettingDelete, component: ProjectSettingDelete,
meta: { meta: {
showAsModal: true, showAsModal: true,
}, },
}, },
{ {
path: '/lists/:listId/settings/archive', path: '/projects/:projectId/settings/archive',
name: 'list.settings.archive', name: 'project.settings.archive',
component: ListSettingArchive, component: ProjectSettingArchive,
meta: { meta: {
showAsModal: true, showAsModal: true,
}, },
}, },
{ {
path: '/lists/:listId/settings/edit', path: '/projects/:projectId/settings/edit',
name: 'filter.settings.edit', name: 'filter.settings.edit',
component: FilterEdit, component: FilterEdit,
meta: { meta: {
showAsModal: true, showAsModal: true,
}, },
props: route => ({ listId: Number(route.params.listId as string) }), props: route => ({ projectId: Number(route.params.projectId as string) }),
}, },
{ {
path: '/lists/:listId/settings/delete', path: '/projects/:projectId/settings/delete',
name: 'filter.settings.delete', name: 'filter.settings.delete',
component: FilterDelete, component: FilterDelete,
meta: { meta: {
showAsModal: true, showAsModal: true,
}, },
props: route => ({ listId: Number(route.params.listId as string) }), props: route => ({ projectId: Number(route.params.projectId as string) }),
}, },
{ {
path: '/lists/:listId/info', path: '/projects/:projectId/info',
name: 'list.info', name: 'project.info',
component: ListInfo, component: ProjectInfo,
meta: { meta: {
showAsModal: true, showAsModal: true,
}, },
props: route => ({ listId: Number(route.params.listId as string) }), props: route => ({ projectId: Number(route.params.projectId as string) }),
}, },
{ {
path: '/lists/:listId', path: '/projects/:projectId',
name: 'list.index', name: 'project.index',
redirect(to) { redirect(to) {
// Redirect the user to list view by default // Redirect the user to project view by default
const savedListView = getListView(to.params.listId) const savedProjectView = getProjectView(to.params.projectId)
console.debug('Replaced list view with', savedListView) console.debug('Replaced project view with', savedProjectView)
return { return {
name: router.hasRoute(savedListView) name: router.hasRoute(savedProjectView)
? savedListView ? savedProjectView
: 'list.list', : 'project.project',
params: {listId: to.params.listId}, params: {projectId: to.params.projectId},
} }
}, },
}, },
{ {
path: '/lists/:listId/list', path: '/projects/:projectId/project',
name: 'list.list', name: 'project.project',
component: ListList, component: ProjectList,
beforeEnter: (to) => saveListView(to.params.listId, to.name), beforeEnter: (to) => saveProjectView(to.params.projectId, to.name),
props: route => ({ listId: Number(route.params.listId as string) }), props: route => ({ projectId: Number(route.params.projectId as string) }),
}, },
{ {
path: '/lists/:listId/gantt', path: '/projects/:projectId/gantt',
name: 'list.gantt', name: 'project.gantt',
component: ListGantt, component: ProjectGantt,
beforeEnter: (to) => saveListView(to.params.listId, to.name), beforeEnter: (to) => saveProjectView(to.params.projectId, to.name),
// FIXME: test if `useRoute` would be the same. If it would use it instead. // FIXME: test if `useRoute` would be the same. If it would use it instead.
props: route => ({route}), props: route => ({route}),
}, },
{ {
path: '/lists/:listId/table', path: '/projects/:projectId/table',
name: 'list.table', name: 'project.table',
component: ListTable, component: ProjectTable,
beforeEnter: (to) => saveListView(to.params.listId, to.name), beforeEnter: (to) => saveProjectView(to.params.projectId, to.name),
props: route => ({ listId: Number(route.params.listId as string) }), props: route => ({ projectId: Number(route.params.projectId as string) }),
}, },
{ {
path: '/lists/:listId/kanban', path: '/projects/:projectId/kanban',
name: 'list.kanban', name: 'project.kanban',
component: ListKanban, component: ProjectKanban,
beforeEnter: (to) => { beforeEnter: (to) => {
saveListView(to.params.listId, to.name) saveProjectView(to.params.projectId, to.name)
// Properly set the page title when a task popup is closed // Properly set the page title when a task popup is closed
const listStore = useListStore() const projectStore = useProjectStore()
const listFromStore = listStore.getListById(Number(to.params.listId)) const projectFromStore = projectStore.getProjectById(Number(to.params.projectId))
if(listFromStore) { if(projectFromStore) {
setTitle(listFromStore.title) setTitle(projectFromStore.title)
} }
}, },
props: route => ({ listId: Number(route.params.listId as string) }), props: route => ({ projectId: Number(route.params.projectId as string) }),
}, },
{ {
path: '/teams', path: '/teams',
name: 'teams.index', name: 'teams.index',
component: ListTeamsComponent, component: ProjectTeamsComponent,
}, },
{ {
path: '/teams/new', path: '/teams/new',
@ -427,7 +427,7 @@ const router = createRouter({
{ {
path: '/labels', path: '/labels',
name: 'labels.index', name: 'labels.index',
component: ListLabelsComponent, component: ProjectLabelsComponent,
}, },
{ {
path: '/labels/new', path: '/labels/new',

6
src/services/backgroundUnsplash.ts
View File

@ -1,13 +1,13 @@
import AbstractService from './abstractService' import AbstractService from './abstractService'
import BackgroundImageModel from '../models/backgroundImage' import BackgroundImageModel from '../models/backgroundImage'
import ListModel from '@/models/list' import ProjectModel from '@/models/project'
import type { IBackgroundImage } from '@/modelTypes/IBackgroundImage' import type { IBackgroundImage } from '@/modelTypes/IBackgroundImage'
export default class BackgroundUnsplashService extends AbstractService<IBackgroundImage> { export default class BackgroundUnsplashService extends AbstractService<IBackgroundImage> {
constructor() { constructor() {
super({ super({
getAll: '/backgrounds/unsplash/search', getAll: '/backgrounds/unsplash/search',
update: '/lists/{listId}/backgrounds/unsplash', update: '/projects/{projectId}/backgrounds/unsplash',
}) })
} }
@ -16,7 +16,7 @@ export default class BackgroundUnsplashService extends AbstractService<IBackgrou
} }
modelUpdateFactory(data) { modelUpdateFactory(data) {
return new ListModel(data) return new ProjectModel(data)
} }
async thumb(model) { async thumb(model) {

Some files were not shown because too many files have changed in this diff Show More