From 29fd282e44f3cc7113c6c2470b144611817bd2c3 Mon Sep 17 00:00:00 2001 From: Benoit Alessandroni <benoit@happy-dev.fr> Date: Fri, 10 Dec 2021 17:07:08 +0100 Subject: [PATCH 1/2] feature: adding proper notification template for job-offer --- src/locales/en.json | 3 +++ src/locales/es.json | 3 +++ src/locales/fr.json | 3 +++ src/views/partials/notifications.pug | 1 + src/views/partials/notifications/message-joboffer.pug | 8 ++++++++ 5 files changed, 18 insertions(+) create mode 100644 src/views/partials/notifications/message-joboffer.pug diff --git a/src/locales/en.json b/src/locales/en.json index 0d7c07ca..0b5a8a02 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -297,6 +297,9 @@ "circle": { "in": "in" }, + "joboffer": { + "new": "in job-offers" + }, "private": { "private": "in private" } diff --git a/src/locales/es.json b/src/locales/es.json index a3e260fb..f5f72338 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -297,6 +297,9 @@ "circle": { "in": "dentro" }, + "joboffer": { + "new": "in oferta de trabajo" + }, "private": { "private": "en privado" } diff --git a/src/locales/fr.json b/src/locales/fr.json index eeb82055..c18cae42 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -295,6 +295,9 @@ "circle": { "in": "dans" }, + "joboffer": { + "new": "dans offres de mission" + }, "private": { "private": "en privé" } diff --git a/src/views/partials/notifications.pug b/src/views/partials/notifications.pug index b17336d8..715c290e 100644 --- a/src/views/partials/notifications.pug +++ b/src/views/partials/notifications.pug @@ -4,3 +4,4 @@ include notifications/message-circle.pug include notifications/message-project.pug include notifications/message-private.pug include notifications/message-poll.pug +include notifications/message-joboffer.pug diff --git a/src/views/partials/notifications/message-joboffer.pug b/src/views/partials/notifications/message-joboffer.pug new file mode 100644 index 00000000..2f4a148a --- /dev/null +++ b/src/views/partials/notifications/message-joboffer.pug @@ -0,0 +1,8 @@ +solid-notifications-template(data-rdf-type='hd:joboffer') + template + .solid-notification__avatar + | ${await author['account.picture'] ? `<img src="${await author['account.picture']}" style="max-width:100%; max-height: 100%;" />` : `<img src="/images/alien.webp" />`} + .solid-notification__content + span.solid-notification__title ${await author.name} + span.solid-notification__title__side(data-trans='notification.joboffer.new') + p.solid-notification__summary ${await object.title} -- GitLab From dc0882fb462fe34517a3f8a3bfdef9f829feb441 Mon Sep 17 00:00:00 2001 From: Benoit Alessandroni <benoit@startinblox.com> Date: Fri, 10 Dec 2021 17:31:24 +0100 Subject: [PATCH 2/2] ci/cd: testing a fix --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6f10fec2..91e6985e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,7 +41,9 @@ build: test:e2e: stage: test - image: cypress/included:7.6.0 + image: + name: cypress/included:7.6.0 + entrypoint: [""] services: - name: ${CI_REGISTRY_IMAGE}/djangoldp:latest before_script: -- GitLab