diff --git a/app/javascript/dashboard/assets/scss/_next-colors.scss b/app/javascript/dashboard/assets/scss/_next-colors.scss index b6a91c6a5..f1abaea76 100644 --- a/app/javascript/dashboard/assets/scss/_next-colors.scss +++ b/app/javascript/dashboard/assets/scss/_next-colors.scss @@ -120,6 +120,8 @@ --card-color: 255 255 255; --overlay: 0, 0, 0, 0.12; --overlay-avatar: 255, 255, 255, 0.67; + --button-color: 255 255 255; + --button-hover-color: 255, 255, 255, 0.2; --alpha-1: 215, 215, 215, 0.22; --alpha-2: 196, 197, 198, 0.22; @@ -248,6 +250,8 @@ --card-color: 28 30 34; --overlay: 0, 0, 0, 0.4; --overlay-avatar: 0, 0, 0, 0.05; + --button-color: 42 43 51; + --button-hover-color: 0, 0, 0, 0.15; --alpha-1: 35, 36, 42, 0.8; --alpha-2: 147, 153, 176, 0.12; diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactHistory.vue b/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactHistory.vue index 3763d198a..d22aa524a 100644 --- a/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactHistory.vue +++ b/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactHistory.vue @@ -3,6 +3,7 @@ import { computed } from 'vue'; import { useMapGetter } from 'dashboard/composables/store'; import { useRoute } from 'vue-router'; import { useI18n } from 'vue-i18n'; +import { useSnakeCase } from 'dashboard/composables/useTransformKeys'; import Spinner from 'dashboard/components-next/spinner/Spinner.vue'; import ConversationCard from 'dashboard/components-next/Conversation/ConversationCard/ConversationCard.vue'; @@ -13,11 +14,6 @@ const route = useRoute(); const conversations = useMapGetter( 'contactConversations/getAllConversationsByContactId' ); -const contactsById = useMapGetter('contacts/getContactById'); -const stateInbox = useMapGetter('inboxes/getInboxById'); -const accountLabels = useMapGetter('labels/getLabels'); - -const accountLabelsValue = computed(() => accountLabels.value); const uiFlags = useMapGetter('contactConversations/getUIFlags'); const isFetching = computed(() => uiFlags.value.isFetching); @@ -36,16 +32,17 @@ const contactConversations = computed(() =>

diff --git a/app/javascript/dashboard/components-next/Conversation/ConversationCard/CardAvatar.vue b/app/javascript/dashboard/components-next/Conversation/ConversationCard/CardAvatar.vue new file mode 100644 index 000000000..5fb509dbc --- /dev/null +++ b/app/javascript/dashboard/components-next/Conversation/ConversationCard/CardAvatar.vue @@ -0,0 +1,58 @@ + + + diff --git a/app/javascript/dashboard/components-next/Conversation/ConversationCard/CardContent.vue b/app/javascript/dashboard/components-next/Conversation/ConversationCard/CardContent.vue new file mode 100644 index 000000000..755f6fa49 --- /dev/null +++ b/app/javascript/dashboard/components-next/Conversation/ConversationCard/CardContent.vue @@ -0,0 +1,47 @@ + + + diff --git a/app/javascript/dashboard/components-next/Conversation/ConversationCard/CardHeader.vue b/app/javascript/dashboard/components-next/Conversation/ConversationCard/CardHeader.vue new file mode 100644 index 000000000..e39fcff2b --- /dev/null +++ b/app/javascript/dashboard/components-next/Conversation/ConversationCard/CardHeader.vue @@ -0,0 +1,23 @@ + + + diff --git a/app/javascript/dashboard/components-next/Conversation/ConversationCard/CardLabels.vue b/app/javascript/dashboard/components-next/Conversation/ConversationCard/CardLabels.vue index dfd4115e8..c09098921 100644 --- a/app/javascript/dashboard/components-next/Conversation/ConversationCard/CardLabels.vue +++ b/app/javascript/dashboard/components-next/Conversation/ConversationCard/CardLabels.vue @@ -1,95 +1,167 @@