Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Membership count #446

Closed
wants to merge 3 commits into from
Closed

Membership count #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
947ab15
Update docker-compose for local dev
Mark-Powers May 17, 2024
593adfa
Update sample env
Mark-Powers May 20, 2024
9f419b7
Add membership count and index to users on project page
Mark-Powers Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions .env.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,17 @@ [email protected]
# Trovi
ZENODO_URL=https://sandbox.zenodo.org
ARTIFACT_SHARING_JUPYTERHUB_URL=http://localhost:8001
TROVI_API_BASE_URL=http://chameleon.local:8808

# Allocations
ALLOCATIONS_BALANCE_SERVICE_ROOT_URL=http://allocations_api:8080

# Keycloak realm management
KEYCLOAK_SERVER_URL=https://auth.dev.chameleoncloud.org
KEYCLOAK_SERVER_URL=https://chameleon.local:8080
KEYCLOAK_REALM_NAME=chameleon
# This client is in the Keycloak "master" realm
KEYCLOAK_PORTAL_ADMIN_CLIENT_ID=portal-local-dev-admin
KEYCLOAK_PORTAL_ADMIN_CLIENT_SECRET=
KEYCLOAK_PORTAL_ADMIN_CLIENT_SECRET=portal-local-dev-admin-secret

# these are testing values, that will not work for production traffic
RECAPTCHA_PUBLIC_KEY=6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI
Expand All @@ -88,13 +89,13 @@ SSO_CALLBACK_VALID_HOSTS=['dev.tacc.chameleoncloud.org','dev.uc.chameleoncloud.o
# Federated SSO
# This client is in the Keycloak "chameleon" realm
OIDC_RP_CLIENT_ID=portal-local-dev
OIDC_RP_CLIENT_SECRET=
OIDC_RP_CLIENT_SECRET=portal-local-dev-secret
OIDC_RP_SIGN_ALGO=RS256
OIDC_OP_JWKS_ENDPOINT=https://auth.dev.chameleoncloud.org/auth/realms/chameleon/protocol/openid-connect/certs
OIDC_OP_AUTHORIZATION_ENDPOINT=https://auth.dev.chameleoncloud.org/auth/realms/chameleon/protocol/openid-connect/auth
OIDC_OP_TOKEN_ENDPOINT=https://auth.dev.chameleoncloud.org/auth/realms/chameleon/protocol/openid-connect/token
OIDC_OP_USER_ENDPOINT=https://auth.dev.chameleoncloud.org/auth/realms/chameleon/protocol/openid-connect/userinfo
LOGOUT_REDIRECT_URL=https://auth.dev.chameleoncloud.org/auth/realms/chameleon/protocol/openid-connect/logout?client_id=portal-local-dev-admin&redirect_uri=https%3A%2F%2Fauth.dev.chameleoncloud.org%2Fauth%2Frealms%2Fchameleon%2Fpost-logout%3Fclient_id%3Dportal-local-dev-admin
OIDC_OP_JWKS_ENDPOINT=https://chameleon.local:8080/auth/realms/chameleon/protocol/openid-connect/certs
OIDC_OP_AUTHORIZATION_ENDPOINT=https://chameleon.local:8080/auth/realms/chameleon/protocol/openid-connect/auth
OIDC_OP_TOKEN_ENDPOINT=https://chameleon.local:8080/auth/realms/chameleon/protocol/openid-connect/token
OIDC_OP_USER_ENDPOINT=https://chameleon.local:8080/auth/realms/chameleon/protocol/openid-connect/userinfo
LOGOUT_REDIRECT_URL=https://chameleon.local:8080/auth/realms/chameleon/protocol/openid-connect/logout?client_id=portal-local-dev-admin&redirect_uri=https%3A%2F%2Fchameleon.local:8080%2Fauth%2Frealms%2Fchameleon%2Fpost-logout%3Fclient_id%3Dportal-local-dev-admin

# Publication APIs
SEMANTIC_SCHOLAR_API_KEY=
Expand All @@ -107,4 +108,5 @@ EDGE_OS_IDENTITY_API_VERSION=3
EDGE_OS_REGION_NAME="CHI@Edge"
EDGE_OS_INTERFACE=public
EDGE_OS_APPLICATION_CREDENTIAL_ID=<grab this from chi@edge keystone>
EDGE_OS_APPLICATION_CREDENTIAL_SECRET=<grab this from chi@edge keystone>
EDGE_OS_APPLICATION_CREDENTIAL_SECRET=<grab this from chi@edge keystone>
REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
12 changes: 6 additions & 6 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ services:
- ./media:/media
- static:/static
ports:
- "127.0.0.1:8890:${PORTAL_PORT}"
- "8890:${PORTAL_PORT}"
entrypoint: ["python3", "manage.py"]
command: ["runserver", "0.0.0.0:${PORTAL_PORT}"]
depends_on:
- mysql
referenceapi:
image: docker.chameleoncloud.org/referenceapi:latest
ports:
- "127.0.0.1:8891:8000"
- "8891:8000"
mysql:
image: mariadb:10
volumes:
Expand All @@ -39,11 +39,11 @@ services:
MYSQL_USER: ${DB_USER}
MYSQL_PASSWORD: ${DB_PASSWORD}
ports:
- "127.0.0.1:3306:3306"
- "3306:3306"
phpmyadmin:
image: phpmyadmin/phpmyadmin
ports:
- "127.0.0.1:8889:80"
- "8889:80"
environment:
- PMA_HOST=mysql
- PMA_PORT=3306
Expand Down Expand Up @@ -71,12 +71,12 @@ services:
volumes:
- .:/project
ports:
- "127.0.0.1:9000:9000"
- "9000:9000"
mail:
image: mailhog/mailhog:latest
restart: always
ports:
- "127.0.0.1:8025:8025"
- "8025:8025"

volumes:
static:
13 changes: 9 additions & 4 deletions projects/templates/projects/view_project.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,19 +156,24 @@ <h3>Project Members</h3>
{% endif %}

<br>

<h4>{{ users | length }} users{% if invitations %}, {{ invitations | length }} pending invitations{% endif %}{% if join_requests %}, {{ join_requests | length }} requests{% endif %}</h4>

<br>

{% for u in users %}
<div class="panel panel-default" style="background-color: transparent">
<div class="panel-heading" style="background-color: #d9edf7;">
<div class="row" align="center">
<div class="col-xs-4 col-sm-4">
<div class="col-xs-1 col-sm-1">#{{ forloop.counter }}</div>
<div class="col-xs-3 col-sm-3">
{{ u.username }}
</div>
<div class="col-xs-4 col-sm-4">
{{ u.first_name }}, {{ u.last_name }}
<div class="col-xs-3 col-sm-3">
{{ u.username }}
</div>
<div class="col-xs-2 col-sm-2">
<div class="col-xs-3 col-sm-3">
{{ u.first_name }}, {{ u.last_name }}
</div>
<div class="col-xs-2 col-sm-2">
{% if u.username == request.user.username or can_manage_project_membership %}
Expand Down
Loading