From 5d56a5ed6b20b4769c41cc541bb8fee3e340aea5 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Pasquier <contact@jbpasquier.eu>
Date: Tue, 23 Feb 2021 11:43:01 +0100
Subject: [PATCH] fix: autologin & i18n for circles
---
src/index.pug | 11 ++++++++++-
src/locales/fr.json | 1 +
src/views/partials/circle/page-circle-events.pug | 6 +++---
src/views/partials/menu-left.pug | 4 ++--
4 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/index.pug b/src/index.pug
index 6475e964..b272e4c7 100644
--- a/src/index.pug
+++ b/src/index.pug
@@ -46,7 +46,16 @@ html(lang="en")
if componentSet.has("autoLogin") || componentSet.has("registering")
for component of components
- if component.type == "autoLogin" || component.type == "registering"
+ if component.type == "autoLogin"
+ if component.parameters
+ if component.parameters.authority
+ sib-auth(style='display:none!important' auto-login)
+ sib-auth-provider(
+ data-authority=`${component.parameters.authority}`
+ data-id=`${component.parameters.authorityName || "authority"}`
+ data-client-name=`${client.name || "My Personal Hubl"}`
+ )
+ if component.type == "registering"
if component.parameters
if component.parameters.authority
sib-auth(style='display:none!important')
diff --git a/src/locales/fr.json b/src/locales/fr.json
index b4ed9dec..3570ce8c 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -28,6 +28,7 @@
"profileDirectory": "Annuaire des membres",
"projects": "Projets",
"circles": "Cercles",
+ "thematics": "Thématiques",
"messages": "Messages",
"search": "Rechercher..."
},
diff --git a/src/views/partials/circle/page-circle-events.pug b/src/views/partials/circle/page-circle-events.pug
index b01489d1..7d18940d 100644
--- a/src/views/partials/circle/page-circle-events.pug
+++ b/src/views/partials/circle/page-circle-events.pug
@@ -2,8 +2,8 @@ solid-event(
class='w700'
bind-resources
nested-field="events"
- range-event-type=`${component.get('events').endpoints.typeevents}`
+ range-event-type=`${extension.get('events').endpoints.typeevents}`
range-event-circle=`${component.endpoints.get}`
- upload-dir=`${component.get('events').endpoints.uploads}`
- id-prefix='circles'
+ upload-dir=`${extension.get('events').endpoints.uploads}`
+ id-prefix=`${component.route}`
)
\ No newline at end of file
diff --git a/src/views/partials/menu-left.pug b/src/views/partials/menu-left.pug
index 600d8238..9c398627 100644
--- a/src/views/partials/menu-left.pug
+++ b/src/views/partials/menu-left.pug
@@ -15,7 +15,7 @@ solid-router#navbar-router(default-route='dashboard')
solid-route.menu.segment.full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name=`admin-${component.route}`)
div.segment.margin-right-xxsmall
div.segment.icon.icon-small.icon-folder-alt
- div.segment.three-quarter.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.circles")
+ div.segment.three-quarter.text-uppercase.text-letter-spacing-large(data-trans=`${component.name?component.name:"menuLeft.circles"}`)
div.menu-chevron.segment
div.menu-icon.icon-arrow-right-circle
solid-route(name=`admin-${component.route}-create`)
@@ -23,7 +23,7 @@ solid-router#navbar-router(default-route='dashboard')
div.menu.segment.full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading
div.segment.margin-right-xxsmall
div.segment.icon.icon-small.icon-folder-alt
- div.segment.three-quarter.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.circles")
+ div.segment.three-quarter.text-uppercase.text-letter-spacing-large(data-trans=`${component.name?component.name:"menuLeft.circles"}`)
solid-route(name=component.route, rdf-type='hd:circle', use-id='', hidden)
solid-route(name=`${component.route}-left`)
div.sub-menu.menu-notification
--
GitLab