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

Merge branch 'feature/user-admin' into 'release/profile-directory'

Browse Source 
Feature/user admin

See merge request applications/sib-app!129
This commit is contained in:
Jean-Baptiste Pasquier 2020-04-13 17:02:51 +00:00
commit df66f7f107
7 changed files with 168 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fonts/custom-icons.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 146 KiB

After

Width:  |  Height:  |  Size: 148 KiB

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>
Side by Side

After

Width:  |  Height:  |  Size: 8.2 KiB

2
src/page-admin.pug
View File

@ -14,7 +14,7 @@ nav.jsRightMenu(role='navigation')
li.jsOffsiteToggle
a Fold menu
if (endpoints.users || (endpoints.get && endpoints.get.users))
sib-route(name='admin-users')
sib-route.active-color(name='admin-users')
li
a Users
if endpoints.circles || (endpoints.get && endpoints.get.circles)

24
src/styles/base/table.scss
View File

@ -88,18 +88,18 @@
}
}
.cell-with-groups {
align-items: center;
display: flex;
justify-content: center;
}
.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;
@ -134,18 +134,6 @@
}
}
.cell-with-groups {
align-items: center;
display: flex;
justify-content: center;
>div {
display: flex;
justify-content: space-evenly;
width: 100%;
}
}
sib-ac-checker {
align-items: center;
display: flex;

2
src/styles/components/icons/custom-icons.scss
View File

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

30
src/styles/components/sidebar.scss
View File

@ -68,12 +68,6 @@
>sib-route {
&[active] {
background-color: $color-233-18-29;
color: $color-46-100-67;
display: inline-block;
}
&[name*='circle'],
&[name*='project'] {
@ -109,8 +103,16 @@
@include ci('file');
}
&[name='admin-users']>li {
@include ci('drawing');
&[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 {
@ -120,6 +122,18 @@
&[name='admin-projects']>li {
@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;
}
}
}
}
}

3
src/views/admin/page-admin-circles-create.pug
View File

@ -8,9 +8,6 @@ div.content-box__info
fields='name, description'
label-name='Name *'
label-description='Description *'
class-name='form-label is-light is-full-width'
class-description='form-label is-light is-full-width'