Merge branch 'master' of git.startinblox.com:applications/sib-app into release/dashboard

This commit is contained in:
Jean-Baptiste Pasquier 2020-04-20 17:34:03 +02:00
commit 65f08ae339
No known key found for this signature in database
GPG Key ID: F2702E6D22ED4D62
47 changed files with 744 additions and 689 deletions

View File

@ -19,6 +19,7 @@
"events": "http://localhost:8000/events/", "events": "http://localhost:8000/events/",
"typeevents": "http://localhost:8000/typeevents/", "typeevents": "http://localhost:8000/typeevents/",
"users": "http://localhost:8000/users/", "users": "http://localhost:8000/users/",
"groups": "http://localhost:8000/groups/",
"uploads": "http://localhost:8000/upload/" "uploads": "http://localhost:8000/upload/"
}, },
"post": { "post": {
@ -32,6 +33,7 @@
"events": "http://localhost:8000/events/", "events": "http://localhost:8000/events/",
"typeevents": "http://localhost:8000/typeevents/", "typeevents": "http://localhost:8000/typeevents/",
"users": "http://localhost:8000/users/", "users": "http://localhost:8000/users/",
"groups": "http://localhost:8000/groups/",
"uploads": "http://localhost:8000/upload/" "uploads": "http://localhost:8000/upload/"
} }
}, },

View File

@ -16,6 +16,7 @@
"businessproviders": "http://localhost:8000/sources/businessproviders/", "businessproviders": "http://localhost:8000/sources/businessproviders/",
"skills": "http://localhost:8000/sources/skills/", "skills": "http://localhost:8000/sources/skills/",
"events": "http://localhost:8000/events/", "events": "http://localhost:8000/events/",
"groups": "http://localhost:8000/groups/",
"typeevents": "http://localhost:8000/typeevents/", "typeevents": "http://localhost:8000/typeevents/",
"users": "http://localhost:8000/users/", "users": "http://localhost:8000/users/",
"uploads": "http://localhost:8000/upload/" "uploads": "http://localhost:8000/upload/"

View File

@ -46,8 +46,5 @@ script(data-default-context, type="application/ld+json")
| "author": "http://happy-dev.fr/owl/#author", | "author": "http://happy-dev.fr/owl/#author",
| "account": "http://happy-dev.fr/owl/#account", | "account": "http://happy-dev.fr/owl/#account",
| "jabberID": "foaf:jabberID", | "jabberID": "foaf:jabberID",
| "picture": "foaf:depiction", | "picture": "foaf:depiction"
| "firstName": "http://happy-dev.fr/owl/#first_name",
| "lastName": "http://happy-dev.fr/owl/#last_name",
| "isAdmin": "http://happy-dev.fr/owl/#is_admin"
| } | }

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 146 KiB

After

Width:  |  Height:  |  Size: 148 KiB

View File

@ -17,7 +17,7 @@ include templates/hd-user-avatar.pug
details#user-controls.notLoggedIn details#user-controls.notLoggedIn
summary(tabindex='0' role='button') summary(tabindex='0' role='button')
sib-display#user-controls__profile( sib-display#user-controls__profile(
fields='firstName, account.picture' fields='first_name, account.picture'
widget-account.picture='hd-user-avatar' widget-account.picture='hd-user-avatar'
bind-user bind-user
) )

136
src/images/add-user.svg Normal file
View File

@ -0,0 +1,136 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 511.998 511.998" style="enable-background:new 0 0 511.998 511.998;" xml:space="preserve">
<g>
<g>
<path d="M142.235,281.001c-3.839-1.558-8.212,0.292-9.769,4.131c-3.134,7.728-10.557,12.722-18.911,12.722
c-5.447,0-10.577-2.125-14.438-5.976c-1.948-1.948-3.451-4.213-4.468-6.734c-1.551-3.842-5.921-5.699-9.762-4.148
c-3.841,1.551-5.698,5.921-4.148,9.762c1.776,4.4,4.391,8.345,7.778,11.733c6.7,6.683,15.592,10.363,25.038,10.363
c14.491,0,27.371-8.668,32.812-22.084C147.923,286.932,146.073,282.558,142.235,281.001z"/>
</g>
</g>
<g>
<g>
<path d="M79.057,239.767c-4.142,0-7.5,3.358-7.5,7.5v3.329c0,4.142,3.358,7.5,7.5,7.5c4.142,0,7.5-3.358,7.5-7.5v-3.329
C86.557,243.125,83.199,239.767,79.057,239.767z"/>
</g>
</g>
<g>
<g>
<path d="M148.053,239.767c-4.142,0-7.5,3.358-7.5,7.5v3.329c0,4.142,3.358,7.5,7.5,7.5c4.142,0,7.5-3.358,7.5-7.5v-3.329
C155.553,243.125,152.195,239.767,148.053,239.767z"/>
</g>
</g>
<g>
<g>
<path d="M310.487,223.502c-3.837-1.557-8.212,0.292-9.769,4.131c-4.78,11.784-16.098,19.399-28.835,19.399
c-8.305,0-16.125-3.238-22.013-9.112c-2.97-2.971-5.264-6.428-6.817-10.275c-1.551-3.841-5.922-5.699-9.762-4.147
c-3.841,1.549-5.698,5.92-4.147,9.761c2.312,5.728,5.716,10.864,10.126,15.274c8.726,8.705,20.309,13.499,32.613,13.499
c18.874,0,35.648-11.29,42.735-28.761C316.175,229.433,314.325,225.059,310.487,223.502z"/>
</g>
</g>
<g>
<g>
<path d="M224.148,166.656c-4.142,0-7.5,3.358-7.5,7.5v4.606c0,4.142,3.358,7.5,7.5,7.5c4.142,0,7.5-3.358,7.5-7.5v-4.606
C231.648,170.014,228.29,166.656,224.148,166.656z"/>
</g>
</g>
<g>
<g>
<path d="M319.62,166.656c-4.142,0-7.5,3.358-7.5,7.5v4.606c0,4.142,3.358,7.5,7.5,7.5c4.142,0,7.5-3.358,7.5-7.5v-4.606
C327.12,170.014,323.762,166.656,319.62,166.656z"/>
</g>
</g>
<g>
<g>
<path d="M470.324,341.652c-3.253-2.564-7.968-2.007-10.533,1.246c-2.564,3.252-2.007,7.969,1.246,10.533
c19.487,15.364,30.664,38.39,30.664,63.173c0,44.331-36.065,80.396-80.396,80.396s-80.396-36.065-80.396-80.396
s36.065-80.396,80.396-80.396c8.367,0,16.608,1.278,24.495,3.797c3.947,1.261,8.166-0.916,9.427-4.861s-0.916-8.167-4.861-9.427
c-9.365-2.992-19.143-4.509-29.061-4.509c-21.24,0-40.879,6.98-56.749,18.763c-10.571-4.521-21.796-6.811-33.437-6.811h-5.95
v-17.15c10.07-4.674,19.408-11,27.645-18.843c17.398-16.575,28.308-38.376,31.167-62.005h15.056
c16.415,0,29.769-13.354,29.769-29.769v-10.536c0-11.659-6.741-21.768-16.526-26.65V78.83c0-28.408-23.112-51.52-51.52-51.52
h-13.208C328.802,10.667,311.24,0,292.358,0h-62.36c-16.889,0-33.311,4.773-47.489,13.804c-3.494,2.225-4.522,6.861-2.296,10.355
c2.225,3.493,6.859,4.522,10.355,2.296C202.333,18.961,215.968,15,229.998,15h62.36c13.713,0,26.439,7.966,32.429,20.307
l1.36,2.79c1.257,2.578,3.874,4.213,6.741,4.213h17.87c20.137,0,36.52,16.383,36.52,36.52v86.259H374.74v-35.598
c0-26-11.061-50.917-30.348-68.363c-3.117-2.82-7.516-3.727-11.478-2.366c-3.968,1.362-6.886,4.784-7.616,8.932
c-5.869,33.367-34.77,57.585-68.719,57.585h-80.051h-12.132c-4.142,0-7.5,3.358-7.5,7.5c0,4.142,3.358,7.5,7.5,7.5h4.632v24.81
h-12.54V88.51c0-15.812,4.94-30.871,14.287-43.55c2.458-3.334,1.748-8.029-1.587-10.487c-3.333-2.458-8.029-1.748-10.487,1.587
c-11.261,15.275-17.213,33.413-17.213,52.45v79.698c-9.785,4.883-16.525,14.991-16.525,26.649v10.536
c0,0.103,0.007,0.204,0.008,0.307h-1.243c-1.486,0-2.947-0.5-4.115-1.41l-24.381-18.969c-3.123-2.42-7.112-3.26-10.944-2.298
c-3.831,0.959-6.954,3.578-8.57,7.19l-5.137,11.514c-1.08,2.413-3.483,3.972-6.124,3.972h-12.32v-35.71
c0-6.198,5.047-11.24,11.25-11.24h20.53c4.142,0,7.5-3.358,7.5-7.5v-6.82c0-2.895,2.355-5.25,5.25-5.25h23.75
c4.142,0,7.5-3.358,7.5-7.5c0-4.142-3.358-7.5-7.5-7.5h-23.75c-10.938,0-19.879,8.718-20.239,19.57h-13.04
c-14.474,0-26.25,11.771-26.25,26.24v38.17v5.04v25.43h-8.25c-13.008,0-23.59,10.587-23.59,23.6v7.61
c0,13.013,10.583,23.6,23.59,23.6h9.058c3.712,25.562,19.989,46.865,42.252,57.67v8.99h-2.22
c-32.375,0-59.583,24.243-63.29,56.388l-7.17,61.958c-0.327,2.822,0.569,5.658,2.459,7.78c1.893,2.125,4.612,3.343,7.461,3.343
h90.06c4.142,0,7.5-3.358,7.5-7.5c0-4.142-3.358-7.5-7.5-7.5H59.597v-41.74c0-4.142-3.358-7.5-7.5-7.5c-4.142,0-7.5,3.358-7.5,7.5
v41.74h-21.53l6.522-56.361c2.833-24.576,23.637-43.109,48.389-43.109h2.682c2.631,15.786,16.378,27.86,32.898,27.86
c8.904,0,17.279-3.472,23.583-9.776c4.986-4.986,8.192-11.27,9.318-18.083h2.679c0.016,0,0.032,0.001,0.049,0.001
c-5.902,9.998-9.841,21.34-11.249,33.536l-9.922,85.752c-0.349,3.095,0.641,6.202,2.715,8.523
c2.071,2.318,5.041,3.647,8.147,3.647h240.674c9.938,3.518,20.624,5.44,31.752,5.44c52.602,0,95.396-42.794,95.396-95.396
C506.7,387.198,493.441,359.879,470.324,341.652z M139.963,194.857c0-8.144,6.625-14.769,14.769-14.769h21.796
c4.142,0,7.5-3.358,7.5-7.5v-32.31h72.551c39.088,0,72.669-26.436,82.147-63.718c13.421,14.253,21.014,33.22,21.014,52.93v43.098
c0,4.142,3.358,7.5,7.5,7.5h21.796c8.144,0,14.769,6.625,14.769,14.769v10.536c0,8.144-6.625,14.769-14.769,14.769h-21.933
c-3.992,0-7.284,3.126-7.49,7.112c-1.165,22.499-10.806,43.463-27.146,59.031c-8.108,7.72-17.467,13.718-27.592,17.818
c-0.092,0.037-0.182,0.076-0.272,0.116c-10.286,4.125-21.359,6.289-32.72,6.289c-11.579,0-22.65-2.246-32.795-6.325
c-0.122-0.053-0.248-0.098-0.373-0.145c-30.658-12.487-52.758-41.793-54.561-76.783c-0.206-3.987-3.498-7.114-7.49-7.114h-21.932
c-8.144,0-14.769-6.625-14.769-14.769V194.857z M300.168,321.588v31.522c0,7.552-2.943,14.659-8.288,20.011
c-5.33,5.339-12.43,8.279-19.992,8.279c-15.599,0-28.29-12.691-28.29-28.29v-31.517c8.995,2.564,18.485,3.935,28.286,3.935
C281.567,325.528,291.068,324.181,300.168,321.588z M131.918,369.6c0,4.897-1.912,9.505-5.384,12.977
c-3.471,3.472-8.079,5.383-12.976,5.383c-10.124,0-18.36-8.236-18.36-18.36v-13.085c5.888,1.451,12.034,2.235,18.36,2.235
c6.257,0,12.413-0.761,18.36-2.227V369.6z M149.138,360.1h-2.22v-9.018c7.019-3.412,13.546-7.901,19.335-13.414
c8.632-8.23,15.303-18.494,19.29-29.68c1.39-3.902-0.646-8.192-4.547-9.583c-3.898-1.389-8.191,0.645-9.583,4.547
c-3.203,8.989-8.567,17.24-15.507,23.857c-5.696,5.424-12.273,9.635-19.388,12.503c-0.013,0.006-0.027,0.011-0.04,0.017
c-7.204,2.898-14.961,4.42-22.919,4.42c-8.089,0-15.822-1.569-22.911-4.416c-0.078-0.033-0.159-0.06-0.239-0.091
c-21.449-8.721-36.916-29.217-38.18-53.69c-0.206-3.986-3.499-7.113-7.49-7.113h-15.85c-4.737,0-8.59-3.858-8.59-8.6v-7.61
c0-4.742,3.854-8.6,8.59-8.6h15.75c4.142,0,7.5-3.358,7.5-7.5V220.7h12.32c8.547,0,16.326-5.043,19.819-12.854l3.988-8.939
l22.133,17.22c3.786,2.949,8.52,4.574,13.329,4.574h5.484c5.212,8.657,14.7,14.461,25.52,14.461h15.053
c4.357,36.119,27.298,66.234,58.813,80.851v17.147h-5.95c-24.803,0-47.329,10.647-62.999,27.814
C156.187,360.398,152.669,360.1,149.138,360.1z M194.344,491.56v-60.638c0-4.142-3.358-7.5-7.5-7.5c-4.142,0-7.5,3.358-7.5,7.5
v60.638h-35.901l9.396-81.2c4.093-35.459,34.104-62.2,69.809-62.2h5.95v4.95c0,23.87,19.42,43.29,43.29,43.29
c11.573,0,22.443-4.503,30.607-12.681c8.172-8.185,12.673-19.055,12.673-30.609v-4.95h5.95c7.133,0,14.073,1.048,20.742,3.111
c-16.081,17.083-25.951,40.076-25.951,65.333c0,30.372,14.268,57.473,36.452,74.956H194.344z"/>
</g>
</g>
<g>
<g>
<path d="M464.565,394.219h-30.876v-30.876c0-5.91-4.808-10.718-10.718-10.718h-23.334c-5.91,0-10.718,4.808-10.718,10.718v30.876
h-30.876c-5.91,0-10.718,4.808-10.718,10.718v23.334c0,5.91,4.808,10.718,10.718,10.718h30.876v30.876
c0,5.91,4.808,10.718,10.718,10.718h23.334c5.91,0,10.718-4.808,10.718-10.718v-30.876h30.876c5.91,0,10.719-4.808,10.719-10.718
v-23.334C475.284,399.027,470.475,394.219,464.565,394.219z M460.285,423.99h-30.876c-5.91,0-10.719,4.809-10.719,10.719v30.875
h-14.771v-30.875c0-5.91-4.808-10.719-10.718-10.719h-30.876v-0.001v-14.771h30.876c5.91,0,10.718-4.809,10.718-10.719v-30.875
h14.771V398.5c0,5.91,4.809,10.719,10.719,10.719h30.876V423.99z"/>
</g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 8.2 KiB

View File

@ -5,7 +5,7 @@
if endpoints.projects || (endpoints.get && endpoints.get.projects) if endpoints.projects || (endpoints.get && endpoints.get.projects)
#admin-projects(hidden) #admin-projects(hidden)
include views/admin/page-admin-projects.pug include views/admin/page-admin-projects.pug
if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users)) if (endpoints.users || (endpoints.get && endpoints.get.users))
#admin-users(hidden) #admin-users(hidden)
include views/admin/page-admin-users.pug include views/admin/page-admin-users.pug
nav.jsRightMenu(role='navigation') nav.jsRightMenu(role='navigation')
@ -13,8 +13,8 @@ nav.jsRightMenu(role='navigation')
ul ul
li.jsOffsiteToggle li.jsOffsiteToggle
a Fold menu a Fold menu
if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users)) if (endpoints.users || (endpoints.get && endpoints.get.users))
sib-route(name='admin-users') sib-route.active-color(name='admin-users')
li li
a Users a Users
if endpoints.circles || (endpoints.get && endpoints.get.circles) if endpoints.circles || (endpoints.get && endpoints.get.circles)

View File

@ -10,7 +10,7 @@
class-description='h1-aside description' class-description='h1-aside description'
) )
button.mobile-sidebar-button.jsMobileSidebarOpenButton.icon-arrow-left-circle MENU button.mobile-sidebar-button.jsMobileSidebarOpenButton.icon-arrow-left-circle MENU
div.content-box__info div
sib-ac-checker(permission='acl:Read', bind-resources) sib-ac-checker(permission='acl:Read', bind-resources)
#circle-chat(hidden) #circle-chat(hidden)
include views/circle/page-circle-chat.pug include views/circle/page-circle-chat.pug

View File

@ -16,7 +16,7 @@
.mobile-sidebar-button.jsMobileSidebarOpenButton .mobile-sidebar-button.jsMobileSidebarOpenButton
button.icon-arrow-left-circle button.icon-arrow-left-circle
span MENU span MENU
div.content-box__info div
sib-ac-checker(permission='acl:Read', bind-resources) sib-ac-checker(permission='acl:Read', bind-resources)
#project-chat(hidden) #project-chat(hidden)
include views/project/page-project-chat.pug include views/project/page-project-chat.pug

View File

@ -91,6 +91,17 @@ function refreshSibDisplays(resourceId, clearCache = true) {
}); // and update them }); // and update them
} }
async function updateSources(resource) {
let res = resource.split('/');
res.splice(3, 0, 'sources');
let cacheCleared = false;
if (event.target.component.resource != null) {
event.target.component.resource.clearCache();
cacheCleared = true;
}
refreshSibDisplays(res.join('/'),cacheCleared);
}
//auxiliary function updates displays using a given resource //auxiliary function updates displays using a given resource
//NOTE: this is a temporary workaround and should be replaced by a reactive storage //NOTE: this is a temporary workaround and should be replaced by a reactive storage
//https://git.happy-dev.fr/startinblox/framework/sib-core/issues/524 //https://git.happy-dev.fr/startinblox/framework/sib-core/issues/524
@ -98,6 +109,7 @@ async function refreshResource(event) {
// if of the edited resource || id of the container of the created resource // if of the edited resource || id of the container of the created resource
const resourceId = event.detail.resource["@id"] || event.target.dataset.src; const resourceId = event.detail.resource["@id"] || event.target.dataset.src;
updateSources(resourceId, event);
let resource = document let resource = document
.querySelector('[data-src="' + resourceId + '"]') .querySelector('[data-src="' + resourceId + '"]')
.component.resource.getResourceData(); .component.resource.getResourceData();
@ -106,8 +118,9 @@ async function refreshResource(event) {
let partnerId = null; let partnerId = null;
if (resourceId.includes("circle-members")) { if (resourceId.includes("circle-members")) {
partnerId = resource["http://happy-dev.fr/owl/#circle"]["@id"]; partnerId = resource["http://happy-dev.fr/owl/#circle"]["@id"];
} else if (resourceId.includes("project-members")) } else if (resourceId.includes("project-members")) {
partnerId = resource["http://happy-dev.fr/owl/#project"]["@id"]; partnerId = resource["http://happy-dev.fr/owl/#project"]["@id"];
}
//refresh all resources using the partner ID //refresh all resources using the partner ID
if (partnerId != null) { if (partnerId != null) {

View File

@ -1,3 +1,20 @@
#admin-circle-create,
#admin-project-create,
#admin-users-create,
#admin-users-edit {
input[type='submit'] {
@extend .button,
.text-bold,
.text-uppercase,
.reversed,
.button-dark,
.bordered;
margin-left: auto;
margin-top: 3.2rem;
}
}
.content-box { .content-box {
&.with-form { &.with-form {
@ -23,26 +40,21 @@
padding-bottom: 0.8rem; padding-bottom: 0.8rem;
} }
p.center {
margin: 0;
text-align: center;
}
[name$='-text'] {
font-size: 1.5rem;
margin-bottom: 2rem;
}
[name^='block-'] { [name^='block-'] {
margin-bottom: 2.75rem; margin-bottom: 2.75rem;
} }
[name$='border-top'] {
border-top: 1px solid $color-221-51-90;
margin-top: 3rem;
}
form { form {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
sib-set-default { sib-set-default:not([name='user-thumb']) {
clear: both; clear: both;
display: flex!important; display: flex!important;
flex-wrap: wrap; flex-wrap: wrap;
@ -153,20 +165,17 @@
margin-top: 2.7rem; margin-top: 2.7rem;
} }
.form-edit { .form-edit>form {
>form { input[type='submit'] {
@extend .button,
input[type='submit'] { .text-bold,
@extend .button, .text-uppercase,
.text-bold, .reversed,
.text-uppercase, .button-dark,
.reversed, .bordered;
.button-dark, margin-left: auto;
.bordered; margin-top: 3.2rem;
margin-left: auto;
margin-top: 3.2rem;
}
} }
} }
@ -312,6 +321,14 @@
sib-multiple-select { sib-multiple-select {
&.select-groups .ss-values .ss-disabled::before {
content: "Select groups";
}
&.select-skills .ss-values .ss-disabled::before {
content: "Select skills";
}
sib-form-auto-completion > label { sib-form-auto-completion > label {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@ -361,7 +378,6 @@
&::before { &::before {
color: $color-213-4-50; color: $color-213-4-50;
content: "Select skills";
font-weight: normal; font-weight: normal;
} }
} }

View File

@ -65,6 +65,7 @@
details { details {
margin-right: 2.5rem; margin-right: 2.5rem;
position: relative;
@include breakpoint(sm) { @include breakpoint(sm) {
margin-right: 0; margin-right: 0;
@ -82,7 +83,7 @@
} }
} }
details { .sib-notifications__container {
position: relative; position: relative;
.sib-notifications__button { .sib-notifications__button {
@ -169,7 +170,7 @@
width: 45%; width: 45%;
} }
sib-display-value[name='firstName'] { sib-display-value[name='first_name'] {
@include icon('arrow-down'); @include icon('arrow-down');
align-items: center; align-items: center;
display: flex; display: flex;
@ -241,7 +242,7 @@
div { div {
sib-display-value[name='firstName'] { sib-display-value[name='first_name'] {
@include icon('close'); @include icon('close');
&::before { &::before {

View File

@ -1,12 +1,3 @@
$breakpoints: (phone: 480px,
tablet: 768px,
desktop: 1024px) !default;
[hidden],
.hidden {
display: none !important;
}
* { * {
outline: none; outline: none;
} }
@ -91,10 +82,15 @@ nav {
/* Quick fix. Will be removed later */ /* Quick fix. Will be removed later */
#admin-circles, #admin-circles,
#admin-projects { #admin-projects,
#admin-users {
display: contents; display: contents;
} }
[hidden],
.hidden {
display: none !important;
}
img { img {
max-height: 100%; max-height: 100%;
@ -121,12 +117,6 @@ h6 {
}*/ }*/
} }
.h2-like {
display: block;
margin: 14.94px 0;
width: 100%;
}
h1, .h1-like { h1, .h1-like {
color: $color-233-18-29; color: $color-233-18-29;
font-size: 2rem; font-size: 2rem;
@ -143,6 +133,12 @@ h2, .h2-like {
text-transform: uppercase; text-transform: uppercase;
} }
.h2-like {
display: block;
margin: 14.94px 0;
width: 100%;
}
h3 { h3 {
color: $color-216-4-22; color: $color-216-4-22;
font-size: 1.7rem; font-size: 1.7rem;
@ -164,21 +160,6 @@ h5 {
padding: 3.2rem; padding: 3.2rem;
} }
#admin-circle-create,
#admin-project-create {
input[type='submit'] {
@extend .button,
.text-bold,
.text-uppercase,
.reversed,
.button-dark,
.bordered;
margin-left: auto;
margin-top: 3.2rem;
}
}
.content-box { .content-box {
@include window-style-modal(); @include window-style-modal();
display: flex; display: flex;
@ -199,6 +180,7 @@ h5 {
} }
} }
/* Header inside circle, project view */
.content-box__header { .content-box__header {
border-bottom: 1px solid $color-221-51-90; border-bottom: 1px solid $color-221-51-90;
padding: 3rem; padding: 3rem;
@ -257,6 +239,12 @@ h5 {
} }
} }
.content-box__info {
@extend %padding-block;
display: flex;
flex-direction: column;
}
.modal { .modal {
color: white; color: white;
margin: 75px; margin: 75px;
@ -280,11 +268,6 @@ h5 {
} }
} }
.drive {
width: 100%;
border: 0;
}
.backlink { .backlink {
@include icon('arrow-left-circle'); @include icon('arrow-left-circle');
color: $color-233-18-29; color: $color-233-18-29;
@ -297,6 +280,11 @@ h5 {
margin-right: 1rem; margin-right: 1rem;
text-decoration: none; text-decoration: none;
} }
&.right {
display: block;
text-align: right;
}
} }
.name { .name {
@ -342,6 +330,7 @@ h5 {
@import 'table'; @import 'table';
@import 'header'; @import 'header';
@import 'menu-left'; @import 'menu-left';
@import 'user-thumb';
// Button global CSS // Button global CSS
sib-delete, sib-delete,
@ -396,7 +385,8 @@ a,
&.rounded { &.rounded {
border-radius: 50%; border-radius: 50%;
padding: 0.5rem 1rem; font-size: 1.8rem;
padding: 1rem;
} }
&.button-link { &.button-link {

View File

@ -4,18 +4,8 @@
#admin-circle-create, #admin-circle-create,
#project-edit, #project-edit,
#admin-project-list, #admin-project-list,
#admin-project-create { #admin-project-create,
#admin-users-list {
.content-box__info {
@extend %padding-block;
display: flex;
flex-direction: column;
.backlink {
text-align: right;
display: block;
}
}
.table { .table {
@ -79,93 +69,6 @@
} }
} }
.cell-with-name {
color: $color-233-18-29;
font-weight: 600;
padding-top: 2.5rem;
}
.cell-with-id-card>div,
/* for the table in circle-edit */
.cell-with-id-card>sib-display>div,
project-captain[name='user']>sib-display>div {
/* for the captain's cell in project-admin */
display: grid;
grid-column-gap: 1.6rem;
grid-template-columns: 7vh auto;
grid-template-rows: repeat(2, 5.2vh);
padding: 0 2.2rem;
>[name$='account.picture'] {
align-items: center;
align-self: center;
background-color: $color-213-20-91;
border-radius: 50%;
display: flex;
grid-column: 1 / span 1;
grid-row: 1 / span 2;
height: 7vh;
justify-content: center;
overflow: hidden;
position: relative;
width: 7vh;
img {
background-color: white;
height: 100%;
left: 0;
object-fit: cover;
position: absolute;
top: 0;
width: 100%;
}
object {
height: 45%;
width: 45%;
}
}
>[name='sup'] {
align-self: end;
display: flex;
grid-column: 2 / span 1;
grid-row: 1 / span 1;
margin-bottom: 0.50rem;
[name$='name'] {
color: #7A7F85;
font-weight: 600;
margin-right: 1rem;
}
sib-multiple>div {
display: flex;
[name='groups'] {
@extend %tag-role;
}
}
}
>[name='sub'] {
align-self: start;
grid-column: 2 / span 1;
grid-row: 2 / span 1;
margin-top: 0.50rem;
>[name$='username']:not(:empty) {
align-items: center;
display: flex;
&::before {
content: '@';
}
}
}
}
.cell-with-buttons { .cell-with-buttons {
align-items: center; align-items: center;
display: flex; display: flex;
@ -185,6 +88,52 @@
} }
} }
.cell-with-name {
color: $color-233-18-29;
font-weight: 600;
padding-top: 2.5rem;
}
sib-multiple {
display: flex;
align-items: center;
justify-content: center;
}
.user-thumb>div /* for the table in circle-edit and captain's cell in project-admin */,
[name='user-thumb'] {
@extend %user-thumb__grid;
padding: 0 2.2rem;
>.user-thumb__picture {
@extend %user-thumb__picture;
}
>[name='sup'] {
@extend %user-thumb__grid-sup;
.user-thumb__name {
@extend %user-thumb__name;
}
.user-thumb__groups {
@extend %user-thumb__groups;
}
}
>[name='sub'] {
@extend %user-thumb__grid-inf;
>.user-thumb__username:not(:empty) {
@extend %user-thumb__username;
}
>.user-thumb__city:not(:empty) {
@extend %user-thumb__city;
}
}
}
sib-ac-checker { sib-ac-checker {
align-items: center; align-items: center;
display: flex; display: flex;

View File

@ -0,0 +1,108 @@
%user-thumb__grid {
display: grid;
grid-column-gap: 1.6rem;
grid-template-columns: 7vh auto;
grid-template-rows: repeat(2, 5.2vh);
}
%user-thumb__grid-sup {
align-items: center;
align-self: end;
display: flex;
grid-column: 2 / span 1;
grid-row: 1 / span 1;
margin-bottom: 0.50rem;
}
%user-thumb__grid-inf {
align-self: start;
grid-column: 2 / span 1;
grid-row: 2 / span 1;
margin-top: 0.50rem;
}
%user-thumb__picture {
align-items: center;
align-self: center;
background-color: $color-213-20-91;
border-radius: 50%;
display: flex;
grid-column: 1 / span 1;
grid-row: 1 / span 2;
height: 7vh;
justify-content: center;
overflow: hidden;
position: relative;
width: 7vh;
img {
background-color: white;
height: 100%;
left: 0;
object-fit: cover;
position: absolute;
top: 0;
width: 100%;
}
object {
height: 45%;
width: 45%;
}
}
%user-thumb__name {
color: #7A7F85;
font-weight: 600;
margin-right: 1rem;
}
%user-thumb__groups {
display: flex;
margin-bottom: 1px;
margin-left: 0.6rem;
[name='groups'],
[name='user.groups'] {
@extend %tag-role;
}
}
%user-thumb__admin {
@extend %tag-admin;
}
%user-thumb__username {
align-items: center;
display: flex;
&::before {
content: '@';
}
}
%user-thumb__city {
@include mdi('atom');
align-items: center;
display: flex;
margin-right: 1.6rem;
&::before {
color: $color-43-100-50;
margin-right: 0.50rem;
}
}
%user-thumb__lead {
@include icon('eyeglass');
align-items: center;
display: flex;
&::before {
color: $color-43-100-50;
font-size: 1.9rem;
font-weight: bold;
margin-left: 0;
margin-right: 0.50rem;
}
}

View File

@ -1,5 +1,5 @@
@import 'chat'; @import 'chat';
@import 'comment.scss'; @import 'comment';
@import 'filters'; @import 'filters';
@import 'howto'; @import 'howto';
@import 'sidebar'; @import 'sidebar';

View File

@ -12,6 +12,3 @@
flex-shrink: 0; flex-shrink: 0;
} }
} }

View File

@ -51,7 +51,7 @@ $ci-icons: (
hat: '\e91c', hat: '\e91c',
beer1: '\e91d', beer1: '\e91d',
alien: '\e91e', alien: '\e91e',
drawing: '\e91f', add-user: '\e91f',
feedback: '\e920', feedback: '\e920',
globe: '\e921', globe: '\e921',
bubble-add: '\e922' bubble-add: '\e922'

View File

@ -53,7 +53,7 @@
padding: 2.15rem 2.55rem; padding: 2.15rem 2.55rem;
position: relative; position: relative;
/*width: 12em;*/ /*width: 12em;*/
&::before { &::before {
float: left; float: left;
font-size: 4rem; font-size: 4rem;
@ -68,12 +68,6 @@
>sib-route { >sib-route {
&[active] {
background-color: $color-233-18-29;
color: $color-46-100-67;
display: inline-block;
}
&[name*='circle'], &[name*='circle'],
&[name*='project'] { &[name*='project'] {
@ -82,6 +76,13 @@
} }
} }
&[name*='users'] {
>li::before {
font-size: 5rem;
}
}
&[name$='chat']>li { &[name$='chat']>li {
@include ci('chat'); @include ci('chat');
} }
@ -102,6 +103,18 @@
@include ci('file'); @include ci('file');
} }
&[name='admin-users']>li::before {
background-color: $color-233-18-29;
content: '';
display: inline-block;
height: 40px;
mask: url('/images/add-user.svg') 1% 1% / 1px 1px no-repeat;
mask-size: cover;
-webkit-mask: url('/images/add-user.svg') 1% 1% / 1px 1px no-repeat;
-webkit-mask-size: cover;
width: 40px;
}
&[name='admin-circles']>li { &[name='admin-circles']>li {
@include ci('bubble-add'); @include ci('bubble-add');
} }
@ -109,6 +122,18 @@
&[name='admin-projects']>li { &[name='admin-projects']>li {
@include ci('add'); @include ci('add');
} }
&[active] {
background-color: $color-233-18-29;
color: $color-46-100-67;
display: inline-block;
}
&.active-color[active] {
>li::before {
background-color: #ffd857;
}
}
} }
} }
} }

View File

@ -15,6 +15,5 @@
font-size: 1.4rem; font-size: 1.4rem;
font-weight: 400; font-weight: 400;
margin-left: 0.6rem; margin-left: 0.6rem;
margin-top: -2px; padding: 0.35rem 0.98rem;
padding: 0.3rem 0.98rem;
} }

View File

@ -18,7 +18,7 @@ div#viewport {
@import 'components/index'; @import 'components/index';
@import 'layout/members/index'; @import 'layout/members/index';
@import 'layout/job-offers/index'; @import 'layout/job-offers/index';
@import 'layout/project-profile/index'; @import 'layout/project/index';
@import 'layout/circle/index'; @import 'layout/circle/index';
@import 'layout/user/index'; @import 'layout/user/index';
@import 'layout/events/index'; @import 'layout/events/index';

View File

@ -1,3 +1,2 @@
@import 'circle';
@import 'circle-profile'; @import 'circle-profile';
@import 'circle-admin'; @import 'circle-admin';

View File

@ -8,62 +8,22 @@
.block { .block {
/* peut-être à mettre dans main.scss */ /* peut-être à mettre dans main.scss */
circle-team-template>sib-display>div { .user-thumb>div {
display: grid; @extend %user-thumb__grid;
grid-column-gap: 1.6rem;
grid-template-columns: 7vh auto;
grid-template-rows: repeat(2, 5.2vh);
>[name='account.picture'] { >.user-thumb__picture {
align-items: center; @extend %user-thumb__picture;
align-self: center;
background-color: $color-213-20-91;
border-radius: 50%;
display: flex;
grid-column: 1 / span 1;
grid-row: 1 / span 2;
height: 7vh;
justify-content: center;
overflow: hidden;
position: relative;
width: 7vh;
img {
background-color: white;
height: 100%;
left: 0;
object-fit: cover;
position: absolute;
top: 0;
width: 100%;
}
object {
height: 45%;
width: 45%;
}
} }
>[name='sup'] { >[name='sup'] {
align-items: center; @extend %user-thumb__grid-sup;
align-self: end;
display: flex;
grid-column: 2 / span 1;
grid-row: 1 / span 1;
margin-bottom: 0.50rem;
.user-name { .user-thumb__name {
font-weight: 600; @extend %user-thumb__name;
} }
.tag-group { .tag-group {
display: flex; @extend %user-thumb__groups;
margin-bottom: 1px;
margin-left: 0.6rem;
[name='groups'] {
@extend %tag-role;
}
} }
.tag-admin:not(:empty) { .tag-admin:not(:empty) {
@ -72,20 +32,10 @@
} }
>[name='sub'] { >[name='sub'] {
align-self: start; @extend %user-thumb__grid-inf;
grid-column: 2 / span 1;
grid-row: 2 / span 1;
margin-top: 0.50rem;
>.city:not(:empty) { >.user-thumb__city:not(:empty) {
@include mdi('atom'); @extend %user-thumb__city;
align-items: center;
display: flex;
&::before {
color: $color-43-100-50;
margin-right: 0.50rem;
}
} }
} }
} }

View File

@ -1,191 +0,0 @@
#circle-information,
#circle-edit,
#admin-circle-list,
#admin-circle-create,
#admin-project-list,
#admin-project-create {
.content-box__info {
@extend %padding-block;
display: flex;
flex-direction: column;
.backlink {
text-align: right;
display: block;
}
}
.table {
.table-header {
display: flex;
flex: 1;
font-size: 1.6rem;
font-weight: 600;
justify-content: space-around;
text-align: center;
&.grey-color {
background: $color-228-25-79;
color: white;
}
>* {
border-right: 1px solid white;
flex: 1;
padding: 2.1rem 0;
text-align: center;
}
>*:last-of-type {
border-right: 1px solid $color-228-25-79;
}
}
.table-body {
>div:first-of-type>sib-display>div,
team-template-edit[name='members'] {
display: flex;
border-left: 1px solid $color-228-25-79;
}
.border {
border-bottom: 1px solid $color-228-25-79;
border-right: 1px solid $color-228-25-79;
}
.cell {
text-align: center;
word-wrap: break-word;
}
.w25 {
width: 25%;
}
.w33 {
width: 33.3333%;
}
.w50 {
width: 50%;
}
.hashtag::before {
content: '#';
}
}
.cell-with-name {
color: $color-233-18-29;
font-weight: 600;
padding-top: 2.5rem;
}
.cell-with-id-card>div, /* for the table in circle-edit */
.cell-with-id-card>sib-display>div,
project-captain[name='user']>sib-display>div { /* for the captain's cell in project-admin */
display: grid;
grid-column-gap: 1.6rem;
grid-template-columns: 7vh auto;
grid-template-rows: repeat(2, 5.2vh);
padding: 0 2.2rem;
>[name$='account.picture'] {
align-items: center;
align-self: center;
background-color: $color-213-20-91;
border-radius: 50%;
display: flex;
grid-column: 1 / span 1;
grid-row: 1 / span 2;
height: 7vh;
justify-content: center;
overflow: hidden;
position: relative;
width: 7vh;
img {
background-color: white;
height: 100%;
left: 0;
object-fit: cover;
position: absolute;
top: 0;
width: 100%;
}
object {
height: 45%;
width: 45%;
}
}
>[name='sup'] {
align-self: end;
display: flex;
grid-column: 2 / span 1;
grid-row: 1 / span 1;
margin-bottom: 0.50rem;
[name$='name'] {
color: #7A7F85;
font-weight: 600;
margin-right: 1rem;
}
sib-multiple>div {
display: flex;
[name='groups'] {
@extend %tag-role;
}
}
}
>[name='sub'] {
align-self: start;
grid-column: 2 / span 1;
grid-row: 2 / span 1;
margin-top: 0.50rem;
>[name$='username']:not(:empty) {
align-items: center;
display: flex;
&::before {
content: '@';
}
}
}
}
.cell-with-buttons {
align-items: center;
display: flex;
justify-content: center;
[name='button'] {
input[type='submit'] {
@extend .button,
.text-bold,
.text-uppercase,
.reversed,
.button-blue,
.bordered,
.btn-margin-left;
}
}
}
sib-ac-checker {
align-items: center;
display: flex;
justify-content: center;
}
}
}

View File

@ -75,7 +75,7 @@ sib-job-board {
margin: 0.25em; margin: 0.25em;
} }
[name='author.firstName'] { [name='author.first_name'] {
color: $color-0-0-29; color: $color-0-0-29;
font-weight: 600; font-weight: 600;
} }

View File

@ -1,177 +0,0 @@
#project-profile {
.button-question__position {
position: relative;
bottom: 5px;
}
.button-question__color {
color: $color-216-4-22;
}
.customer-box {
display: flex;
margin: 1.6rem 0;
>* {
border: 1px solid $color-221-51-90;
flex: 0 1 50%;
padding: 1.7rem 2rem;
&:first-child {
li:last-child {
margin-top: 3rem;
p {
margin-top: 0.8rem;
}
}
}
&:last-child {
border-left: none;
li {
margin-bottom: 1.5rem;
}
}
}
}
.customer-logo {
box-sizing: border-box;
display: flex;
height: 8.5vh;
justify-content: flex-end;
margin-top: 20px;
text-align: end;
width: 15vw;
}
hd-captain>sib-display>div,
hd-project-team>sib-display>div { /* Maybe move it in main.scss. /!\ some fields are different */
display: grid;
grid-column-gap: 1.6rem;
grid-template-columns: 7vh auto;
grid-template-rows: repeat(2, 5.2vh);
>[name='user.account.picture'],
>[name='account.picture'] {
align-items: center;
align-self: center;
background-color: $color-213-20-91;
border-radius: 50%;
display: flex;
grid-column: 1 / span 1;
grid-row: 1 / span 2;
height: 7vh;
justify-content: center;
overflow: hidden;
position: relative;
width: 7vh;
img {
background-color: white;
height: 100%;
left: 0;
object-fit: cover;
position: absolute;
top: 0;
width: 100%;
}
object {
height: 45%;
width: 45%;
}
}
>[name='sup'] {
align-self: end;
display: flex;
grid-column: 2 / span 1;
grid-row: 1 / span 1;
margin-bottom: 0.50rem;
.user-name {
font-weight: 600;
}
sib-multiple {
display: flex;
margin-left: 1rem;
[name='groups'],
[name='user.groups'] {
@extend %tag-role;
}
}
.tag-admin:not(:empty) {
@extend %tag-admin;
}
}
>[name='sub'] {
align-self: start;
grid-column: 2 / span 1;
grid-row: 2 / span 1;
margin-top: 0.50rem;
>[name$='profile.city']:not(:empty) {
@include mdi('atom');
align-items: center;
display: flex;
margin-right: 1.6rem;
&::before {
color: $color-43-100-50;
margin-right: 0.50rem;
}
}
>[name$='name']:not(:empty),
>[name='is_lead'] {
@include icon('eyeglass');
align-items: center;
display: flex;
&::before {
color: $color-43-100-50;
font-size: 1.9rem;
font-weight: bold;
margin-left: 0;
margin-right: 0.50rem;
}
}
}
}
ul {
list-style: none;
padding-left: 0;
li {
margin-bottom: 0.5em;
span::before {
color: $color-43-100-50;
font-size: 2.2rem;
margin: 0 1rem 0 0;
}
span {
font-weight: bold;
&.link-color {
color: $color-244-73-62;
}
&.norm-weight {
font-weight: normal;
}
}
}
}
}

View File

@ -1,8 +0,0 @@
#project-profile {
.content-box__info {
@extend %padding-block;
display: flex;
flex-direction: column;
}
}

View File

@ -1,2 +1 @@
@import 'project';
@import 'project-profile'; @import 'project-profile';

View File

@ -0,0 +1,115 @@
#project-profile {
.button-question__position {
position: relative;
bottom: 5px;
}
.button-question__color {
color: $color-216-4-22;
}
.customer-box {
display: flex;
margin: 1.6rem 0;
>* {
border: 1px solid $color-221-51-90;
flex: 0 1 50%;
padding: 1.7rem 2rem;
&:first-child {
li:last-child {
margin-top: 3rem;
p {
margin-top: 0.8rem;
}
}
}
&:last-child {
border-left: none;
li {
margin-bottom: 1.5rem;
}
}
}
}
.customer-logo {
box-sizing: border-box;
display: flex;
height: 8.5vh;
justify-content: flex-end;
margin-top: 20px;
text-align: end;
width: 15vw;
}
.user-thumb>div {
/* Maybe move it in main.scss. /!\ some fields are different */
@extend %user-thumb__grid;
>.user-thumb__picture {
@extend %user-thumb__picture;
}
>[name='sup'] {
@extend %user-thumb__grid-sup;
.user-thumb__name {
@extend %user-thumb__name;
}
sib-multiple {
@extend %user-thumb__groups;
}
.tag-admin:not(:empty) {
@extend %tag-admin;
}
}
>[name='sub'] {
@extend %user-thumb__grid-inf;
>.user-thumb__city:not(:empty) {
@extend %user-thumb__city;
}
>.user-thumb__lead:not(:empty) {
@extend %user-thumb__lead;
}
}
}
ul {
list-style: none;
padding-left: 0;
li {
margin-bottom: 0.5em;
span::before {
color: $color-43-100-50;
font-size: 2.2rem;
margin: 0 1rem 0 0;
}
span {
font-weight: bold;
&.link-color {
color: $color-244-73-62;
}
&.norm-weight {
font-weight: normal;
}
}
}
}
}

View File

@ -1 +1,2 @@
@import 'user-profile'; @import 'user-profile';
@import 'admin-users';

View File

@ -0,0 +1,6 @@
/* Fix. Could disappear when we can add .class on set fields */
sib-set-default[name='cell-1'] {
@extend .w33;
@extend .cell;
@extend .border;
}

View File

@ -2,12 +2,14 @@ include hd-user-avatar.pug
sib-widget(name='hd-captain') sib-widget(name='hd-captain')
template template
sib-display( sib-display.user-thumb(
data-src="${await value}" data-src="${await value}"
fields='account.picture, sup(name), sub(profile.city, is_lead)' fields='account.picture, sup(name), sub(profile.city, is_lead)'
class-name='user-name' class-account.picture='user-thumb__picture'
class-profile.city='city' class-name='user-thumb__name'
class-profile.city='user-thumb__city'
class-is_lead='user-thumb__lead'
widget-account.picture='hd-user-avatar' widget-account.picture='hd-user-avatar'
widget-is_lead='hd-user-lead' widget-is_lead='hd-user-lead'

View File

@ -2,15 +2,16 @@ include hd-user-avatar.pug
sib-widget(name='circle-team-template') sib-widget(name='circle-team-template')
template template
sib-display( sib-display.user-thumb(
data-src='${await value.user}' data-src='${await value.user}'
fields='account.picture, sup(name, isadmin, groups), sub(profile.city)' fields='account.picture, sup(name, isadmin, groups), sub(profile.city)'
value-isadmin='${await value.is_admin}' value-isadmin='${await value.is_admin}'
class-name='user-name' class-account.picture='user-thumb__picture'
class-name='user-thumb__name'
class-isadmin='tag-admin' class-isadmin='tag-admin'
class-groups='tag-group' class-groups='tag-group'
class-profile.city='city' class-profile.city='user-thumb__city'
widget-account.picture='hd-user-avatar' widget-account.picture='hd-user-avatar'
widget-isadmin='hd-circle-user-admin' widget-isadmin='hd-circle-user-admin'

View File

@ -10,7 +10,7 @@ sib-widget(name='hd-customer')
div div
h3 Contact: h3 Contact:
ul ul
li #[span(class='mdi-account-outline') ${await value.firstName} ${await value.lastName ? await value.lastName : ""}]${await value.role ? `, ${await value.role}` : ""} li #[span(class='mdi-account-outline') ${await value.first_name} ${await value.last_name ? await value.last_name : ""}]${await value.role ? `, ${await value.role}` : ""}
li li
span(class='link-color norm-weight mdi-email-outline') span(class='link-color norm-weight mdi-email-outline')
a(href='mailto:${await value.email}') ${await value.email} a(href='mailto:${await value.email}') ${await value.email}

View File

@ -2,15 +2,18 @@ include hd-user-avatar.pug
sib-widget(name='hd-project-team') sib-widget(name='hd-project-team')
template template
sib-display( sib-display.user-thumb(
data-src='${await value}' data-src='${await value}'
fields='user.account.picture, sup(user.name, isadmin, user.groups), sub(user.profile.city, name)' fields='user.account.picture, sup(user.name, isadmin, user.groups), sub(user.profile.city, name)'
value-isadmin='${await value.is_admin}' value-isadmin='${await value.is_admin}'
class-user.name='user-name' class-user.account.picture='user-thumb__picture'
class-user.name='user-thumb__name'
class-isadmin='tag-admin' class-isadmin='tag-admin'
class-user.groups='tag-group' class-user.groups='tag-group'
class-user.profile.city='city' class-user.profile.city='user-thumb__city'
class-name='user-thumb__lead'
widget-user.account.picture='hd-user-avatar' widget-user.account.picture='hd-user-avatar'
widget-isadmin='hd-project-user-admin' widget-isadmin='hd-project-user-admin'

View File

@ -1,11 +1,9 @@
div.content-box__info div.content-box__info
sib-link(class="backlink", next='admin-circle-list') Back sib-link(class="backlink right", next='admin-circle-list') Back
h1.centered New circle h1.centered New circle
p.center Here you can create a new circle according to your interests, what you want to share, etc. sib-form(
sib-form.block(
data-src=`${endpoints.circles || endpoints.post.circles}` data-src=`${endpoints.circles || endpoints.post.circles}`
fields='name, description' fields='name, description'

View File

@ -4,8 +4,8 @@
sib-route(name='admin-circle-create') sib-route(name='admin-circle-create')
sib-route(name='circle-left') sib-route(name='circle-left')
div.content-box__header.with-description div.content-box__header
h1.title-left.without-margin Administration h1.without-margin Administration
#circle-left(hidden) #circle-left(hidden)
@ -17,10 +17,14 @@
sib-widget(name='circle-owner') sib-widget(name='circle-owner')
template template
sib-display( sib-display.user-thumb(
data-src='${await value}' data-src='${await value}'
fields='account.picture, sup(name), sub(username)' fields='account.picture, sup(name), sub(username)'
class-account.picture='user-thumb__picture'
class-name='user-thumb__name'
class-username='user-thumb__username'
widget-account.picture='hd-user-avatar' widget-account.picture='hd-user-avatar'
) )

View File

@ -3,7 +3,7 @@ sib-widget(name='hd-template-project-title')
p ${value} p ${value}
div.content-box__info div.content-box__info
sib-link(class="backlink" next='admin-project-list') Back sib-link(class="backlink right" next='admin-project-list') Back
sib-widget(name="admin-project-add-user") sib-widget(name="admin-project-add-user")
template template
@ -18,7 +18,7 @@ div.content-box__info
h1.centered New project h1.centered New project
sib-form.block( sib-form(
data-src=`${endpoints.projects || endpoints.post.projects}` data-src=`${endpoints.projects || endpoints.post.projects}`
fields='line-1(customer, name), line-3(project.description), fieldset-fee, line-4(businessProvider.name, businessProvider.fee), fieldset-captain, line-10(captain)' fields='line-1(customer, name), line-3(project.description), fieldset-fee, line-4(businessProvider.name, businessProvider.fee), fieldset-captain, line-10(captain)'

View File

@ -4,8 +4,8 @@
sib-route(name='admin-project-create') sib-route(name='admin-project-create')
sib-route(name='project-left') sib-route(name='project-left')
div.content-box__header.with-description div.content-box__header
h1.title-left.without-margin Administration h1.without-margin Administration
#project-left(hidden) #project-left(hidden)
include ../project/page-project-left.pug include ../project/page-project-left.pug
@ -38,10 +38,14 @@
sib-widget(name='project-captain') sib-widget(name='project-captain')
template template
sib-display( sib-display.user-thumb(
data-src='${await value}' data-src='${await value}'
fields='account.picture, sup(name), sub(username)' fields='account.picture, sup(name), sub(username)'
class-account.picture='user-thumb__picture'
class-name='user-thumb__name'
class-username='user-thumb__username'
widget-account.picture='hd-user-avatar' widget-account.picture='hd-user-avatar'
) )
@ -50,9 +54,9 @@
sib-display( sib-display(
data-src='${value}' data-src='${value}'
fields='user' fields='user'
search-fields='isAdmin' search-fields='is_admin'
search-value-isAdmin='true' search-value-is_admin='true'
search-widget-isAdmin='sib-form-hidden' search-widget-is_admin='sib-form-hidden'
widget-user='project-captain' widget-user='project-captain'
) )

View File

@ -0,0 +1,35 @@
div.content-box__info
sib-link(class='backlink right', next='admin-users-list') Back
h1.centered Add a new user to the platform
sib-form(
data-src=`${endpoints.users || endpoints.post.users}`
range-groups=`${endpoints.groups || endpoints.get.groups}`
fields='line-1(first_name, last_name), line-2(username, email), line-3(password), line-4-border-top(groups)'
class-first_name='form-label is-light is-half-width'
class-last_name='form-label is-light is-half-width'
class-username='form-label is-light is-half-width'
class-email='form-label is-light is-half-width'
class-groups='form-label is-light is-half-width select-groups'
label-first_name='First Name *'
label-last_name='Last Name *'
label-username='Username *'
label-email='Email *'
label-groups='Groups'
multiple-groups='sib-multiple-select'
widget-groups='sib-form-auto-completion'
value-password=''
widget-password='sib-form-hidden'
next='admin-users-list'
submit-button='Create'
)
p Administrators of your platform can create new Groups on the Django Administration.

View File

@ -0,0 +1,35 @@
div.content-box__info
sib-link(class='backlink right', next='admin-users-list') Back
h1.centered
span Edit user
sib-display(
bind-resources=''
fields='name'
)
sib-form(
bind-resources=''
range-groups=`${endpoints.groups || endpoints.get.groups}`
fields='line-1(first_name, last_name), line-2(username, email), line-4-border-top(groups)'
class-first_name='form-label is-light is-half-width'
class-last_name='form-label is-light is-half-width'
class-username='form-label is-light is-half-width'
class-email='form-label is-light is-half-width'
class-groups='form-label is-light is-half-width select-groups'
label-first_name='First Name *'
label-last_name='Last Name *'
label-username='Username *'
label-email='Email *'
label-groups='Groups'
multiple-groups='sib-multiple-select'
widget-groups='sib-form-auto-completion'
next='admin-user-list'
submit-button='Save user'
)

View File

@ -2,17 +2,70 @@
sib-router(default-route='admin-users-list', hidden) sib-router(default-route='admin-users-list', hidden)
sib-route(name='admin-users-list') sib-route(name='admin-users-list')
sib-route(name='admin-users-create') sib-route(name='admin-users-create')
sib-route(name='admin-users-edit')
div.content-box__header div.content-box__header
h2 Administration h1.without-margin Administration
sib-widget(name='sib-action-hd-custom')
template
sib-ac-checker(data-src="${src}", permission='acl:Write')
sib-link(
class='button rounded reversed button-blue bordered icon-pencil'
data-src="${src}"
next="${value}"
)
#admin-users-list(hidden) sib-widget(name='hd-user-admin-groups-display')
div.content-box__info template
sib-display.block( sib-display(
data-src=`${endpoints.users || endpoints.get.users}` data-src="${value}"
fields="account.picture, name, username, email, groups" fields="name"
multiple-groups=""
) )
#admin-users-list(hidden)
div.content-box__info
div.admin-header
div.admin-header__title Users
sib-ac-checker(data-src=`${endpoints.users || endpoints.post.users}`, permission='acl:Append')
sib-link(
class='button text-bold text-uppercase reversed button-yellow bordered with-icon icon-plus'
next='admin-users-create'
) Create a new user
.table
div.table-header.grey-color
div Name
div Groups
div
sib-display(
class='table-body'
data-src=`${endpoints.users || endpoints.get.users}`
fields='cell-1(user-thumb(account.picture, sup(name), sub(username))), groups, actions'
class-account.picture='user-thumb__picture'
class-name='user-thumb__name'
class-username='user-thumb__username'
class-profile.city='user-thumb__city'
widget-account.picture='hd-user-avatar'
class-groups='w33 cell border cell-with-groups'
multiple-groups=''
widget-groups='hd-user-admin-groups-display'
label-actions='Edit'
action-actions='admin-users-edit'
class-actions='w33 cell border cell-with-buttons'
widget-actions='sib-action-hd-custom'
order-by='username'
)
#admin-users-create(hidden) #admin-users-create(hidden)
include page-admin-users-create.pug
#admin-users-edit(hidden)
include page-admin-users-edit.pug

View File

@ -7,11 +7,16 @@ div.content-box__info
sib-widget(name='team-template-edit') sib-widget(name='team-template-edit')
template template
sib-display( sib-display.user-thumb(
class='w50 cell border cell-with-id-card' class='w50 cell border cell-with-id-card user-thumb'
data-src='${await value.user}' data-src='${await value.user}'
fields='account.picture, sup(name, groups), sub(profile.city)' fields='account.picture, sup(name, groups), sub(profile.city)'
class-account.picture='user-thumb__picture'
class-name='user-thumb__name'
class-groups='user-thumb__groups'
class-profile.city='user-thumb__city'
widget-account.picture='hd-user-avatar' widget-account.picture='hd-user-avatar'
multiple-groups='' multiple-groups=''
@ -36,12 +41,12 @@ div.content-box__info
data-src="${value['@id']}" data-src="${value['@id']}"
) )
sib-link(class="backlink", bind-resources, next='circle-profile') Back sib-link(class="backlink right", bind-resources, next='circle-profile') Back
sib-ac-checker(permission='acl:Write', bind-resources) sib-ac-checker(permission='acl:Write', bind-resources)
h1 Edit your circle h1 Edit your circle
sib-form.block.form-edit( sib-form.form-edit(
bind-resources bind-resources
fields='block-circle__info(name, owner), description' fields='block-circle__info(name, owner), description'

View File

@ -1,33 +1,20 @@
.content-box.with-padding.with-form .content-box.with-padding.with-form
h1 Post a new job offer h1 Post a new job offer
p.center This form allows you to share an offer to all members of the network.
sib-widget(name='title-text')
template
p Be clear and specific with the name of your offer. You can indicate which skill is important, the start date or the name of the client. Ex: "Looking for a plumber for planet Mars ASAP".
sib-widget(name='description-text')
template
p Be specific and exhaustive to avoid answering too many questions later. Indicate what is the best way to fill the offer, the prerequisites...'
sib-form.block( sib-form(
data-src=`${endpoints.joboffers || endpoints.post.joboffers}` data-src=`${endpoints.joboffers || endpoints.post.joboffers}`
range-skills=`${endpoints.skills || endpoints.get.skills}` range-skills=`${endpoints.skills || endpoints.get.skills}`
fields='title, title-text, description, description-text, skills, closingDate' fields='title, description, skills, closingDate'
class-title='field form-label is-light is-expanded' class-title='field form-label is-light is-expanded'
label-title='Title*' label-title='Title*'
widget-title-text='title-text'
class-description='field form-label is-light is-expanded' class-description='field form-label is-light is-expanded'
label-description='Description*' label-description='Description*'
widget-description='sib-form-textarea' widget-description='sib-form-textarea'
widget-description-text='description-text' class-skills='form-label is-dark select-skills'
class-skills='form-label is-dark'
label-skills='The required skills for this mission:*' label-skills='The required skills for this mission:*'
multiple-skills='sib-multiple-select' multiple-skills='sib-multiple-select'
widget-skills='sib-form-auto-completion' widget-skills='sib-form-auto-completion'

View File

@ -1,7 +1,7 @@
.content-box.with-padding.with-form .content-box.with-padding.with-form
h1 Edit your job offer h1 Edit your job offer
sib-form.block( sib-form(
bind-resources bind-resources
range-skills=`${endpoints.skills || endpoints.get.skills}` range-skills=`${endpoints.skills || endpoints.get.skills}`
@ -14,7 +14,7 @@
label-description='Description*' label-description='Description*'
widget-description='sib-form-textarea' widget-description='sib-form-textarea'
class-skills='form-label is-dark' class-skills='form-label is-dark select-skills'
label-skills='The required skills for this mission:*' label-skills='The required skills for this mission:*'
multiple-skills='sib-multiple-select' multiple-skills='sib-multiple-select'
widget-skills='sib-form-auto-completion' widget-skills='sib-form-auto-completion'

View File

@ -6,11 +6,11 @@ div.content-box__info
template template
label ${label} label ${label}
sib-link(class='backlink', bind-resources, next='project-profile') Back sib-link(class='backlink right', bind-resources, next='project-profile') Back
h1 Edit your project h1 Edit your project
sib-form.block.form-edit( sib-form.form-edit(
bind-resources bind-resources
fields='fieldset-info, block-project__info(customer, name, description), fieldset-fee, block-project__fee(businessProvider, businessProviderFee)' fields='fieldset-info, block-project__info(customer, name, description), fieldset-fee, block-project__fee(businessProvider, businessProviderFee)'

View File

@ -55,7 +55,7 @@ sib-router(default-route='project-profile', hidden)
h2 Customer informations: h2 Customer informations:
sib-display.block( sib-display(
bind-resources bind-resources
fields='customer' fields='customer'