Merge pull request #17 from osakunta/next-site

updates CI for next-site branch
osakunta · Aug 6, 2024 · 577b530 · 577b530
2 parents 4ea2239 + cedcda1
commit 577b530
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml
@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v3
       - run: npm install && npm run lint && npm run test && npm run build
         env:
-          NEXT_PUBLIC_DIRECTUS_URL: ${{ secrets.CMS_URL }}
+          DIRECTUS_URL: ${{ secrets.CMS_URL }}
 
       - uses: FirebaseExtended/action-hosting-deploy@v0
         id: firebase

diff --git a/lib/fetchNavData.test.ts b/lib/fetchNavData.test.ts
@@ -20,15 +20,12 @@ describe("fetchNavData", () => {
     const result = await fetchNavData();
     expect(result).toEqual(mockData);
     expect(fetch).toHaveBeenCalledTimes(1);
-    expect(fetch).toHaveBeenCalledWith(
-      `${process.env.NEXT_PUBLIC_DIRECTUS_URL}items/Nav`,
-      {
-        method: "GET",
-        headers: {
-          "Content-Type": "application/json",
-        },
+    expect(fetch).toHaveBeenCalledWith(`${process.env.DIRECTUS_URL}items/Nav`, {
+      method: "GET",
+      headers: {
+        "Content-Type": "application/json",
       },
-    );
+    });
   });
 
   it("should return an empty data object when the fetch response is not ok", async () => {

diff --git a/lib/fetchNavData.ts b/lib/fetchNavData.ts
@@ -1,6 +1,6 @@
 export async function fetchNavData() {
   const collectionName: string = "Nav";
-  const url = `${process.env.NEXT_PUBLIC_DIRECTUS_URL}items/${collectionName}`;
+  const url = `${process.env.DIRECTUS_URL}items/${collectionName}`;
   const headers = {
     "Content-Type": "application/json",
   };

diff --git a/pages/nation-info.tsx b/pages/nation-info.tsx
@@ -15,7 +15,7 @@ export default function NationInfo({ navData }: NavProps) {
   return (
     <>
       <Navbar navData={navData} />
-      <p>hi</p>
+      <p>hi!</p>
     </>
   );
 }