Merge branch 'main' into worker-log-level

conda-incubator · Oct 21, 2024 · 04fe23a · 04fe23a
2 parents 71c6410 + d02544b
commit 04fe23a
Show file tree

Hide file tree

Showing 2 changed files with 3,022 additions and 3,021 deletions.
diff --git a/conda-store-server/conda_store_server/_internal/server/templates/conda-store-ui.html b/conda-store-server/conda_store_server/_internal/server/templates/conda-store-ui.html
@@ -25,6 +25,7 @@
              REACT_APP_API_URL: "{{ url_for('get_conda_store_ui') }}",
              REACT_APP_LOGIN_PAGE_URL: "{{ url_for('get_login_method') }}?next=",
              REACT_APP_LOGOUT_PAGE_URL: "{{ url_for('post_logout_method') }}?next=/",
+             REACT_APP_URL_BASENAME: new URL("{{ url_for('get_conda_store_ui') }}").pathname
          };
         </script>
         <script defer src="static/conda-store-ui/main.js"></script>