Merge branch 'eclipse-xpanse:main' into main

WangLiNaruto · May 16, 2024 · 372cb30 · 372cb30
2 parents 4cf0446 + 1bddc3e
commit 372cb30
Show file tree

Hide file tree

Showing 55 changed files with 7,217 additions and 16,262 deletions.
diff --git a/.env b/.env
@@ -1,7 +1,7 @@
-REACT_APP_XPANSE_API_URL='http://localhost:8080'
-REACT_APP_ZITADEL_SCOPE='openid profile urn:zitadel:iam:org:projects:roles urn:zitadel:iam:user:metadata'
-REACT_APP_ZITADEL_REDIRECT_URI='/authentication/callback'
-REACT_APP_ZITADEL_SILENT_REDIRECT_URI='/authentication/silent-callback'
-REACT_APP_ZITADEL_AUTHORITY_URL='http://localhost:8081'
-REACT_APP_ZITADEL_CLIENT_ID=''
-REACT_APP_AUTH_USE_SERVICE_WORKER_ONLY=false
+VITE_APP_XPANSE_API_URL='http://localhost:8080'
+VITE_APP_ZITADEL_SCOPE='openid profile urn:zitadel:iam:org:projects:roles urn:zitadel:iam:user:metadata'
+VITE_APP_ZITADEL_REDIRECT_URI='/authentication/callback'
+VITE_APP_ZITADEL_SILENT_REDIRECT_URI='/authentication/silent-callback'
+VITE_APP_ZITADEL_AUTHORITY_URL='http://localhost:8081'
+VITE_APP_ZITADEL_CLIENT_ID=''
+VITE_APP_AUTH_USE_SERVICE_WORKER_ONLY=false
diff --git a/.env.zitadel-testbed b/.env.zitadel-testbed
@@ -1,2 +1,2 @@
-REACT_APP_ZITADEL_AUTHORITY_URL='https://iam.xpanse.site'
-REACT_APP_ZITADEL_CLIENT_ID=221692308037369859@eclipse-xpanse
+VITE_APP_ZITADEL_AUTHORITY_URL='https://iam.xpanse.site'
+VITE_APP_ZITADEL_CLIENT_ID=221692308037369859@eclipse-xpanse
diff --git a/.gitignore b/.gitignore
@@ -14,4 +14,5 @@ node_modules
 .history
 *.db
 build
-*.zip
+*.zip
+dist
diff --git a/.prettierignore b/.prettierignore
@@ -1,2 +1,2 @@
-build
+dist
 public/OidcServiceWorker.js
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -6,7 +6,7 @@ FROM nginx:1.26.0-alpine
 WORKDIR /usr/share/nginx/html
 RUN apk add --no-cache bash envsubst
 COPY docker/nginx-entrypoint.sh /
-COPY build/ /usr/share/nginx/html
+COPY dist/ /usr/share/nginx/html
 COPY docker/nginx.conf /etc/nginx/conf.d/default.conf
 
 EXPOSE 3000

diff --git a/docker/nginx-entrypoint.sh b/docker/nginx-entrypoint.sh
@@ -7,7 +7,7 @@
 # the script reads all available environment vars with names starting with REACT_APP_ and adds them to the
 # inject.js file as a JS object.
 WWW_DIR=/usr/share/nginx/html
-ENV_PREFIX=REACT_APP_
+ENV_PREFIX=VITE_APP_
 INJECT_FILE_PATH="${WWW_DIR}/inject.js"
 rm -f ${INJECT_FILE_PATH}
 echo "window.injectedEnv = {" >> "${INJECT_FILE_PATH}"

diff --git a/public/index.html → index.html b/public/index.html → index.html
@@ -11,11 +11,11 @@
         <meta content="#000000" name="theme-color" />
         <meta content="Xpanse" name="description" />
         <title>xpanse</title>
-        <script src="%PUBLIC_URL%/inject.js"></script>
+        <script src="/inject.js"></script>
     </head>
-
     <body>
         <noscript>You need to enable JavaScript to run this app.</noscript>
         <div id="root"></div>
+        <script type="module" src="src/index.tsx"></script>
     </body>
 </html>
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,4 +14,5 @@ node_modules @@
     .history
     *.db
     build
-    *.zip
+    *.zip
+    dist