Skip to content

Commit 780509a

Browse files
Modify application url to root (#250)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent 5aa8526 commit 780509a

File tree

10 files changed

+16
-45
lines changed

10 files changed

+16
-45
lines changed

.github/workflows/ci.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
run: docker compose -f ./docker-compose-e2e.yaml up -d
8888
- name: Poll until Query Connector is ready
8989
run: |
90-
until curl -s http://localhost:3000/query-connector; do
90+
until curl -s http://localhost:3000/; do
9191
echo "Waiting for Query Connector to be ready before running Playwright..."
9292
sleep 5
9393
done

.github/workflows/ecs_terraform.yaml

+6-1
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,9 @@ jobs:
8585
-var "ersd_api_key=${ERSD_API_KEY}" \
8686
-var "qc_tls_key=${TLS_KEY}" \
8787
-var "qc_tls_cert=${TLS_CERT}"
88-
terraform apply -auto-approve -replace="module.ecs.dockerless_remote_image.dibbs"
88+
terraform apply -auto-approve -replace="module.ecs.dockerless_remote_image.dibbs[\"query-connector\"]" \
89+
-var-file="$WORKSPACE.tfvars" \
90+
-var "umls_api_key=${UMLS_API_KEY}" \
91+
-var "ersd_api_key=${ERSD_API_KEY}" \
92+
-var "qc_tls_key=${TLS_KEY}" \
93+
-var "qc_tls_cert=${TLS_CERT}"

query-connector/design-review/design-review.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,15 @@ git checkout $BRANCH_NAME
6565
docker-compose build --no-cache && docker-compose up -d
6666

6767
# Wait for TEFCA Viewer to be available
68-
URL="http://localhost:3000/query-connector"
68+
URL="http://localhost:3000/"
6969
while ! curl -s -o /dev/null -w "%{http_code}" "$URL" | grep -q "200"; do
7070
echo "Waiting for $URL to be available..."
7171
sleep 5
7272
done
7373

7474

7575
# Open in default browser
76-
open http://localhost:3000/query-connector
76+
open http://localhost:3000/
7777

7878
# Prompt to end review session
7979
read -p "Press enter to end review"

query-connector/next.config.js

+2-9
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,9 @@ const nextConfig = {
88
],
99
},
1010
transpilePackages: ["yaml"],
11-
async rewrites() {
12-
return [
13-
{
14-
source: "/query-connector/:slug*",
15-
destination: "/:slug*",
16-
},
17-
];
18-
},
11+
1912
output: "standalone",
20-
basePath: process.env.NODE_ENV === "production" ? "/query-connector" : "",
13+
basePath: "",
2114
};
2215

2316
module.exports = nextConfig;

query-connector/playwright-setup.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
export const TEST_URL =
2-
process.env.TEST_ENV ?? "http://localhost:3000/query-connector";
1+
export const TEST_URL = process.env.TEST_ENV ?? "http://localhost:3000/";
32
/**
43
*
54
*/

query-connector/src/app/middleware.js

-26
This file was deleted.

query-connector/src/app/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export default function LandingPage() {
3333
</div>
3434
<Image
3535
alt="Graphic illustrating what TEFCA is"
36-
src="/query-connector/tefca-graphic.svg"
36+
src="/tefca-graphic.svg"
3737
width={250}
3838
height={300}
3939
priority

query-connector/src/app/query/components/footer/footer.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export default function FooterComponent() {
1111
<footer className={classNames("usa-footer", styles.footerContainer)}>
1212
<div className={styles.cdcLogoContainer}>
1313
<Image
14-
src="/query-connector/CDC_logo.png"
14+
src="/CDC_logo.png"
1515
alt="CDC logo"
1616
width={62}
1717
height={36}

query-connector/src/app/query/components/header/header.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export default function HeaderComponent() {
4747
setShowMenu(!showMenu);
4848
};
4949
const isProduction = process.env.NODE_ENV === "production";
50-
const backLink = isProduction ? "/query-connector" : "/";
50+
const backLink = "/";
5151

5252
return (
5353
<div className={styles.headerContainer}>

query-connector/src/app/signin/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export default function SigninPage() {
5959
<Image
6060
alt="Graphic illustrating what TEFCA is"
6161
className={styles.image}
62-
src="/query-connector/tefca-graphic.svg"
62+
src="/tefca-graphic.svg"
6363
width={474}
6464
height={438}
6565
priority

0 commit comments

Comments
 (0)