diff --git a/src/index.pug b/src/index.pug
index cf0f8d030ff4de86a6e3065ca315d6702077db1e..302da84cd9647ce55feea716495ee7beba25a524 100644
--- a/src/index.pug
+++ b/src/index.pug
@@ -35,6 +35,9 @@ html(lang="en")
#circle(hidden).with-sidebar
include page-circle.pug
+ #circle-admin(hidden).no-sidebar
+ include page-circle-admin.pug
+
#messages(hidden).with-sidebar
include page-messages.pug
diff --git a/src/menu-left.pug b/src/menu-left.pug
index 121347336232ef9b57f004d2bd0a84539d597032..b40adb44c9737fb1a46aa99a991d73d3127fc3fc 100644
--- a/src/menu-left.pug
+++ b/src/menu-left.pug
@@ -82,6 +82,7 @@ nav#main__menu
next='messages'
)
+ sib-route(hidden, name='circle-admin', use-id='')
//- div.divider
//- sib-route.menu(hidden, name='my-profile', rdf-type='foaf:user', use-id='')
diff --git a/src/page-circle-admin.pug b/src/page-circle-admin.pug
new file mode 100644
index 0000000000000000000000000000000000000000..2731be53ff7d3196de2e24d9d2d78fb4cd7e88d9
--- /dev/null
+++ b/src/page-circle-admin.pug
@@ -0,0 +1,44 @@
+sib-widget(name='circle-admin-leave-button-template')
+ template
+ sib-ac-checker(
+ permission="acl:Delete"
+ data-src="${await value['@id']}"
+ )
+ sib-delete(
+ data-src="${await value['@id']}"
+ data-label='Leave the circle'
+ )
+
+sib-widget(name='circle-admin-join-button-template')
+ template
+ sib-form.circle-admin-join-button(
+ data-src='${src}'
+ nested-field='members'
+ fields='user'
+ widget-user='sib-form-dropdown'
+ label-user=''
+ range-user=`${endpoints.users}`
+ submit-button='Join'
+ set-user-id-select="user"
+ )
+
+h1 Circles
+
+div
+ //- Search a circle
+
+div.table-header
+ div.cell Name
+ div.cell Admins
+ div.cell Join
+
+sib-display.table-body(
+ data-src=`${endpoints.circles}`
+ fields="name,own(owner.name,owner.account['@id']),members,button"
+
+ widget-members='circle-admin-leave-button-template'
+ multiple-members
+
+ widget-button='circle-admin-join-button-template'
+ action-button='button'
+)
\ No newline at end of file
diff --git a/src/page-user-panel.pug b/src/page-user-panel.pug
index d3491ace8ecc6002a5221467f11f986920ccaec9..76e1a32c6412ca3a361890f325840d68c3906082 100644
--- a/src/page-user-panel.pug
+++ b/src/page-user-panel.pug
@@ -4,6 +4,6 @@ nav(role="user's functionalities menu")
//- sib-link(next='my-profile') My profile
//-li
sib-link(next='user-settings') Settings
- //-li
- sib-link(name='user-admin') Admin
+ li
+ sib-link(next='circle-admin') Admin
button(role='log out' onclick="document.querySelector('sib-auth').logout();") Log out
diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss
index 4a127933fa2df8e9e9cb0e377a894b5ff87f51bb..b4e3ce1917c2f209ff37cda3db6359b68d04c8a2 100644
--- a/src/styles/base/main.scss
+++ b/src/styles/base/main.scss
@@ -260,4 +260,5 @@ sib-delete {
// Other base components
@import 'form';
@import 'header';
-@import 'menu-left';
\ No newline at end of file
+@import 'menu-left';
+@import 'user-avatar';
\ No newline at end of file
diff --git a/src/styles/base/user-avatar.scss b/src/styles/base/user-avatar.scss
new file mode 100644
index 0000000000000000000000000000000000000000..0c93093715ae313f2ed42c9ec463ef4a05d64f72
--- /dev/null
+++ b/src/styles/base/user-avatar.scss
@@ -0,0 +1,29 @@
+.project-profile-user-avatar {
+ align-self: center;
+ grid-column: 1 / span 1;
+ grid-row: 1 / span 2;
+ display: inline;
+
+ * {
+ height: 100%;
+ width: 100%;
+ }
+
+ div {
+ background-color: $color-0-0-100;
+ border-radius: 50%;
+ height: 7vh;
+ overflow: hidden;
+ position: relative;
+ width: 7vh;
+
+ img {
+ height: 100%;
+ left: 0;
+ object-fit: cover;
+ position: absolute;
+ top: 0;
+ width: 100%;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/styles/layout/circle/_index.scss b/src/styles/layout/circle/_index.scss
index 6efac3d0d23ebbb29c4cdaefc79d23d111b04107..350cfc1f90c5e234619642ebf5b1c500a770732b 100644
--- a/src/styles/layout/circle/_index.scss
+++ b/src/styles/layout/circle/_index.scss
@@ -1,2 +1,3 @@
@import 'circle-profile';
-@import 'circle-edit';
\ No newline at end of file
+@import 'circle-edit';
+@import 'circle-admin';
\ No newline at end of file
diff --git a/src/styles/layout/circle/circle-admin.scss b/src/styles/layout/circle/circle-admin.scss
new file mode 100644
index 0000000000000000000000000000000000000000..04813c0c20357129fce2979826dcd586d08aab7e
--- /dev/null
+++ b/src/styles/layout/circle/circle-admin.scss
@@ -0,0 +1,3 @@
+.circle-admin-join-button select[name='user'] {
+ display: none;
+}
\ No newline at end of file
diff --git a/src/styles/layout/circle/circle-edit.scss b/src/styles/layout/circle/circle-edit.scss
index 547e39916465003ef38b6a056364c668dd073e02..f5812cf295661d17d3c99bc039006616329eac7d 100644
--- a/src/styles/layout/circle/circle-edit.scss
+++ b/src/styles/layout/circle/circle-edit.scss
@@ -13,11 +13,22 @@ h2 {
justify-content: space-around;
text-align: center;
- >*{
- border-right: 1px solid $color-228-25-79;
+ .cell {
+ border-bottom: none;
+ border-top: none;
flex: 1;
padding: 1rem;
width: 50%;
+
+ &:not(:last-child) {
+ border-left: none;
+ border-right: 1px solid white;
+ }
+
+ &:not(:last-child) {
+ border-left: 1px solid white;
+ border-right: none;
+ }
}
>*:last-of-type {
diff --git a/src/styles/layout/project-profile/project-profile.scss b/src/styles/layout/project-profile/project-profile.scss
index 1a8b0f25d7f520c9dfd6f8e96c02806a09d3bb87..ae54b38ab25dec46f67103f4ec4667ccdc37bfd1 100644
--- a/src/styles/layout/project-profile/project-profile.scss
+++ b/src/styles/layout/project-profile/project-profile.scss
@@ -169,30 +169,6 @@
display: none;
}
- sib-display.project-profile-user-avatar {
- align-self: center;
- grid-column: 1 / span 1;
- grid-row: 1 / span 2;
-
- div {
- background-color: $color-0-0-100;
- border-radius: 50%;
- height: 7vh;
- overflow: hidden;
- position: relative;
- width: 7vh;
-
- img {
- height: 100%;
- left: 0;
- object-fit: cover;
- position: absolute;
- top: 0;
- width: 100%;
- }
- }
- }
-
team-template[name='members'], captain-template[name='captain'] {
display: grid;
grid-column-gap: 1.6rem;
@@ -231,13 +207,4 @@
}
}
}
-
- .project-profile-user-avatar {
- display: inline;
-
- * {
- height: 100%;
- width: 100%;
- }
- }
}
\ No newline at end of file