Merge branch 'master' into feature/resource-component
This commit is contained in:
@ -56,6 +56,9 @@
|
||||
hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}` target-src='${src}')
|
||||
hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}joinable/` target-src='${src}')
|
||||
hubl-reactivity(bind-user nested-field="circles" target-src='${src}')
|
||||
if (endpoints.post && endpoints.post.circles) && (endpoints.get && endpoints.get.circles)
|
||||
hubl-reactivity(data-src=`${endpoints.post.circles}joinable/` target-src=`${src}`)
|
||||
hubl-reactivity(data-src=`${endpoints.post.circles}` target-src=`${src}`)
|
||||
|
||||
solid-display(
|
||||
class='table-body'
|
||||
@ -89,6 +92,9 @@
|
||||
hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}` target-src='${value}')
|
||||
hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}joinable/` target-src='${value}')
|
||||
hubl-reactivity(bind-user nested-field="circles" target-src='${value}')
|
||||
if (endpoints.post && endpoints.post.circles) && (endpoints.get && endpoints.get.circles)
|
||||
hubl-reactivity(data-src=`${endpoints.post.circles}joinable/` target-src=`${value}`)
|
||||
hubl-reactivity(data-src=`${endpoints.post.circles}` target-src=`${value}`)
|
||||
|
||||
solid-display(
|
||||
class='table-body'
|
||||
|
@ -40,6 +40,9 @@
|
||||
hubl-reactivity(data-src=`${endpoints.projects || endpoints.get.projects}` target-src='${src}')
|
||||
hubl-reactivity(data-src=`${endpoints.projects || endpoints.get.projects}joinable/` target-src='${src}')
|
||||
hubl-reactivity(bind-user nested-field="projects" target-src='${src}')
|
||||
if (endpoints.post && endpoints.post.projects) && (endpoints.get && endpoints.get.projects)
|
||||
hubl-reactivity(data-src=`${endpoints.post.projects}joinable/` target-src=`${src}`)
|
||||
hubl-reactivity(data-src=`${endpoints.post.projects}` target-src=`${src}`)
|
||||
|
||||
solid-widget(name='hubl-project-captain')
|
||||
template
|
||||
@ -109,6 +112,9 @@
|
||||
hubl-reactivity(data-src=`${endpoints.projects || endpoints.get.projects}` target-src='${src}')
|
||||
hubl-reactivity(data-src=`${endpoints.projects || endpoints.get.projects}joinable/` target-src='${src}')
|
||||
hubl-reactivity(bind-user nested-field="projects" target-src='${src}')
|
||||
if (endpoints.post && endpoints.post.projects) && (endpoints.get && endpoints.get.projects)
|
||||
hubl-reactivity(data-src=`${endpoints.post.projects}joinable/` target-src=`${value}`)
|
||||
hubl-reactivity(data-src=`${endpoints.post.projects}` target-src=`${value}`)
|
||||
|
||||
solid-display(
|
||||
class='table-body'
|
||||
|
@ -11,16 +11,14 @@ div.content-box__info.flex
|
||||
solid-form.form.button-register(
|
||||
bind-resources=''
|
||||
|
||||
fields='line-1(first_name, last_name), line-2(username, email)'
|
||||
fields='line-1(first_name, last_name), line-2(email)'
|
||||
|
||||
class-first_name='form-label is-light is-half-width input-text-like'
|
||||
class-last_name='form-label is-light is-half-width input-text-like'
|
||||
class-username='form-label is-light is-half-width input-text-like'
|
||||
class-email='form-label is-light is-half-width input-text-like'
|
||||
class-email='form-label is-light is-full-width input-text-like'
|
||||
|
||||
label-first_name='Prénom *'
|
||||
label-last_name='Nom *'
|
||||
label-username='Nom d\'utilisateur *'
|
||||
label-email='E-mail *'
|
||||
|
||||
next='admin-user-list'
|
||||
|
10
src/views/circle/page-circle-notifications.pug
Normal file
10
src/views/circle/page-circle-notifications.pug
Normal file
@ -0,0 +1,10 @@
|
||||
solid-notifications-template(data-rdf-type='hd:circle')
|
||||
template
|
||||
.solid-notification__avatar
|
||||
| ${await author['account.foaf:depiction'] ? `<img src="${await author['account.foaf:depiction']}" style="max-width:100%; max-height: 100%;" />` : `<object type="image/svg+xml" data="/images/alien.svg"></object>`}
|
||||
.solid-notification__content
|
||||
.solid-notification__title ${await author.name}
|
||||
span.solid-notification__title__side dans
|
||||
span.solid-notification__title__icon ${(await object.status) == 'Public' ? '#' : ''}
|
||||
| ${await object.name}
|
||||
p.solid-notification__summary ${summary}
|
8
src/views/user/page-user-notifications.pug
Normal file
8
src/views/user/page-user-notifications.pug
Normal file
@ -0,0 +1,8 @@
|
||||
solid-notifications-template(data-rdf-type='foaf:user')
|
||||
template
|
||||
.solid-notification__avatar
|
||||
| ${await author['account.foaf:depiction'] ? `<img src="${await author['account.foaf:depiction']}" style="max-width:100%; max-height: 100%;" />` : `<object type="image/svg+xml" data="/images/alien.svg"></object>`}
|
||||
.solid-notification__content
|
||||
.solid-notification__title ${await author.name}
|
||||
span.solid-notification__title__side en privé
|
||||
p.solid-notification__summary ${summary}
|
Reference in New Issue
Block a user