Merge branch 'custos-tenant-portal' of https://github.com/apache/aira…

…vata-custos-portal into apachegh-31-ui-improvements

# Conflicts:
#	custos-demo-gateway/src/components/workspace/Agents.vue
#	custos-demo-gateway/src/components/workspace/Groups.vue
#	custos-demo-gateway/src/components/workspace/Logs.vue
#	custos-demo-gateway/src/components/workspace/Secrets.vue
#	custos-demo-gateway/src/components/workspace/Sharing.vue
#	custos-demo-gateway/src/components/workspace/Users.vue
#	custos-demo-gateway/src/components/workspace/Workspace.vue

custos-demo-gateway/.dockerignore

@@ -6,6 +6,7 @@
 .github/*
 README.md
 Dockerfile
+.env
 
 # Artifacts that will be built during image creation.
 # This should contain all files created during `yarn build`.

custos-demo-gateway/.env

@@ -1,3 +1,3 @@
 VUE_APP_CLIENT_ID=""
 VUE_APP_CLIENT_SEC=""
-VUE_APP_REDIRECT_URI="http://localhost:8080/callback"
+VUE_APP_REDIRECT_URI="http://localhost:8080/callback"

custos-demo-gateway/.gitignore

@@ -0,0 +1,23 @@
+.DS_Store
+node_modules
+/dist
+
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

custos-demo-gateway/Dockerfile

@@ -14,6 +14,6 @@ COPY privkey.pem /etc/nginx/privkey.pem
 COPY fullchain.pem /etc/nginx/fullchain.pem
 COPY entrypoint.sh /
 RUN chmod +x /entrypoint.sh
-EXPOSE 443
+EXPOSE 8080
 ENTRYPOINT [ "/entrypoint.sh" ]
 #CMD ["nginx", "-g", "daemon off;"]

custos-demo-gateway/nginx.conf

@@ -8,6 +8,28 @@ server {
     return 301 https://demo.gateway.custos.scigap.org$request_uri;
 }
 
+server {
+    listen 8080;
+
+    root /usr/share/nginx/html;
+
+      index index.html;
+
+      location ~ ^/(css|js)/ {
+        # These assets include a digest in the filename, so they will never change
+        expires max;
+      }
+
+      location ~* ^.+\.(html|htm)$ {
+        # Very short caching time to ensure changes are immediately recognized
+        expires 5m;
+      }
+
+      location / {
+        try_files $uri $uri/ /index.html;
+      }
+}
+
 server {
   listen 443 ssl;
   listen [::]:443 ssl;