From ba30aa095fa641e3d91b179f4d33415f2ac00adb Mon Sep 17 00:00:00 2001
From: zurdi zurdo <zurdizurdo25@gmail.com>
Date: Fri, 17 Mar 2023 13:19:48 +0100
Subject: [PATCH] proxy redirect to api added in vite

---
 .github/actions/build.sh  | 0
 backend/src/main.py       | 6 +++---
 docker/nginx/default.conf | 2 +-
 frontend/package.json     | 2 +-
 frontend/vite.config.js   | 5 +++--
 5 files changed, 8 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 .github/actions/build.sh

diff --git a/.github/actions/build.sh b/.github/actions/build.sh
old mode 100644
new mode 100755
diff --git a/backend/src/main.py b/backend/src/main.py
index 2ea145715..6d6ae5f3d 100644
--- a/backend/src/main.py
+++ b/backend/src/main.py
@@ -19,19 +19,19 @@ igdbh: IGDBHandler = IGDBHandler()
 dbh: DBHandler = DBHandler()
 
 
-@app.get("/api/platforms/{slug}/roms")
+@app.get("/platforms/{slug}/roms")
 async def platforms(slug):
     """Returns roms data of the desired platform"""
     return {'data': [Rom(*r) for r in dbh.get_roms(slug)]}
 
 
-@app.get("/api/platforms")
+@app.get("/platforms")
 async def platforms():
     """Returns platforms data"""
     return {'data': [Platform(*p) for p in dbh.get_platforms()]}
 
 
-@app.get("/api/scan")
+@app.get("/scan")
 async def scan(overwrite: bool=False):
     """Scan platforms and roms and write them in database."""
 
diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf
index c878a3a52..1c9f2509e 100644
--- a/docker/nginx/default.conf
+++ b/docker/nginx/default.conf
@@ -39,7 +39,7 @@ http {
 
             # Backend api calls
             location /api {
-                # rewrite /api/(.*) /$1 break;
+                rewrite /api/(.*) /$1 break;
                 proxy_pass http://localhost:5000/;
             }
         }
diff --git a/frontend/package.json b/frontend/package.json
index 9c53c6f85..fffd98927 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "romm",
-  "version": "0.12",
+  "version": "0.13",
   "private": true,
   "scripts": {
     "dev": "vite --host",
diff --git a/frontend/vite.config.js b/frontend/vite.config.js
index 561998476..eecdd9dba 100644
--- a/frontend/vite.config.js
+++ b/frontend/vite.config.js
@@ -38,10 +38,11 @@ export default defineConfig({
   server: {
     proxy: {
         '/api': {
-            target: 'https://localhost:5000',
-            changeOrigin: true,
+            target: 'http://localhost:5000',
+            changeOrigin: false,
             secure: false,      
             ws: true,
+            rewrite: (path) => path.replace(/^\/api/, ''),
         }
     },
     port: 3000,