autonomic-cooperative/hubl
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into feature/resource-component

Browse Source
This commit is contained in:
Benoit Alessandroni
2020-09-27 14:22:23 +02:00
parent a7abbd89d2 1692b42e8f
commit cfdd3ae361
59 changed files with 1545 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/admin/page-admin-circles-create.pug
View File

@ -13,6 +13,9 @@ div.content-box__info.flex
data-src=`${endpoints.circles || endpoints.post.circles}`
fields='status, name, description'
required-status
required-name
required-description
loader-id='loader-circles-create'
class-status='form-label is-light is-full-width color'

6
src/views/admin/page-admin-circles.pug
View File

@ -15,7 +15,7 @@
solid-widget(name='hubl-circle-owner')
template
solid-display.user-thumb.is-spaced(
solid-display.user-thumb.block.is-spaced(
data-src='${await value}'
fields='account.picture, sup(name), sub(username)'
@ -70,7 +70,7 @@
class-circle.name='w280 border cell-with-name'
class-circle.owner='w280 border cell-with-id-card'
class-leaveButton='w280 border cell-with-buttons'
class-leaveButton='w280 border cell-with-buttons is-spaced'
action-leaveButton="joinButton"
widget-leaveButton="hubl-admin-circle-leave-button"
@ -108,7 +108,7 @@
class-owner='w280 border cell-with-id-card'
widget-owner='hubl-circle-owner'
class-members='w280 border cell-with-buttons'
class-members='w280 border cell-with-buttons is-spaced'
widget-members="hubl-admin-circle-join-button"
order-by="name"

6
src/views/admin/page-admin-projects-create.pug
View File

@ -24,6 +24,10 @@ div.content-box__info.flex
data-src=`${endpoints.projects || endpoints.post.projects}`
fields='status, line-1(customer.name, name), line-2(captain)'
required-status
required-customer.name
required-name
required-captain
loader-id='loader-projects-create'
label-status='Statut du cercle*'
@ -40,7 +44,7 @@ div.content-box__info.flex
label-captain='Capitaine du projet*'
range-captain=`${endpoints.users || endpoints.get.users}`
class-captain='form-label is-light is-half-width'
widget-captain='solid-form-auto-completion'
widget-captain='solid-form-dropdown-autocompletion-label'
class='input-text-like'

6
src/views/admin/page-admin-projects.pug
View File

@ -46,7 +46,7 @@
solid-widget(name='hubl-project-captain')
template
solid-display.user-thumb.is-spaced(
solid-display.user-thumb.block.is-spaced(
data-src='${await value}'
fields='account.picture, sup(name), sub(username)'
@ -87,7 +87,7 @@
class-project.name='w280 cell border cell-with-name'
class-project.members='w280 cell border cell-with-id-card'
class-project.captain='w280 cell border cell-with-id-card'
class-leaveButton='w230 cell border cell-with-buttons'
class-leaveButton='w230 cell border cell-with-buttons is-spaced'
action-leaveButton="joinButton"
widget-leaveButton="hubl-admin-project-leave-button"
@ -127,7 +127,7 @@
class-name='w280 cell border cell-with-name'
class-members='w280 cell border cell-with-id-card'
class-captain='w280 cell border cell-with-id-card'
class-joinButton='w230 cell border cell-with-buttons'
class-joinButton='w230 cell border cell-with-buttons is-spaced'
action-joinButton="joinButton" # Workaround: I need members two times
widget-joinButton="hubl-admin-project-join-button"

4
src/views/admin/page-admin-users-create.pug
View File

@ -13,6 +13,10 @@ div.content-box__info.flex
data-src=`${endpoints.users || endpoints.post.users}`
fields='line-1(first_name, last_name), line-2(username, email), line-3(password)'
required-first_name
required-last_name
required-username
required-email
loader-id='loader-users-create'
class-first_name='form-label is-light is-half-width input-text-like'

3
src/views/admin/page-admin-users-edit.pug
View File

@ -20,6 +20,9 @@ div.content-box__info.flex
bind-resources=''
fields='line-1(first_name, last_name), line-2(email)'
required-first_name
required-last_name
required-email
loader-id='loader-users-edit'
class-first_name='form-label is-light is-half-width input-text-like'

2
src/views/circle/page-circle-chat.pug
View File

@ -2,7 +2,7 @@
solid-xmpp-chat(
data-authentication='login',
data-auto-login='true',
data-bosh-service-url=`${xmpp}`,
data-websocket-url=`${xmppWebsocket || 'wss://jabber.happy-dev.fr/xmpp-websocket'}`,
data-i18n='en',
bind-resources
)

69
src/views/circle/page-circle-edit.pug
View File

@ -2,45 +2,15 @@ div.content-box__info
include ../../templates/hubl-user-avatar.pug
solid-widget(name='hubl-user-groups')
template ${await value.name}
solid-widget(name='hubl-team-template-edit')
solid-widget(name="circle-edit-members-delete")
template
solid-display.user-thumb.is-spaced(
class='w280 cell border cell-with-id-card user-thumb'
data-src='${await value.user}'
fields='account.picture, sup(name, groups), sub(profile.city)'
class-account.picture='user-thumb__picture avatar'
class-name='user-thumb__name'
class-groups='user-thumb__groups'
class-profile.city='user-thumb__city'
widget-account.picture='hubl-user-avatar'
multiple-groups=''
widget-groups='hubl-user-groups'
)
solid-ac-checker(
class='w162 cell border'
permission="acl:Delete"
data-src="${value['@id']}"
)
solid-ac-checker(permission="acl:Delete" data-src="${src}")
solid-delete(
class='button text-bold text-uppercase reversed button-secondary bordered with-icon icon-close'
data-src="${value['@id']}"
data-src="${src}"
data-label='Retirer'
)
//- Only to show the table grid
solid-ac-checker(
class='w162 cell border'
no-permission="acl:Delete"
data-src="${value['@id']}"
)
solid-link(class="backlink right", bind-resources, next='circle-profile') Retour
solid-ac-checker(permission='acl:Write', bind-resources)
@ -56,6 +26,10 @@ div.content-box__info
bind-resources
fields='status, line-1(name, owner), description'
required-status
required-name
required-owner
required-description
range-owner=`${endpoints.users || endpoints.get.users}`
label-status='Statut du cercle'
@ -70,7 +44,7 @@ div.content-box__info
class-description='form-label is-light is-full-width input-text-like'
class-status='form-label is-light is-full-width member-select color'
widget-owner='solid-form-auto-completion'
widget-owner='solid-form-dropdown-autocompletion-label'
partial=''
@ -87,9 +61,8 @@ div.content-box__info
fields='user'
range-user=`${endpoints.users || endpoints.get.users}`
class-user='team form-label is-light'
label-user=''
widget-user='solid-form-auto-completion'
class-user='team'
widget-user='solid-form-dropdown-autocompletion'
submit-button='Ajouter un membre'
)
@ -100,14 +73,28 @@ div.content-box__info
div.w280 Nom
div.w162 Accès
//-class='table-body'
solid-display(
class='table-body'
bind-resources
fields='members'
nested-field='members'
fields='classGroup(classGrid(user.account.picture, sup(user.name, user.groups), sub(user.profile.city))), self'
loader-id='loader-circle-edit'
multiple-members=''
widget-members='hubl-team-template-edit'
class-classGroup='w280 cell border cell-with-id-card user-thumb is-spaced'
class-user.account.picture='user-thumb__picture avatar'
class-user.name='user-thumb__name'
class-user.groups='user-thumb__groups'
class-user.profile.city='user-thumb__city'
widget-user.account.picture='hubl-user-avatar'
multiple-user.groups
multiple-user.groups-fields='name'
action-self='self'
widget-self='circle-edit-members-delete'
)
//- Only to show the table grid
div.w162.cell.border

22
src/views/circle/page-circle-profile.pug
View File

@ -3,7 +3,6 @@ solid-router(default-route='circle-profile', hidden)
solid-route(name='circle-edit')
#circle-profile(hidden)
include ../../templates/hubl-circle-team.pug
.content-box__info.flex
@ -23,7 +22,7 @@ solid-router(default-route='circle-profile', hidden)
value-title='Date de création : '
widget-creationDate='solid-display-date'
widget-creationDate='solid-display-value-date'
)
solid-ac-checker(permission='acl:Append', bind-resources, nested-field='members')
solid-ac-checker(permission='acl:Delete', bind-resources)
@ -38,6 +37,7 @@ solid-router(default-route='circle-profile', hidden)
class='button mobile-full-width text-bold text-uppercase button-primary bordered with-icon icon-trash'
bind-resources
data-label='Supprimer le cercle'
next='admin-circles'
)
solid-widget(name='hubl-circle-leave-button')
@ -80,14 +80,26 @@ solid-router(default-route='circle-profile', hidden)
h2 Membres :
solid-widget(name='hubl-circle-user-admin')
template ${value ? "Administrateur" : ""}
solid-display.block(
bind-resources
fields='members'
nested-field='members'
loader-id='loader-circle-profile'
fields='classGroup(user.account.picture, sup(user.name, is_admin), sub(user.profile.city))'
multiple-members=''
widget-members='hubl-circle-team-template'
class-classGroup='user-thumb is-spaced'
class-user.account.picture='avatar user-thumb__picture'
class-user.name='user-thumb__name'
class-is_admin='user-thumb__admin'
class-user.profile.city='user-thumb__city'
widget-classGroup='solid-set-div'
widget-user.account.picture='hubl-user-avatar'
widget-is_admin='hubl-circle-user-admin'
)
#circle-edit.content-box__height(hidden)
include page-circle-edit.pug

27
src/views/job-offer/page-job-offer-create.pug
View File

@ -1,27 +0,0 @@
.content-box.with-padding.with-form
h1 Post a new job offer
solid-form(
data-src=`${endpoints.joboffers || endpoints.post.joboffers}`
range-skills=`${endpoints.skills || endpoints.get.skills}`
fields='title, description, skills, closingDate'
class-title='field form-label is-light is-expanded'
label-title='Title*'
class-description='field form-label is-light is-expanded'
label-description='Description*'
widget-description='solid-form-textarea'
class-skills='form-label is-dark select-skills'
label-skills='The required skills for this mission:*'
multiple-skills='solid-multiple-select'
widget-skills='solid-form-auto-completion'
class-closingDate='form-label is-dark'
label-closingDate='Publication end date:*'
widget-closingDate='solid-form-date'
next='job-offers'
)

27
src/views/job-offer/page-job-offer-edit.pug
View File

@ -1,27 +0,0 @@
.content-box.with-padding.with-form
h1 Edit your job offer
solid-form(
bind-resources
range-skills=`${endpoints.skills || endpoints.get.skills}`
fields='title, description, skills, closingDate'
class-title='field form-label is-light is-expanded'
label-title='Title*'
class-description='field form-label is-light is-expanded'
label-description='Description*'
widget-description='solid-form-textarea'
class-skills='form-label is-dark select-skills'
label-skills='The required skills for this mission:*'
multiple-skills='solid-multiple-select'
widget-skills='solid-form-auto-completion'
class-closingDate='form-label is-dark'
label-closingDate='Publication end date:*'
widget-closingDate='solid-form-date'
next='job-offers'
)

0
src/views/circle/page-circle-notifications.pug → src/views/notifications/message-circle.pug
View File

0
src/views/user/page-user-notifications.pug → src/views/notifications/message-private.pug
View File

2
src/views/project/page-project-chat.pug
View File

@ -2,7 +2,7 @@
solid-xmpp-chat(
data-authentication='login',
data-auto-login='true',
data-bosh-service-url=`${xmpp}`,
data-websocket-url=`${xmppWebsocket || 'wss://jabber.happy-dev.fr/xmpp-websocket'}`,
data-i18n='en',
bind-resources
)

33
src/views/project/page-project-edit.pug
View File

@ -1,6 +1,15 @@
div.content-box__info
include ../../templates/hubl-user-avatar.pug
solid-widget(name="project-edit-members-delete")
template
solid-ac-checker(permission="acl:Delete" data-src="${src}")
solid-delete(
class='button text-bold text-uppercase reversed button-secondary bordered with-icon icon-close'
data-src="${src}"
data-label='Retirer'
)
solid-link(class='backlink right', bind-resources, next='project-profile') Retour
@ -17,6 +26,8 @@ div.content-box__info
bind-resources
fields='line-1(customer.name, name)'
required-customer.name
required-name
label-name='Nom du projet*'
@ -40,9 +51,9 @@ div.content-box__info
fields='user'
range-user=`${endpoints.users || endpoints.get.users}`
class-user='team form-label is-light'
class-user='team'
label-user=''
widget-user='solid-form-auto-completion'
widget-user='solid-form-dropdown-autocompletion'
submit-button='Ajouter un membre'
)
@ -57,9 +68,21 @@ div.content-box__info
solid-display(
class='table-body'
bind-resources
fields='members'
nested-field='members'
fields='classGroup(classGrid(user.account.picture, sup(user.name, user.groups), sub(user.profile.city))), self'
loader-id='loader-project-edit'
multiple-members=''
widget-members='hubl-team-template-edit'
class-classGroup='w280 cell border cell-with-id-card user-thumb is-spaced'
class-user.account.picture='user-thumb__picture avatar'
class-user.name='user-thumb__name'
class-user.groups='user-thumb__groups'
class-user.profile.city='user-thumb__city'
widget-user.account.picture='hubl-user-avatar'
multiple-user.groups
multiple-user.groups-fields='name'
action-self='self'
widget-self='project-edit-members-delete'
)

22
src/views/project/page-project-profile.pug
View File

@ -4,7 +4,6 @@ solid-router(default-route='project-profile', hidden)
#project-profile(hidden)
include ../../templates/hubl-captain.pug
include ../../templates/hubl-project-team.pug
.content-box__info.flex
@ -24,7 +23,7 @@ solid-router(default-route='project-profile', hidden)
value-title='Date de création : '
widget-creationDate='solid-display-date'
widget-creationDate='solid-display-value-date'
)
solid-ac-checker(permission='acl:Append', bind-resources, nested-field='members')
solid-ac-checker(permission='acl:Delete', bind-resources)
@ -38,6 +37,7 @@ solid-router(default-route='project-profile', hidden)
class='button mobile-full-width text-bold text-uppercase button-primary bordered with-icon icon-trash'
bind-resources
data-label='Supprimer le projet'
next='admin-projects'
)
solid-widget(name='hubl-project-leave-button')
@ -79,12 +79,24 @@ solid-router(default-route='project-profile', hidden)
h2 Equipe :
solid-widget(name='hubl-project-user-admin')
template ${value ? "Administrateur" : ""}
solid-display.block(
bind-resources
fields='members'
nested-field='members'
fields='classGroup(user.account.picture, sup(user.name, is_admin), sub(user.profile.city, name))'
multiple-members
widget-members='hubl-project-team'
class-classGroup='user-thumb is-spaced'
class-user.account.picture='avatar user-thumb__picture'
class-user.name='user-thumb__name'
class-is_admin='user-thumb__admin'
class-user.profile.city='user-thumb__city'
class-name='user-thumb__lead'
widget-classGroup='solid-set-div'
widget-user.account.picture='hubl-user-avatar'
widget-is_admin='hubl-project-user-admin'
)
#project-edit.content-box__height(hidden)