diff --git a/cypress/integration/task/task.spec.js b/cypress/integration/task/task.spec.js index 83025aaa2..e661f1d29 100644 --- a/cypress/integration/task/task.spec.js +++ b/cypress/integration/task/task.spec.js @@ -353,7 +353,7 @@ describe('Task', () => { .first() .click() - cy.get('.global-notification') + cy.get('.global-notification', { timeout: 4000 }) .should('contain', 'Success') cy.get('.task-view .details.labels-list .multiselect .input-wrapper span.tag') .should('exist') diff --git a/cypress/support/factory.js b/cypress/support/factory.js index 0c50bf8fc..934f2fae9 100644 --- a/cypress/support/factory.js +++ b/cypress/support/factory.js @@ -1,5 +1,4 @@ import {seed} from './seed' -import merge from 'lodash/merge' /** * A factory makes it easy to seed the database with data. @@ -25,7 +24,10 @@ export class Factory { const data = [] for (let i = 1; i <= count; i++) { - const entry = merge(this.factory(), override) + const entry = { + ...this.factory(), + ...override, + } for (const e in entry) { if(typeof entry[e] === 'function') { entry[e] = entry[e](i) diff --git a/nginx.conf b/nginx.conf index 1b3d0e4f1..1adb02b5f 100644 --- a/nginx.conf +++ b/nginx.conf @@ -34,7 +34,7 @@ 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 audio/wav; + 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 image/x-icon audio/wav; map_hash_max_size 128; map_hash_bucket_size 128; diff --git a/originalMedia/audio/pop.mp3 b/originalMedia/audio/pop.mp3 new file mode 100644 index 000000000..019dc257a Binary files /dev/null and b/originalMedia/audio/pop.mp3 differ diff --git a/public/audio/pop.wav b/originalMedia/audio/pop.wav similarity index 100% rename from public/audio/pop.wav rename to originalMedia/audio/pop.wav diff --git a/originalMedia/icons/android-chrome-192x192.png b/originalMedia/icons/android-chrome-192x192.png new file mode 100644 index 000000000..981d0057d Binary files /dev/null and b/originalMedia/icons/android-chrome-192x192.png differ diff --git a/originalMedia/icons/android-chrome-512x512.png b/originalMedia/icons/android-chrome-512x512.png new file mode 100644 index 000000000..2ed624508 Binary files /dev/null and b/originalMedia/icons/android-chrome-512x512.png differ diff --git a/originalMedia/icons/apple-touch-icon-120x120.png b/originalMedia/icons/apple-touch-icon-120x120.png new file mode 100644 index 000000000..2994716bb Binary files /dev/null and b/originalMedia/icons/apple-touch-icon-120x120.png differ diff --git a/originalMedia/icons/apple-touch-icon-152x152.png b/originalMedia/icons/apple-touch-icon-152x152.png new file mode 100644 index 000000000..f32e17a95 Binary files /dev/null and b/originalMedia/icons/apple-touch-icon-152x152.png differ diff --git a/originalMedia/icons/apple-touch-icon-180x180.png b/originalMedia/icons/apple-touch-icon-180x180.png new file mode 100644 index 000000000..c6d9e555d Binary files /dev/null and b/originalMedia/icons/apple-touch-icon-180x180.png differ diff --git a/originalMedia/icons/apple-touch-icon-60x60.png b/originalMedia/icons/apple-touch-icon-60x60.png new file mode 100644 index 000000000..a8cea5d2a Binary files /dev/null and b/originalMedia/icons/apple-touch-icon-60x60.png differ diff --git a/originalMedia/icons/apple-touch-icon-76x76.png b/originalMedia/icons/apple-touch-icon-76x76.png new file mode 100644 index 000000000..c82e89718 Binary files /dev/null and b/originalMedia/icons/apple-touch-icon-76x76.png differ diff --git a/originalMedia/icons/apple-touch-icon.png b/originalMedia/icons/apple-touch-icon.png new file mode 100644 index 000000000..c6d9e555d Binary files /dev/null and b/originalMedia/icons/apple-touch-icon.png differ diff --git a/originalMedia/icons/badge-monochrome.png b/originalMedia/icons/badge-monochrome.png new file mode 100644 index 000000000..6e346df50 Binary files /dev/null and b/originalMedia/icons/badge-monochrome.png differ diff --git a/originalMedia/icons/favicon-16x16.png b/originalMedia/icons/favicon-16x16.png new file mode 100644 index 000000000..8e320aa44 Binary files /dev/null and b/originalMedia/icons/favicon-16x16.png differ diff --git a/originalMedia/icons/favicon-32x32.png b/originalMedia/icons/favicon-32x32.png new file mode 100644 index 000000000..308d32ca8 Binary files /dev/null and b/originalMedia/icons/favicon-32x32.png differ diff --git a/originalMedia/icons/icon-maskable.png b/originalMedia/icons/icon-maskable.png new file mode 100644 index 000000000..959479b3a Binary files /dev/null and b/originalMedia/icons/icon-maskable.png differ diff --git a/originalMedia/icons/msapplication-icon-144x144.png b/originalMedia/icons/msapplication-icon-144x144.png new file mode 100644 index 000000000..552f4d2b8 Binary files /dev/null and b/originalMedia/icons/msapplication-icon-144x144.png differ diff --git a/originalMedia/icons/mstile-150x150.png b/originalMedia/icons/mstile-150x150.png new file mode 100644 index 000000000..42d5792b3 Binary files /dev/null and b/originalMedia/icons/mstile-150x150.png differ diff --git a/originalMedia/icons/safari-pinned-tab.svg b/originalMedia/icons/safari-pinned-tab.svg new file mode 100644 index 000000000..732afd8eb --- /dev/null +++ b/originalMedia/icons/safari-pinned-tab.svg @@ -0,0 +1,149 @@ + + + + +Created by potrace 1.11, written by Peter Selinger 2001-2013 + + + + + diff --git a/public/images/cool.svg b/originalMedia/images/cool.svg similarity index 100% rename from public/images/cool.svg rename to originalMedia/images/cool.svg diff --git a/public/images/llama-nightscape.png b/originalMedia/images/llama-nightscape.png similarity index 100% rename from public/images/llama-nightscape.png rename to originalMedia/images/llama-nightscape.png diff --git a/public/images/llama-nightscape.svg b/originalMedia/images/llama-nightscape.svg similarity index 100% rename from public/images/llama-nightscape.svg rename to originalMedia/images/llama-nightscape.svg diff --git a/public/images/llama.svg b/originalMedia/images/llama.svg similarity index 100% rename from public/images/llama.svg rename to originalMedia/images/llama.svg diff --git a/public/images/logo-full-pride.svg b/originalMedia/images/logo-full-pride.svg similarity index 100% rename from public/images/logo-full-pride.svg rename to originalMedia/images/logo-full-pride.svg diff --git a/public/images/logo-full-white.svg b/originalMedia/images/logo-full-white.svg similarity index 100% rename from public/images/logo-full-white.svg rename to originalMedia/images/logo-full-white.svg diff --git a/public/images/logo-full.svg b/originalMedia/images/logo-full.svg similarity index 100% rename from public/images/logo-full.svg rename to originalMedia/images/logo-full.svg diff --git a/public/images/logo.svg b/originalMedia/images/logo.svg similarity index 100% rename from public/images/logo.svg rename to originalMedia/images/logo.svg diff --git a/originalMedia/images/migration/microsoft-todo.svg b/originalMedia/images/migration/microsoft-todo.svg new file mode 100644 index 000000000..08ead855f --- /dev/null +++ b/originalMedia/images/migration/microsoft-todo.svg @@ -0,0 +1 @@ +Todo \ No newline at end of file diff --git a/originalMedia/images/migration/todoist.svg b/originalMedia/images/migration/todoist.svg new file mode 100644 index 000000000..720046abe --- /dev/null +++ b/originalMedia/images/migration/todoist.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/originalMedia/images/migration/trello.svg b/originalMedia/images/migration/trello.svg new file mode 100644 index 000000000..8cb63b043 --- /dev/null +++ b/originalMedia/images/migration/trello.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/originalMedia/images/migration/wunderlist.png b/originalMedia/images/migration/wunderlist.png new file mode 100644 index 000000000..9c74530f7 Binary files /dev/null and b/originalMedia/images/migration/wunderlist.png differ diff --git a/package.json b/package.json index aac1105eb..c08cb2ff1 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,6 @@ "easymde": "^2.15.0", "highlight.js": "11.2.0", "is-touch-device": "1.0.1", - "lodash": "4.17.21", "marked": "3.0.4", "register-service-worker": "1.7.2", "snake-case": "3.0.4", diff --git a/public/audio/pop.mp3 b/public/audio/pop.mp3 new file mode 100644 index 000000000..019dc257a Binary files /dev/null and b/public/audio/pop.mp3 differ diff --git a/public/images/icons/android-chrome-192x192.png b/public/images/icons/android-chrome-192x192.png index 981d0057d..07d7dbd8d 100644 Binary files a/public/images/icons/android-chrome-192x192.png and b/public/images/icons/android-chrome-192x192.png differ diff --git a/public/images/icons/android-chrome-512x512.png b/public/images/icons/android-chrome-512x512.png index 2ed624508..1bf42a0e4 100644 Binary files a/public/images/icons/android-chrome-512x512.png and b/public/images/icons/android-chrome-512x512.png differ diff --git a/public/images/icons/apple-touch-icon-120x120.png b/public/images/icons/apple-touch-icon-120x120.png index 2994716bb..58ff5209d 100644 Binary files a/public/images/icons/apple-touch-icon-120x120.png and b/public/images/icons/apple-touch-icon-120x120.png differ diff --git a/public/images/icons/apple-touch-icon-152x152.png b/public/images/icons/apple-touch-icon-152x152.png index f32e17a95..248cc77ad 100644 Binary files a/public/images/icons/apple-touch-icon-152x152.png and b/public/images/icons/apple-touch-icon-152x152.png differ diff --git a/public/images/icons/apple-touch-icon-180x180.png b/public/images/icons/apple-touch-icon-180x180.png index c6d9e555d..39d6e68b8 100644 Binary files a/public/images/icons/apple-touch-icon-180x180.png and b/public/images/icons/apple-touch-icon-180x180.png differ diff --git a/public/images/icons/apple-touch-icon-60x60.png b/public/images/icons/apple-touch-icon-60x60.png index a8cea5d2a..ad20376f7 100644 Binary files a/public/images/icons/apple-touch-icon-60x60.png and b/public/images/icons/apple-touch-icon-60x60.png differ diff --git a/public/images/icons/apple-touch-icon-76x76.png b/public/images/icons/apple-touch-icon-76x76.png index c82e89718..ce616ccec 100644 Binary files a/public/images/icons/apple-touch-icon-76x76.png and b/public/images/icons/apple-touch-icon-76x76.png differ diff --git a/public/images/icons/apple-touch-icon.png b/public/images/icons/apple-touch-icon.png index c6d9e555d..39d6e68b8 100644 Binary files a/public/images/icons/apple-touch-icon.png and b/public/images/icons/apple-touch-icon.png differ diff --git a/public/images/icons/badge-monochrome.png b/public/images/icons/badge-monochrome.png index 6e346df50..e1ae189d2 100644 Binary files a/public/images/icons/badge-monochrome.png and b/public/images/icons/badge-monochrome.png differ diff --git a/public/images/icons/favicon-16x16.png b/public/images/icons/favicon-16x16.png index 8e320aa44..56d71330b 100644 Binary files a/public/images/icons/favicon-16x16.png and b/public/images/icons/favicon-16x16.png differ diff --git a/public/images/icons/favicon-32x32.png b/public/images/icons/favicon-32x32.png index 308d32ca8..e0ccb6193 100644 Binary files a/public/images/icons/favicon-32x32.png and b/public/images/icons/favicon-32x32.png differ diff --git a/public/images/icons/icon-maskable.png b/public/images/icons/icon-maskable.png index 959479b3a..261aec338 100644 Binary files a/public/images/icons/icon-maskable.png and b/public/images/icons/icon-maskable.png differ diff --git a/public/images/icons/msapplication-icon-144x144.png b/public/images/icons/msapplication-icon-144x144.png index 552f4d2b8..05143040c 100644 Binary files a/public/images/icons/msapplication-icon-144x144.png and b/public/images/icons/msapplication-icon-144x144.png differ diff --git a/public/images/icons/mstile-150x150.png b/public/images/icons/mstile-150x150.png index 42d5792b3..5f4d833d1 100644 Binary files a/public/images/icons/mstile-150x150.png and b/public/images/icons/mstile-150x150.png differ diff --git a/public/images/migration/microsoft-todo.png b/public/images/migration/microsoft-todo.png deleted file mode 100644 index 38a2da383..000000000 Binary files a/public/images/migration/microsoft-todo.png and /dev/null differ diff --git a/public/images/migration/todoist.png b/public/images/migration/todoist.png deleted file mode 100644 index c06f9f346..000000000 Binary files a/public/images/migration/todoist.png and /dev/null differ diff --git a/public/images/migration/trello.png b/public/images/migration/trello.png deleted file mode 100644 index 02cfa1140..000000000 Binary files a/public/images/migration/trello.png and /dev/null differ diff --git a/public/images/migration/vikunja-file.png b/public/images/migration/vikunja-file.png deleted file mode 100644 index ee9eb1583..000000000 Binary files a/public/images/migration/vikunja-file.png and /dev/null differ diff --git a/public/images/migration/wunderlist.png b/public/images/migration/wunderlist.png deleted file mode 100644 index 907ed0ca1..000000000 Binary files a/public/images/migration/wunderlist.png and /dev/null differ diff --git a/run.sh b/run.sh index cee71a507..0af00c2cf 100755 --- a/run.sh +++ b/run.sh @@ -5,15 +5,18 @@ VIKUNJA_API_URL="${VIKUNJA_API_URL:-"/api/v1"}" VIKUNJA_HTTP_PORT="${VIKUNJA_HTTP_PORT:-80}" -VIKUNJA_HTTPS_PORT="${VIKUNJA_HTTP_PORT:-443}" +VIKUNJA_HTTPS_PORT="${VIKUNJA_HTTPS_PORT:-443}" + +echo "Using $VIKUNJA_API_URL as default api url" # Escape the variable to prevent sed from complaining VIKUNJA_API_URL=$(echo $VIKUNJA_API_URL |sed 's/\//\\\//g') -sed -i "s/http\:\/\/localhost\:3456\/api\/v1/$VIKUNJA_API_URL/g" /usr/share/nginx/html/index.html +sed -i "s/http\:\/\/localhost\:3456//g" /usr/share/nginx/html/index.html # replacing in two steps to make sure api urls from releases are properly replaced as well +sed -i "s/'\/api\/v1/'$VIKUNJA_API_URL/g" /usr/share/nginx/html/index.html -sed -i "s/listen 80/listen $VIKUNJA_HTTP_PORT/g" nginx.conf -sed -i "s/listen 443/listen $VIKUNJA_HTTPS_PORT/g" nginx.conf +sed -i "s/listen 80/listen $VIKUNJA_HTTP_PORT/g" /etc/nginx/nginx.conf +sed -i "s/listen 443/listen $VIKUNJA_HTTPS_PORT/g" /etc/nginx/nginx.conf # Set the uid and gid of the nginx run user usermod --non-unique --uid ${PUID} nginx diff --git a/src/assets/llama-cool.svg b/src/assets/llama-cool.svg new file mode 100644 index 000000000..e086954ab --- /dev/null +++ b/src/assets/llama-cool.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/llama-nightscape.jpg b/src/assets/llama-nightscape.jpg new file mode 100644 index 000000000..1f1654720 Binary files /dev/null and b/src/assets/llama-nightscape.jpg differ diff --git a/src/assets/llama.svg b/src/assets/llama.svg new file mode 100644 index 000000000..bd208994c --- /dev/null +++ b/src/assets/llama.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/logo-full-pride.svg b/src/assets/logo-full-pride.svg new file mode 100644 index 000000000..f79358778 --- /dev/null +++ b/src/assets/logo-full-pride.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/logo-full.svg b/src/assets/logo-full.svg new file mode 100644 index 000000000..12b4369da --- /dev/null +++ b/src/assets/logo-full.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/logo.svg b/src/assets/logo.svg new file mode 100644 index 000000000..435c904a2 --- /dev/null +++ b/src/assets/logo.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/assets/migration/microsoft-todo.svg b/src/assets/migration/microsoft-todo.svg new file mode 100644 index 000000000..0a7cf5ac2 --- /dev/null +++ b/src/assets/migration/microsoft-todo.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/migration/todoist.svg b/src/assets/migration/todoist.svg new file mode 100644 index 000000000..a6c0fefc6 --- /dev/null +++ b/src/assets/migration/todoist.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/migration/trello.svg b/src/assets/migration/trello.svg new file mode 100644 index 000000000..416e2673d --- /dev/null +++ b/src/assets/migration/trello.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/assets/migration/vikunja-file.png b/src/assets/migration/vikunja-file.png new file mode 100644 index 000000000..aa27b9ac8 Binary files /dev/null and b/src/assets/migration/vikunja-file.png differ diff --git a/src/assets/migration/wunderlist.jpg b/src/assets/migration/wunderlist.jpg new file mode 100644 index 000000000..1f846fcbe Binary files /dev/null and b/src/assets/migration/wunderlist.jpg differ diff --git a/src/components/home/contentLinkShare.vue b/src/components/home/contentLinkShare.vue index f6fa8288d..3647aec78 100644 --- a/src/components/home/contentLinkShare.vue +++ b/src/components/home/contentLinkShare.vue @@ -6,7 +6,7 @@ >
@@ -64,6 +64,8 @@ import 'flatpickr/dist/flatpickr.css' import Fancycheckbox from '../../components/input/fancycheckbox' import {LOADING, LOADING_MODULE} from '../../store/mutation-types' +import llamaCoolUrl from '@/assets/llama-cool.svg' + export default { name: 'ShowTasks', components: { @@ -81,6 +83,7 @@ export default { cEndDate: null, showNothingToDo: false, + llamaCoolUrl, } }, props: { diff --git a/src/views/tasks/TaskDetailView.vue b/src/views/tasks/TaskDetailView.vue index 6232bba0e..1c22186a6 100644 --- a/src/views/tasks/TaskDetailView.vue +++ b/src/views/tasks/TaskDetailView.vue @@ -423,7 +423,6 @@