diff --git a/plugins/docker/tenant-proxy.conf.template b/plugins/docker/tenant-proxy.conf.template index 6db283107..175dd6568 100644 --- a/plugins/docker/tenant-proxy.conf.template +++ b/plugins/docker/tenant-proxy.conf.template @@ -68,6 +68,43 @@ server { } } + location ~ ^/multitenancy/reservations$ { + proxy_set_header X-API-KEY ${ACAPY_ADMIN_URL_API_KEY}; + proxy_pass ${ACAPY_ADMIN_URL}; + allow all; + + proxy_set_header Proxy ''; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + + proxy_hide_header Access-Control-Allow-Origin; + proxy_hide_header Access-Control-Allow-Credentials; + + set $CORS_CREDS true; + set $CORS_ORIGIN $http_origin; + set $CORS_PREFLIGHT_CACHE_AGE 600; + + if ($request_method = 'OPTIONS') { + add_header Access-Control-Allow-Origin $CORS_ORIGIN; + add_header Access-Control-Allow-Methods $http_access_control_request_methods; + add_header Access-Control-Allow-Headers $http_access_control_request_headers; + add_header Access-Control-Allow-Credentials $CORS_CREDS; + + add_header Access-Control-Max-Age $CORS_PREFLIGHT_CACHE_AGE; + add_header Content-Type 'text/plain; charset=utf-8'; + add_header Content-Length 0; + return 204; + } + if ($request_method != 'OPTIONS') { + add_header Access-Control-Allow-Origin $CORS_ORIGIN; + add_header Access-Control-Allow-Methods $http_access_control_request_methods; + add_header Access-Control-Allow-Headers $http_access_control_request_headers; + add_header Access-Control-Allow-Credentials $CORS_CREDS; + } + } + location ~ ^/status/(live|ready)$ { proxy_set_header X-API-KEY ${ACAPY_ADMIN_URL_API_KEY}; proxy_pass ${ACAPY_ADMIN_URL}; diff --git a/services/tenant-ui/frontend/src/assets/style.scss b/services/tenant-ui/frontend/src/assets/style.scss index c5fec5aab..8d8020693 100644 --- a/services/tenant-ui/frontend/src/assets/style.scss +++ b/services/tenant-ui/frontend/src/assets/style.scss @@ -4,3 +4,34 @@ @import 'tenantuiComponents.scss'; @import 'primevueComponents.scss'; @import 'toast.scss'; + +// General HTML +html, +body, +#app { + height: 100vh; + padding: 0; + margin: 0; +} + +:root { + font-family: Inter, Avenir, Helvetica, Arial, sans-serif; + font-size: 14px; + line-height: 24px; + font-weight: 400; + + font-synthesis: none; + text-rendering: optimizeLegibility; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + -webkit-text-size-adjust: 100%; +} + +h1 { + font-size: 3.2em; + line-height: 1.1; +} + +a { + color: $tenant-ui-link-color; +} diff --git a/services/tenant-ui/frontend/src/components/Login.vue b/services/tenant-ui/frontend/src/components/Login.vue index 9e4491f6d..55d27b7ee 100644 --- a/services/tenant-ui/frontend/src/components/Login.vue +++ b/services/tenant-ui/frontend/src/components/Login.vue @@ -11,8 +11,31 @@ /> -
+ Don't have an account? + Create Request! +
+