Merge branch 'master' into dpo/switch-to-skypack

src/views/page-about.pug

@@ -0,0 +1,17 @@
+.views-container
+  h2(data-trans='about.title')
+  div.flex-content-white
+    div
+      div
+        h3(data-trans='about.card1.subTitle')
+        p(data-trans='about.card1.paragraph1')
+        p(data-trans='about.card1.paragraph2')
+      div
+        a(href="https://startinblox.com/fr/" target="_blank") https://startinblox.com/fr/
+
+    div
+      div
+        h3(data-trans='about.card2.subTitle')
+        p(data-trans='about.card2.paragraph1')
+      div
+        a(href="https://startinblox.com/fr/#home-contact" target="_blank" data-trans='about.card2.link').main-cta

src/views/page-admin.pug

@@ -0,0 +1,27 @@
+.views-container.sidebar-is-closed
+  if endpoints.circles || (endpoints.get && endpoints.get.circles)
+    #admin-circles(hidden, data-view="admin-circles")
+      include partials/admin/page-admin-circles.pug
+  if endpoints.projects || (endpoints.get && endpoints.get.projects)
+    #admin-projects(hidden, data-view="admin-projects")
+      include partials/admin/page-admin-projects.pug
+  if (endpoints.users || (endpoints.get && endpoints.get.users))
+    #admin-communities(hidden, data-view="admin-communities")
+      include partials/admin/page-admin-communities.pug
+nav.jsRightMenu(role='navigation')
+  solid-router(default-route='admin-circles')
+    ul
+      li.jsOffsiteToggle
+        a(data-trans='admin.menuRight.fold')
+      if (endpoints.users || (endpoints.get && endpoints.get.users))
+        solid-route(name='admin-communities')
+          li
+            a(data-trans='admin.menuRight.community')
+      if endpoints.circles || (endpoints.get && endpoints.get.circles)
+        solid-route(name='admin-circles')
+          li
+            a(data-trans='admin.menuRight.circles')
+      if endpoints.projects || (endpoints.get && endpoints.get.projects)
+        solid-route(name='admin-projects')
+          li
+            a(data-trans='admin.menuRight.projects')

src/views/page-circle.pug

@@ -0,0 +1,49 @@
+.views-container.sidebar-is-closed
+  .content-box.flex.full-width.with-form
+    div.content-box__header
+      solid-ac-checker.flex.space-between(permission='acl:Read', bind-resources)
+        solid-display(
+          bind-resources
+          fields='name, description'
+
+          class-name='h1-like'
+          class-description='h1-aside description'
+        )
+        button.mobile-sidebar-button.jsMobileSidebarOpenButton.icon-arrow-left-circle(data-trans='circle.menuRight.buttonMobile')
+    div.content-box__height
+      solid-ac-checker(permission='acl:Read', bind-resources)
+        #circle-chat(hidden, data-view="circle-chat")
+          include partials/circle/page-circle-chat.pug
+        #circle-information.content-box__height(hidden, data-view="circle-information")
+          include partials/circle/page-circle-profile.pug
+        #circle-events(hidden, data-view="circle-events")
+          include partials/circle/page-circle-events.pug
+        #circle-resources(hidden, data-view="circle-resources")
+          include partials/circle/page-circle-resources.pug
+        #circle-polls(hidden, data-view="circle-polls")
+          include partials/circle/page-circle-polls.pug
+
+nav.jsRightMenu(role='navigation')
+  solid-router(default-route='circle-chat')
+    ul
+      li.jsOffsiteToggle
+        a(data-trans='circle.menuRight.fold')
+      solid-route(name='circle-chat')
+        li
+          a(data-trans='circle.menuRight.chat')
+      solid-route(name='circle-information')
+        li
+          a(data-trans='circle.menuRight.information')
+      if (endpoints.resources || (endpoints.get && endpoints.get.resources)) && (endpoints.resourceskeywords || (endpoints.get && endpoints.get.resourceskeywords)) && (endpoints.resourcestypes || (endpoints.get && endpoints.get.resourcestypes))
+        solid-route(name='circle-resources' use-id)
+          li
+            a(data-trans='circle.menuRight.resources')
+      if (endpoints.events || (endpoints.get && endpoints.get.events)) && (endpoints.typeevents || (endpoints.get && endpoints.get.typeevents))
+        solid-route(name='circle-events' use-id)
+          li
+            a(data-trans='circle.menuRight.events')
+      if endpoints.polls || (endpoints.get && endpoints.get.polls)
+        solid-route(name='circle-polls' use-id)
+          li
+            a(data-trans='circle.menuRight.polls')
+      

src/views/page-dashboard.pug

@@ -0,0 +1,5 @@
+.views-container
+  h1(data-trans='dashboard.title')
+  solid-dashboard(
+    data-src=`${endpoints.dashboards || endpoints.get.dashboards}`
+  )

src/views/page-directory.pug

@@ -0,0 +1,4 @@
+solid-directory(
+  data-src=`${endpoints.users || endpoints.get.users}`
+  range-skills=`${endpoints.skills || endpoints.get.skills}`
+)

src/views/page-events.pug

@@ -0,0 +1,7 @@
+.views-container
+  solid-event(data-src=`${endpoints.events || (endpoints.get && endpoints.get.events)}`
+            range-event-type=`${endpoints.typeevents || (endpoints.get && endpoints.get.typeevents)}`
+            range-event-circle=`${endpoints.circles || (endpoints.get && endpoints.get.circles)}`
+            upload-dir=`${endpoints.uploads || (endpoints.get && endpoints.get.uploads)}`
+            id-prefix='default'
+  )

src/views/page-job-offers.pug

@@ -0,0 +1,7 @@
+.content-box.full-width
+  #job-offers.job-offers__container
+    solid-job-board(
+      data-src=`${endpoints.joboffers || endpoints.get.joboffers}`,
+      post-data-src=`${endpoints.joboffers || endpoints.post.joboffers}`,
+      range-skills=`${endpoints.skills || endpoints.get.skills}`
+    )

src/views/page-messages.pug

@@ -0,0 +1,25 @@
+.content-box.flex.full-width
+
+  div.content-box__header
+    solid-display(
+      bind-resources
+      fields='avatar-container(account.picture), text(name, hyphen, at, username)'
+      value-hyphen=" - "
+      value-at="@"
+
+      widget-account.picture='hubl-user-avatar'
+      class-text="avatar-text"
+      class-avatar-container="avatar-container"
+      class-account.picture='avatar'
+      class-name='h1-like'
+      class-hypen='h1-like'
+    )
+
+  .chat-view
+    solid-xmpp-chat(
+      data-authentication='login',
+      data-auto-login='true',
+      data-websocket-url=`${xmppWebsocket || 'wss://jabber.happy-dev.fr/xmpp-websocket'}`,
+      data-i18n='en',
+      bind-resources
+    )

src/views/page-polls.pug

@@ -0,0 +1,7 @@
+.views-container
+  solid-poll(
+    data-src=`${endpoints.polls || (endpoints.get && endpoints.get.polls)}`
+    range-base-polls=`${endpoints.pollRangeBase || (endpoints.get && endpoints.get.pollRangeBase)}`
+    upload-dir=`${endpoints.uploads || (endpoints.get && endpoints.get.uploads)}`
+    id-prefix='default'
+  )

src/views/page-profile.pug

@@ -0,0 +1,5 @@
+solid-profile(
+  bind-user
+  upload-src=`${endpoints.uploads || endpoints.post.uploads}`
+  range-skills=`${endpoints.skills || endpoints.get.skills}`
+)

src/views/page-project.pug

@@ -0,0 +1,37 @@
+.views-container.sidebar-is-closed
+  .content-box.flex.full-width.with-form
+    div.content-box__header
+      solid-ac-checker.flex.space-between(permission='acl:Read', bind-resources)
+        solid-display(
+          bind-resources
+          fields='const-title1, number, customer.name, name'
+
+          class-const-title1='h1-like'
+          class-number='h1-like word-spacing-right'
+          class-customer.name='h1-like'
+          class-name='h1-aside'
+    
+          value-const-title1='N°'
+        )
+        button.mobile-sidebar-button.jsMobileSidebarOpenButton.icon-arrow-left-circle(data-trans='project.menuRight.buttonMobile')
+    div.content-box__height
+      solid-ac-checker(permission='acl:Read', bind-resources)
+        #project-chat(hidden, data-view="project-chat")
+          include partials/project/page-project-chat.pug
+        #project-information.content-box__height(hidden, data-view="project-information")
+          include partials/project/page-project-profile.pug
+        #project-picture(hidden, data-view="project-picture")
+          include partials/project/page-project-picture.pug
+
+nav.jsRightMenu(role='navigation')
+  solid-router(default-route='project-chat')
+    ul
+      li.jsOffsiteToggle
+        a(data-trans='project.menuRight.fold')
+      solid-route(name='project-chat')
+        li 
+          a(data-trans='project.menuRight.chat')
+      solid-route(name='project-information')
+        li 
+          a(data-trans='project.menuRight.information')
+      solid-route(name='project-picture' use-id)

src/views/page-resources.pug

@@ -0,0 +1,8 @@
+.views-container
+  solid-resource(data-src=`${endpoints.resources || (endpoints.get && endpoints.get.resources)}`
+      range-resource-type=`${endpoints.resourcestypes || (endpoints.get && endpoints.get.resourcestypes)}`
+      range-resource-keyword=`${endpoints.resourceskeywords || (endpoints.get && endpoints.get.resourceskeywords)}`
+      range-resource-circle=`${endpoints.circles || (endpoints.get && endpoints.get.circles)}`
+      upload-dir=`${endpoints.uploads || (endpoints.get && endpoints.get.uploads)}`
+      id-prefix='default'
+  )

src/views/partials/admin/page-admin-circles.pug

@@ -11,7 +11,6 @@
   include ../circle/page-circle-left.pug
 
   #admin-circle-list.content-box__height(hidden, data-view="admin-circle-list")
-    include ../../templates/hubl-user-avatar.pug
 
     solid-widget(name='hubl-circle-owner')
       template
@@ -90,7 +89,7 @@
                 value-user.username='hubl-workaround-493'
                 widget-user.username='solid-form-hidden'
 
-                submit-button='Rejoindre'
+                submit-button=''
                 data-trans='submit-button=circle.list.buttonJoin'
               )
               hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}` target-src='${value}')

src/views/partials/admin/page-admin-projects.pug

@@ -12,7 +12,6 @@
     include ../project/page-project-left.pug
 
   #admin-project-list.content-box__height(hidden, data-view="admin-project-list")
-    include ../../templates/hubl-user-avatar.pug
 
     div.content-box__info.flex
       div.admin-header.flex

src/views/partials/circle/page-circle-edit.pug

@@ -1,7 +1,5 @@
 div.content-box__info
 
-  include ../../templates/hubl-user-avatar.pug
-
   solid-widget(name="circle-edit-members-delete")
     template
       solid-ac-checker(permission="acl:Delete" data-src="${src}")

src/views/partials/header.pug

@@ -0,0 +1,44 @@
+.header-left
+  .logo
+    solid-link(next='dashboard')
+      img(src=`${clientLogo || '/images/logo.webp'}` style=`max-height:${clientLogoHeight || '74px'}`)
+
+  span.beta-tag(data-trans='header.beta')
+
+solid-notifications.notLoggedIn(
+  nested-field="inbox"
+  bind-user
+)
+
+details#user-controls.notLoggedIn
+  summary(tabindex='0' role='button')
+    solid-display#user-controls__profile(
+      fields='first_name, account.picture'
+      class-first_name='flex'
+      class-account.picture='avatar'
+      widget-account.picture='hubl-user-avatar'
+      bind-user
+    )
+  #user-controls__panel
+    nav(role="user's functionalities menu")
+      ul
+        if (endpoints.uploads || (endpoints.get && endpoints.get.uploads)) && (endpoints.skills || (endpoints.get && endpoints.get.skills)) && (endpoints.users || (endpoints.get && endpoints.get.users))
+          li
+            solid-link(next='profile' data-trans='header.myProfile')
+        li
+          solid-link(next='admin' data-trans='header.admin')
+        li
+          solid-link(next='about' data-trans='header.about')
+      button(role='log out' onclick="document.querySelector('sib-auth').logout();" data-trans='header.logOut')
+
+button.loggedIn(role='log in' onclick="document.querySelector('sib-auth').login();" data-trans='header.logIn')
+
+button.notLoggedIn.mobile-menu-icon.icon-menu#toggleMainMenu
+
+sib-auth(style='display:none!important', auto-login)
+  sib-auth-provider(
+    data-authority=`${authority}`
+    data-id=`${authorityName || "authority"}`
+    data-client-name=`${clientName || "Hubl"}`
+  )
+

src/views/partials/menu-left.pug

@@ -0,0 +1,198 @@
+solid-widget(name='hubl-counter')
+  template
+    solid-badge(data-src="${value == 'badge' ? src : value}")
+
+solid-widget(name='hubl-menu-jabberid')
+  template
+    div.hidden(
+      data-jabberID="${value}"
+    )
+
+solid-widget(name='hubl-menu-publicprivate')
+  template
+    div ${value == 'Public' ? '#' : ''}
+
+solid-widget(name='hubl-create-contact')
+  template
+    p.create
+      span(data-trans="menuLeft.contact.create")
+      span  
+      solid-link(next="members" data-trans="menuLeft.contact.profileDir")
+      span  
+      span(data-trans="menuLeft.contact.create2")
+
+solid-widget(name='hubl-create')
+  template
+    p.create 
+      span(data-trans="menuLeft.emptyCircleProject.notPartOf")
+      span  ${value}.
+      br
+      span(data-trans="menuLeft.emptyCircleProject.createNew")
+      span  
+      solid-link(next="${value == 'projet' ? 'admin-projects' : 'admin-circles'}", data-trans="menuLeft.emptyCircleProject.adminPanel")
+
+solid-widget(name='hubl-menu-fix-url-contact')
+  template
+    solid-link(data-src="${value}" next="messages")
+      solid-display(
+        data-src='${value}'
+        fields='name, chatProfile.jabberID, badge'
+        value-badge='${value}'
+        widget-badge='hubl-counter'
+        widget-chatProfile.jabberID='hubl-menu-jabberid'
+        widget-name='solid-display-div'
+        order-asc='username'
+      )
+
+solid-widget(name='hubl-menu-fix-url-circle')
+  template
+    solid-link(data-src="${value}" next="circle")
+      solid-display(
+        data-src='${value}'
+        fields='status, name, jabberID, badge'
+        value-badge='${value}'
+        widget-status='hubl-menu-publicprivate'
+        widget-badge='hubl-counter'
+        widget-jabberID='hubl-menu-jabberid'
+        widget-name='solid-display-div'
+        order-asc="name"
+      )
+
+solid-widget(name='hubl-menu-fix-url-project')
+  template
+    solid-link(data-src="${value}" next="project")
+      solid-display(
+        data-src='${value}'
+        fields='status, project(customer.name, name, jabberID), badge'
+        class-name='project-name'
+        class-customer.name='project-customer'
+        value-badge='${value}'
+        widget-status='hubl-menu-publicprivate'
+        widget-jabberID='hubl-menu-jabberid'
+        widget-badge='hubl-counter'
+        widget-name='solid-display-div'
+        order-asc="customer.name"
+      )
+
+
+solid-router#navbar-router(default-route='dashboard')
+  if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards)
+    solid-route.menu(name='dashboard')
+      div.menu-label(data-trans="menuLeft.dashboard")
+      div.menu-icon.icon-home
+    div.divider
+  if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users))
+    solid-route.menu(name='members')
+      div.menu-label(data-trans="menuLeft.profileDirectory")
+      div.menu-icon.icon-people
+    div.divider
+  if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers)
+    solid-route.menu(name='job-offers', rdf-type='hd:joboffer')
+      div.menu-label(data-trans="menuLeft.jobBoard")
+      div.menu-icon.icon-briefcase
+    div.divider
+  if endpoints.resources || (endpoints.get && endpoints.get.resources)
+    solid-route.menu(name='resources')
+      div.menu-label(data-trans="menuLeft.resources")
+      div.menu-icon.icon-docs
+    div.divider
+  if endpoints.polls || (endpoints.get && endpoints.get.polls)
+    solid-route.menu(name='polls')
+      div.menu-label(data-trans="menuLeft.gov")
+      div.menu-icon.icon-bubbles
+    div.divider
+  if endpoints.events || (endpoints.get && endpoints.get.events)
+    solid-route.menu(name='events')
+      div.menu-label(data-trans="menuLeft.events")
+      div.menu-icon.icon-calendar
+    div.divider
+  if endpoints.projects || (endpoints.get && endpoints.get.projects)
+    div.menu-wrapper
+      solid-link
+        //- (next='admin-project-list')
+        div.menu
+          div.menu-chevron
+            div.menu-icon.icon-arrow-up
+            //- div.menu-icon.icon-arrow-right-circle
+          div.menu-label(data-trans="menuLeft.projects")
+          div.menu-icon.icon-folder-alt
+      solid-route(name='project', rdf-type='hd:project', use-id='', hidden)
+      div.sub-menu.menu-notification
+        div#loader-projects.loader.loader-menu
+          div
+          div
+          div
+          div
+        solid-display.project-tab(
+          bind-user
+          nested-field='projects'
+          fields='project'
+          loader-id='loader-projects'
+          empty-widget='hubl-create'
+          empty-value=''
+          data-trans="empty-value=menuLeft.emptyCircleProject.project"
+          widget-project='hubl-menu-fix-url-project'
+          order-asc="project.customer.name"
+        )
+    div.divider
+  if endpoints.circles || (endpoints.get && endpoints.get.circles)
+    div.menu-wrapper
+      solid-link
+        //- (next='admin-circle-list')
+        div.menu
+          div.menu-chevron
+            div.menu-icon.icon-arrow-up
+            //- div.menu-icon.icon-arrow-right-circle
+          div.menu-label(data-trans="menuLeft.circles")
+          div.menu-icon.icon-folder-alt
+      solid-route(name='circle', rdf-type='hd:circle', use-id='', hidden)
+      div.sub-menu.menu-notification
+        div#loader-circles.loader.loader-menu
+          div
+          div
+          div
+          div
+        solid-display.circle-tab(
+          bind-user
+          nested-field='circles'
+          fields='circle'
+          loader-id='loader-circles'
+          empty-widget='hubl-create'
+          empty-value=''
+          data-trans="empty-value=menuLeft.emptyCircleProject.circle"
+          widget-circle='hubl-menu-fix-url-circle'
+          order-asc="circle.name"
+        )
+    div.divider
+  div.menu-wrapper
+    div.menu
+      div.menu-chevron
+        div.menu-icon.icon-arrow-up
+      div.menu-label(data-trans="menuLeft.messages")
+      div.menu-icon.icon-envelope-letter
+    solid-route(name='messages', rdf-type='foaf:user', use-id='', hidden)
+    div.sub-menu.menu-notification
+      div#loader-messages.loader.loader-menu
+        div
+        div
+        div
+        div
+        //- search-fields="contact.name"
+        //- search-label-contact.name=""
+        //- data-trans="search-label-contact.name=menuLeft.search"
+        //- search-widget-contact.name="hubl-search-users"
+      solid-display.message-tab(
+        bind-user
+        nested-field='contacts'
+        fields='contact'
+        loader-id='loader-messages'
+        empty-widget='hubl-create-contact'
+        empty-value=''
+        widget-contact='hubl-menu-fix-url-contact'
+        order-asc="contact.username"
+      )
+  div.divider
+
+  solid-route(name='admin', hidden)
+  solid-route.menu(name='profile', hidden)
+  solid-route(name='about', hidden)

src/views/partials/notifications.pug

@@ -0,0 +1,4 @@
+//- Templates for notifications
+
+include notifications/message-circle.pug
+include notifications/message-private.pug

src/views/partials/project/page-project-edit.pug

@@ -1,7 +1,5 @@
 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}")

src/views/partials/project/page-project-profile.pug

@@ -3,7 +3,6 @@ solid-router(default-route='project-profile', hidden)
   solid-route(name='project-edit')
 
 #project-profile(hidden, data-view="project-profile")
-  include ../../templates/hubl-captain.pug
 
   solid-widget(name='hubl-project-team-contact')
     template 

src/views/partials/widgets.pug

@@ -0,0 +1,4 @@
+//- Import your widgets from the `widget`folder here
+
+include widgets/hubl-captain.pug
+include widgets/hubl-user-avatar.pug

src/views/partials/widgets/hubl-captain.pug

@@ -0,0 +1,14 @@
+solid-widget(name='hubl-captain')
+  template
+    solid-display.user-thumb(
+      data-src="${value}"
+      fields='account.picture, sup(name), sub(is_lead)'
+
+      class-account.picture='avatar user-thumb__picture'
+      class-name='user-thumb__name'
+      class-is_lead='user-thumb__lead'
+
+      widget-account.picture='hubl-user-avatar'
+      value-is_lead=''
+      data-trans='value-is_lead=template-captain.isLead'
+    )

src/views/partials/widgets/hubl-user-avatar.pug

@@ -0,0 +1,2 @@
+solid-widget(name='hubl-user-avatar')
+  template ${value ? `<img src="${value}" style="max-width:100%; max-height: 100%;" />` : `<object type="image/svg+xml" data="/images/alien.svg"></object>`}