diff --git a/.changeset/light-impalas-cough.md b/.changeset/light-impalas-cough.md new file mode 100644 index 0000000000..a845151cc8 --- /dev/null +++ b/.changeset/light-impalas-cough.md @@ -0,0 +1,2 @@ +--- +--- diff --git a/conductor.json b/conductor.json index ac7b82ac50..dd39eaa4c1 100644 --- a/conductor.json +++ b/conductor.json @@ -1,7 +1,7 @@ { "copyFiles": [ { - "from": "../../.env", + "from": "../../.env.local", "to": ".env.local", "append": true } diff --git a/docker-compose.yml b/docker-compose.yml index 8349a1994d..dabaebfec1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,6 +26,8 @@ services: - PORT=8080 - DATABASE_URL=postgresql://adcp:localdev@postgres:5432/adcp_registry - RUN_MIGRATIONS=true + # WARNING: Only for local development - DO NOT use in production + - ALLOW_INSECURE_COOKIES=true depends_on: postgres: condition: service_healthy diff --git a/server/public/admin-members.html b/server/public/admin-members.html index aa51a5f661..edb0c0fe2c 100644 --- a/server/public/admin-members.html +++ b/server/public/admin-members.html @@ -230,6 +230,71 @@ .payment-amount.negative { color: #c33; } + .btn-danger { + background: #dc3545; + color: white; + border: 1px solid #dc3545; + } + .btn-danger:hover { + background: #c82333; + border-color: #bd2130; + } + .btn-danger:disabled { + background: #e4606d; + border-color: #e4606d; + cursor: not-allowed; + } + .delete-warning { + background: #fff3cd; + border: 1px solid #ffc107; + border-radius: 6px; + padding: 15px; + margin-bottom: 20px; + } + .delete-warning h4 { + color: #856404; + margin-bottom: 10px; + } + .delete-warning p { + color: #856404; + margin-bottom: 0; + } + .delete-error { + background: #f8d7da; + border: 1px solid #f5c6cb; + border-radius: 6px; + padding: 15px; + margin-bottom: 20px; + color: #721c24; + } + .confirm-input { + width: 100%; + padding: 10px; + border: 1px solid #e0e0e0; + border-radius: 6px; + font-size: 14px; + margin-top: 10px; + margin-bottom: 10px; + } + .confirm-input:focus { + outline: none; + border-color: #dc3545; + } + .workspace-name-highlight { + font-weight: bold; + background: #f8f9fa; + padding: 2px 6px; + border-radius: 4px; + font-family: monospace; + } + .modal-actions { + display: flex; + gap: 10px; + justify-content: flex-end; + margin-top: 20px; + padding-top: 20px; + border-top: 1px solid #e0e0e0; + }
@@ -328,6 +393,33 @@