diff --git a/.drone.yml b/.drone.yml index e6567acb..d605db13 100644 --- a/.drone.yml +++ b/.drone.yml @@ -19,7 +19,12 @@ steps: - yarn --frozen-lockfile --network-timeout 100000 - yarn run lint - yarn run build - + - name: test + image: node:13 + pull: true + group: build-static + commands: + - yarn test --- kind: pipeline name: release-latest diff --git a/package.json b/package.json index 8305f328..bcdc9a96 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,8 @@ "scripts": { "serve": "vue-cli-service serve", "build": "vue-cli-service build --modern", - "lint": "vue-cli-service lint" + "lint": "vue-cli-service lint --ignore-pattern '*.test.*'", + "test": "jest" }, "dependencies": { "bulma": "0.9.1", @@ -40,6 +41,7 @@ "babel-eslint": "10.1.0", "eslint": "7.14.0", "eslint-plugin-vue": "7.1.0", + "jest": "^26.6.3", "node-sass": "5.0.0", "sass-loader": "10.1.0", "vue-flatpickr-component": "8.1.6", diff --git a/src/components/input/datepicker.vue b/src/components/input/datepicker.vue new file mode 100644 index 00000000..9fea9288 --- /dev/null +++ b/src/components/input/datepicker.vue @@ -0,0 +1,246 @@ + + + + + {{ chooseDateLabel }} + + + {{ formatDateShort(date) }} + + + + + + + setDate('today')" v-if="(new Date()).getHours() < 21"> + + + + + + Today + + + {{ getWeekdayFromStringInterval('today') }} + + + + setDate('tomorrow')"> + + + + + + Tomorrow + + + {{ getWeekdayFromStringInterval('tomorrow') }} + + + + setDate('nextMonday')"> + + + + + + Next Monday + + + {{ getWeekdayFromStringInterval('nextMonday') }} + + + + setDate('thisWeekend')"> + + + + + + This Weekend + + + {{ getWeekdayFromStringInterval('thisWeekend') }} + + + + setDate('laterThisWeek')"> + + + + + + Later This Week + + + {{ getWeekdayFromStringInterval('laterThisWeek') }} + + + + setDate('nextWeek')"> + + + + + + Next Week + + + {{ getWeekdayFromStringInterval('nextWeek') }} + + + + + + + + Confirm + + + + + + + diff --git a/src/components/tasks/partials/reminders.vue b/src/components/tasks/partials/reminders.vue index d0820885..f94ce3db 100644 --- a/src/components/tasks/partials/reminders.vue +++ b/src/components/tasks/partials/reminders.vue @@ -1,70 +1,79 @@ - + addReminderDate(index)" /> - + - - + addReminderDate()" + choose-date-label="Add a new reminder..." />