From 9bb455ec2d56f2ca117f938cba84df5c1829c861 Mon Sep 17 00:00:00 2001 From: Muhsin Keloth Date: Mon, 19 Jun 2023 18:23:35 +0530 Subject: [PATCH] feat: Ability to choose the custom time for snooze conversation (#7257) --- .../dashboard/assets/scss/_date-picker.scss | 31 +++++++- .../components/CustomSnoozeModal.vue | 75 +++++++++++++++++++ .../components/buttons/ResolveAction.vue | 41 ++++++++-- app/javascript/dashboard/constants/globals.js | 1 + .../mixins/conversation/snoozeTimesMixin.js | 22 ------ .../dashboard/commands/conversationHotKeys.js | 9 +++ 6 files changed, 149 insertions(+), 30 deletions(-) create mode 100644 app/javascript/dashboard/components/CustomSnoozeModal.vue delete mode 100644 app/javascript/dashboard/mixins/conversation/snoozeTimesMixin.js diff --git a/app/javascript/dashboard/assets/scss/_date-picker.scss b/app/javascript/dashboard/assets/scss/_date-picker.scss index 4377480c9..2263c4354 100644 --- a/app/javascript/dashboard/assets/scss/_date-picker.scss +++ b/app/javascript/dashboard/assets/scss/_date-picker.scss @@ -26,7 +26,7 @@ border-radius: var(--border-radius-normal); box-shadow: none; display: flex; - height: 4.0rem; + height: 4rem; } .mx-input:disabled, @@ -35,3 +35,32 @@ cursor: pointer; } } + +.mx-datepicker-inline { + width: 100%; + + .mx-calendar { + width: 100%; + } + + .cell.disabled { + background-color: var(--s-25); + color: var(--s-200); + } + + .mx-time-item.disabled { + background-color: var(--s-25); + } + + .today { + font-weight: var(--font-weight-bold); + } + + .mx-datepicker-main { + border: 0; + } + + .mx-time-header { + border: 0; + } +} diff --git a/app/javascript/dashboard/components/CustomSnoozeModal.vue b/app/javascript/dashboard/components/CustomSnoozeModal.vue new file mode 100644 index 000000000..33fa4c9c2 --- /dev/null +++ b/app/javascript/dashboard/components/CustomSnoozeModal.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/app/javascript/dashboard/components/buttons/ResolveAction.vue b/app/javascript/dashboard/components/buttons/ResolveAction.vue index 163328e76..5fdffb747 100644 --- a/app/javascript/dashboard/components/buttons/ResolveAction.vue +++ b/app/javascript/dashboard/components/buttons/ResolveAction.vue @@ -71,21 +71,30 @@ + + +