diff --git a/.gitignore b/.gitignore
index 03780aac40be7a9a2ae772c8498c47195af7a72c..5e6e5fb9808adff330db155cbcfb6d23d2e27886 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,5 @@
/www/oidc-client-config.json
!/www/lib/sib-core
!/www/lib/sib-router
-!/www/lib/sib-chat
\ No newline at end of file
+!/www/lib/sib-chat
+!/www/lib/sib-oidc
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index 99cd6171576a0beb3506a73defcea81a15c44195..bd2c2be32cc0237d3ba219ffb600599e03d5f7d5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
[submodule "www/lib/sib-chat"]
path = www/lib/sib-chat
url = git@git.happy-dev.fr:startinblox/sib-chat.git
+[submodule "www/lib/sib-oidc"]
+ path = www/lib/sib-oidc
+ url = git@git.happy-dev.fr:startinblox/sib-oidc.git
diff --git a/Makefile b/Makefile
index f593ba029260a877098cd350aba851a04a9cb53f..130c7444a34a665807de97fe00bbf169d414f28a 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,6 @@ copy_lib:
# sample
copy_samples:
@cp -n src/config.sample.pug src/config.pug
- @cp -n www/oidc-client-config.sample.json www/oidc-client-config.json
# pug
$(DIST_DIR)/index.html: src/index.pug $(wildcard src/*.pug src/*/*.pug)
@@ -58,7 +57,11 @@ $(DIST_DIR)/%.js: src/%.js
@mkdir -p $(dir $@)
@node_modules/.bin/babel $< --out-file $@ --source-maps || touch $@
+buildprod:
+ export SDN="https://test-paris.happy-dev.fr"; \
+ $(MAKE) $(DIST_DIR)/index.html -B
+
sync:
- rsync -rv www/* staging-app@ssh-staging-app.happy-dev.fr:~/staging-app.happy-dev.fr/
+ rsync -rv www/* staging-app@ssh-staging-app.happy-dev.fr:~/staging-app.happy-dev.fr/ --exclude=www/oidc-client-config.json
-.PHONY: default install submodules copy_lib copy_samples build watch serve clean
\ No newline at end of file
+.PHONY: default install submodules copy_lib copy_samples build watch serve clean sync buildprod
\ No newline at end of file
diff --git a/src/dependencies.pug b/src/dependencies.pug
index 27d28aeb2ea84792f9d6f5fa5523cb32fd43c4a1..b017764f3c9abd6ed6fd1cdf88fa37987bee5f37 100644
--- a/src/dependencies.pug
+++ b/src/dependencies.pug
@@ -3,7 +3,17 @@
script(src="/lib/webcomponentsjs/webcomponents-loader.js")
//- script(src="lib/html-imports.js")
-//- script(src='/lib/sib-chat/3rdparty/sib-oidc-client.js')
+script(src="https://cdn.happy-dev.fr/oidc-client/oidc-client.min.js")
+script(
+ src="lib/sib-oidc/sib-oidc.js"
+ data-authority='https://test-paris.happy-dev.fr/openid/',
+ data-client_id='833925',
+ data-response_type='id_token token',
+ data-scope='openid profile email',
+ data-automaticSilentRenew='true',
+ data-loadUserInfo='true'
+)
+
script(src="/scripts/index.js")
// Stylesheets
@@ -20,7 +30,7 @@ link(href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,6
//- local
link(rel='import', href='/lib/sib-core/sib-display.html')
link(rel='import', href='/lib/sib-router/sib-router.html')
-//- link(rel='import', href='/lib/sib-chat/sib-chat.html')
+link(rel='import', href='/lib/sib-chat/sib-chat.html')
//- cdn
link(rel='import', href="https://cdn.happy-dev.fr/sib-core/sib-display.html")
diff --git a/src/header.pug b/src/header.pug
index 3f945f28ff8ddf30fe698b7ea1c2ece79a528a51..36de081089950d838b2aba4f208c4af9bc314e01 100644
--- a/src/header.pug
+++ b/src/header.pug
@@ -11,7 +11,7 @@
#notification
#profile
- img(src="/images/user.png" width=43 height=43)
+ img(src="/images/user.jpg")
span
- | Sophie
+ | Paul
span.icon-arrow-down
\ No newline at end of file
diff --git a/src/page-members.pug b/src/page-members.pug
index 7ecd12410c24dbcf2a2623e63882e317bd0e05d1..6ee5abc230e3df66f4606172756e80695924132b 100644
--- a/src/page-members.pug
+++ b/src/page-members.pug
@@ -1,5 +1,5 @@
script.
- document.addEventListener("WebComponentsReady", function(event) {
+ document.addEventListener("WebComponentsReady", function(event) {
class HDAppUserInfo extends SIBDisplayLookupList {
get parentElement() {return "div"}
getTemplate(value, index) {
@@ -20,7 +20,7 @@ script.
else this.value = [];
return '';
}
- return `<div id="${firstname}-${lastname}">${firstname} ${lastname}</div>`;
+ return `<div>${firstname} ${lastname}</div>`;
// + `<div id="${email}">${email}</div>`;
}
}
@@ -45,7 +45,7 @@ script.
else this.value = [];
return '';
}
- return `<span id="${city}-${country}">${city} ${country}</span>`;
+ return `<span>${city} ${country}</span>`;
}
}
customElements.define("hdapp-usercell", HDAppCell);
@@ -56,8 +56,8 @@ div
sib-display#profiles-list(
data-src=`${sdn}/members/`,
data-fields='header, cell, skills',
- set-header='avatar, user, pseudonym, bio'
- set-pseudonym='before-pseudo, pseudo'
+ set-header='avatar, user, pseudonym, bio',
+ set-pseudonym='before-pseudo, pseudo',
value-before-pseudo='@',
widget-avatar='sib-display-img',
widget-user='hdapp-userinfo',
@@ -67,6 +67,3 @@ div
search-fields='searchset',
next='member'
)
-
-
-
diff --git a/src/page-project-profile.pug b/src/page-project-profile.pug
index d0a5a55a00c0a40574ca63292ef89d4541343b78..b272a27768bc3f6ebea588bce5987b8b3eedc3e8 100644
--- a/src/page-project-profile.pug
+++ b/src/page-project-profile.pug
@@ -1,10 +1,12 @@
#project-profile
sib-display(
- data-fields='title, description, client',
- set-title='number, name'
+ data-fields='title, description, client, team',
+ set-title='number, client, name',
widget-client='hdapp-client',
- bind-resources
+ widget-team='sib-display-lookuplist',
+ bind-resources,
)
+
h3 Team
sib-display.members-list-condensed(
id-suffix='team',
@@ -12,5 +14,5 @@
widget-avatar='sib-display-img',
widget-user='hdapp-userinfo',
next='member',
- bind-resources
- )
+ bind-resources,
+ )
\ No newline at end of file
diff --git a/src/styles/content.scss b/src/styles/content.scss
index 54e84f78dd87bdc6cbeb0cafac92661450108efb..4124bfb64efd088a05e4f971f2959d5444231292 100644
--- a/src/styles/content.scss
+++ b/src/styles/content.scss
@@ -89,6 +89,10 @@ sib-display#member-info,
@extend %shadow;
padding: 1em;
cursor: pointer;
+
+ label {
+ // display: none;
+ }
sib-display-img {
$width: 55%;
display: block;
@@ -119,10 +123,25 @@ sib-display#member-info,
}
}
-
// projects
#project-profile {
- [name="title"]{
-
+ [name='title'] {
+ @extend h1;
+ > sib-display-div {
+ display: inline-block;
+ }
+ div[name='number'] {
+ padding-right: 0.5em;
+ &:before {
+ content: '#';
+ }
+ }
}
-}
\ No newline at end of file
+}
+
+label {
+ @extend h2;
+ &:after {
+ content: ':';
+ }
+}
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 8a87e482f39c3890296722aebbdc5bf044ba2711..6175744a5ab7086d139085397ff8c694a20631ec 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -9,6 +9,5 @@
@import 'form';
@import 'content';
-// @import 'members';
-@import 'menu';
-
+@import 'members';
+@import 'menu';
\ No newline at end of file
diff --git a/src/styles/main.scss b/src/styles/main.scss
index 5b420b8fcc843fe6f26ee227d947e85ba893c7f7..d767dd6f056cce7b3fecf304237a68dbc6eb26ae 100644
--- a/src/styles/main.scss
+++ b/src/styles/main.scss
@@ -87,6 +87,11 @@ h3 {
}
img {
margin-right: 0.5em;
+ width: 43px;
+ height: 43px;
+ object-fit: cover;
+ object-position: center;
+ border-radius: 100%;
}
}
diff --git a/www/images/user.jpg b/www/images/user.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..6edfb389e8d86beac7595571bb638c0013d10a6d
Binary files /dev/null and b/www/images/user.jpg differ
diff --git a/www/images/user.png b/www/images/user.png
deleted file mode 100644
index e8a30be62d01deaccc406d7062cccba51bd8b4d4..0000000000000000000000000000000000000000
Binary files a/www/images/user.png and /dev/null differ
diff --git a/www/lib/sib-core b/www/lib/sib-core
index be42b1cb02524a69e7009ee9f4a1144be29ed1e8..2d4c97a40e02041b6001fdf51b0490d211144c75 160000
--- a/www/lib/sib-core
+++ b/www/lib/sib-core
@@ -1 +1 @@
-Subproject commit be42b1cb02524a69e7009ee9f4a1144be29ed1e8
+Subproject commit 2d4c97a40e02041b6001fdf51b0490d211144c75
diff --git a/www/lib/sib-oidc b/www/lib/sib-oidc
new file mode 160000
index 0000000000000000000000000000000000000000..79804ac27cd389bcf91e5eb5714f42c1436c430d
--- /dev/null
+++ b/www/lib/sib-oidc
@@ -0,0 +1 @@
+Subproject commit 79804ac27cd389bcf91e5eb5714f42c1436c430d
diff --git a/www/oidc-client-config.sample.json b/www/oidc-client-config.sample.json
deleted file mode 100644
index 3fc26ae912d7080bf5d9b6b43b5b0ff9b4ede888..0000000000000000000000000000000000000000
--- a/www/oidc-client-config.sample.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "authority": "https://test-paris.happy-dev.fr/openid/",
- "client_id": "125356",
- "redirect_uri": "http://127.0.0.1:3000",
- "response_type": "id_token token",
- "scope": "openid profile email",
- "automaticSilentRenew": true,
- "silent_redirect_uri": "http://127.0.0.1:3000",
- "loadUserInfo": true
-}
\ No newline at end of file