Skip to content

Fix drawers inconsistencies #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mariobalca merged 1 commit into from
Nov 7, 2022
Merged

Fix drawers inconsistencies #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions frontend/src/assets/scss/drawer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,13 @@
@apply text-gray-600;
}
}

&.bordered {
.el-drawer__header {
@apply mb-6;
}
.el-drawer__body {
@apply border-t border-gray-200;
}
}
}
18 changes: 6 additions & 12 deletions frontend/src/modules/automation/components/webhooks/webhook-form.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
<template>
<el-drawer
<app-drawer
v-model="isDrawerOpenComputed"
custom-class="automation-attributes-drawer"
direction="rtl"
size="40%"
@closed="doCancel"
:title="isEditing ? 'Edit webhook' : 'Add webhook'"
@close="doCancel"
>
<template #header>
<h5 class="text-black">
{{ isEditing ? 'Edit webhook' : 'Add webhook' }}
</h5>
</template>
<template #default>
<template #content>
<el-form
v-if="model"
ref="form"
Expand Down Expand Up @@ -187,6 +180,7 @@
</div>
</el-form>
</template>

<template #footer>
<div
class="flex grow items-center"
Expand Down Expand Up @@ -223,7 +217,7 @@
</div>
</div>
</template>
</el-drawer>
</app-drawer>
</template>

<script>
Expand Down
14 changes: 7 additions & 7 deletions frontend/src/modules/automation/pages/automation-list-page.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,17 @@
/>

<!-- Executions Drawer -->
<el-drawer
<app-drawer
v-model="isExecutionsDrawerOpen"
:destroy-on-close="true"
:close-on-click-modal="false"
title="Webhook executions"
custom-class="webhook-executions-drawer"
size="600px"
@closed="onCloseExecutionsDrawer"
custom-class="webhook-executions-drawer"
@close="onCloseExecutionsDrawer"
>
<app-webhook-execution-list :webhook="automation" />
</el-drawer>
<template #content>
<app-webhook-execution-list :webhook="automation" />
</template>
</app-drawer>
</div>
</template>

Expand Down
38 changes: 10 additions & 28 deletions frontend/src/modules/conversation/components/conversation-drawer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,16 @@
<template>
<el-drawer
<app-drawer
v-model="isExpanded"
:show-close="false"
:size="600"
:show-footer="false"
:has-border="true"
title="Conversation"
>
<template #header="{ close }">
<div
class="flex justify-between items-center border-b border-gray-200 -mb-4 -mx-6 px-6 pb-6"
>
<h2 class="text-lg font-medium text-gray-1000">
Conversation
</h2>
<div class="flex items-center">
<div v-if="conversation" class="pr-6">
<app-activity-link
:activity="conversation.conversationStarter"
/>
</div>
<div
class="p-2 flex cursor-pointer"
@click="close"
>
<i
class="ri-close-line text-xl flex items-center h-6 w-6 text-gray-400"
></i>
</div>
</div>
</div>
</template>
<template #default>
<template v-if="conversation" #header-label
><app-activity-link
:activity="conversation.conversationStarter"
/></template>
<template #content>
<app-conversation-details
v-if="loading"
:loading="true"
Expand All @@ -52,7 +34,7 @@
</div>
</div>
</template>
</el-drawer>
</app-drawer>
</template>

<script>
Expand Down
Loading