autonomic-cooperative/hubl
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'gm-update' into 'staging'

Browse Source 
Gm update

See merge request startinblox/applications/sib-app!36
This commit is contained in:
Jean-Baptiste Pasquier 2019-05-22 12:52:19 +00:00
commit d9e4cd845e
7 changed files with 121 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dependencies.pug
View File

@ -17,8 +17,8 @@ link(rel='stylesheet', href='https://fonts.googleapis.com/css?family=Open+Sans:3
//- CDN //- CDN
script(type="module" src="https://unpkg.com/@startinblox/core@0.7") 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/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-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-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")

4
src/index.pug
View File

@ -31,5 +31,5 @@ html(lang="en")
#circle(hidden).with-sidebar #circle(hidden).with-sidebar
include page-circle.pug include page-circle.pug
#member-chat(hidden).with-sidebar #messages(hidden).with-sidebar
include page-member-chat.pug include page-messages.pug

4
src/menu-left.pug
View File

@ -46,13 +46,13 @@ nav#main__menu
div.menu-icon.icon-arrow-up div.menu-icon.icon-arrow-up
div.menu-label Chat div.menu-label Chat
div.menu-icon.icon-envelope-letter 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 div.sub-menu
sib-display( sib-display(
data-src=`${sdn}/members/`, data-src=`${sdn}/members/`,
data-fields='user.username', data-fields='user.username',
widget-user.username='sib-display-div', widget-user.username='sib-display-div',
next='member-chat' next='messages'
) )
div.divider div.divider

3
src/page-job-offers.pug
View File

@ -7,7 +7,8 @@ div.job-offers__main
sib-widget(name='hd-contact-author') sib-widget(name='hd-contact-author')
template 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 div.job-offers__content
h1 New offers h1 New offers

0
src/page-member-chat.pug → src/page-messages.pug
View File

225
src/styles/layout/members/member-profile.scss
View File

@ -3,137 +3,136 @@
flex-direction: column; flex-direction: column;
flex-grow: 1; flex-grow: 1;
#member-info { .member-info {
background-color: $color-0-0-100; background-color: $color-0-0-100;
box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.14); box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.14);
margin: 2rem 1rem 5rem 2rem; margin: 2rem 1rem 5rem 2rem;
min-height: 100vh; min-height: 100vh;
div[name='member-profile__bio'] { .member-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'] { div[name='member-profile__bio'] {
grid-area: avatar; border-bottom: 1px solid $color-221-51-90;
overflow: hidden; display: grid;
position: relative; grid-template-areas: "avatar name status"
"avatar pseudo status"
img { "avatar bio status"
border-radius: 50%; "avatar list button";
object-fit: cover; grid-template-columns: 1fr 2fr 1fr;
max-width: 90% !important; 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'] { div[name='member-profile'] {
align-items: flex-start; align-items: baseline;
align-self: end; align-self: end;
display: flex; display: flex;
grid-area: name; grid-area: name;
> sib-display-value[name^='user.'] { >sib-display-value[name^='user.'] {
color: $color-216-4-22; 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; font-weight: bold;
@extend h1; justify-self: end;
} padding: 0.6em 1.5em 0.4em;
> 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 { &::before {
border-bottom: 2px solid $color-43-100-50; font-size: 25px;
font-size: 7.3rem; padding-right: 0.5em;
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=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'] { .member-skills {
padding: 4.5rem;
& ~ div[name='member-profile__skills'] {
padding-top: 0;
}
label { label {
float: left;
font-weight: bold; font-weight: bold;
display: block; display: block;
padding-bottom: 0.5rem; padding-bottom: 0.5rem;

2
src/styles/layout/members/members.scss
View File

@ -191,7 +191,7 @@ member-info-groups {
text-align: center; text-align: center;
} }
[next=member-chat] { [next=messages] {
align-self: center; align-self: center;
border: 1px solid $color-244-73-62; border: 1px solid $color-244-73-62;
border-radius: 3.4rem; border-radius: 3.4rem;