diff --git a/src/dependencies.pug b/src/dependencies.pug
index 872c6f18a3ba0d407ccfbbfb9d00a422bb9dda94..97000fc3b789751db52709e0e861bee3a197a031 100644
--- a/src/dependencies.pug
+++ b/src/dependencies.pug
@@ -3,7 +3,7 @@
//script(src="/lib/webcomponentsjs/webcomponents-loader.js")
//- script(src="lib/html-imports.js")
-script(type="module" src="https://unpkg.com/@startinblox/oidc@0.5")
+script(type="module" src="https://unpkg.com/@startinblox/oidc@0.6")
script(src="/scripts/index.js")
@@ -19,15 +19,14 @@ link(rel='stylesheet', href='https://fonts.googleapis.com/css?family=Open+Sans:3
//script(type="module" src="/lib/sib-core/sib-display.js")
//script(type="module" src="/lib/sib-router/sib-router.js")
//script(type="module" src="/lib/sib-core/sib-form.js")
-//script(type="module" src="/lib/sib-chat/sib-chat.js")
//link(rel='import', href='/lib/sib-chat/sib-chat.html')
//- cdn
-script(type="module" src="https://unpkg.com/@startinblox/core@0.6")
+script(type="module" src="https://unpkg.com/@startinblox/core@0.7")
script(type="module" src="https://unpkg.com/@startinblox/router@0.6")
-script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.1")
-script(type="module" src="https://unpkg.com/@startinblox/component-notifications")
-script(type="module" src="https://unpkg.com/@startinblox/component-conversation")
-script(type="module" src="https://unpkg.com/@startinblox/component-directory")
+script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.1.7")
+script(type="module" src="https://unpkg.com/@startinblox/component-notifications@0.1")
+script(type="module" src="https://unpkg.com/@startinblox/component-conversation@0.2")
+script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.1")
diff --git a/src/index.pug b/src/index.pug
index c6b83ee080ab81eb9c73ab8e576e4427435e113e..86e1bbc6dddb7c9c5d5abe04e379b7a061c3e0f9 100644
--- a/src/index.pug
+++ b/src/index.pug
@@ -5,7 +5,7 @@ html(lang="en")
title HD App
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/logo.png")
+ link(rel="icon" type="image/png" href="/images/favicon.png")
include dependencies.pug
body
div.layer
diff --git a/src/menu-left.pug b/src/menu-left.pug
index 19702410c05b7e578be94727de6e07211c9ad4ac..a9a83d91864814e0d0dbeefe5f9c5717d777148a 100644
--- a/src/menu-left.pug
+++ b/src/menu-left.pug
@@ -33,7 +33,7 @@ nav#navbar
data-src=`${sdn}/projects/`,
data-fields='project',
set-project='customer.name, dash, name',
- value-dash='-',
+ value-dash=' - ',
next='project'
)
div.divider
@@ -48,6 +48,7 @@ nav#navbar
sib-display(
data-src=`${sdn}/circles/`,
data-fields='name',
+ widget-name='sib-display-div',
next='circle'
)
div.divider
@@ -62,6 +63,8 @@ nav#navbar
sib-display(
data-src=`${sdn}/members/`,
data-fields='user.username',
+ widget-user.username='sib-display-div',
next='member-chat'
)
div.divider
+
diff --git a/src/page-group-profile.pug b/src/page-group-profile.pug
index 740e4eb7a6f7fe7688b3c6437589105741cfe194..55114d3d5801706f9ab06e3074e5d083e9ba4dc3 100644
--- a/src/page-group-profile.pug
+++ b/src/page-group-profile.pug
@@ -18,7 +18,7 @@
set-teammate-img='account.picture',
set-teammate-pseudonym='before-pseudo, username',
- set-teammate-name='first_name, last_name',
+ set-teammate-name='name',
template-teammate-contact='chat-link',
diff --git a/src/page-job-offers.pug b/src/page-job-offers.pug
index 04050e7b74b89f39b05f5fb4ec51544217b29b00..23731dccc7ac1ebd7960259b61fec012b988cc7c 100644
--- a/src/page-job-offers.pug
+++ b/src/page-job-offers.pug
@@ -3,28 +3,24 @@ div.grid-layer
include templates/template-groups.pug
include templates/template-skills.pug
include templates/template-joboffers-filter.pug
- include templates/template-joboffers-conversation.pug
div.grid-layer-main.containerV
h2 New offers
span Here you can find and post offers
sib-display#offers-list(
data-src=`${sdn}/job-offers/`,
- data-fields='user-thumb, creationDate, title, description, skills, send, conversation',
+ data-fields='user-thumb, creationDate, title, description, skills, send',
- set-conversation="@id"
set-user-thumb='author.account.picture, author.first_name, author.groups',
widget-author.account.picture='sib-display-img',
widget-author.groups='groups-name',
multiple-author.groups,
- widget-skills='skills-name',
+
multiple-skills,
action-send='member-chat',
label-send='Send a private message',
-
- widget-conversation='joboffers-conversation'
search-range-skills=`${sdn}/skills/`,
search-fields='content, open, skills',
@@ -38,6 +34,7 @@ div.grid-layer
search-widget-skills='sib-form-placeholder-dropdown',
search-widget-open='joboffers-filter'
)
+
div.grid-layer-links.containerV
template#groups-list-template
p ${value}
diff --git a/src/page-project-edit.pug b/src/page-project-edit.pug
index b835fcd1d12be5e21c20c723c653bd69054f24f0..8549be4d18bfbd53a5604e5493c8e65bd7828abc 100644
--- a/src/page-project-edit.pug
+++ b/src/page-project-edit.pug
@@ -15,11 +15,11 @@ sib-widget(name='template-legend-team')
p.form-goal Here you can edit your projet's details
.form-view
sib-form.block(
- data-src=`${sdn}/projects/`,
- range-members=`${sdn}/members/`,
+ range-businessProvider=`${sdn}/businessproviders/`,
range-team=`${sdn}/users/`,
+ range-members=`${sdn}/project-members/`,
- data-fields='block-project__info, block-project__fee, block-project__customer',
+ 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',
@@ -27,20 +27,28 @@ sib-widget(name='template-legend-team')
label-customer.logo='Customer\'s logo',
label-description='Project description',
- set-block-project__fee='fieldset-fee, businessProvider, businessProviderFee',
- widget-fieldset-fee='template-legend-fee',
+ set-block-project__fee='fieldset-fee, businessProvider, businessProvider.fee',
label-businessProvider='Business provider',
- label-businessProviderFee='Amount of the contribution',
+ label-businessProvider.fee='Amount of the contribution (%)',
+ widget-fieldset-fee='template-legend-fee',
+ widget-businessProvider.fee='sib-form-number',
set-block-project__customer='fieldset-customer, customer.companyRegister, customer.address, customer.firstName, customer.lastName, customer.role, customer.email, customer.phone',
- widget-fieldset-customer='template-legend-customer',
- label-customer.companyRegister='Company register',
+ 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='template-legend-customer',
+
+ set-block-project__team='fieldset-team, team, members',
+ label-team='Member',
+ label-members='Role',
+ widget-fieldset-team='template-legend-team',
+ multiple-team,
+ multiple-members,
bind-resources
)
diff --git a/src/page-project-profile.pug b/src/page-project-profile.pug
index 16c58698078a63158f9179a734de2f51cb670cac..b4f6cb64d52b78df391c20fa9675070302dac38c 100644
--- a/src/page-project-profile.pug
+++ b/src/page-project-profile.pug
@@ -30,7 +30,7 @@
value-label-team='TEAM:'
widget-members='team-template',
multiple-members,
-
+
bind-resources
)
diff --git a/src/styles/filters.scss b/src/styles/filters.scss
index 847e3a05b232a60f41b83ad23bb2c304dabd1448..d97dc63e79094cb84d616d590877562f906aa98e 100644
--- a/src/styles/filters.scss
+++ b/src/styles/filters.scss
@@ -10,6 +10,8 @@
input, select {
appearance: none;
+ -moz-appearance: none;
+ -webkit-appearance: none;
border-style: none;
box-shadow: 0 0 5px 0 rgba(133, 140, 148, 0.09);
color: $color-taupe-gray;
@@ -18,8 +20,6 @@
margin-top: 1.36rem;
padding: 0.9rem;
width: 95%;
- -moz-appearance: none;
- -webkit-appearance: none;
}
input[type="submit"] {
diff --git a/src/styles/form.scss b/src/styles/form.scss
index f5a811bbcab23b70c8d7d3725931b13f3f4fa8d8..ab6514fd539ba43d2cc9e07b334f3f8170ec57e1 100644
--- a/src/styles/form.scss
+++ b/src/styles/form.scss
@@ -12,6 +12,10 @@
}
}
+@include styleTemplateFieldset('fee');
+@include styleTemplateFieldset('customer');
+@include styleTemplateFieldset('team');
+
#circle-create,
#circle-edit,
#job-offer-create,
@@ -42,14 +46,13 @@
flex-direction: column;
}
- @include styleTemplateFieldset('fee');
- @include styleTemplateFieldset('customer');
- @include styleTemplateFieldset('team');
sib-form-auto-completion,
sib-form-checkbox,
+ sib-form-dropdown,
sib-form-label-text,
sib-form-multiple-dropdown,
+ sib-form-number,
sib-form-textarea {
display: flex;
flex-direction: column;
@@ -69,19 +72,18 @@
}
input,
+ select,
textarea {
padding: 1.7rem;
}
select {
margin-bottom: 1.7rem;
- padding: 0.85rem;
}
}
sib-form-auto-completion,
sib-form-checkbox,
- sib-form-dropdown,
sib-form-multiple-dropdown {
label {
@@ -166,19 +168,22 @@
}
}
- /* A REFACTORISER. PAS ENCORE UTILISE SUR L'APPLI */
sib-form-dropdown {
select {
- background: $color-glitter;
- border: none;
- color: $color-purple-dark;
- line-height: 1.5;
- margin-left: 1rem;
- padding: 0.85rem;
+ appearance: none;
+ -moz-appearance: none;
+ -webkit-appearance: none;
+ background-image: url("/images/chevron-down.png");
+ background-position: right 12px top 60%;
+ background-repeat: no-repeat;
+ background-size: 14px 9px;
+ box-sizing: border-box;
}
}
+ /* A REFACTORISER. PAS ENCORE UTILISE SUR L'APPLI */
+
sib-form-multiple-dropdown {
button {
diff --git a/src/styles/group-profile.scss b/src/styles/group-profile.scss
index bc9522d4cfc4a43d2957d1df9d11a325862755e5..ddc1f87fe309d39a1774a0333e0726bf16733cb0 100644
--- a/src/styles/group-profile.scss
+++ b/src/styles/group-profile.scss
@@ -48,32 +48,9 @@
}
}
- > hdapp-userinfo {
-
- > label {
- display: none;
- }
- }
-
div[name='teammate-name'] {
grid-column: 3 / span 2;
grid-row: 1 / span 1;
-
- sib-display-div[name='first_name'] {
- display: inline;
-
- > div {
- display: inline;
- }
- }
-
- sib-display-div[name='last_name'] {
- display: inline;
-
- > div {
- display: inline;
- }
- }
}
> div[name='teammate-pseudonym'] {
@@ -81,20 +58,17 @@
font-size: 1.2rem;
grid-column: 3 / span 2;
grid-row: 2 / span 1;
-
- > * > * {
- display: inline;
- }
}
- > sib-display-div[name='teammate-profile'] {
+ > sib-display-value[name='teammate-profile'] {
color: $color-dark-lava;
+ display: block;
font-size: 1.2rem;
grid-column: 1 / span 2;
grid-row: 3 / span 1;
}
- > sib-link {
+ > sib-display-value[name='teammate-contact'] {
color: $color-majorelle-blue;
font-size: 1.2rem;
justify-self: stretch;
diff --git a/src/styles/header.scss b/src/styles/header.scss
index 8ad869637cc27c7aa5fcee3706a716a0397031ff..8b448dadfedbe3f4a75630d88a2b3b6070a2c313 100644
--- a/src/styles/header.scss
+++ b/src/styles/header.scss
@@ -10,7 +10,7 @@
position: relative;
z-index: 1;
- > * {
+ > *:not(sib-widget) {
padding: 0 2.5rem;
}
}
@@ -138,20 +138,16 @@ details#user-controls {
width: 4.8rem;
}
- sib-display-div[name='first_name'] {
+ sib-display-value[name='first_name'] {
+ @include icon('arrow-down');
align-items: center;
display: flex;
+ flex-direction: row-reverse;
+ font-size: 1.8rem;
+ font-weight: 600;
- div[name='first_name'] {
- align-items: flex-end;
- display: flex;
- font-size: 1.8rem;
- font-weight: 600;
- @include icon('arrow-down');
-
- &::before {
- margin-left: 1.5rem;
- }
+ &::before {
+ margin-left: 1.5rem;
}
}
}
@@ -205,14 +201,11 @@ details#user-controls {
div {
- sib-display-div[name='first_name'] {
+ sib-display-value[name='first_name'] {
+ @include icon('close');
- div[name='first_name'] {
- @include icon('close');
-
- &::before {
- margin-left: 1.5rem;
- }
+ &::before {
+ margin-left: 1.5rem;
}
}
}
diff --git a/src/styles/job-offers.scss b/src/styles/job-offers.scss
index 5a9a123b9f51d3c3526eb16d6e57bec517b8dd20..473156e3a66136d5187f842b79638a4e5e593c28 100644
--- a/src/styles/job-offers.scss
+++ b/src/styles/job-offers.scss
@@ -70,11 +70,12 @@
}
[name='creationDate'] {
+ display: block;
margin-bottom: 0.7rem;
margin-top: 2rem;
}
- sib-display-div[name='title'] {
+ [name='title'] {
@extend h3;
display: block;
font-weight: bold;
@@ -82,6 +83,7 @@
}
[name='description'] {
+ display: block;
line-height: 1.6;
margin-bottom: 1.6rem;
}
diff --git a/src/styles/member-profile.scss b/src/styles/member-profile.scss
index 07ec78344580d8dab0fa6c3088eb1e90ccf0c2ef..db515857b991990c37ae2205f8c215f94e12b184 100644
--- a/src/styles/member-profile.scss
+++ b/src/styles/member-profile.scss
@@ -48,7 +48,7 @@
display: flex;
grid-area: name;
- > sib-display-div[name^='user.'] {
+ > sib-display-value[name^='user.'] {
color: $color-dark-lava;
font-weight: bold;
@extend h1;
@@ -60,15 +60,15 @@
}
}
- sib-display-div[name='user.username'] {
+ sib-display-value[name='user.username'] {
grid-area: pseudo;
-
- div[name='user.username']::before {
+
+ &::before {
content: '@';
}
}
- sib-display-div[name='bio'] {
+ sib-display-value[name='bio'] {
grid-area: bio;
}
diff --git a/src/styles/members.scss b/src/styles/members.scss
index d9122e3e8126d6844685c25f0656b0bb0042b451..07c3fa4ab0b90df61d68194f9a56c156b51f41c6 100644
--- a/src/styles/members.scss
+++ b/src/styles/members.scss
@@ -58,7 +58,6 @@
justify-content: center;
margin: 3.75rem 0;
position: relative;
- z-index: 1;
&::before {
border-top: 1px solid $color-timberwolf;
@@ -147,7 +146,7 @@
@extend h1;
}
- sib-display-div[name$='bio'] {
+ sib-display-value[name$='bio'] {
display: flex;
flex-basis: 3.5em;
line-height: 1.6;
diff --git a/src/styles/menu-left.scss b/src/styles/menu-left.scss
index 670fe52c696574cea8fc835e44709465d2e77e45..223051cfc0fec13c78c23444e6ef8d48178b19fc 100644
--- a/src/styles/menu-left.scss
+++ b/src/styles/menu-left.scss
@@ -124,6 +124,10 @@
div[name='project'] {
display: flex;
+
+ sib-display-value {
+ display: block;
+ }
sib-display-div[name='dash'] {
margin: 0 0.4em;
diff --git a/src/styles/project-profile.scss b/src/styles/project-profile.scss
index 1988b5ad2267e8d2809f15f6bda7bdf8d05b9036..17d17f20666af3c1fef92ade16ddaba967c813c0 100644
--- a/src/styles/project-profile.scss
+++ b/src/styles/project-profile.scss
@@ -4,13 +4,14 @@
margin-top: 5.1rem;
[name^='label-'] {
+ display: block;
font-weight: bold;
margin-bottom: 1.4rem;
text-transform: uppercase;
@extend h2;
}
- sib-display-div:not(:first-of-type),
+ sib-display-value:not(:first-of-type),
ul,
[name*='job'] {
font-size: 1.5rem;
@@ -34,7 +35,7 @@
padding: 0;
}
- > sib-display-div[name='name'] {
+ > sib-display-value[name='name'] {
padding-left: 0.85rem;
}
@@ -61,6 +62,8 @@
justify-content: space-between;
[name='description'] {
+ display: flex;
+ flex-direction: column;
width: 90%;
}
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index c31a9f9ef980d0595cdd42a2aa735b62b7e98373..b9d021989be855c32bdf56da2829c4b016d12357 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -69,7 +69,7 @@ $color-majorelle-blue: hsl(244, 73%, 62%);
sib-multiple[name^='user.'],
> member-info > div,
- > sib-display-div > div {
+ > sib-display-value {
display: flex;
flex-wrap: wrap;
margin-bottom: 0;
@@ -93,7 +93,7 @@ $color-majorelle-blue: hsl(244, 73%, 62%);
@include mdi('cellphone-iphone');
}
- [name="foaf:homepage"] * {
+ [name="foaf:homepage"] {
@include mdi('link-variant');
}
}
diff --git a/src/templates/template-customer.pug b/src/templates/template-customer.pug
index f3446b4340ace0602cfda77d8487ea8c3b21ead6..a5abb0b309dcfa105edad52e41b1353d7f90ffe0 100644
--- a/src/templates/template-customer.pug
+++ b/src/templates/template-customer.pug
@@ -17,3 +17,4 @@ sib-widget(name='customer-template')
li(class='mdi-email-outline')
a(href='mailto:${value.email}') ${value.email}
li(class='mdi-cellphone-iphone') ${value.phone}
+
diff --git a/src/templates/template-joboffers-conversation.pug b/src/templates/template-joboffers-conversation.pug
deleted file mode 100644
index a427d5d92fb106a240b8517920ff12dc7fb97b8e..0000000000000000000000000000000000000000
--- a/src/templates/template-joboffers-conversation.pug
+++ /dev/null
@@ -1,3 +0,0 @@
-sib-widget
- template
- sib-conversation(data-src="${value}", id-suffix="threads")
diff --git a/src/templates/template-team.pug b/src/templates/template-team.pug
index 6afdf97497c2b4651785268ca15525ffe29db5fd..f4551f1f086ff1ff7e863d8ceb6617dc2e5e7ecf 100644
--- a/src/templates/template-team.pug
+++ b/src/templates/template-team.pug
@@ -1,6 +1,6 @@
-
sib-widget(name='team-template')
template
+ p ${value}
sib-display(
data-src="${value.user['@id']}"
data-fields='account.picture',
@@ -14,18 +14,3 @@ sib-widget(name='team-template')
multiple-name
)
span ${value.name}
-
-//-
- include templates/template-groups.pug
-
- sib-widget(name='team-template')
- template
- sib-display(
- data-src="${value.user['@id']}",
- data-fields='account.picture, name, groups',
- widget-account.picture='sib-display-img',
- widget-groups='groups-name',
- multiple-groups
- )
- span ${value.name}
-
diff --git a/www/images/favicon.png b/www/images/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0d43ddb3d4aab6e6c91ba462f564a3ab393b2e5
Binary files /dev/null and b/www/images/favicon.png differ
diff --git a/www/test.html b/www/test.html
deleted file mode 100644
index 2b5d36a8eaecfe45e19a305027f0c2bb491186b7..0000000000000000000000000000000000000000
--- a/www/test.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="UTF-8"/>
- <title>[test] HD App</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
- <meta http-equiv="X-UA-Compatible" content="ie=edge"/>
- <!-- Scripts-->
- <script src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/1.2.7/webcomponents-loader.js" integrity="sha256-fz7VMnmo2h7TlM7CBea8/vpbWpdQnbp20TnwmRwi/KU=" crossorigin="anonymous"></script>
- <!-- Web components-->
- <!-- <link rel="import" href="https://cdn.happy-dev.fr/sib-core/sib-display.html"/> -->
- <link rel="import" href="lib/sib-core/sib-display.html"/>
-
- <style>
- body.debug *:not(script):not(button){
- display: block;
- padding: 3px;
- margin: 3px;
- border: 1px solid #f006;
- }
- sib-display,
- sib-display-div{
- display: block;
- background-color: #0002;
- margin: .5em 0;
- min-height: 1em;
- }
- </style>
- </head>
- <body>
- <button onclick="document.body.classList.toggle('debug')">debug</button>
- <!-- <div id="job-offers">
- <h1>Job offers</h1>
- <sib-display id="offers-list"
- data-src="https://test-paris.happy-dev.fr/job-offers/"
- data-fields="title, description, skills"
- widget-skills="sib-display-lookuplist"
- ></sib-display>
- </div> -->
- <div id="members">
- <h1>Members</h1>
- <sib-display id="profiles-list"
- data-src="http://127.0.0.1:8000/members/"
- data-fields="roles, ab"
- widget-skills="sib-display-lookuplist"
- set-ab="user.first_name, user.last_name"
- ></sib-display>
- </div>
- <!-- <div>
- <h1>sib-form</h1>
- <sib-form class="block" range-client="https://test-paris.happy-dev.fr/clients/" widget-team="sib-form-multiple-dropdown" range-team="https://test-paris.happy-dev.fr/members/" data-src="https://test-paris.happy-dev.fr/projects/1/"></sib-form>
- </div> -->
- </body>
-</html>