diff --git a/.gitignore b/.gitignore index 03780aa..5e6e5fb 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 99cd617..bd2c2be 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 f593ba0..130c744 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 $@ -sync: - rsync -rv www/* staging-app@ssh-staging-app.happy-dev.fr:~/staging-app.happy-dev.fr/ +buildprod: + export SDN="https://test-paris.happy-dev.fr"; \ + $(MAKE) $(DIST_DIR)/index.html -B -.PHONY: default install submodules copy_lib copy_samples build watch serve clean \ No newline at end of file +sync: + 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 sync buildprod \ No newline at end of file diff --git a/src/dependencies.pug b/src/dependencies.pug index 27d28ae..b017764 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 3f945f2..36de081 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 7ecd124..6ee5abc 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 `
${firstname} ${lastname}
`; + return `
${firstname} ${lastname}
`; // + `
${email}
`; } } @@ -45,7 +45,7 @@ script. else this.value = []; return ''; } - return `${city} ${country}`; + return `${city} ${country}`; } } 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 d0a5a55..b272a27 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 54e84f7..4124bfb 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 8a87e48..6175744 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 5b420b8..d767dd6 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 0000000..6edfb38 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 e8a30be..0000000 Binary files a/www/images/user.png and /dev/null differ diff --git a/www/lib/sib-core b/www/lib/sib-core index be42b1c..2d4c97a 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 0000000..79804ac --- /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 3fc26ae..0000000 --- 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