From 4578b30ff95c6546724b708583e338acea0f0891 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Wed, 7 Oct 2020 14:25:53 +0200 Subject: [PATCH] minor: form feedbacks --- cypress/integration/edit-user.spec.js | 4 ++-- src/dependencies.pug | 4 +++- src/scripts/save-feedback.js | 19 +++++++++++++++++++ .../admin/page-admin-projects-create.pug | 11 ----------- src/views/admin/page-admin-users-create.pug | 13 +++++++++++++ src/views/admin/page-admin-users-edit.pug | 1 + src/views/circle/page-circle-edit.pug | 4 ++-- 7 files changed, 40 insertions(+), 16 deletions(-) create mode 100644 src/scripts/save-feedback.js diff --git a/cypress/integration/edit-user.spec.js b/cypress/integration/edit-user.spec.js index 5bc2923..ff82266 100644 --- a/cypress/integration/edit-user.spec.js +++ b/cypress/integration/edit-user.spec.js @@ -66,8 +66,8 @@ context('Edit User Browser Testing', () => { cy.contains('solid-display-value[name="name"]', userFirstName + ' ' + userLastName).should("exist"); cy.contains('solid-display-value[name="profile.job"]', jobDescription).should("exist"); cy.contains('solid-display-value[name="profile.city"]', city).should("exist"); - cy.contains('solid-display-tel[name="profile.phone"] a', phone).should("exist"); - cy.contains('profile-website[name="profile.website"] a', website).should("exist"); + cy.contains('directory-link-tel a', phone).should("exist"); + cy.contains('directory-website a', website).should("exist"); }); }); }); diff --git a/src/dependencies.pug b/src/dependencies.pug index 562b7ef..7222b97 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -23,7 +23,7 @@ if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers) //- script(type="module" src="/lib/solid-job-board/dist/index.js" defer) if (endpoints.uploads || (endpoints.get && endpoints.get.uploads)) && (endpoints.skills || (endpoints.get && endpoints.get.skills)) && (endpoints.users || (endpoints.get && endpoints.get.users)) - script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.8" defer) + script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.9" defer) //- script(type="module" src="/lib/solid-directory/dist/index.js" defer) if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards) @@ -34,6 +34,8 @@ if endpoints.users || (endpoints.get && endpoints.get.users) script(type="module" src="https://unpkg.com/@startinblox/component-chat@1.1" defer) //- script(type="module" src="/lib/solid-xmpp-chat/dist/index.js" defer) +script(src="https://cdn.jsdelivr.net/npm/sweetalert2@10") + script(src="/scripts/index.js" defer) //- Stylesheets diff --git a/src/scripts/save-feedback.js b/src/scripts/save-feedback.js new file mode 100644 index 0000000..154bddf --- /dev/null +++ b/src/scripts/save-feedback.js @@ -0,0 +1,19 @@ +document.addEventListener("DOMContentLoaded", () => { + const Toast = Swal.mixin({ + toast: true, + position: 'top', + showConfirmButton: false, + timer: 3000, + timerProgressBar: true, + didOpen: (toast) => { + toast.addEventListener('mouseenter', Swal.stopTimer) + toast.addEventListener('mouseleave', Swal.resumeTimer) + } + }) + document.addEventListener("save", () => { + Toast.fire({ + icon: 'success', + title: 'Succès!' + }) + }); +}); \ No newline at end of file diff --git a/src/views/admin/page-admin-projects-create.pug b/src/views/admin/page-admin-projects-create.pug index 202131b..8a42024 100644 --- a/src/views/admin/page-admin-projects-create.pug +++ b/src/views/admin/page-admin-projects-create.pug @@ -1,17 +1,6 @@ div.content-box__info.flex solid-link(class="backlink right" next='admin-project-list') Retour - solid-widget(name="hubl-admin-project-add-user") - template - solid-form( - data-holder - fields='user, project' - range-user=`${endpoints.users || endpoints.get.users}` - value-project='${src}' - widget-project='solid-form-hidden' - naked - ) - h1.centered Créer un nouveau projet div#loader-projects-create.loader.loader-top diff --git a/src/views/admin/page-admin-users-create.pug b/src/views/admin/page-admin-users-create.pug index f98c5f9..c0fb8b1 100644 --- a/src/views/admin/page-admin-users-create.pug +++ b/src/views/admin/page-admin-users-create.pug @@ -9,6 +9,16 @@ div.content-box__info.flex div div + solid-widget(name='hubl-username-field') + template + label Nom d'utilisateur* + input(type="text" title='Caractères alphanumérique uniquement' pattern="[a-zA-Z0-9]+" label="Nom d'utilisateur *" name="username" required value="\${value}" data-holder) + + solid-widget(name='hubl-email-field') + template + label E-mail * + input(type="email" label="E-mail *" name="email" required value="\${value}" data-holder) + solid-form.form.button-register( data-src=`${endpoints.users || endpoints.post.users}` @@ -32,6 +42,9 @@ div.content-box__info.flex value-password='' widget-password='solid-form-hidden' + widget-username='hubl-username-field' + widget-email='hubl-email-field' + next='admin-users-list' submit-button='Enregistrer' diff --git a/src/views/admin/page-admin-users-edit.pug b/src/views/admin/page-admin-users-edit.pug index af39318..572367a 100644 --- a/src/views/admin/page-admin-users-edit.pug +++ b/src/views/admin/page-admin-users-edit.pug @@ -32,6 +32,7 @@ div.content-box__info.flex label-first_name='Prénom *' label-last_name='Nom *' label-email='E-mail *' + widget-email='hubl-email-field' next='admin-user-list' diff --git a/src/views/circle/page-circle-edit.pug b/src/views/circle/page-circle-edit.pug index 3e7c5e5..281cff6 100644 --- a/src/views/circle/page-circle-edit.pug +++ b/src/views/circle/page-circle-edit.pug @@ -35,8 +35,8 @@ div.content-box__info label-status='Statut du cercle' widget-status='hubl-status' - label-name='Nom du cercle' - label-owner='Administrateur ou administratrice' + label-name='Nom du cercle *' + label-owner='Administrateur ou administratrice *' label-description='Sous-titre du cercle *' class-name='form-label is-light is-half-width input-text-like'