diff --git a/Dilomarkt/Caddyfile b/Dilomarkt/Caddyfile new file mode 100644 index 0000000..a99cdf3 --- /dev/null +++ b/Dilomarkt/Caddyfile @@ -0,0 +1,8 @@ +localhost { + # Route all API requests to Laravel backend + reverse_proxy /api/* 127.0.0.1:8000 + + # Route everything else to development server + reverse_proxy * 127.0.0.1:5173 +} + diff --git a/Dilomarkt/index.html b/Dilomarkt/index.html index b19040a..53d1e38 100644 --- a/Dilomarkt/index.html +++ b/Dilomarkt/index.html @@ -8,6 +8,10 @@
+<<<<<<< HEAD + +======= +>>>>>>> d534ca87a19998118e5b745e9071e0dbc057a1e7 diff --git a/Dilomarkt/src/App.vue b/Dilomarkt/src/App.vue index 4af688d..93c770d 100644 --- a/Dilomarkt/src/App.vue +++ b/Dilomarkt/src/App.vue @@ -1,5 +1,195 @@ + + + +=======