diff --git a/.drone.yml b/.drone.yml index 0553195be..4d23f9593 100644 --- a/.drone.yml +++ b/.drone.yml @@ -148,6 +148,7 @@ steps: GITEA_TOKEN: from_secret: gitea_token commands: + - shasum -a 384 -c ./scripts/deploy-preview-netlify.js.sha384 - node ./scripts/deploy-preview-netlify.js depends_on: - build-prod @@ -655,6 +656,6 @@ steps: from_secret: crowdin_key --- kind: signature -hmac: 15df446c7e93a881249d46273485183386157229ee6a37b1ed0fcb2a0b32bbe2 +hmac: 188ee90100c5fc5922a445e531e7a47453121edddb2a64a182eb23ed2bf602de ... diff --git a/cypress/integration/user/registration.spec.js b/cypress/integration/user/registration.spec.js index 3e7cf1f54..fc1b0fbde 100644 --- a/cypress/integration/user/registration.spec.js +++ b/cypress/integration/user/registration.spec.js @@ -24,8 +24,8 @@ context('Registration', () => { cy.visit('/register') cy.get('#username').type(fixture.username) cy.get('#email').type(fixture.email) - cy.get('#password1').type(fixture.password) - cy.get('#password2').type(fixture.password) + cy.get('#password').type(fixture.password) + cy.get('#passwordValidation').type(fixture.password) cy.get('#register-submit').click() cy.url().should('include', '/') cy.clock(1625656161057) // 13:00 @@ -42,8 +42,8 @@ context('Registration', () => { cy.visit('/register') cy.get('#username').type(fixture.username) cy.get('#email').type(fixture.email) - cy.get('#password1').type(fixture.password) - cy.get('#password2').type(fixture.password) + cy.get('#password').type(fixture.password) + cy.get('#passwordValidation').type(fixture.password) cy.get('#register-submit').click() cy.get('div.notification.is-danger').contains('A user with this username already exists.') }) diff --git a/package.json b/package.json index e980c0835..9e87b114d 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "dompurify": "2.3.3", "easymde": "2.15.0", "flatpickr": "4.6.9", + "flexsearch": "0.7.21", "highlight.js": "11.3.1", "is-touch-device": "1.0.1", "lodash.clonedeep": "4.5.0", @@ -39,8 +40,8 @@ "register-service-worker": "1.7.2", "snake-case": "3.0.4", "ufo": "0.7.9", - "vue": "3.2.21", - "vue-advanced-cropper": "2.6.3", + "vue": "3.2.22", + "vue-advanced-cropper": "2.7.0", "vue-drag-resize": "2.0.3", "vue-flatpickr-component": "9.0.5", "vue-i18n": "9.2.0-beta.18", @@ -55,6 +56,7 @@ "@fortawesome/free-regular-svg-icons": "5.15.4", "@fortawesome/free-solid-svg-icons": "5.15.4", "@fortawesome/vue-fontawesome": "3.0.0-5", + "@types/flexsearch": "0.7.2", "@types/jest": "27.0.2", "@typescript-eslint/eslint-plugin": "5.3.1", "@typescript-eslint/parser": "5.3.1", @@ -63,7 +65,7 @@ "@vue/eslint-config-typescript": "9.0.1", "autoprefixer": "10.4.0", "axios": "0.24.0", - "browserslist": "4.17.6", + "browserslist": "4.18.0", "cypress": "9.0.0", "cypress-file-upload": "5.0.8", "esbuild": "0.13.13", @@ -81,9 +83,9 @@ "ts-jest": "27.0.7", "typescript": "4.4.4", "vite": "2.6.14", - "vite-plugin-pwa": "0.11.3", - "vue-tsc": "0.29.4", + "vite-plugin-pwa": "0.11.5", "vite-svg-loader": "3.1.0", + "vue-tsc": "0.29.4", "wait-on": "6.0.0", "workbox-cli": "6.3.0" }, diff --git a/scripts/deploy-preview-netlify.js.sha384 b/scripts/deploy-preview-netlify.js.sha384 new file mode 100644 index 000000000..fe5f72f1d --- /dev/null +++ b/scripts/deploy-preview-netlify.js.sha384 @@ -0,0 +1 @@ +55ce0faaa2c1919341617ccfaeccbb6029ac12107964ff488985cff13dd952f1a991df3ab0d4b0705deb761e508e6434 ./scripts/deploy-preview-netlify.js diff --git a/src/assets/logo.svg b/src/assets/logo.svg index 435c904a2..53176d66e 100644 --- a/src/assets/logo.svg +++ b/src/assets/logo.svg @@ -1,4 +1,4 @@ - + diff --git a/src/components/list/partials/filters.vue b/src/components/list/partials/filters.vue index 95a849d2a..039061ac3 100644 --- a/src/components/list/partials/filters.vue +++ b/src/components/list/partials/filters.vue @@ -189,6 +189,8 @@ import ListService from '@/services/list' import NamespaceService from '@/services/namespace' import EditLabels from '@/components/tasks/partials/editLabels.vue' +import {objectToSnakeCase} from '@/helpers/case' + // FIXME: merge with DEFAULT_PARAMS in taskList.js const DEFAULT_PARAMS = { sort_by: [], @@ -261,7 +263,9 @@ export default { watch: { modelValue: { handler(value) { - this.params = value + // FIXME: filters should only be converted to snake case in + // the last moment + this.params = objectToSnakeCase(value) this.prepareFilters() }, immediate: true, diff --git a/src/components/misc/api-config.vue b/src/components/misc/api-config.vue index 6b2ff7208..07ca857b8 100644 --- a/src/components/misc/api-config.vue +++ b/src/components/misc/api-config.vue @@ -67,7 +67,7 @@ export default { }, computed: { apiDomain() { - return parseURL(this.apiUrl).host + return parseURL(this.apiUrl).host || parseURL(window.location.href).host }, }, props: { diff --git a/src/components/misc/keyboard-shortcuts/index.vue b/src/components/misc/keyboard-shortcuts/index.vue index c46d209e6..a1b7be304 100644 --- a/src/components/misc/keyboard-shortcuts/index.vue +++ b/src/components/misc/keyboard-shortcuts/index.vue @@ -1,6 +1,6 @@

{{ $t(s.title) }}

@@ -12,10 +12,11 @@ -
+
diff --git a/src/views/filters/FilterDelete.vue b/src/views/filters/FilterDelete.vue new file mode 100644 index 000000000..b0cba2ba2 --- /dev/null +++ b/src/views/filters/FilterDelete.vue @@ -0,0 +1,40 @@ + + + diff --git a/src/views/filters/FilterEdit.vue b/src/views/filters/FilterEdit.vue new file mode 100644 index 000000000..d7de1c854 --- /dev/null +++ b/src/views/filters/FilterEdit.vue @@ -0,0 +1,127 @@ + + + diff --git a/src/views/filters/CreateSavedFilter.vue b/src/views/filters/FilterNew.vue similarity index 66% rename from src/views/filters/CreateSavedFilter.vue rename to src/views/filters/FilterNew.vue index 43296fe28..418beb0e6 100644 --- a/src/views/filters/CreateSavedFilter.vue +++ b/src/views/filters/FilterNew.vue @@ -26,20 +26,20 @@
- - diff --git a/src/views/filters/settings/delete.vue b/src/views/filters/settings/delete.vue deleted file mode 100644 index 07172382f..000000000 --- a/src/views/filters/settings/delete.vue +++ /dev/null @@ -1,39 +0,0 @@ - - - diff --git a/src/views/filters/settings/edit.vue b/src/views/filters/settings/edit.vue deleted file mode 100644 index 2ee4e0941..000000000 --- a/src/views/filters/settings/edit.vue +++ /dev/null @@ -1,117 +0,0 @@ - - - diff --git a/src/views/migrator/MigrateService.vue b/src/views/migrator/MigrateService.vue index bc5377fe8..b8678a1e2 100644 --- a/src/views/migrator/MigrateService.vue +++ b/src/views/migrator/MigrateService.vue @@ -41,7 +41,7 @@
- +

{{ $t('migrate.inProgress') }}

@@ -186,9 +186,10 @@ export default { align-items: center; margin-bottom: 2rem; - img { + img, svg { display: block; max-height: 100px; + max-width: 100px; } } diff --git a/src/views/user/DataExportDownload.vue b/src/views/user/DataExportDownload.vue index 4c02f7fc8..827d396ac 100644 --- a/src/views/user/DataExportDownload.vue +++ b/src/views/user/DataExportDownload.vue @@ -35,36 +35,25 @@ - diff --git a/src/views/user/PasswordReset.vue b/src/views/user/PasswordReset.vue index fa0d4d94d..16735eb25 100644 --- a/src/views/user/PasswordReset.vue +++ b/src/views/user/PasswordReset.vue @@ -60,55 +60,49 @@ {{ $t('user.auth.login') }} - + - diff --git a/src/views/user/Register.vue b/src/views/user/Register.vue index 3b8ea2976..bfd65b3bd 100644 --- a/src/views/user/Register.vue +++ b/src/views/user/Register.vue @@ -36,12 +36,12 @@
- +
- +
@@ -95,61 +95,50 @@
- diff --git a/src/views/user/RequestPasswordReset.vue b/src/views/user/RequestPasswordReset.vue index 57f2196a4..b6e193656 100644 --- a/src/views/user/RequestPasswordReset.vue +++ b/src/views/user/RequestPasswordReset.vue @@ -43,42 +43,38 @@ {{ $t('user.auth.login') }}
- + - diff --git a/src/views/user/Settings.vue b/src/views/user/Settings.vue index aba2931d5..e7db1e184 100644 --- a/src/views/user/Settings.vue +++ b/src/views/user/Settings.vue @@ -57,24 +57,19 @@ -