Skip to content

Commit 3168f14

Browse files
committed
feat: enhance UI components with improved layout and functionality adjustments
1 parent 0e4b46a commit 3168f14

File tree

7 files changed

+28
-18
lines changed

7 files changed

+28
-18
lines changed

src/components/2pan/index.vue

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,24 +67,24 @@ q-splitter(
6767
q-avatar(v-if='!isSimple' size="sm" color="primary" icon="mdi-unfold-more-vertical" class="text-white")
6868

6969
template(#after)
70-
q-card.full-height.q-pa-sm(bordered :class='{"hidden": isSimple && !targetId}')
70+
q-card.full-height.q-pa-none(bordered :class='{"hidden": isSimple && !targetId}')
7171
q-card-section.q-pa-none.flex.items-center.full-height.justify-center(v-if='!targetId')
7272
slot(name="right-panel-empty")
7373
slot(name="right-panel-empty-content-before")
7474
p Selectionnez une entrée pour afficher son contenu...
7575
slot(name="right-panel-empty-content-after")
7676
div.full-height.q-pa-none.flex.justify-start(v-else style='flex-flow: column; overflow-y: auto;')
77-
q-card-actions
77+
q-toolbar.q-py-none(style='height: 50px;')
78+
q-btn(color="primary" icon="mdi-chevron-left" @click="cancel" tooltip="Retour" dense)
79+
q-tooltip.text-body2 Retour
80+
q-separator.q-mx-sm(vertical)
7881
slot(name="right-panel-title" :target="target")
7982
slot(name="right-panel-title-before" :target="target")
80-
q-toolbar-title(v-text='getTitle' style='flex: 100 1 0%')
83+
q-toolbar-title(v-html=`isNew ? defaultTitle : getTitle` style='flex: 100 1 0%')
8184
slot(name="right-panel-title-after" :target="target")
8285
q-space
8386
slot(name="right-panel-actions")
8487
slot(name="right-panel-actions-content-before" :target="target")
85-
q-btn(color="primary", icon="mdi-chevron-left" @click="cancel" tooltip="Retour")
86-
q-tooltip.text-body2 Retour
87-
q-separator.q-mx-sm(vertical)
8888
slot(name="right-panel-actions-content" v-if="defaultRightPanelButton" :target="target" :isNew="isNew" :crud="crud")
8989
q-btn(color="positive" icon='mdi-content-save-plus' @click="create(target)" v-show="isNew" v-if="crud.create")
9090
q-tooltip.text-body2 Créer
@@ -240,6 +240,7 @@ const props = defineProps({
240240
},
241241
})
242242
243+
const defaultTitle = "<span class='text-grey-8'>Création d'un nouveau élément</span>"
243244
const simple = ref(props.simple)
244245
const isSimple = computed(() => {
245246
if ($q.platform.is.mobile) return true

src/components/identityForm/actions.vue

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ div.flex
2020
q-btn(color="positive" icon='mdi-content-save-plus' @click="create" v-show="isNew" v-if="crud.create")
2121
q-tooltip.text-body2 Créer
2222
q-toggle.q-px-md.q-gutter-y-lg(
23+
v-if="props.identity?._id"
2324
checked-icon="mdi-account-check"
2425
unchecked-icon="mdi-account-cancel"
2526
indeterminate-icon="mdi-lock-reset"
@@ -33,12 +34,12 @@ div.flex
3334
:indeterminate-value="-2"
3435
:false-value="-3"
3536
)
36-
q-btn-group(push)
37-
q-btn( @click="forceChangePassword()" color="orange-8" icon="mdi-lock-reset" :disabled="props.identity.state != IdentityState.SYNCED")
37+
q-btn-group(v-if="props.identity?._id" push flat)
38+
q-btn(@click="forceChangePassword()" color="orange-8" icon="mdi-lock-reset" :disabled="props.identity.state != IdentityState.SYNCED" padding='5px 10px' dense)
3839
q-tooltip.text-body2(slot="trigger") Obliger l'utilisateur à changer son mot de passe
39-
q-btn(@click="resetPasswordModal = true" color="red-8" icon="mdi-account-key" :disabled="props.identity.state != IdentityState.SYNCED")
40+
q-btn(@click="resetPasswordModal = true" color="red-8" icon="mdi-account-key" :disabled="props.identity.state != IdentityState.SYNCED" padding='5px 10px' dense)
4041
q-tooltip.text-body2(slot="trigger") Définir le mot de passe
41-
q-btn(@click="sendInit" color="primary" icon="mdi-email-arrow-right" :disabled="props.identity.state != IdentityState.SYNCED")
42+
q-btn(@click="sendInit" color="primary" icon="mdi-email-arrow-right" :disabled="props.identity.state != IdentityState.SYNCED" padding='5px 10px' dense)
4243
q-tooltip.text-body2(slot="trigger") Envoyer le mail d'invitation
4344

4445
q-separator(size='3px' vertical)
@@ -49,9 +50,9 @@ div.flex
4950
q-tooltip.text-body2(slot="trigger" v-if="props.identity.state == IdentityState.TO_VALIDATE") Synchroniser l'identité
5051
q-tooltip.text-body2(slot="trigger" v-else) L'état de l'identité ne permet pas de la synchroniser
5152

52-
q-separator(size='3px' vertical)
53+
q-separator(v-if="props.identity?._id" size='3px' vertical)
5354

54-
q-btn-dropdown.text-white(dropdown-icon="mdi-dots-vertical" style='background-color: rgba(0, 0, 0, .6)' no-caps)
55+
q-btn-dropdown.text-white(v-if="props.identity?._id" dropdown-icon="mdi-dots-vertical" style='background-color: rgba(0, 0, 0, .6)' padding='5px 10px' dense no-caps)
5556
q-list
5657
a(:href="'/jobs?filters[:concernedTo.id]=' + props.identity?._id" target="_blank" style='text-decoration: none; color: inherit' @click.prevent="dialogLog = true")
5758
q-item(v-if="props.identity?._id" clickable v-close-popup)

src/components/identityForm/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template lang="pug">
22
div
33
//- pre(v-html="JSON.stringify(identity, null, 2)")
4-
q-tabs(v-model="tab" align="justify")
4+
q-tabs(v-model="tab" align="justify" dense)
55
q-tab(name="inetOrgPerson" label="inetOrgPerson" :alert="getTabValidations('inetOrgPerson')" alert-icon="mdi-alert" :class="`q-mr-xs`")
66
q-tab.q-pr-none(v-for="tab in tabs" :key="tab" :name="tab" :alert="getTabValidations(tab)" alert-icon="mdi-alert" :class="`q-mr-xs`")
77
div.flex.row.full-height.items-center(style='flex-wrap: nowrap;')

src/components/searchfilters/Main.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template lang="pug">
2-
.row.q-gutter-sm.items-center.q-mt-sm
2+
.row.q-gutter-sm.items-center.q-mt-none
33
//- .col.col-md-2
44
//- q-select(:options="fieldTypes" label="Type de champ" v-model="fieldType" clearable @update:model-value="clearFields(['field', 'comparator'])")
55
.col.col-md-2

src/components/searchfilters/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<template lang="pug" @keypress.enter="addFilter">
2-
.q-pa-sm
2+
.q-pb-sm
33
sesameSearchfiltersMain(ref="mainData")
44
template(#rightSelect)
55
slot(name="rightSelect")
66
//Filters chips
7-
.row.q-gutter-sm.items-center.q-mt-sm
7+
.row.q-gutter-sm.items-center.q-mt-xs
88
q-chip(
99
v-for="filter in filterArray" :key="filter.field"
1010
removable @remove="removeFilter(filter)" @click="editFilter(filter)" clickable

src/composables/useMenu.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,13 @@ function useMenu(identityStateStore) {
4646
color: 'primary',
4747
part: 'Données',
4848
hideInMenuBar: false
49+
}, {
50+
icon: 'mdi-timeline-clock-outline',
51+
label: 'Journal des jobs',
52+
path: '/lifecycles/table',
53+
color: 'primary',
54+
part: 'Données',
55+
hideInMenuBar: false
4956
},
5057
{
5158
icon: 'mdi-set-merge',

src/layouts/default.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ q-layout(view="hHh LpR lff" style="margin-top: -1px;")
1212
q-list(v-for="part in menuParts" :key="part")
1313
div(v-for="menu in getMenuByPart(part)")
1414
q-item(v-if="menu.hideInMenuBar !== true"
15-
:key="part" clickable v-ripple
16-
:to="menu.path" :active="menu.path === $route.fullPath"
15+
:key="part" clickable v-ripple
16+
:to="menu.path" :active="menu.path === $route.fullPath" active-class="q-item--active"
1717
)
18+
q-separator(vertical color='primary' size="5px" style='position: absolute; left: 0; height: 100%; margin-top: -8px;')
1819
q-item-section(avatar)
1920
q-icon(:name="menu.icon" :color="menu.color")
2021
q-badge(v-if="menu.badge" :color="menu.badge.color" floating) {{ menu.badge.value }}

0 commit comments

Comments
 (0)