diff --git a/index.prod.html b/index.prod.html
deleted file mode 100644
index b1012ee64fa09596e5f67240aababef9aac5a1ae..0000000000000000000000000000000000000000
--- a/index.prod.html
+++ /dev/null
@@ -1,299 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="UTF-8">
- <title>HD App</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta http-equiv="X-UA-Compatible" content="ie=edge">
- <link rel="icon" type="image/png" href="/images/favicon.png">
- <script type="module" src="https://unpkg.com/@startinblox/oidc@0.6.0"></script>
- <script src="/scripts/index.js"></script>
- <link rel="stylesheet" href="/styles/index.css">
- <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600,700&amp;subset=latin-ext">
- <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i,700,700i,800,800i">
- <script type="module" src="https://unpkg.com/@startinblox/core@0.7"></script>
- <script type="module" src="https://unpkg.com/@startinblox/router@0.7.2"></script>
- <script type="module" src="https://unpkg.com/@startinblox/component-chat@0.1.7"></script>
- <script type="module" src="https://unpkg.com/@startinblox/component-notifications@0.1.12"></script>
- <script type="module" src="https://unpkg.com/@startinblox/component-conversation@0.2.1"></script>
- <script type="module" src="https://unpkg.com/@startinblox/component-directory@0.1.16"></script>
- </head>
- <body>
- <header id="header" role="banner">
- <div id="logo">
- <sib-link next="members"><img src="/images/logo.png" width="111" height="32"></sib-link>
- </div>
- <sib-notifications id-suffix="inbox" bind-user></sib-notifications>
- <sib-widget name="hd-user-avatar">
- <template><img name="${name}" src="${value || '/images/alien.jpg'}" style="max-width:100%; max-height: 100%;"></template>
- </sib-widget>
- <details id="user-controls">
- <summary tabindex="0" role="button">
- <sib-display id="user-controls__profile" data-fields="first_name, account.picture" widget-account.picture="hd-user-avatar" bind-user></sib-display>
- </summary>
- </details>
- <button role="log in" onclick="document.querySelector('sib-auth').login();">Login</button>
- <sib-auth>
- <sib-auth-provider class="sib-auth-provider" data-authority="https://api.test-nantes.happy-dev.fr/openid/" data-client_id="621272" data-id="paris" data-response_type="id_token token" data-scope="openid profile email" data-automaticSilentRenew="true" data-loadUserInfo="true"></sib-auth-provider>
- </sib-auth>
- </header>
- <main>
- <nav id="main__menu">
- <sib-router id="navbar-router" default-route="members">
- <sib-route class="menu" name="members">
- <div class="menu-label">Members</div>
- <div class="menu-icon icon-people"></div>
- </sib-route>
- <div class="divider"></div>
- <sib-route class="menu" name="job-offers" rdf-type="hd:joboffer">
- <div class="menu-label">Job offers</div>
- <div class="menu-icon icon-briefcase"></div>
- </sib-route>
- <sib-route hidden name="job-offer-create"></sib-route>
- <div class="divider"></div>
- <div class="menu-wrapper">
- <div class="menu">
- <div class="menu-chevron">
- <div class="menu-icon icon-arrow-up"></div>
- </div>
- <div class="menu-label">Projects</div>
- <div class="menu-icon icon-folder-alt"></div>
- </div>
- <sib-route hidden name="project" id-prefix="https://api.test-nantes.happy-dev.fr/projects/" rdf-type="hd:project" use-id=""></sib-route>
- <div class="sub-menu">
- <sib-display data-src="https://api.test-nantes.happy-dev.fr/projects/" data-fields="project" set-project="customer.name, dash, name" value-dash=" - " next="project"></sib-display>
- </div>
- </div>
- <div class="divider"></div>
- <div class="menu-wrapper">
- <div class="menu">
- <div class="menu-chevron">
- <div class="menu-icon icon-arrow-up"></div>
- </div>
- <div class="menu-label">Chat</div>
- <div class="menu-icon icon-envelope-letter"></div>
- </div>
- <sib-route hidden name="member-chat" id-prefix="https://api.test-nantes.happy-dev.fr/members/" rdf-type="foaf:user" use-id=""></sib-route>
- <div class="sub-menu">
- <sib-display data-src="https://api.test-nantes.happy-dev.fr/members/" data-fields="user.username" widget-user.username="sib-display-div" next="member-chat"></sib-display>
- </div>
- </div>
- <div class="divider"></div>
- </sib-router>
- </nav>
- <div id="viewport">
- <div class="no-sidebar" id="members" hidden>
- <sib-directory data-src="https://api.test-nantes.happy-dev.fr/members/" range-groups="https://api.test-nantes.happy-dev.fr/groups/" range-skills="https://api.test-nantes.happy-dev.fr/skills/"></sib-directory>
- </div>
- <div class="no-sidebar" id="job-offers" hidden>
- <div class="job-offers__main">
- <sib-widget name="hd-user-avatar">
- <template><img name="${name}" src="${value || '/images/alien.jpg'}" style="max-width:100%; max-height: 100%;"></template>
- </sib-widget>
- <sib-widget name="groups-name">
- <template>${value.name}</template>
- </sib-widget>
- <sib-widget name="skills-name">
- <template>
- <li class="skill">${value.name}</li>
- </template>
- </sib-widget>
- <sib-widget name="joboffers-filter">
- <template>
- <select>
- <option name="Offers" disabled>Offers</option>
- <option selected name="Current offers">Current offers</option>
- <option name="Expired offers">Expired offers</option>
- <option name="All offers">All offers</option>
- <option name="My offers">Only my offers</option>
- </select>
- </template>
- </sib-widget>
- <sib-widget name="hd-contact-author">
- <template>
- <sib-link next="member-chat" data-src="${value.profile['@id']}">Send a message</sib-link>
- </template>
- </sib-widget>
- <div class="job-offers__content">
- <h1>New offers<span>Here you can find and post offers</span></h1>
- <sib-display id="offers-list" data-src="https://api.test-nantes.happy-dev.fr/job-offers/" data-fields="user-thumb, creationDate, title, description, skills, author" set-user-thumb="author.account.picture, author.first_name, author.groups" widget-author.account.picture="hd-user-avatar" widget-author.groups="groups-name" multiple-author.groups widget-skills="skills-name" multiple-skills widget-author="hd-contact-author" search-range-skills="https://api.test-nantes.happy-dev.fr/skills/" search-fields="content, open, skills" set-content="title, description" search-label-content="Search by keyword" search-label-skills="Search by skills" search-widget-content="sib-form-placeholder-text" search-widget-skills="sib-form-placeholder-dropdown" search-widget-open="joboffers-filter"></sib-display>
- </div>
- <div class="job-offers__newoffer">
- <template id="groups-list-template">
- <p>${value}</p>
- </template>
- <sib-link class="plus-button" next="job-offer-create">
- <div class="icon-plus"></div>
- <div>Post a new offer</div>
- </sib-link>
- </div>
- </div>
- </div>
- <div class="no-sidebar" id="job-offer-create" hidden>
- <sib-link class="backlink" next="job-offers">Back</sib-link>
- <div class="content-box with-form">
- <h1>Post a new job offer</h1>
- <p class="center">This form allows you to share an offer to all members of the network.</p>
- <sib-widget name="title-text">
- <template>
- <p>Be clear and specific with the name of your offer. You can indicate which skill is important, the start date or the name of the client. Ex: "Looking for a plumber for planet Mars ASAP".</p>
- </template>
- </sib-widget>
- <sib-widget name="description-text">
- <template>
- <p>Be specific and exhaustive to avoid answering too many questions later. Indicate what is the best way to fill the offer, the prerequisites...'</p>
- </template>
- </sib-widget>
- <sib-form class="block" data-src="https://api.test-nantes.happy-dev.fr/job-offers/" range-skills="https://api.test-nantes.happy-dev.fr/skills/" data-fields="title, title-text, description, description-text, skills" label-title="Title*" widget-title-text="title-text" label-description="Description*" widget-description-text="description-text" label-skills="The required skills for this mission:*" multiple-skills="sib-multiple-select" widget-skills="sib-form-auto-completion" next="job-offers"></sib-form>
- </div>
- </div>
- <div class="with-sidebar" id="project" hidden>
- <div class="views-container">
- <div id="project-chat">
- <div class="content-box full-width chat-view">
- <sib-chat data-authentication="login" data-auto-login="true" data-bosh-service-url="https://jabber.happy-dev.fr/http-bind/" data-debug="false" data-locales-url="en" bind-resources></sib-chat>
- </div>
- </div>
- <div id="project-profile">
- <div class="content-box full-width">
- <sib-widget name="template-business-provider">
- <template>
- <ul>
- <li><span>Happy Dev Paris:</span> 5%</li>
- <li><span>Business provider:</span> ${value.name}, ${value.fee ? value.fee:0}%</li>
- </ul>
- </template>
- </sib-widget>
- <sib-widget name="customer-template">
- <template>
- <div id="clientBox">
- <div>
- <h5>Client:</h5>
- <ul>
- <li><span>Business name:</span>${value.name}</li>
- <li><span>Company register:</span>${value.companyRegister}</li>
- <li><span>Address:</span><br>
- <p>${value.address}</p>
- </li>
- </ul>
- </div>
- <div>
- <h5>Contact:</h5>
- <ul>
- <li class="mdi-account-outline"><span>${value.firstName} ${value.lastName}</span>, ${value.role}</li>
- <li class="mdi-email-outline"><a href="mailto:${value.email}">${value.email}</a></li>
- <li class="mdi-cellphone-iphone">${value.phone}</li>
- </ul>
- </div>
- </div>
- </template>
- </sib-widget>
- <sib-widget name="hd-user-avatar">
- <template><img name="${name}" src="${value || '/images/alien.jpg'}" style="max-width:100%; max-height: 100%;"></template>
- </sib-widget>
- <sib-widget name="team-template">
- <template>
- <sib-display data-src="${value.user['@id']}" data-fields="account.picture" widget-account.picture="hd-user-avatar"></sib-display>
- <div name="user.thumb"><span>${value.user.name}</span>
- <sib-display data-src="${value.user.groups['@id']}" data-fields="name" multiple-name></sib-display>
- </div><span>${value.name}</span>
- </template>
- </sib-widget>
- <sib-display data-fields="block-title, infos, block-lead, block-fee, block-customer, block-team" set-block-title="const-title1, number, customer.name, const-title2, name, entitled, creationDate" value-const-title1="N°" value-const-title2="-" value-entitled="Creation date:" set-infos="block-description, block-logo" set-block-description="label-description, description" set-block-logo="customer.logo" value-label-description="DESCRIPTION:" widget-customer.logo="sib-display-img" set-block-fee="label-fee, businessProvider" value-label-fee="FEE:" widget-businessProvider="template-business-provider" set-block-customer="label-customer, customer" value-label-customer="CUSTOMER INFORMATIONS:" widget-customer="customer-template" set-block-team="label-team, members" value-label-team="TEAM:" widget-members="team-template" multiple-members="" bind-resources></sib-display>
- </div>
- </div>
- <div id="project-edit">
- <div class="content-box with-form full-width">
- <h1>Edit your project</h1>
- <p>Here you can edit your projet's details</p>
- <sib-widget name="hd-template-project-title">
- <template><span>${label}</span></template>
- </sib-widget>
- <sib-widget name="template-members">
- <template>
- <sib-form class="team is-horizontal" naked data-src="${id}" data-fields="user.name, name" range-user.name="https://api.test-nantes.happy-dev.fr/users/" class-name="field" class-user.name="field" label-name="Role" label-user.name="Member(s)"></sib-form>
- </template>
- </sib-widget>
- <sib-form class="block" data-fields="block-project__info, block-project__fee, block-project__customer, block-project__team" set-block-project__info="customer.name, name, customer.logo, description" label-customer.name="Customer's name" label-name="Project's name" label-customer.logo="Customer's logo" label-description="Project description" set-block-project__fee="fieldset-fee, businessProvider, businessProvider.fee" range-businessProvider="https://api.test-nantes.happy-dev.fr/businessproviders/" label-businessProvider="Business provider" label-businessProvider.fee="Amount of the contribution (%)" widget-fieldset-fee="hd-template-project-title" widget-businessProvider.fee="sib-form-number" label-fieldset-fee="Fee" set-block-project__customer="fieldset-customer, customer.companyRegister, customer.address, customer.firstName, customer.lastName, customer.role, customer.email, customer.phone" label-customer.companyRegister="Company registration number" label-customer.address="Address" label-customer.firstName="Name of the contact at the customer's premises" label-customer.lastName="Firstname of the contact at the customer's premises" label-customer.role="Role within the company" label-customer.email="Email" label-customer.phone="Phone" widget-fieldset-customer="hd-template-project-title" label-fieldset-customer="Customer information" set-block-project__team="fieldset-team, members" label-fieldset-team="The team" widget-fieldset-team="hd-template-project-title" widget-members="template-members" multiple-members bind-resources></sib-form>
- </div>
- </div>
- <div id="project-create">
- <div class="content-box with-form full-width">
- <h1>New project</h1>
- <p>Here you can create your project, add members and assign them a job.</p>
- <sib-form class="block" data-src="https://api.test-nantes.happy-dev.fr/projects/" range-members="https://api.test-nantes.happy-dev.fr/members/" range-team="https://api.test-nantes.happy-dev.fr/users/" data-fields="block-project__info, block-project__fee, block-project__customer" set-block-project__info="customer.name, name, customer.logo, description" label-customer.name="Customer's name" label-name="Project's name" label-customer.logo="Customer's logo" label-description="Project description" set-block-project__fee="fieldset-fee, businessProvider, businessProviderFee" widget-fieldset-fee="hd-template-project-title" label-businessProvider="Business provider" label-businessProviderFee="Amount of the contribution" set-block-project__customer="fieldset-customer, customer.companyRegister, customer.address, customer.firstName, customer.lastName, customer.role, customer.email, customer.phone" widget-fieldset-customer="hd-template-project-title" label-customer.companyRegister="Company register" label-customer.address="Address" label-customer.firstName="Name of the contact at the customer's premises" label-customer.lastName="Firstname of the contact at the customer's premises" label-customer.role="Role within the company" label-customer.email="Email" label-customer.phone="Phone"></sib-form>
- </div>
- </div>
- </div>
- <nav class="jsRightMenu" role="navigation">
- <sib-router default-route="project-chat">
- <ul>
- <li class="jsOffsiteToggle"><a>Fold menu</a></li>
- <sib-route name="project-chat" use-id>
- <li> <a>Chat</a></li>
- </sib-route>
- <sib-route name="project-profile" use-id>
- <li> <a>Information</a></li>
- </sib-route>
- <sib-route name="project-edit" use-id></sib-route>
- <sib-route name="project-create" use-id></sib-route>
- </ul>
- </sib-router>
- </nav>
- </div>
- <div class="with-sidebar" id="circle" hidden>
- <div class="views-container">
- <div id="circle-chat">
- <div class="content-box full-width chat-view">
- <sib-chat data-authentication="login" data-auto-login="true" data-bosh-service-url="https://jabber.happy-dev.fr/http-bind/" data-debug="false" data-locales-url="en" bind-resources></sib-chat>
- </div>
- </div>
- <div id="circle-profile">
- <div class="content-box full-width">
- <h2>Channel's name:</h2>
- <sib-display data-fields="name" bind-resources></sib-display>
- <h2>Description:</h2>
- <sib-display data-fields="description" bind-resources></sib-display>
- <h2>In group:</h2>
- <sib-display class="block-group" id-suffix="team" data-fields="teammate-img, teammate-name, teammate-pseudonym, teammate-profile, teammate-contact" set-teammate-img="account.picture" set-teammate-pseudonym="before-pseudo, username" set-teammate-name="name" template-teammate-contact="chat-link" value-before-pseudo="@" value-teammate-contact="Send a message" value-teammate-profile="View profile" widget-account.picture="sib-display-img" next="member" bind-resources></sib-display>
- </div>
- </div>
- <div id="circle-edit">
- <div class="content-box with-form full-width" id="circle-edit">
- <h1>Edit group</h1>
- <sib-form class="block" range-owner="https://api.test-nantes.happy-dev.fr/members/" data-fields="name, description, owner, team, jabberID, jabberRoom" range-team="https://api.test-nantes.happy-dev.fr/members/" widget-team="sib-form-multiple-dropdown" bind-resources></sib-form>
- </div>
- </div>
- <div id="circle-create">
- <div class="content-box with-form full-width">
- <h1>New group</h1>
- <p>Here you can create a new group according to your interests, what you want to share, etc.</p>
- <sib-form data-src="https://api.test-nantes.happy-dev.fr/circles/" range-owner="https://api.test-nantes.happy-dev.fr/users/" range-team="https://api.test-nantes.happy-dev.fr/members/" data-fields="name, description, description-text, owner, owner-text, team, team-text, jabberRoom, foaf:jabberID" label-name="Channel's name" label-description="Description" label-owner="Owner of this channel" label-foaf:jabberID="Chatroom id" label-team="Member(s) of this channel" value-description-text="You can write a short description like "Here, we are like Pinky and the Brain, we talk about strategy to conquer the world"." value-owner-text="The one who will admin this channel" value-team-text="Add any members as you want." widget-description="sib-form-textarea" widget-jabberRoom="sib-form-checkbox" widget-team="sib-form-multiple-dropdown"></sib-form>
- </div>
- </div>
- </div>
- <nav class="jsRightMenu" role="navigation">
- <sib-router default-route="circle-chat">
- <ul>
- <li class="jsOffsiteToggle"><a>Fold menu</a></li>
- <sib-route name="circle-chat">
- <li><a>Chat</a></li>
- </sib-route>
- <sib-route name="circle-profile">
- <li><a>Information</a></li>
- </sib-route>
- <sib-route name="circle-edit"></sib-route>
- <sib-route name="circle-create"></sib-route>
- </ul>
- </sib-router>
- </nav>
- </div>
- <div class="with-sidebar" id="member-chat" hidden>
- <div class="content-box full-width chat-view">
- <sib-chat data-authentication="login" data-auto-login="true" data-bosh-service-url="https://jabber.happy-dev.fr/http-bind/" data-debug="false" data-locales-url="en" bind-resources></sib-chat>
- </div>
- </div>
- </div>
- </main>
- </body>
-</html>
\ No newline at end of file
diff --git a/src/config.sample.json b/src/config.sample.json
index 2b026358ae375d1e45c9fae1bb75752833d23846..031b6db1f6a8305ec4cda6ecf20a0836c1413105 100644
--- a/src/config.sample.json
+++ b/src/config.sample.json
@@ -3,6 +3,7 @@
"cdn": "https://cdn.happy-dev.fr",
"xmpp": "https://jabber.happy-dev.fr/http-bind/",
"authority": "http://127.0.0.1:8000/openid/",
+ "clientName": "SIB App",
"endpoints": {
"businessproviders": "http://127.0.0.1:8000/businessproviders/",
"circles": "http://127.0.0.1:8000/circles/",
@@ -11,13 +12,14 @@
"projects": "http://127.0.0.1:8000/projects/",
"skills": "http://127.0.0.1:8000/skills/",
"users": "http://127.0.0.1:8000/users/"
- }
+ }
},
"alpha": {
"cdn": "https://cdn.happy-dev.fr",
"xmpp": "https://jabber.happy-dev.fr/http-bind/",
"authority": "https://api.alpha.happy-dev.fr/openid/",
+ "clientName": "SIB App",
"endpoints": {
"businessproviders": "https://api.alpha.happy-dev.fr/businessproviders/",
"circles": "https://api.alpha.happy-dev.fr/circles/",
@@ -26,7 +28,7 @@
"projects": "https://api.alpha.happy-dev.fr/projects/",
"skills": "https://api.alpha.happy-dev.fr/skills/",
"users": "https://api.alpha.happy-dev.fr/users/"
- }
+ }
},
"paris": {
@@ -34,6 +36,7 @@
"cdn": "https://cdn.happy-dev.fr",
"xmpp": "https://jabber.happy-dev.fr/http-bind/",
"authority": "https://api.test-paris.happy-dev.fr/openid/",
+ "clientName": "SIB App",
"endpoints": {
"businessproviders": "https://api.test-paris.happy-dev.fr/businessproviders/",
"circles": "https://api.test-paris.happy-dev.fr/circles/",
@@ -42,13 +45,14 @@
"projects": "https://api.test-paris.happy-dev.fr/projects/",
"skills": "https://api.test-paris.happy-dev.fr/skills/",
"users": "https://api.test-paris.happy-dev.fr/users/"
- }
+ }
},
"nantes": {
"cdn": "https://cdn.happy-dev.fr",
"xmpp": "https://jabber.happy-dev.fr/http-bind/",
"authority": "https://api.test-nantes.happy-dev.fr/openid/",
+ "clientName": "SIB App",
"endpoints": {
"businessproviders": "https://api.test-nantes.happy-dev.fr/businessproviders/",
"circles": "https://api.test-nantes.happy-dev.fr/circles/",
diff --git a/src/context.jsonld b/src/context.jsonld
new file mode 100644
index 0000000000000000000000000000000000000000..be7f99d85ff7fb0c68b84fd34119df746953d923
--- /dev/null
+++ b/src/context.jsonld
@@ -0,0 +1,6 @@
+
+ {
+ "inbox": "http://happy-dev.fr/owl/#inbox",
+ "object": "http://happy-dev.fr/owl/#object",
+ "author": "http://happy-dev.fr/owl/#author"
+ }
diff --git a/src/dependencies.pug b/src/dependencies.pug
index fbb8abeeea35af7a6a70d6656ab1419c416dce28..8752ff2260d43bb9180bae7fc7af9419293dfc97 100644
--- a/src/dependencies.pug
+++ b/src/dependencies.pug
@@ -18,7 +18,11 @@ link(rel='stylesheet', href='https://fonts.googleapis.com/css?family=Open+Sans:3
script(type="module" src="https://unpkg.com/@startinblox/core@0.9")
script(type="module" src="https://unpkg.com/@startinblox/router@0.7")
script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.4")
-//- script(type="module" src="https://unpkg.com/@startinblox/component-notifications@0.2")
+script(type="module" src="https://unpkg.com/@startinblox/component-notifications@0.3")
//- script(type="module" src="https://unpkg.com/@startinblox/component-conversation@0.3")
//- script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.3")
//- script(type="module" src="https://unpkg.com/@startinblox/component-job-board@0.3")
+
+//- Context - Fix for LDFlex
+script(data-default-context, type="application/ld+json")
+ include context.jsonld
diff --git a/src/header.pug b/src/header.pug
index 43d58354a09b40ec2e8d5ddbbdda8c6ac60982fd..b327da489a9623d07a2efcc19552183b15255cd9 100644
--- a/src/header.pug
+++ b/src/header.pug
@@ -17,7 +17,8 @@ include templates/hd-user-avatar.pug
details#user-controls
summary(tabindex='0' role='button')
sib-display#user-controls__profile(
- fields='first_name, account.picture'
+ fields='firstName, account.picture'
+ extra-context='{firstName:"first_name"}'
widget-account.picture='hd-user-avatar'
bind-user
)
@@ -30,5 +31,6 @@ sib-auth
sib-auth-provider(
data-authority=`${authority}`
data-id=`${authorityName || "paris"}`
+ data-client-name=`${clientName || "SIB App"}`
)
diff --git a/src/menu-left.pug b/src/menu-left.pug
index 71a8de740907d15bf62778020402e1f027e5016b..46c644a25c6b559763a82d4c751ade1941f98635 100644
--- a/src/menu-left.pug
+++ b/src/menu-left.pug
@@ -32,6 +32,10 @@ nav#main__menu
//- empty-widget='hd-create'
//- empty-value='project'
//- value-dash=' - '
+ //- search-fields='team'
+ //- search-widget-team='sib-form-hidden'
+ //- search-value-team='-'
+ //- set-user-id='search-value-team'
//- widget-badge='hd-counter'
//- action-badge='badge'
//- )
@@ -54,7 +58,7 @@ nav#main__menu
action-badge='badge'
search-fields='team'
search-widget-team='sib-form-hidden'
- search-value-team=''
+ search-value-team='-'
set-user-id='search-value-team'
order-by='name'
next='circle'
diff --git a/src/page-project-profile.pug b/src/page-project-profile.pug
index c3aa6d366109eda8dd0bae9dda540ebb16d6421d..9cbbb5f4968261ce1fe44bb82dd8f019db19fe10 100644
--- a/src/page-project-profile.pug
+++ b/src/page-project-profile.pug
@@ -3,9 +3,10 @@
include templates/template-business-provider.pug
include templates/template-customer.pug
include templates/template-team.pug
+ include templates/template-captain.pug
sib-display(
- fields='block-title(const-title1, number, customer.name, const-title2, name, entitled, creationDate), infos(block-description(label-description, description), block-logo(customer.logo)), block-lead, block-fee(label-fee, businessProvider), block-customer(label-customer, customer), block-team(label-team, members)',
+ fields='block-title(const-title1, number, customer.name, const-title2, name, entitled, creationDate), infos(block-description(label-description, description), block-logo(customer.logo)), block-lead, block-fee(label-fee, businessProvider), block-customer(label-customer, customer), block-captain(label-captain, captain), block-team(label-team, members)',
value-const-title1='N°',
value-const-title2='-',
@@ -19,11 +20,13 @@
value-label-customer='CUSTOMER INFORMATIONS:',
widget-customer='customer-template',
-
+
+ value-label-captain='CAPTAIN:',
+ widget-captain='captain-template',
+
value-label-team='TEAM:',
widget-members='team-template',
- multiple-members='',
+ multiple-members,
bind-resources
)
-
diff --git a/src/styles/base/header.scss b/src/styles/base/header.scss
index 947f756307f8c93b2a4101c65c1017c3545ddb31..776381b17967377fa6bf4fc997d12e88af718058 100644
--- a/src/styles/base/header.scss
+++ b/src/styles/base/header.scss
@@ -156,7 +156,7 @@
width: 45%;
}
- sib-display-value[name='first_name'] {
+ sib-display-value[name='firstName'] {
@include icon('arrow-down');
align-items: center;
display: flex;
@@ -224,7 +224,7 @@
div {
- sib-display-value[name='first_name'] {
+ sib-display-value[name='firstName'] {
@include icon('close');
&::before {
diff --git a/src/styles/layout/job-offers/job-offers.scss b/src/styles/layout/job-offers/job-offers.scss
index 1eac0c15627e8f894969b1d3472c06733b060b3c..d8324ab5dd4586d5fafd3a88d7cdb6f9016c86af 100644
--- a/src/styles/layout/job-offers/job-offers.scss
+++ b/src/styles/layout/job-offers/job-offers.scss
@@ -75,7 +75,7 @@ sib-job-board {
margin: 0.25em;
}
- [name='author.first_name'] {
+ [name='author.firstName'] {
color: $color-0-0-29;
font-weight: 600;
}
diff --git a/src/styles/layout/project-profile/project-profile.scss b/src/styles/layout/project-profile/project-profile.scss
index 67adc47c95d6dc12358ecea64f041bef8d3b8f2b..e8b8cdc762afa1656a6c2928399feba73f2d4150 100644
--- a/src/styles/layout/project-profile/project-profile.scss
+++ b/src/styles/layout/project-profile/project-profile.scss
@@ -98,9 +98,7 @@
#clientBox {
display: flex;
- margin-left: auto;
- margin-right: auto;
- margin-top: 1.7rem;
+ margin: 1.7rem auto;
max-width: 100%;
>* {
@@ -166,75 +164,80 @@
}
}
- [name='block-team'] {
-
- >sib-multiple {
+ [name='block-team'], [name='block-captain'] {
+ label {
+ display: none;
+ }
- label {
- display: none;
+ sib-display.project-profile-user-avatar {
+ align-self: center;
+ grid-column: 1 / span 1;
+ grid-row: 1 / span 2;
+
+ div {
+ background-color: $color-0-0-100;
+ border-radius: 50%;
+ height: 7vh;
+ overflow: hidden;
+ position: relative;
+ width: 7vh;
+
+ img {
+ height: 100%;
+ left: 0;
+ object-fit: cover;
+ position: absolute;
+ top: 0;
+ width: 100%;
+ }
}
+ }
- >team-template[name='members'] {
- display: grid;
- grid-column-gap: 1.6rem;
- grid-template-columns: 7vh auto;
- grid-template-rows: repeat(2, 5.2vh);
+ team-template[name='members'], captain-template[name='captain'] {
+ display: grid;
+ grid-column-gap: 1.6rem;
+ grid-template-columns: 7vh auto;
+ grid-template-rows: repeat(2, 5.2vh);
- >sib-display:first-child {
- align-self: center;
- grid-column: 1 / span 1;
- grid-row: 1 / span 2;
-
- div {
- background-color: $color-0-0-100;
- border-radius: 50%;
- height: 7vh;
- overflow: hidden;
- position: relative;
- width: 7vh;
-
- img {
- height: 100%;
- left: 0;
- object-fit: cover;
- position: absolute;
- top: 0;
- width: 100%;
- }
- }
- }
- >div:nth-child(2) {
- align-self: end;
- display: flex;
- grid-column: 2 / span 1;
- grid-row: 1 / span 1;
+ > div:nth-child(2) {
+ align-self: end;
+ display: flex;
+ grid-column: 2 / span 1;
+ grid-row: 1 / span 1;
- span {
- align-self: center;
- font-weight: 600;
- }
+ span {
+ align-self: center;
+ font-weight: 600;
+ }
- span~sib-display {
+ span ~ sib-display {
- >div {
- display: flex;
- margin-left: 1rem;
+ > div {
+ display: flex;
+ margin-left: 1rem;
- sib-multiple [name='name'] {
- @extend %user-role;
- }
+ sib-multiple [name='name'] {
+ @extend %user-role;
}
}
}
+ }
- >span:nth-child(3) {
- align-self: start;
- grid-column: 2 / span 1;
- grid-row: 2 / span 1;
- }
+ > span:nth-child(3) {
+ align-self: start;
+ grid-column: 2 / span 1;
+ grid-row: 2 / span 1;
}
}
}
+ .project-profile-user-avatar {
+ display: inline;
+
+ * {
+ height: 100%;
+ width: 100%;
+ }
+ }
}
\ No newline at end of file
diff --git a/src/templates/template-captain.pug b/src/templates/template-captain.pug
new file mode 100644
index 0000000000000000000000000000000000000000..d1bec422e29f0ea05a1ae1e8027441cdd2a8c8b0
--- /dev/null
+++ b/src/templates/template-captain.pug
@@ -0,0 +1,23 @@
+include hd-user-avatar.pug
+
+sib-widget(name='captain-template')
+ template
+ sib-display.project-profile-user-avatar(
+ data-src="${value ? value['@id'] : ''}"
+ fields='account.picture',
+ widget-account.picture='hd-user-avatar'
+ )
+ div(name='user.thumb')
+ sib-display(
+ data-src="${value ? value['@id'] : ''}"
+ fields='name'
+ )
+ sib-display(
+ data-src="${value ? value['@id'] : ''}",
+ fields='name'
+ nested-field="groups"
+ )
+ sib-display(
+ data-src="${value ? value['@id'] : ''}"
+ fields='username'
+ )
diff --git a/src/templates/template-team.pug b/src/templates/template-team.pug
index ac3a2ffccdcad1e556d0f2a8698e62f798aad1c5..f529ecfc003295b6719172a6e697d11541c30ede 100644
--- a/src/templates/template-team.pug
+++ b/src/templates/template-team.pug
@@ -2,16 +2,22 @@ include hd-user-avatar.pug
sib-widget(name='team-template')
template
- sib-display(
- data-src="${value.user['@id']}"
+ sib-display.project-profile-user-avatar(
+ data-src="${value.user ? value.user['@id'] : ''}"
fields='account.picture',
widget-account.picture='hd-user-avatar'
)
div(name='user.thumb')
- span ${value.user.name}
sib-display(
- data-src="${value.user.groups['@id']}",
- fields='name',
- multiple-name
+ data-src="${value.user ? value.user['@id'] : ''}"
+ fields='name'
+ )
+ sib-display(
+ data-src="${value.user ? value.user['@id'] : ''}",
+ fields='name'
+ nested-field="groups"
)
- span ${value.name}
+ sib-display(
+ data-src="${value.user ? value.user['@id'] : ''}"
+ fields='username'
+ )