From 3d79828e9a9a3ab7c10ba02f3e1d11d3dc4be8ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABlle=20Morin?= Date: Wed, 15 May 2019 14:49:43 +0200 Subject: [PATCH 1/3] ui: default avatar added New template created --- src/dependencies.pug | 2 +- src/header.pug | 6 ++---- src/page-job-offers.pug | 3 ++- src/styles/layout/job-offers/job-offers.scss | 2 +- src/templates/hd-user-avatar.pug | 3 +++ src/templates/template-team.pug | 4 +++- www/images/alien.jpg | Bin 0 -> 8282 bytes www/images/user.jpg | Bin 2567 -> 0 bytes 8 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 src/templates/hd-user-avatar.pug create mode 100644 www/images/alien.jpg delete mode 100644 www/images/user.jpg diff --git a/src/dependencies.pug b/src/dependencies.pug index f1c82fd..a1daf4f 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -20,5 +20,5 @@ script(type="module" src="https://unpkg.com/@startinblox/router@0.7.2") 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.12") script(type="module" src="https://unpkg.com/@startinblox/component-conversation@0.2.1") -script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.1.15") +script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.1.16") diff --git a/src/header.pug b/src/header.pug index 9099c88..0f37c0b 100644 --- a/src/header.pug +++ b/src/header.pug @@ -11,15 +11,13 @@ sib-notifications( bind-user ) -sib-widget(name="user-picture") - template - img(name="${name}",src="\${value || '/images/user.jpg'}",style="max-width:100%; max-height: 100%;") +include templates/hd-user-avatar.pug details#user-controls summary(tabindex='0' role='button') sib-display#user-controls__profile( data-fields='first_name, account.picture', - widget-account.picture='user-picture', + widget-account.picture='hd-user-avatar', bind-user ) #user-controls__panel diff --git a/src/page-job-offers.pug b/src/page-job-offers.pug index f648a42..51ad526 100644 --- a/src/page-job-offers.pug +++ b/src/page-job-offers.pug @@ -1,5 +1,6 @@ div.job-offers__main + include templates/hd-user-avatar.pug include templates/template-groups.pug include templates/template-skills.pug include templates/template-joboffers-filter.pug @@ -12,7 +13,7 @@ div.job-offers__main data-fields='user-thumb, creationDate, title, description, skills, send', set-user-thumb='author.account.picture, author.first_name, author.groups', - widget-author.account.picture='sib-display-img', + widget-author.account.picture='hd-user-avatar', widget-author.groups='groups-name', multiple-author.groups, diff --git a/src/styles/layout/job-offers/job-offers.scss b/src/styles/layout/job-offers/job-offers.scss index 186b446..066372c 100644 --- a/src/styles/layout/job-offers/job-offers.scss +++ b/src/styles/layout/job-offers/job-offers.scss @@ -87,7 +87,7 @@ } } - sib-display-img { + hd-user-avatar { background-color: $color-0-0-100; border-radius: 50%; height: 4.25rem; diff --git a/src/templates/hd-user-avatar.pug b/src/templates/hd-user-avatar.pug new file mode 100644 index 0000000..86a0d4c --- /dev/null +++ b/src/templates/hd-user-avatar.pug @@ -0,0 +1,3 @@ +sib-widget(name='hd-user-avatar') + template + img(name="${name}",src="\${value || '/images/alien.jpg'}",style="max-width:100%; max-height: 100%;") \ No newline at end of file diff --git a/src/templates/template-team.pug b/src/templates/template-team.pug index 1f42849..2b80733 100644 --- a/src/templates/template-team.pug +++ b/src/templates/template-team.pug @@ -1,9 +1,11 @@ +include hd-user-avatar.pug + sib-widget(name='team-template') template sib-display( data-src="${value.user['@id']}" data-fields='account.picture', - widget-account.picture='sib-display-img' + widget-account.picture='hd-user-avatar' ) div(name='user.thumb') span ${value.user.name} diff --git a/www/images/alien.jpg b/www/images/alien.jpg new file mode 100644 index 0000000000000000000000000000000000000000..c6277a19d92d65b7f0ace44255ed37d949991179 GIT binary patch literal 8282 zcmcIobySqyx1Jfghg3osx{)4Q8cFE}Y3XhdhL)C;2Bkz=Lb?R$l2AZEKo~%}n>&2! z_kH)S`_EnL{?2;Wth49r=Q(?ybKd>#eQv+reg}XRWaVW6Kty8$vH<|MHvmE@S4&fO zOACmXjk`5OPF`8{b`Br~Kmvj89z;V%JSgZWD9Fetm}qFI=-8Op*jSiYSU9)@U>sb0 zTr4aw2^gP{h?tld8}HtI5~BMAM8rgQBtRqt1{nnd1qFi$2MdSj|J-i70Ql&4mLdW1 z0U&%J51e|H3j`R4C9fn`f2OuxuUQSq{m+6F!8vhHN2Yz~aFG9Q@9odA4ka=xqhy=v8B zh!Xv|?krsNK{XenJ09A|g;7sD^Hm4uofe=EEhM$XuikKYTy;J@QfVZl|D!!aPIRT9 z+=kUb+Rz5z{$FYq09-e?sMDCwNZJViFs2QaX$J#P{~96%fYO_1NbEZR09@DT&-2y7 zCV=1EfXH`i9|�Y>{ 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 P9Vdd=AaL*1?aY4x{FJ{5 literal 0 HcmV?d00001 diff --git a/www/images/user.jpg b/www/images/user.jpg deleted file mode 100644 index 6edfb389e8d86beac7595571bb638c0013d10a6d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2567 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 TMp(_$xu@O7Gk{i3`6=b!0 Date: Thu, 16 May 2019 20:38:08 +0200 Subject: [PATCH 2/3] feature: Form of job-offer-create works Close issue #57 --- src/page-job-offer-create.pug | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/page-job-offer-create.pug b/src/page-job-offer-create.pug index f15bf1a..c05922a 100644 --- a/src/page-job-offer-create.pug +++ b/src/page-job-offer-create.pug @@ -12,18 +12,22 @@ sib-form.block( data-src=`${sdn}/job-offers/`, - range-skills= `${sdn}/skills/`, - range-author= `${sdn}/users/`, + range-skills=`${sdn}/skills/`, data-fields='title, title-text, description, description-text, skills', label-title='Title*', - label-description='Description*', - label-skills='The required skills for this mission:*', 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" ) + From 06529f9070635fbd9917f29e6e682ecf0ec6a154 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABlle=20Morin?= Date: Tue, 21 May 2019 17:55:34 +0200 Subject: [PATCH 3/3] update: according to new versions of sib-chat and sib-directory --- src/dependencies.pug | 4 +- src/index.pug | 4 +- src/menu-left.pug | 4 +- src/page-job-offers.pug | 3 +- ...page-member-chat.pug => page-messages.pug} | 0 src/styles/layout/members/member-profile.scss | 225 +++++++++--------- src/styles/layout/members/members.scss | 2 +- 7 files changed, 121 insertions(+), 121 deletions(-) rename src/{page-member-chat.pug => page-messages.pug} (100%) diff --git a/src/dependencies.pug b/src/dependencies.pug index a1daf4f..358313e 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -17,8 +17,8 @@ link(rel='stylesheet', href='https://fonts.googleapis.com/css?family=Open+Sans:3 //- CDN script(type="module" src="https://unpkg.com/@startinblox/core@0.7") script(type="module" src="https://unpkg.com/@startinblox/router@0.7.2") -script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.1.7") +script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.1.10") script(type="module" src="https://unpkg.com/@startinblox/component-notifications@0.1.12") script(type="module" src="https://unpkg.com/@startinblox/component-conversation@0.2.1") -script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.1.16") +script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.1.18") diff --git a/src/index.pug b/src/index.pug index a67f96c..a666834 100644 --- a/src/index.pug +++ b/src/index.pug @@ -31,5 +31,5 @@ html(lang="en") #circle(hidden).with-sidebar include page-circle.pug - #member-chat(hidden).with-sidebar - include page-member-chat.pug + #messages(hidden).with-sidebar + include page-messages.pug diff --git a/src/menu-left.pug b/src/menu-left.pug index beb5cfc..a3229a7 100644 --- a/src/menu-left.pug +++ b/src/menu-left.pug @@ -46,13 +46,13 @@ nav#main__menu div.menu-icon.icon-arrow-up div.menu-label Chat div.menu-icon.icon-envelope-letter - sib-route(hidden, name='member-chat', id-prefix=`${sdn}/members/`, rdf-type='foaf:user', use-id='') + sib-route(hidden, name='messages', id-prefix=`${sdn}/members/`, rdf-type='foaf:user', use-id='') div.sub-menu sib-display( data-src=`${sdn}/members/`, data-fields='user.username', widget-user.username='sib-display-div', - next='member-chat' + next='messages' ) div.divider diff --git a/src/page-job-offers.pug b/src/page-job-offers.pug index 4f02f24..f92929c 100644 --- a/src/page-job-offers.pug +++ b/src/page-job-offers.pug @@ -7,7 +7,8 @@ div.job-offers__main sib-widget(name='hd-contact-author') template - sib-link(next='member-chat', data-src="${value.profile['@id']}") Send a message + p ${JSON.stringify(value)} + sib-link(next='messages', data-src="${value.profile['@id']}") Send a message div.job-offers__content h1 New offers diff --git a/src/page-member-chat.pug b/src/page-messages.pug similarity index 100% rename from src/page-member-chat.pug rename to src/page-messages.pug diff --git a/src/styles/layout/members/member-profile.scss b/src/styles/layout/members/member-profile.scss index 183a6e9..0cb4fef 100644 --- a/src/styles/layout/members/member-profile.scss +++ b/src/styles/layout/members/member-profile.scss @@ -3,137 +3,136 @@ flex-direction: column; flex-grow: 1; - #member-info { + .member-info { background-color: $color-0-0-100; box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.14); margin: 2rem 1rem 5rem 2rem; min-height: 100vh; - div[name='member-profile__bio'] { - border-bottom: 1px solid $color-221-51-90; - display: grid; - grid-template-areas: "avatar name status" - "avatar pseudo status" - "avatar bio status" - "avatar list button"; - grid-template-columns: 1fr 2fr 1fr; - padding: 4.5rem; + .member-bio { - div[name='member-img'] { - grid-area: avatar; - overflow: hidden; - position: relative; - - img { - border-radius: 50%; - object-fit: cover; - max-width: 90% !important; + div[name='member-profile__bio'] { + border-bottom: 1px solid $color-221-51-90; + display: grid; + grid-template-areas: "avatar name status" + "avatar pseudo status" + "avatar bio status" + "avatar list button"; + grid-template-columns: 1fr 2fr 1fr; + padding: 4.5rem; + + div[name='member-img'] { + grid-area: avatar; + overflow: hidden; + position: relative; + + img { + border-radius: 50%; + object-fit: cover; + max-width: 90% !important; + } } - } - div[name='member-profile'] { - align-items: flex-start; - align-self: end; - display: flex; - grid-area: name; - - > sib-display-value[name^='user.'] { - color: $color-216-4-22; + div[name='member-profile'] { + align-items: baseline; + align-self: end; + display: flex; + grid-area: name; + + >sib-display-value[name^='user.'] { + color: $color-216-4-22; + font-weight: bold; + @extend h1; + } + + >sib-multiple[name$='groups'] { + display: flex; + padding-left: 1.4rem; + } + } + + sib-display-value[name='user.username'] { + grid-area: pseudo; + + &::before { + content: '@'; + } + } + + sib-display-value[name='bio'] { + grid-area: bio; + } + + div[name='infos'] { + grid-area: list; + + @extend %member-info; + } + + member-status[name$='available'] { + align-self: flex-end; + color: $color-244-73-62; + grid-area: status; + justify-self: flex-end; + + span { + align-items: center; + align-self: center; + display: flex; + flex-direction: column; + font-weight: 600; + line-height: 2; + } + + span.status-one { + @include ci('awareness'); + + &::before { + border-bottom: 2px solid $color-43-100-50; + font-size: 7.3rem; + padding-bottom: 1.5rem; + } + } + + span.status-two { + @include ci('armor'); + + &::before { + border-bottom: 2px solid $color-43-100-50; + font-size: 7.3rem; + padding-bottom: 1.5rem; + } + } + } + + sib-action[name='send'] { + align-self: flex-end; + grid-area: button; + justify-self: flex-end; + } + + [next=messages] { + @include icon('speech'); + border: 1px solid $color-244-73-62; + border-radius: 2em; + color: $color-244-73-62; + font-size: 18px; font-weight: bold; - @extend h1; - } - - > sib-multiple[name$='groups'] { - display: flex; - padding-left: 1.4rem; - } - } - - sib-display-value[name='user.username'] { - grid-area: pseudo; - - &::before { - content: '@'; - } - } - - sib-display-value[name='bio'] { - grid-area: bio; - } - - div[name='infos'] { - grid-area: list; - - @extend %member-info; - } - - member-status[name$='available']{ - align-self: flex-end; - color: $color-244-73-62; - grid-area: status; - justify-self: flex-end; - - span { - align-items: center; - align-self: center; - display: flex; - flex-direction: column; - font-weight: 600; - line-height: 2; - } - - span.status-one { - @include ci('awareness'); + justify-self: end; + padding: 0.6em 1.5em 0.4em; &::before { - border-bottom: 2px solid $color-43-100-50; - font-size: 7.3rem; - padding-bottom: 1.5rem; + font-size: 25px; + padding-right: 0.5em; } } - - span.status-two { - @include ci('armor'); - - &::before { - border-bottom: 2px solid $color-43-100-50; - font-size: 7.3rem; - padding-bottom: 1.5rem; - } - } - } - - sib-action[name='send'] { - align-self: flex-end; - grid-area: button; - justify-self: flex-end; - } - - [next=member-chat] { - @include icon('speech'); - border: 1px solid $color-244-73-62; - border-radius: 2em; - color: $color-244-73-62; - font-size: 18px; - font-weight: bold; - justify-self: end; - padding: 0.6em 1.5em 0.4em; - - &::before { - font-size: 25px; - padding-right: 0.5em; - } } } - div[name='member-profile__skills'] { - padding: 4.5rem; - - & ~ div[name='member-profile__skills'] { - padding-top: 0; - } + .member-skills { label { + float: left; font-weight: bold; display: block; padding-bottom: 0.5rem; diff --git a/src/styles/layout/members/members.scss b/src/styles/layout/members/members.scss index e430fbb..7248391 100644 --- a/src/styles/layout/members/members.scss +++ b/src/styles/layout/members/members.scss @@ -191,7 +191,7 @@ member-info-groups { text-align: center; } - [next=member-chat] { + [next=messages] { align-self: center; border: 1px solid $color-244-73-62; border-radius: 3.4rem;