Merge pull request #23 from tminaorg/fixing-bun

feat: Finally adressed cors error bug and other fixes
hearchco · Nov 4, 2023 · 035a745 · 035a745
2 parents 82c92a2 + 0e87fbf
commit 035a745
Show file tree

Hide file tree

Showing 14 changed files with 2,328 additions and 3,199 deletions.
diff --git a/.env.example b/.env.example
@@ -1,2 +1,3 @@
-PRIVATE_API_URL=http://localhost:3030 # server reachable
+ORIGIN=http://localhost:5173 # this server
+API_URL=http://localhost:3030 # server reachable
 PUBLIC_API_URL=http://localhost:3030 # client reachable
diff --git a/.github/workflows/dockerci.yml b/.github/workflows/dockerci.yml
@@ -18,12 +18,15 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      # install deps (using npm until bun fixes bug for static assets)
+      # install deps (using pnpm until bun fixes bug for static assets)
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 8
       - uses: actions/setup-node@v4
         with:
           node-version: lts/*
-          cache: 'npm'
-      - run: npm ci 
+          cache: 'pnpm'
+      - run: pnpm install
 
       # build project
       - uses: oven-sh/setup-bun@v1

diff --git a/.github/workflows/dockerflycd.yml b/.github/workflows/dockerflycd.yml
@@ -18,12 +18,15 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      # install deps (using npm until bun fixes bug for static assets)
+      # install deps (using pnpm until bun fixes bug for static assets)
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 8
       - uses: actions/setup-node@v4
         with:
           node-version: lts/*
-          cache: 'npm'
-      - run: npm ci 
+          cache: 'pnpm'
+      - run: pnpm install
 
       # build project
       - uses: oven-sh/setup-bun@v1

diff --git a/.github/workflows/testingci.yml b/.github/workflows/testingci.yml
@@ -13,11 +13,15 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      # install deps (using pnpm until bun fixes bug for static assets)
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 8
       - uses: actions/setup-node@v4
         with:
           node-version: lts/*
-          cache: 'npm'
-      - run: npm ci
+          cache: 'pnpm'
+      - run: pnpm install
 
       - uses: oven-sh/setup-bun@v1
       - run: bun run build
diff --git a/fly.toml b/fly.toml
@@ -5,7 +5,8 @@ primary_region = "cdg"
   image = "ghcr.io/tminaorg/prednjica:latest"
 
 [env]
-  PRIVATE_API_URL = "http://zadnjica.internal:3030"
+  ORIGIN = "https://brzaguza.rs"
+  API_URL = "http://zadnjica.internal:3030"
   PUBLIC_API_URL = "https://api.brzaguza.rs"
 
 [http_service]