Merge pull request #59 from moleculemaker/feature/switch-to-new-backend

feat: integrate molli-frontend + mmli-backend
moleculemaker · Oct 7, 2024 · 34314a4 · 34314a4
2 parents 05c9253 + ac99085
commit 34314a4
Show file tree

Hide file tree

Showing 59 changed files with 5,145 additions and 127 deletions.
diff --git a/chart/values.prod.yaml b/chart/values.prod.yaml
@@ -10,9 +10,9 @@ ingress:
     traefik.ingress.kubernetes.io/router.middlewares: "alphasynthesis-molli-prod-domain-redirect@kubernetescrd"
 
 config:
-  hostname: "https://jobmgr.platform.moleculemaker.org"
+  hostname: "https://mmli.fastapi.mmli1.ncsa.illinois.edu"
+  basePath: ""
   mmliHostname: "https://mmli.fastapi.mmli1.ncsa.illinois.edu"
-  basePath: "api/v1"
   signInUrl: "https://auth.platform.moleculemaker.org/oauth2/start?rd=https%3A%2F%2Fmolli.platform.moleculemaker.org%2Fconfiguration"
   signOutUrl: "https://auth.platform.moleculemaker.org/oauth2/sign_out?rd=https%3A%2F%2Fmolli.platform.moleculemaker.org%2Fconfiguration"
   userInfoUrl: "https://auth.platform.moleculemaker.org/oauth2/userinfo"

diff --git a/chart/values.staging.yaml b/chart/values.staging.yaml
@@ -10,9 +10,9 @@ controller:
   image: moleculemaker/molli-frontend:staging
 
 config:
-  hostname: "https://jobmgr.staging.mmli1.ncsa.illinois.edu"
+  hostname: "https://mmli.fastapi.staging.mmli1.ncsa.illinois.edu"
+  basePath: ""
   mmliHostname: "https://mmli.fastapi.staging.mmli1.ncsa.illinois.edu"
-  basePath: "api/v1"
   signInUrl: "https://mmli1.ncsa.illinois.edu/oauth2/start?rd=https%3A%2F%2Fmolli.frontend.staging.mmli1.ncsa.illinois.edu%2Fconfiguration"
   signOutUrl: "https://mmli1.ncsa.illinois.edu/oauth2/sign_out?rd=https%3A%2F%2Fmolli.frontend.staging.mmli1.ncsa.illinois.edu%2Fconfiguration"
   userInfoUrl: "https://mmli1.ncsa.illinois.edu/oauth2/userinfo"
diff --git a/openapi/mmli-backend.openapi.json b/openapi/mmli-backend.openapi.json
diff --git a/openapitools.json b/openapitools.json
@@ -0,0 +1,7 @@
+{
+  "$schema": "./node_modules/@openapitools/openapi-generator-cli/config.schema.json",
+  "spaces": 2,
+  "generator-cli": {
+    "version": "7.5.0"
+  }
+}