diff --git a/Makefile b/Makefile index d377bd1d..51b2e992 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ CR_LAUNCHPAD_IMAGE_URI := us-docker.pkg.dev/$(GCP_DEV_PROJECT_ID)/gcr-io/$(CR CR_ADMIN_SERVICE_NAME := admin-console CR_ADMIN_REGION := us-central1 -CR_ADMIN_IMAGE_URI := us-docker.pkg.dev/$(GCP_PROJECT_ID)/gcr-io/$(CR_ADMIN_SERVICE_NAME) +CR_ADMIN_IMAGE_URI = us-docker.pkg.dev/$(GCP_PROJECT_ID)/gcr-io/$(CR_ADMIN_SERVICE_NAME) # --- Environment Detection --- ENV ?= dev diff --git a/admin-web/Dockerfile b/admin-web/Dockerfile index 2b46ff02..f6dbb595 100644 --- a/admin-web/Dockerfile +++ b/admin-web/Dockerfile @@ -19,17 +19,8 @@ FROM nginx:alpine # Copy the built files from the build stage COPY --from=build /app/dist /usr/share/nginx/html -# Copy our custom Nginx configuration -# This config is for a Single Page Application (SPA) and listens on port 8080 for Cloud Run -RUN echo 'server { - listen 8080; - server_name _; - root /usr/share/nginx/html; - index index.html; - location / { - try_files $uri $uri/ /index.html; - } -}' > /etc/nginx/conf.d/default.conf +# Copy the custom Nginx configuration +COPY nginx.conf /etc/nginx/conf.d/default.conf # Expose the port Nginx is listening on EXPOSE 8080 diff --git a/admin-web/favicon.svg b/admin-web/favicon.svg new file mode 100644 index 00000000..cbeedbc2 --- /dev/null +++ b/admin-web/favicon.svg @@ -0,0 +1,18 @@ + + + + + + + diff --git a/admin-web/index.html b/admin-web/index.html index 5b76f9be..8204a736 100644 --- a/admin-web/index.html +++ b/admin-web/index.html @@ -2,9 +2,9 @@ - + - admin-web + KROW Admin Console
diff --git a/admin-web/logo.svg b/admin-web/logo.svg new file mode 100644 index 00000000..cbeedbc2 --- /dev/null +++ b/admin-web/logo.svg @@ -0,0 +1,18 @@ + + + + + + + diff --git a/admin-web/nginx.conf b/admin-web/nginx.conf new file mode 100644 index 00000000..54fca980 --- /dev/null +++ b/admin-web/nginx.conf @@ -0,0 +1,13 @@ +server { + listen 8080; + server_name _; + + root /usr/share/nginx/html; + index index.html; + + location / { + # First attempt to serve request as file, then + # as directory, then fall back to displaying a 404. + try_files $uri $uri/ /index.html; + } +} diff --git a/admin-web/src/pages/Layout.jsx b/admin-web/src/pages/Layout.jsx index 66cf283a..d98a0d96 100644 --- a/admin-web/src/pages/Layout.jsx +++ b/admin-web/src/pages/Layout.jsx @@ -19,8 +19,22 @@ export default function Layout({ children }) {
{/* Sidebar header */}
- - Krow Admin +
+
+ Krow Logo +
+
+

KROW

+

Admin Console

+
+
+ {import.meta.env.VITE_APP_ENV && ( + + {import.meta.env.VITE_APP_ENV === 'staging' ? 'Staging' : 'Dev'} + + )}
{/* Sidebar content */}
diff --git a/firebase/internal-launchpad/index.html b/firebase/internal-launchpad/index.html index 91404173..dbf1fe78 100644 --- a/firebase/internal-launchpad/index.html +++ b/firebase/internal-launchpad/index.html @@ -106,7 +106,7 @@

KROW

-

Workforce Platform

+

Launchpad