diff --git a/.drone.yml b/.drone.yml index efaeb8057..30c4b76fe 100644 --- a/.drone.yml +++ b/.drone.yml @@ -307,7 +307,7 @@ depends_on: platform: os: linux - arch: arm + arch: arm64 trigger: ref: @@ -332,6 +332,8 @@ steps: when: ref: - refs/heads/master + depends_on: + - clone - name: docker-version image: plugins/docker:linux-arm @@ -350,6 +352,48 @@ steps: when: ref: - "refs/tags/**" + depends_on: + - clone + + - name: docker-latest-arm64 + image: plugins/docker:linux-arm64 + pull: true + settings: + username: + from_secret: docker_username + password: + from_secret: docker_password + repo: vikunja/frontend + auto_tag: true + auto_tag_suffix: linux-arm64 + build_args: + - USE_RELEASE=true + - RELEASE_VERSION=master + when: + ref: + - refs/heads/master + depends_on: + - clone + + - name: docker-version-arm64 + image: plugins/docker:linux-arm64 + pull: true + settings: + username: + from_secret: docker_username + password: + from_secret: docker_password + repo: vikunja/frontend + auto_tag: true + auto_tag_suffix: linux-arm64 + build_args: + - USE_RELEASE=true + - RELEASE_VERSION=${DRONE_TAG##v} + when: + ref: + - "refs/tags/**" + depends_on: + - clone --- kind: pipeline diff --git a/cypress/integration/list/list.spec.js b/cypress/integration/list/list.spec.js index 6093871e6..28b6b5091 100644 --- a/cypress/integration/list/list.spec.js +++ b/cypress/integration/list/list.spec.js @@ -21,7 +21,10 @@ describe('Lists', () => { it('Should create a new list', () => { cy.visit('/') - cy.get('.namespace-title a[href="/namespaces/1/list"]') + cy.get('.namespace-title .dropdown-trigger') + .click() + cy.get('.namespace-title .dropdown .dropdown-item') + .contains('New list') .click() cy.url() .should('contain', '/namespaces/1/list') @@ -58,9 +61,8 @@ describe('Lists', () => { .should('contain', '/lists/1/list') cy.get('.list-title h1') .should('contain', 'First List') - cy.get('.list-title a.icon') - .should('have.attr', 'href') - .and('include', '/lists/1/edit') + cy.get('.list-title .dropdown') + .should('exist') cy.get('p') .contains('This list is currently empty.') .should('exist') @@ -363,6 +365,7 @@ describe('Lists', () => { cy.getAttached('.kanban .bucket .tasks .task') .contains(tasks[0].title) + .should('be.visible') .click() cy.url() diff --git a/cypress/integration/task/task.spec.js b/cypress/integration/task/task.spec.js index ced98b605..34967d10e 100644 --- a/cypress/integration/task/task.spec.js +++ b/cypress/integration/task/task.spec.js @@ -175,7 +175,7 @@ describe('Task', () => { .should('exist') }) - it.only('Can add a new comment', () => { + it('Can add a new comment', () => { const tasks = TaskFactory.create(1, { id: 1, }) @@ -377,5 +377,34 @@ describe('Task', () => { cy.get('.task-view .details.labels-list .multiselect .input-wrapper') .should('not.contain', labels[0].title) }) + + it('Can set a due date for a task', () => { + const tasks = TaskFactory.create(1, { + id: 1, + done: false, + }) + cy.visit(`/tasks/${tasks[0].id}`) + + cy.get('.task-view .action-buttons .button') + .contains('Set Due Date') + .click() + cy.get('.task-view .columns.details .column') + .contains('Due Date') + .get('.date-input .datepicker .show') + .click() + cy.get('.datepicker .datepicker-popup a') + .contains('Tomorrow') + .click() + cy.get('.datepicker .datepicker-popup a.button') + .contains('Confirm') + .click() + + cy.get('.task-view .columns.details .column') + .contains('Due Date') + .get('.date-input .datepicker-popup') + .should('not.exist') + cy.get('.global-notification') + .should('contain', 'Success') + }) }) }) diff --git a/docker-manifest.tmpl b/docker-manifest.tmpl index 4d12a36a7..d12a95525 100644 --- a/docker-manifest.tmpl +++ b/docker-manifest.tmpl @@ -11,6 +11,11 @@ manifests: platform: architecture: amd64 os: linux + - + image: vikunja/frontend:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64 + platform: + architecture: arm64 + os: linux - image: vikunja/frontend:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm platform: diff --git a/nginx.conf b/nginx.conf index 2a7f59ab5..1b3d0e4f1 100644 --- a/nginx.conf +++ b/nginx.conf @@ -34,7 +34,10 @@ http { gzip_buffers 16 8k; gzip_http_version 1.1; gzip_min_length 256; - gzip_types text/plain text/css application/json application/x-javascript application/javascript text/xml application/xml application/xml+rss text/javascript application/vnd.ms-fontobject application/x-font-ttf font/opentype image/svg+xml font/woff2 image/x-icon; + gzip_types text/plain text/css application/json application/x-javascript application/javascript text/xml application/xml application/xml+rss text/javascript application/vnd.ms-fontobject application/x-font-ttf font/opentype image/svg+xml font/woff2 image/x-icon audio/wav; + + map_hash_max_size 128; + map_hash_bucket_size 128; # Expires map map $sent_http_content_type $expires { @@ -49,6 +52,7 @@ http { font/woff2 max; image/svg+xml max; image/x-icon max; + audio/wav max; ~image/ max; ~font/ max; } diff --git a/package.json b/package.json index bef001d45..c71fa63c6 100644 --- a/package.json +++ b/package.json @@ -16,16 +16,16 @@ "bulma": "0.9.2", "camel-case": "4.1.2", "copy-to-clipboard": "3.3.1", - "date-fns": "2.16.1", + "date-fns": "2.17.0", "dompurify": "2.2.6", - "highlight.js": "10.5.0", + "highlight.js": "10.6.0", "lodash": "4.17.20", - "marked": "1.2.8", + "marked": "2.0.0", "register-service-worker": "1.7.2", "snake-case": "3.0.4", "verte": "0.0.12", "vue": "2.6.12", - "vue-advanced-cropper": "0.20.1", + "vue-advanced-cropper": "1.3.0", "vue-drag-resize": "1.4.2", "vue-easymde": "1.3.2", "vue-shortkey": "3.1.7", @@ -44,11 +44,11 @@ "@vue/cli-service": "4.5.11", "axios": "0.21.1", "babel-eslint": "10.1.0", - "cypress": "6.3.0", + "cypress": "6.4.0", "cypress-file-upload": "5.0.2", - "eslint": "7.18.0", + "eslint": "7.19.0", "eslint-plugin-vue": "7.5.0", - "faker": "5.2.0", + "faker": "5.3.1", "jest": "26.6.3", "node-sass": "5.0.0", "sass-loader": "10.1.1", diff --git a/public/audio/pop.wav b/public/audio/pop.wav new file mode 100644 index 000000000..bc56c9416 Binary files /dev/null and b/public/audio/pop.wav differ diff --git a/public/fonts/open-sans-v15-latin-700.eot b/public/fonts/open-sans-v15-latin-700.eot deleted file mode 100644 index bf88bfad7..000000000 Binary files a/public/fonts/open-sans-v15-latin-700.eot and /dev/null differ diff --git a/public/fonts/open-sans-v15-latin-700.svg b/public/fonts/open-sans-v15-latin-700.svg deleted file mode 100644 index 8e6b61ade..000000000 --- a/public/fonts/open-sans-v15-latin-700.svg +++ /dev/null @@ -1,334 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/fonts/open-sans-v15-latin-700italic.eot b/public/fonts/open-sans-v15-latin-700italic.eot deleted file mode 100644 index f754e4ee9..000000000 Binary files a/public/fonts/open-sans-v15-latin-700italic.eot and /dev/null differ diff --git a/public/fonts/open-sans-v15-latin-700italic.svg b/public/fonts/open-sans-v15-latin-700italic.svg deleted file mode 100644 index 80b563538..000000000 --- a/public/fonts/open-sans-v15-latin-700italic.svg +++ /dev/null @@ -1,342 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/fonts/open-sans-v15-latin-italic.eot b/public/fonts/open-sans-v15-latin-italic.eot deleted file mode 100644 index d90868185..000000000 Binary files a/public/fonts/open-sans-v15-latin-italic.eot and /dev/null differ diff --git a/public/fonts/open-sans-v15-latin-italic.svg b/public/fonts/open-sans-v15-latin-italic.svg deleted file mode 100644 index e6a951f46..000000000 --- a/public/fonts/open-sans-v15-latin-italic.svg +++ /dev/null @@ -1,349 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/fonts/open-sans-v15-latin-regular.eot b/public/fonts/open-sans-v15-latin-regular.eot deleted file mode 100644 index 1a8b1160d..000000000 Binary files a/public/fonts/open-sans-v15-latin-regular.eot and /dev/null differ diff --git a/public/fonts/open-sans-v15-latin-regular.svg b/public/fonts/open-sans-v15-latin-regular.svg deleted file mode 100644 index 78eb653a7..000000000 --- a/public/fonts/open-sans-v15-latin-regular.svg +++ /dev/null @@ -1,336 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/fonts/quicksand-v7-latin-300.eot b/public/fonts/quicksand-v7-latin-300.eot deleted file mode 100644 index fc162bcc8..000000000 Binary files a/public/fonts/quicksand-v7-latin-300.eot and /dev/null differ diff --git a/public/fonts/quicksand-v7-latin-300.svg b/public/fonts/quicksand-v7-latin-300.svg deleted file mode 100644 index a5aa4ccac..000000000 --- a/public/fonts/quicksand-v7-latin-300.svg +++ /dev/null @@ -1,451 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/fonts/quicksand-v7-latin-500.eot b/public/fonts/quicksand-v7-latin-500.eot deleted file mode 100644 index d4d73588d..000000000 Binary files a/public/fonts/quicksand-v7-latin-500.eot and /dev/null differ diff --git a/public/fonts/quicksand-v7-latin-500.svg b/public/fonts/quicksand-v7-latin-500.svg deleted file mode 100644 index fedf04e68..000000000 --- a/public/fonts/quicksand-v7-latin-500.svg +++ /dev/null @@ -1,455 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/fonts/quicksand-v7-latin-700.eot b/public/fonts/quicksand-v7-latin-700.eot deleted file mode 100644 index 8b0d15c1b..000000000 Binary files a/public/fonts/quicksand-v7-latin-700.eot and /dev/null differ diff --git a/public/fonts/quicksand-v7-latin-700.svg b/public/fonts/quicksand-v7-latin-700.svg deleted file mode 100644 index 2c0d90af4..000000000 --- a/public/fonts/quicksand-v7-latin-700.svg +++ /dev/null @@ -1,458 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/fonts/quicksand-v7-latin-regular.eot b/public/fonts/quicksand-v7-latin-regular.eot deleted file mode 100644 index 8546c22ae..000000000 Binary files a/public/fonts/quicksand-v7-latin-regular.eot and /dev/null differ diff --git a/public/fonts/quicksand-v7-latin-regular.svg b/public/fonts/quicksand-v7-latin-regular.svg deleted file mode 100644 index e7cb778f2..000000000 --- a/public/fonts/quicksand-v7-latin-regular.svg +++ /dev/null @@ -1,454 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/ServiceWorker/sw.js b/src/ServiceWorker/sw.js index 3917ec1ef..98d8bc293 100644 --- a/src/ServiceWorker/sw.js +++ b/src/ServiceWorker/sw.js @@ -4,7 +4,7 @@ // Cache assets workbox.routing.registerRoute( // This regexp matches all files in precache-manifest - new RegExp('.+\\.(css|json|js|eot|svg|ttf|woff|woff2|png|html|txt)$'), + new RegExp('.+\\.(css|json|js|svg|woff2|png|html|txt|wav)$'), new workbox.strategies.StaleWhileRevalidate(), ) @@ -74,7 +74,7 @@ self.addEventListener('notificationclick', function (event) { switch (event.action) { case 'mark-as-done': // FIXME: Ugly as hell, but no other way of doing this, since we can't use modules - // in service workersfor now. + // in service workers for now. fetch('/config.json') .then(r => r.json()) .then(config => { diff --git a/src/components/home/navigation.vue b/src/components/home/navigation.vue index 2942bc0d6..2dc5ff7c3 100644 --- a/src/components/home/navigation.vue +++ b/src/components/home/navigation.vue @@ -64,25 +64,7 @@ {{ n.title }} ({{ n.lists.filter(l => !l.isArchived).length }}) -
- - - - - - - - - - -
+ + @@ -134,9 +117,15 @@ diff --git a/src/components/misc/card.vue b/src/components/misc/card.vue index fc5120758..bf391039b 100644 --- a/src/components/misc/card.vue +++ b/src/components/misc/card.vue @@ -10,7 +10,7 @@ -
+
@@ -46,6 +46,10 @@ export default { type: Boolean, default: true, }, + loading: { + type: Boolean, + default: false, + }, }, } diff --git a/src/components/misc/create-edit.vue b/src/components/misc/create-edit.vue new file mode 100644 index 000000000..01aba2d34 --- /dev/null +++ b/src/components/misc/create-edit.vue @@ -0,0 +1,85 @@ + + + diff --git a/src/components/misc/create.vue b/src/components/misc/create.vue deleted file mode 100644 index 121286bbd..000000000 --- a/src/components/misc/create.vue +++ /dev/null @@ -1,55 +0,0 @@ - - - diff --git a/src/components/misc/dropdown-item.vue b/src/components/misc/dropdown-item.vue new file mode 100644 index 000000000..861b08936 --- /dev/null +++ b/src/components/misc/dropdown-item.vue @@ -0,0 +1,28 @@ + + + diff --git a/src/components/misc/dropdown.vue b/src/components/misc/dropdown.vue new file mode 100644 index 000000000..9c51d06aa --- /dev/null +++ b/src/components/misc/dropdown.vue @@ -0,0 +1,50 @@ + + + diff --git a/src/components/misc/nothing.vue b/src/components/misc/nothing.vue new file mode 100644 index 000000000..923d924b8 --- /dev/null +++ b/src/components/misc/nothing.vue @@ -0,0 +1,11 @@ + + + diff --git a/src/components/modal/modal.vue b/src/components/modal/modal.vue index 1c74e59b1..3c130d096 100644 --- a/src/components/modal/modal.vue +++ b/src/components/modal/modal.vue @@ -2,7 +2,7 @@
-
+
@@ -49,6 +49,10 @@ export default { type: Boolean, default: false, }, + wide: { + type: Boolean, + default: false, + }, }, } diff --git a/src/components/namespace/namespace-settings-dropdown.vue b/src/components/namespace/namespace-settings-dropdown.vue new file mode 100644 index 000000000..70125cec8 --- /dev/null +++ b/src/components/namespace/namespace-settings-dropdown.vue @@ -0,0 +1,63 @@ + + + diff --git a/src/components/sharing/linkSharing.vue b/src/components/sharing/linkSharing.vue index 99059fd02..851098dfe 100644 --- a/src/components/sharing/linkSharing.vue +++ b/src/components/sharing/linkSharing.vue @@ -1,5 +1,6 @@ + + diff --git a/src/helpers/playPop.js b/src/helpers/playPop.js new file mode 100644 index 000000000..d65885a99 --- /dev/null +++ b/src/helpers/playPop.js @@ -0,0 +1,11 @@ +export const playSoundWhenDoneKey = 'playSoundWhenTaskDone' + +export const playPop = () => { + const enabled = localStorage.getItem(playSoundWhenDoneKey) === 'true' || localStorage.getItem(playSoundWhenDoneKey) === null + if(!enabled) { + return + } + + const popSound = new Audio('/audio/pop.wav') + popSound.play() +} \ No newline at end of file diff --git a/src/helpers/saveListView.js b/src/helpers/saveListView.js index a37627511..cddc5d9a4 100644 --- a/src/helpers/saveListView.js +++ b/src/helpers/saveListView.js @@ -1,4 +1,8 @@ export const saveListView = (listId, routeName) => { + if(routeName.includes('settings.')) { + return + } + const savedListView = localStorage.getItem('listView') let savedListViewJson = false if (savedListView !== null) { diff --git a/src/helpers/time/createDateFromString.js b/src/helpers/time/createDateFromString.js new file mode 100644 index 000000000..62f22942e --- /dev/null +++ b/src/helpers/time/createDateFromString.js @@ -0,0 +1,15 @@ +/** + * Returns a new date from any format in a way that all browsers, especially safari, can understand. + * + * @see https://kolaente.dev/vikunja/frontend/issues/207 + * + * @param dateString + * @returns {Date} + */ +export const createDateFromString = dateString => { + if (dateString.includes('-')) { + dateString = dateString.replace(/-/g, "/") + } + + return new Date(dateString) +} diff --git a/src/helpers/time/createDateFromString.test.js b/src/helpers/time/createDateFromString.test.js new file mode 100644 index 000000000..8998341d9 --- /dev/null +++ b/src/helpers/time/createDateFromString.test.js @@ -0,0 +1,13 @@ +import {createDateFromString} from './createDateFromString' + +test('YYYY-MM-DD HH:MM', () => { + const dateString = '2021-02-06 12:00' + const date = createDateFromString(dateString) + expect(date).toBeInstanceOf(Date) + expect(date.getDate()).toBe(6) + expect(date.getMonth()).toBe(1) + expect(date.getFullYear()).toBe(2021) + expect(date.getHours()).toBe(12) + expect(date.getMinutes()).toBe(0) + expect(date.getSeconds()).toBe(0) +}) diff --git a/src/main.js b/src/main.js index 27d3ba290..75829e37e 100644 --- a/src/main.js +++ b/src/main.js @@ -57,6 +57,10 @@ import { faChessKnight, faCoffee, faCocktail, + faEllipsisH, + faArchive, + faShareAlt, + faImage, } from '@fortawesome/free-solid-svg-icons' import {faCalendarAlt, faClock, faComments, faSave, faStar, faTimesCircle, faSun} from '@fortawesome/free-regular-svg-icons' import {FontAwesomeIcon} from '@fortawesome/vue-fontawesome' @@ -144,6 +148,10 @@ library.add(faSun) library.add(faChessKnight) library.add(faCoffee) library.add(faCocktail) +library.add(faEllipsisH) +library.add(faArchive) +library.add(faShareAlt) +library.add(faImage) Vue.component('icon', FontAwesomeIcon) @@ -193,6 +201,7 @@ Vue.mixin({ return date ? format(date, 'PPPPpppp') : '' }, formatDateShort: date => { + console.log('short date', date) return formatDate(date, 'PPpp') }, error: (e, context, actions = []) => message.error(e, context, actions), diff --git a/src/router/index.js b/src/router/index.js index 03d437bb9..d79ab68ba 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -29,6 +29,20 @@ import Kanban from '../views/list/views/Kanban' import List from '../views/list/views/List' import Gantt from '../views/list/views/Gantt' import Table from '../views/list/views/Table' +// List Settings +import ListSettingEdit from '@/views/list/settings/edit' +import ListSettingBackground from '@/views/list/settings/background' +import ListSettingDuplicate from '@/views/list/settings/duplicate' +import ListSettingShare from '@/views/list/settings/share' +import ListSettingDelete from '@/views/list/settings/delete' +import ListSettingArchive from '@/views/list/settings/archive' +import FilterSettingEdit from '@/views/filters/settings/edit' +import FilterSettingDelete from '@/views/filters/settings/delete' +// Namespace Settings +import NamespaceSettingEdit from '@/views/namespaces/settings/edit' +import NamespaceSettingShare from '@/views/namespaces/settings/share' +import NamespaceSettingArchive from '@/views/namespaces/settings/archive' +import NamespaceSettingDelete from '@/views/namespaces/settings/delete' // Saved Filters import CreateSavedFilter from '@/views/filters/CreateSavedFilter' @@ -57,12 +71,6 @@ const NewListComponent = () => ({ error: ErrorComponent, timeout: 60000, }) -const EditListComponent = () => ({ - component: import(/* webpackChunkName: "settings" */'../views/list/EditListView'), - loading: LoadingComponent, - error: ErrorComponent, - timeout: 60000, -}) // Namespace Handling const NewNamespaceComponent = () => ({ component: import(/* webpackChunkName: "settings" */'../views/namespaces/NewNamespace'), @@ -70,12 +78,6 @@ const NewNamespaceComponent = () => ({ error: ErrorComponent, timeout: 60000, }) -const EditNamespaceComponent = () => ({ - component: import(/* webpackChunkName: "settings" */'../views/namespaces/EditNamespace'), - loading: LoadingComponent, - error: ErrorComponent, - timeout: 60000, -}) const EditTeamComponent = () => ({ component: import(/* webpackChunkName: "settings" */'../views/teams/EditTeam'), @@ -163,11 +165,6 @@ export default new Router({ popup: NewNamespaceComponent, }, }, - { - path: '/namespaces/:id/edit', - name: 'namespace.edit', - component: EditNamespaceComponent, - }, { path: '/namespaces/:id/list', name: 'list.create', @@ -176,9 +173,32 @@ export default new Router({ } }, { - path: '/lists/:id/edit', - name: 'list.edit', - component: EditListComponent, + path: '/namespaces/:id/settings/edit', + name: 'namespace.settings.edit', + components: { + popup: NamespaceSettingEdit, + }, + }, + { + path: '/namespaces/:id/settings/share', + name: 'namespace.settings.share', + components: { + popup: NamespaceSettingShare, + }, + }, + { + path: '/namespaces/:id/settings/archive', + name: 'namespace.settings.archive', + components: { + popup: NamespaceSettingArchive, + }, + }, + { + path: '/namespaces/:id/settings/delete', + name: 'namespace.settings.delete', + components: { + popup: NamespaceSettingDelete, + }, }, { path: '/tasks/:id', @@ -190,6 +210,62 @@ export default new Router({ name: 'tasks.range', component: ShowTasksInRangeComponent, }, + { + path: '/lists/:listId/settings/edit', + name: 'list.settings.edit', + components: { + popup: ListSettingEdit, + }, + }, + { + path: '/lists/:listId/settings/background', + name: 'list.settings.background', + components: { + popup: ListSettingBackground, + }, + }, + { + path: '/lists/:listId/settings/duplicate', + name: 'list.settings.duplicate', + components: { + popup: ListSettingDuplicate, + }, + }, + { + path: '/lists/:listId/settings/share', + name: 'list.settings.share', + components: { + popup: ListSettingShare, + }, + }, + { + path: '/lists/:listId/settings/delete', + name: 'list.settings.delete', + components: { + popup: ListSettingDelete, + }, + }, + { + path: '/lists/:listId/settings/archive', + name: 'list.settings.archive', + components: { + popup: ListSettingArchive, + }, + }, + { + path: '/lists/:listId/settings/edit', + name: 'filter.settings.edit', + components: { + popup: FilterSettingEdit, + }, + }, + { + path: '/lists/:listId/settings/delete', + name: 'filter.settings.delete', + components: { + popup: FilterSettingDelete, + }, + }, { path: '/lists/:listId', name: 'list.index', @@ -205,6 +281,46 @@ export default new Router({ name: 'task.list.detail', component: TaskDetailViewModal, }, + { + path: '/lists/:listId/settings/edit', + name: 'list.list.settings.edit', + component: ListSettingEdit, + }, + { + path: '/lists/:listId/settings/background', + name: 'list.list.settings.background', + component: ListSettingBackground, + }, + { + path: '/lists/:listId/settings/duplicate', + name: 'list.list.settings.duplicate', + component: ListSettingDuplicate, + }, + { + path: '/lists/:listId/settings/share', + name: 'list.list.settings.share', + component: ListSettingShare, + }, + { + path: '/lists/:listId/settings/delete', + name: 'list.list.settings.delete', + component: ListSettingDelete, + }, + { + path: '/lists/:listId/settings/archive', + name: 'list.list.settings.archive', + component: ListSettingArchive, + }, + { + path: '/lists/:listId/settings/edit', + name: 'filter.list.settings.edit', + component: FilterSettingEdit, + }, + { + path: '/lists/:listId/settings/delete', + name: 'filter.list.settings.delete', + component: FilterSettingDelete, + }, ], }, { @@ -217,12 +333,94 @@ export default new Router({ name: 'task.gantt.detail', component: TaskDetailViewModal, }, + { + path: '/lists/:listId/settings/edit', + name: 'list.gantt.settings.edit', + component: ListSettingEdit, + }, + { + path: '/lists/:listId/settings/background', + name: 'list.gantt.settings.background', + component: ListSettingBackground, + }, + { + path: '/lists/:listId/settings/duplicate', + name: 'list.gantt.settings.duplicate', + component: ListSettingDuplicate, + }, + { + path: '/lists/:listId/settings/share', + name: 'list.gantt.settings.share', + component: ListSettingShare, + }, + { + path: '/lists/:listId/settings/delete', + name: 'list.gantt.settings.delete', + component: ListSettingDelete, + }, + { + path: '/lists/:listId/settings/archive', + name: 'list.gantt.settings.archive', + component: ListSettingArchive, + }, + { + path: '/lists/:listId/settings/edit', + name: 'filter.gantt.settings.edit', + component: FilterSettingEdit, + }, + { + path: '/lists/:listId/settings/delete', + name: 'filter.gantt.settings.delete', + component: FilterSettingDelete, + }, ], }, { path: '/lists/:listId/table', name: 'list.table', component: Table, + children: [ + { + path: '/lists/:listId/settings/edit', + name: 'list.table.settings.edit', + component: ListSettingEdit, + }, + { + path: '/lists/:listId/settings/background', + name: 'list.table.settings.background', + component: ListSettingBackground, + }, + { + path: '/lists/:listId/settings/duplicate', + name: 'list.table.settings.duplicate', + component: ListSettingDuplicate, + }, + { + path: '/lists/:listId/settings/share', + name: 'list.table.settings.share', + component: ListSettingShare, + }, + { + path: '/lists/:listId/settings/delete', + name: 'list.table.settings.delete', + component: ListSettingDelete, + }, + { + path: '/lists/:listId/settings/archive', + name: 'list.table.settings.archive', + component: ListSettingArchive, + }, + { + path: '/lists/:listId/settings/edit', + name: 'filter.table.settings.edit', + component: FilterSettingEdit, + }, + { + path: '/lists/:listId/settings/delete', + name: 'filter.table.settings.delete', + component: FilterSettingDelete, + }, + ], }, { path: '/lists/:listId/kanban', @@ -234,6 +432,46 @@ export default new Router({ name: 'task.kanban.detail', component: TaskDetailViewModal, }, + { + path: '/lists/:listId/settings/edit', + name: 'list.kanban.settings.edit', + component: ListSettingEdit, + }, + { + path: '/lists/:listId/settings/background', + name: 'list.kanban.settings.background', + component: ListSettingBackground, + }, + { + path: '/lists/:listId/settings/duplicate', + name: 'list.kanban.settings.duplicate', + component: ListSettingDuplicate, + }, + { + path: '/lists/:listId/settings/share', + name: 'list.kanban.settings.share', + component: ListSettingShare, + }, + { + path: '/lists/:listId/settings/delete', + name: 'list.kanban.settings.delete', + component: ListSettingDelete, + }, + { + path: '/lists/:listId/settings/archive', + name: 'list.kanban.settings.archive', + component: ListSettingArchive, + }, + { + path: '/lists/:listId/settings/edit', + name: 'filter.kanban.settings.edit', + component: FilterSettingEdit, + }, + { + path: '/lists/:listId/settings/delete', + name: 'filter.kanban.settings.delete', + component: FilterSettingDelete, + }, ], }, ], diff --git a/src/store/index.js b/src/store/index.js index 643db496c..20523175f 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -106,7 +106,7 @@ export const store = new Vuex.Store({ // Server updates don't return the right. Therefore the right is reset after updating the list which is // confusing because all the buttons will disappear in that case. To prevent this, we're keeping the right // when updating the list in global state. - if(typeof state.currentList.maxRight !== 'undefined') { + if (typeof state.currentList.maxRight !== 'undefined') { currentList.maxRight = state.currentList.maxRight } state.currentList = currentList diff --git a/src/styles/components/base/card.scss b/src/styles/components/base/card.scss index ade437216..519f0a1af 100644 --- a/src/styles/components/base/card.scss +++ b/src/styles/components/base/card.scss @@ -14,6 +14,11 @@ border-bottom: 1px solid $grey-200; border-radius: $radius $radius 0 0; } + + .modal-card-foot { + background: $grey-50; + border-top: 0; + } } .box, .card { diff --git a/src/styles/components/kanban.scss b/src/styles/components/kanban.scss index 0d4a413e0..758d6696a 100644 --- a/src/styles/components/kanban.scss +++ b/src/styles/components/kanban.scss @@ -250,10 +250,6 @@ $filter-container-height: '1rem - #{$switch-view-height}'; } } - .dropdown-trigger { - cursor: pointer; - } - .title.input { height: auto; padding: .4rem .5rem; @@ -261,6 +257,11 @@ $filter-container-height: '1rem - #{$switch-view-height}'; } } + .dropdown-trigger { + cursor: pointer; + padding: .5rem; + } + .bucket-footer { padding: .5rem; diff --git a/src/styles/components/list-backgrounds.scss b/src/styles/components/list-backgrounds.scss index c156e692f..1bbe04b7d 100644 --- a/src/styles/components/list-backgrounds.scss +++ b/src/styles/components/list-backgrounds.scss @@ -77,7 +77,7 @@ } .is-load-more-button { - margin: 0 auto; + margin: 1rem auto 0 !important; display: block; width: 200px; } diff --git a/src/styles/components/list.scss b/src/styles/components/list.scss index f5ac935a4..16589dfbf 100644 --- a/src/styles/components/list.scss +++ b/src/styles/components/list.scss @@ -8,24 +8,6 @@ .content { padding: 0; } - - .table { - border-top: 1px solid $grey-100; - border-radius: 4px; - overflow: hidden; - - td { - vertical-align: middle; - } - - td.type, td.actions { - width: 250px; - } - - td.actions { - text-align: right; - } - } } .task-add { @@ -51,11 +33,12 @@ margin: 0; } - .icon { + .dropdown-trigger { color: $grey-400; margin-left: 1rem; height: 1rem; width: 1rem; + cursor: pointer; } } @@ -63,6 +46,10 @@ padding-bottom: 1rem; } +$filter-container-top-default: -59px; +$filter-container-top-link-share-gantt: -138px; +$filter-container-top-link-share-list: -47px; + .filter-container { text-align: right; width: 100%; @@ -70,7 +57,7 @@ max-width: 180px; position: absolute; right: 1.5rem; - margin-top: -59px; + margin-top: $filter-container-top-default; z-index: 4; .items { @@ -146,20 +133,42 @@ } } +.list-namespace-title { + color: $grey-500; +} + .link-share-container .gantt-chart-container .filter-container, .gantt-chart-container .filter-container { - margin-top: calc(-138px - 2rem); + right: 0; + margin-top: calc(#{$filter-container-top-link-share-gantt} - 2rem); } .link-share-container .list-view .filter-container { - margin-top: -47px; + margin-top: $filter-container-top-link-share-list; } .link-share-container .filter-container { right: 9rem; - margin-top: -59px; + margin-top: $filter-container-top-default; } -.list-namespace-title { - color: $grey-500; +.is-archived { + $notification-height: 1.25rem + 1.25rem + 1.5rem + 1.5rem; + + .filter-container { + margin-top: calc(#{$filter-container-top-default} - #{$notification-height}); + } + + .link-share-container .gantt-chart-container .filter-container, + .gantt-chart-container .filter-container { + margin-top: calc(#{$filter-container-top-link-share-gantt} - 2rem - #{$notification-height}); + } + + .link-share-container .list-view .filter-container { + margin-top: calc(#{$filter-container-top-link-share-list} - #{$notification-height}); + } + + .link-share-container .filter-container { + margin-top: calc(#{$filter-container-top-default} - #{$notification-height}); + } } diff --git a/src/styles/components/modal.scss b/src/styles/components/modal.scss index 1805700bf..5f546d928 100644 --- a/src/styles/components/modal.scss +++ b/src/styles/components/modal.scss @@ -39,6 +39,12 @@ transform: translate(-50%, -50%); text-align: center; + @media screen and (max-width: $tablet) { + margin: 0; + top: 25%; + transform: translate(-50%, -25%); + } + .header { font-size: 2rem; font-weight: 700; @@ -56,6 +62,11 @@ color: $white; font-size: 2rem; } + + .is-wide { + max-width: $desktop; + width: calc(100% - 2rem); + } } } diff --git a/src/styles/theme/content.scss b/src/styles/theme/content.scss index 32c2da640..745a14ced 100644 --- a/src/styles/theme/content.scss +++ b/src/styles/theme/content.scss @@ -64,3 +64,17 @@ .underline-none { text-decoration: none !important; } + +.table.has-actions { + border-top: 1px solid $grey-100; + border-radius: 4px; + overflow: hidden; + + td { + vertical-align: middle; + } + + td.actions { + text-align: right; + } +} diff --git a/src/styles/theme/fonts.scss b/src/styles/theme/fonts.scss index 51bced9b9..dffa7c6cb 100644 --- a/src/styles/theme/fonts.scss +++ b/src/styles/theme/fonts.scss @@ -1,4 +1,4 @@ -$font-files-path: '../../public/fonts/'; +$font-files-path: '/fonts/'; /* quicksand-300 - latin */ @font-face { @@ -6,13 +6,10 @@ $font-files-path: '../../public/fonts/'; font-style: normal; font-weight: 300; font-display: swap; - src: url($font-files-path + 'quicksand-v7-latin-300.eot'); /* IE9 Compat Modes */ src: local('Quicksand Light'), local('Quicksand-Light'), - url($font-files-path + 'quicksand-v7-latin-300.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url($font-files-path + 'quicksand-v7-latin-300.woff2') format('woff2'), /* Super Modern Browsers */ url($font-files-path + 'quicksand-v7-latin-300.woff') format('woff'), /* Modern Browsers */ - url($font-files-path + 'quicksand-v7-latin-300.ttf') format('truetype'), /* Safari, Android, iOS */ - url($font-files-path + 'quicksand-v7-latin-300.svg#Quicksand') format('svg'); /* Legacy iOS */ + url($font-files-path + 'quicksand-v7-latin-300.ttf') format('truetype'); /* Safari, Android, iOS */ } /* quicksand-regular - latin */ @@ -21,13 +18,10 @@ $font-files-path: '../../public/fonts/'; font-style: normal; font-weight: 400; font-display: swap; - src: url($font-files-path + 'quicksand-v7-latin-regular.eot'); /* IE9 Compat Modes */ src: local('Quicksand Regular'), local('Quicksand-Regular'), - url($font-files-path + 'quicksand-v7-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url($font-files-path + 'quicksand-v7-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ url($font-files-path + 'quicksand-v7-latin-regular.woff') format('woff'), /* Modern Browsers */ - url($font-files-path + 'quicksand-v7-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ - url($font-files-path + 'quicksand-v7-latin-regular.svg#Quicksand') format('svg'); /* Legacy iOS */ + url($font-files-path + 'quicksand-v7-latin-regular.ttf') format('truetype'); /* Safari, Android, iOS */ } /* quicksand-500 - latin */ @@ -36,13 +30,10 @@ $font-files-path: '../../public/fonts/'; font-style: normal; font-weight: 500; font-display: swap; - src: url($font-files-path + 'quicksand-v7-latin-500.eot'); /* IE9 Compat Modes */ src: local('Quicksand Medium'), local('Quicksand-Medium'), - url($font-files-path + 'quicksand-v7-latin-500.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url($font-files-path + 'quicksand-v7-latin-500.woff2') format('woff2'), /* Super Modern Browsers */ url($font-files-path + 'quicksand-v7-latin-500.woff') format('woff'), /* Modern Browsers */ - url($font-files-path + 'quicksand-v7-latin-500.ttf') format('truetype'), /* Safari, Android, iOS */ - url($font-files-path + 'quicksand-v7-latin-500.svg#Quicksand') format('svg'); /* Legacy iOS */ + url($font-files-path + 'quicksand-v7-latin-500.ttf') format('truetype'); /* Safari, Android, iOS */ } /* quicksand-700 - latin */ @@ -51,13 +42,10 @@ $font-files-path: '../../public/fonts/'; font-style: normal; font-weight: 700; font-display: swap; - src: url($font-files-path + 'quicksand-v7-latin-700.eot'); /* IE9 Compat Modes */ src: local('Quicksand Bold'), local('Quicksand-Bold'), - url($font-files-path + 'quicksand-v7-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url($font-files-path + 'quicksand-v7-latin-700.woff2') format('woff2'), /* Super Modern Browsers */ url($font-files-path + 'quicksand-v7-latin-700.woff') format('woff'), /* Modern Browsers */ - url($font-files-path + 'quicksand-v7-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */ - url($font-files-path + 'quicksand-v7-latin-700.svg#Quicksand') format('svg'); /* Legacy iOS */ + url($font-files-path + 'quicksand-v7-latin-700.ttf') format('truetype'); /* Safari, Android, iOS */ } /* open-sans-regular - latin */ @@ -66,13 +54,10 @@ $font-files-path: '../../public/fonts/'; font-style: normal; font-weight: 400; font-display: swap; - src: url($font-files-path + 'open-sans-v15-latin-regular.eot'); /* IE9 Compat Modes */ src: local('Open Sans Regular'), local('OpenSans-Regular'), - url($font-files-path + 'open-sans-v15-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url($font-files-path + 'open-sans-v15-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ url($font-files-path + 'open-sans-v15-latin-regular.woff') format('woff'), /* Modern Browsers */ - url($font-files-path + 'open-sans-v15-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ - url($font-files-path + 'open-sans-v15-latin-regular.svg#OpenSans') format('svg'); /* Legacy iOS */ + url($font-files-path + 'open-sans-v15-latin-regular.ttf') format('truetype'); /* Safari, Android, iOS */ } /* open-sans-italic - latin */ @@ -81,13 +66,10 @@ $font-files-path: '../../public/fonts/'; font-style: italic; font-weight: 400; font-display: swap; - src: url($font-files-path + 'open-sans-v15-latin-italic.eot'); /* IE9 Compat Modes */ src: local('Open Sans Italic'), local('OpenSans-Italic'), - url($font-files-path + 'open-sans-v15-latin-italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url($font-files-path + 'open-sans-v15-latin-italic.woff2') format('woff2'), /* Super Modern Browsers */ url($font-files-path + 'open-sans-v15-latin-italic.woff') format('woff'), /* Modern Browsers */ - url($font-files-path + 'open-sans-v15-latin-italic.ttf') format('truetype'), /* Safari, Android, iOS */ - url($font-files-path + 'open-sans-v15-latin-italic.svg#OpenSans') format('svg'); /* Legacy iOS */ + url($font-files-path + 'open-sans-v15-latin-italic.ttf') format('truetype'); /* Safari, Android, iOS */ } /* open-sans-700 - latin */ @@ -96,13 +78,10 @@ $font-files-path: '../../public/fonts/'; font-style: normal; font-weight: 700; font-display: swap; - src: url($font-files-path + 'open-sans-v15-latin-700.eot'); /* IE9 Compat Modes */ src: local('Open Sans Bold'), local('OpenSans-Bold'), - url($font-files-path + 'open-sans-v15-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url($font-files-path + 'open-sans-v15-latin-700.woff2') format('woff2'), /* Super Modern Browsers */ url($font-files-path + 'open-sans-v15-latin-700.woff') format('woff'), /* Modern Browsers */ - url($font-files-path + 'open-sans-v15-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */ - url($font-files-path + 'open-sans-v15-latin-700.svg#OpenSans') format('svg'); /* Legacy iOS */ + url($font-files-path + 'open-sans-v15-latin-700.ttf') format('truetype'); /* Safari, Android, iOS */ } /* open-sans-700italic - latin */ @@ -111,11 +90,8 @@ $font-files-path: '../../public/fonts/'; font-style: italic; font-weight: 700; font-display: swap; - src: url($font-files-path + 'open-sans-v15-latin-700italic.eot'); /* IE9 Compat Modes */ src: local('Open Sans Bold Italic'), local('OpenSans-BoldItalic'), - url($font-files-path + 'open-sans-v15-latin-700italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url($font-files-path + 'open-sans-v15-latin-700italic.woff2') format('woff2'), /* Super Modern Browsers */ url($font-files-path + 'open-sans-v15-latin-700italic.woff') format('woff'), /* Modern Browsers */ - url($font-files-path + 'open-sans-v15-latin-700italic.ttf') format('truetype'), /* Safari, Android, iOS */ - url($font-files-path + 'open-sans-v15-latin-700italic.svg#OpenSans') format('svg'); /* Legacy iOS */ + url($font-files-path + 'open-sans-v15-latin-700italic.ttf') format('truetype'); /* Safari, Android, iOS */ } diff --git a/src/styles/theme/form.scss b/src/styles/theme/form.scss index 080adc793..e33835a0f 100644 --- a/src/styles/theme/form.scss +++ b/src/styles/theme/form.scss @@ -36,6 +36,11 @@ .field.has-addons .button { height: 2.5rem; + margin-left: 0 !important; +} + +.field.has-addons .select select { + margin-right: 0; } .input, diff --git a/src/styles/theme/navigation.scss b/src/styles/theme/navigation.scss index a9b0aa1eb..031418c19 100644 --- a/src/styles/theme/navigation.scss +++ b/src/styles/theme/navigation.scss @@ -179,13 +179,14 @@ } } - .actions { - flex: 0 0 auto; + a:not(.dropdown-item) { + color: $vikunja-nav-color; + padding: 0 .25rem; + } - a { - color: $vikunja-nav-color; - padding: 0 .25rem; - } + .dropdown-trigger { + padding: .5rem; + cursor: pointer; } } @@ -223,15 +224,36 @@ &.can-be-hidden { transition: all $transition; height: 0; - overflow: hidden; + //overflow: hidden; opacity: 0; } li { height: 44px; + display: flex; + align-items: center; + + .dropdown-trigger { + opacity: 0; + padding: .5rem; + cursor: pointer; + transition: $transition; + } + + &:hover { + background: $white; + + .dropdown-trigger { + opacity: 1; + } + } } - span.list-menu-link, a { + a:hover { + background: transparent; + } + + span.list-menu-link, li > a { padding: 0.75rem .5rem 0.75rem $navbar-padding * 1.5; transition: all 0.2s ease; @@ -261,10 +283,8 @@ } &:hover { - background: $white; border-left: $vikunja-nav-selected-width solid $primary; } - } } @@ -302,7 +322,7 @@ font-family: $vikunja-font; } - span.list-menu-link, a { + span.list-menu-link, li > a { padding-left: 2rem; display: inline-block; } @@ -342,12 +362,6 @@ box-shadow: none !important; } } - - .dropdown-menu { - .dropdown-content { - box-shadow: $shadow-md; - } - } } .menu-hide-button, .menu-show-button { diff --git a/src/styles/theme/theme.scss b/src/styles/theme/theme.scss index b036f8ba0..31ee51698 100644 --- a/src/styles/theme/theme.scss +++ b/src/styles/theme/theme.scss @@ -72,11 +72,26 @@ button.table { margin-bottom: 0 !important; } -.dropdown-item.is-disabled { - cursor: not-allowed; +.dropdown-item { + display: flex; + align-items: center; + justify-content: left !important; - &:hover { - background-color: transparent; + .icon { + padding-right: .5rem; + color: $grey-300 !important; + } + + &.has-text-danger .icon { + color: $danger !important; + } + + &.is-disabled { + cursor: not-allowed; + + &:hover { + background-color: transparent; + } } } @@ -120,3 +135,9 @@ button.table { border-radius: 100%; margin-right: 4px; } + +.dropdown-menu { + .dropdown-content { + box-shadow: $shadow-md; + } +} diff --git a/src/styles/theme/variables/colors.scss b/src/styles/theme/variables/colors.scss index d9e320504..09d04c1dd 100644 --- a/src/styles/theme/variables/colors.scss +++ b/src/styles/theme/variables/colors.scss @@ -1,3 +1,4 @@ +$grey-50: #F9FAFB; $grey-100: #f3f4f6; $grey-200: #E5E7EB; $grey-300: #D1D5DB; diff --git a/src/styles/theme/variables/variables.scss b/src/styles/theme/variables/variables.scss index c97323c34..043645902 100644 --- a/src/styles/theme/variables/variables.scss +++ b/src/styles/theme/variables/variables.scss @@ -1,5 +1,6 @@ @import 'colors'; +$white: #fff; $black: hsl(0, 0%, 4%) !default; $orange: #ff851b; $green: #00db60; diff --git a/src/views/filters/EditSavedFilter.vue b/src/views/filters/EditSavedFilter.vue deleted file mode 100644 index 472af2f27..000000000 --- a/src/views/filters/EditSavedFilter.vue +++ /dev/null @@ -1,159 +0,0 @@ - - - diff --git a/src/views/filters/settings/delete.vue b/src/views/filters/settings/delete.vue new file mode 100644 index 000000000..9102c3d68 --- /dev/null +++ b/src/views/filters/settings/delete.vue @@ -0,0 +1,44 @@ + + + diff --git a/src/views/filters/settings/edit.vue b/src/views/filters/settings/edit.vue new file mode 100644 index 000000000..6c7acb726 --- /dev/null +++ b/src/views/filters/settings/edit.vue @@ -0,0 +1,128 @@ + + + diff --git a/src/views/labels/NewLabel.vue b/src/views/labels/NewLabel.vue index e314d28f7..84009183e 100644 --- a/src/views/labels/NewLabel.vue +++ b/src/views/labels/NewLabel.vue @@ -1,5 +1,5 @@ diff --git a/src/views/list/EditListView.vue b/src/views/list/EditListView.vue deleted file mode 100644 index e7c4506f0..000000000 --- a/src/views/list/EditListView.vue +++ /dev/null @@ -1,25 +0,0 @@ - - - - diff --git a/src/views/list/NewList.vue b/src/views/list/NewList.vue index 864b04a2a..2aa6bd03e 100644 --- a/src/views/list/NewList.vue +++ b/src/views/list/NewList.vue @@ -1,5 +1,5 @@ diff --git a/src/components/list/partials/background-settings.vue b/src/views/list/settings/background.vue similarity index 91% rename from src/components/list/partials/background-settings.vue rename to src/views/list/settings/background.vue index faba0d080..0c22b759e 100644 --- a/src/components/list/partials/background-settings.vue +++ b/src/views/list/settings/background.vue @@ -1,9 +1,11 @@ - + diff --git a/src/views/list/settings/duplicate.vue b/src/views/list/settings/duplicate.vue new file mode 100644 index 000000000..9bdd58993 --- /dev/null +++ b/src/views/list/settings/duplicate.vue @@ -0,0 +1,58 @@ + + + diff --git a/src/views/list/settings/edit.vue b/src/views/list/settings/edit.vue new file mode 100644 index 000000000..0212c65f4 --- /dev/null +++ b/src/views/list/settings/edit.vue @@ -0,0 +1,127 @@ + + + diff --git a/src/views/list/settings/share.vue b/src/views/list/settings/share.vue new file mode 100644 index 000000000..e0c763629 --- /dev/null +++ b/src/views/list/settings/share.vue @@ -0,0 +1,78 @@ + + + diff --git a/src/views/list/views/Kanban.vue b/src/views/list/views/Kanban.vue index 3eb47392d..a03f3e5c1 100644 --- a/src/views/list/views/Kanban.vue +++ b/src/views/list/views/Kanban.vue @@ -32,57 +32,47 @@ v-if="bucket.limit > 0"> {{ bucket.tasks.length }}/{{ bucket.limit }} -
-
- - - -
- -
@@ -272,12 +262,15 @@ import {applyDrag} from '@/helpers/applyDrag' import {mapState} from 'vuex' import {saveListView} from '@/helpers/saveListView' import Rights from '../../../models/rights.json' -import {LOADING, LOADING_MODULE} from '../../../store/mutation-types' +import {LOADING, LOADING_MODULE} from '@/store/mutation-types' import FilterPopup from '@/components/list/partials/filter-popup' +import Dropdown from '@/components/misc/dropdown' +import {playPop} from '@/helpers/playPop' export default { name: 'Kanban', components: { + Dropdown, FilterPopup, Container, Draggable, @@ -295,7 +288,6 @@ export default { showOnTop: true, }, sourceBucket: 0, - bucketOptionsDropDownActive: {}, showBucketDeleteModal: false, bucketToDelete: 0, @@ -324,7 +316,6 @@ export default { created() { this.taskService = new TaskService() this.loadBuckets() - this.$nextTick(() => document.addEventListener('click', this.closeBucketDropdowns)) // Save the current list view to local storage // We use local storage and not vuex here to make it persistent across reloads. @@ -431,6 +422,11 @@ export default { this.$set(this.taskUpdating, task.id, true) task.done = !task.done this.$store.dispatch('tasks/update', task) + .then(() => { + if(task.done) { + playPop() + } + }) .catch(e => { this.error(e, this) }) @@ -449,17 +445,6 @@ export default { toggleShowNewTaskInput(bucket) { this.$set(this.showNewTaskInput, bucket, !this.showNewTaskInput[bucket]) }, - toggleBucketDropdown(bucketId) { - const oldState = this.bucketOptionsDropDownActive[bucketId] - this.closeBucketDropdowns() // Close all eventually open dropdowns - this.$set(this.bucketOptionsDropDownActive, bucketId, !oldState) - }, - closeBucketDropdowns() { - this.showSetLimitInput = false - for (const bucketId in this.bucketOptionsDropDownActive) { - this.bucketOptionsDropDownActive[bucketId] = false - } - }, addTaskToBucket(bucketId) { if (this.newTaskText === '') { diff --git a/src/views/list/views/List.vue b/src/views/list/views/List.vue index f799b70e5..9dd5957a0 100644 --- a/src/views/list/views/List.vue +++ b/src/views/list/views/List.vue @@ -84,12 +84,10 @@

-

+ This list is currently empty. Create a new task. -

+
@@ -174,6 +172,7 @@ import Rights from '../../../models/rights.json' import {mapState} from 'vuex' import FilterPopup from '@/components/list/partials/filter-popup' import {HAS_TASKS} from '@/store/mutation-types' +import Nothing from '@/components/misc/nothing' export default { name: 'List', @@ -195,6 +194,7 @@ export default { taskList, ], components: { + Nothing, FilterPopup, SingleTaskInList, EditTask, diff --git a/src/views/list/views/Table.vue b/src/views/list/views/Table.vue index 78981b03f..91f5d1b89 100644 --- a/src/views/list/views/Table.vue +++ b/src/views/list/views/Table.vue @@ -42,7 +42,7 @@
- +
diff --git a/src/views/namespaces/EditNamespace.vue b/src/views/namespaces/EditNamespace.vue deleted file mode 100644 index 24093a543..000000000 --- a/src/views/namespaces/EditNamespace.vue +++ /dev/null @@ -1,201 +0,0 @@ - - - \ No newline at end of file diff --git a/src/views/namespaces/ListNamespaces.vue b/src/views/namespaces/ListNamespaces.vue index 3dffb6a46..85397e9f5 100644 --- a/src/views/namespaces/ListNamespaces.vue +++ b/src/views/namespaces/ListNamespaces.vue @@ -7,7 +7,7 @@ Create saved filter - + Show Archived @@ -28,6 +28,15 @@ > Create list + + Un-Archive +

{{ n.title }} @@ -99,6 +108,7 @@ export default { } }, created() { + this.showArchived = localStorage.getItem('showArchived') ?? false this.loadBackgroundsForLists() }, mounted() { @@ -136,6 +146,9 @@ export default { this.$store.dispatch('lists/toggleListFavorite', list) .catch(e => this.error(e, this)) }, + saveShowArchivedState() { + localStorage.setItem('showArchived', this.showArchived) + }, }, } diff --git a/src/views/namespaces/NewNamespace.vue b/src/views/namespaces/NewNamespace.vue index b0f593181..4d041d741 100644 --- a/src/views/namespaces/NewNamespace.vue +++ b/src/views/namespaces/NewNamespace.vue @@ -1,5 +1,5 @@ diff --git a/src/views/namespaces/settings/delete.vue b/src/views/namespaces/settings/delete.vue new file mode 100644 index 000000000..f8f247ee2 --- /dev/null +++ b/src/views/namespaces/settings/delete.vue @@ -0,0 +1,44 @@ + + + diff --git a/src/views/namespaces/settings/edit.vue b/src/views/namespaces/settings/edit.vue new file mode 100644 index 000000000..dff726dd1 --- /dev/null +++ b/src/views/namespaces/settings/edit.vue @@ -0,0 +1,137 @@ + + + \ No newline at end of file diff --git a/src/views/namespaces/settings/share.vue b/src/views/namespaces/settings/share.vue new file mode 100644 index 000000000..7836aa31e --- /dev/null +++ b/src/views/namespaces/settings/share.vue @@ -0,0 +1,77 @@ + + + \ No newline at end of file diff --git a/src/views/tasks/ShowTasks.vue b/src/views/tasks/ShowTasks.vue index 82dbdf0eb..102a363f3 100644 --- a/src/views/tasks/ShowTasks.vue +++ b/src/views/tasks/ShowTasks.vue @@ -139,7 +139,7 @@ export default { const params = { sort_by: ['due_date', 'id'], - order_by: ['desc', 'desc'], + order_by: ['asc', 'desc'], filter_by: ['done'], filter_value: [false], filter_comparator: ['equals'], diff --git a/src/views/tasks/TaskDetailView.vue b/src/views/tasks/TaskDetailView.vue index 00061e212..ca300e1ae 100644 --- a/src/views/tasks/TaskDetailView.vue +++ b/src/views/tasks/TaskDetailView.vue @@ -421,6 +421,7 @@ import ColorPicker from '../../components/input/colorPicker' import attachmentUpload from '../../components/tasks/mixins/attachmentUpload' import heading from '@/components/tasks/partials/heading' import Datepicker from '@/components/input/datepicker' +import {playPop} from '@/helpers/playPop' export default { name: 'TaskDetailView', @@ -644,6 +645,11 @@ export default { }, toggleTaskDone() { this.task.done = !this.task.done + + if(this.task.done) { + playPop() + } + this.saveTask(true, () => this.toggleTaskDone()) }, setDescriptionChanged(e) { diff --git a/src/views/teams/EditTeam.vue b/src/views/teams/EditTeam.vue index a9a0ecdfe..72fdad59b 100644 --- a/src/views/teams/EditTeam.vue +++ b/src/views/teams/EditTeam.vue @@ -88,7 +88,7 @@ - +
diff --git a/src/views/teams/NewTeam.vue b/src/views/teams/NewTeam.vue index d229289e3..c6ccd2138 100644 --- a/src/views/teams/NewTeam.vue +++ b/src/views/teams/NewTeam.vue @@ -1,5 +1,5 @@
{{ m.getDisplayName() }}