diff --git a/docker/production/nginx/default.conf b/docker/production/nginx/default.conf index 82e03d05..23c029ab 100644 --- a/docker/production/nginx/default.conf +++ b/docker/production/nginx/default.conf @@ -1,10 +1,11 @@ server { - listen 80; - server_name zappyzep.xyz; + listen 80 default_server; + server_name _; # Using a variable here stops nginx from crashing if the dev container is restarted or becomes otherwise unavailable set $backend_upstream "http://api:3001"; set $dashboard_upstream "http://dashboard:3002"; + set $newdashboard_upstream "http://revampdashboard:3000"; location / { # Using a variable in proxy_pass also requires resolver to be set. @@ -12,6 +13,11 @@ server { resolver 127.0.0.11; proxy_pass $dashboard_upstream$uri$is_args$args; } + + location /new { + resolver 127.0.0.11; + proxy_pass $newdashboard_upstream$uri$is_args$args; + } location /api { resolver 127.0.0.11; @@ -21,15 +27,3 @@ server { client_max_body_size 200M; } } - -server { - listen 80; - server_name new.zappyzep.xyz; - - set $dashboard_upstream "http://revampdashboard:3000"; - - location / { - resolver 127.0.0.11; - proxy_pass $dashboard_upstream$uri$is_args$args; - } -} diff --git a/revampdashboard/e2e/demo.test.ts b/revampdashboard/e2e/demo.test.ts index 4e8ffccd..ccbd64d2 100644 --- a/revampdashboard/e2e/demo.test.ts +++ b/revampdashboard/e2e/demo.test.ts @@ -1,6 +1,6 @@ import { expect, test } from "@playwright/test"; test("home page has expected h1", async ({ page }) => { - await page.goto("/"); + await page.goto("/new"); await expect(page.locator("h1")).toBeVisible(); }); diff --git a/revampdashboard/src/app.css b/revampdashboard/src/app.css index 6c8f99f2..a31e4441 100644 --- a/revampdashboard/src/app.css +++ b/revampdashboard/src/app.css @@ -1,3 +1,3 @@ @import 'tailwindcss/base'; @import 'tailwindcss/components'; -@import 'tailwindcss/utilities' +@import 'tailwindcss/utilities'; diff --git a/revampdashboard/src/routes/+layout.svelte b/revampdashboard/src/routes/new/+layout.svelte similarity index 100% rename from revampdashboard/src/routes/+layout.svelte rename to revampdashboard/src/routes/new/+layout.svelte diff --git a/revampdashboard/src/routes/+page.svelte b/revampdashboard/src/routes/new/+page.svelte similarity index 100% rename from revampdashboard/src/routes/+page.svelte rename to revampdashboard/src/routes/new/+page.svelte