5 Commits

Author SHA1 Message Date
fe1de2bbf9 Merge pull request 'mobile update' (#35) from bugfix/iro4ka into master
All checks were successful
Build and Publish Images / build-and-push (push) Successful in 2m12s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/35
2026-03-10 14:45:19 +03:00
7b7554c84b Merge pull request 'mobile update' (#34) from bugfix/iro4ka into master
All checks were successful
Build and Publish Images / build-and-push (push) Successful in 2m8s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/34
2026-03-10 14:28:58 +03:00
c884bf812c Merge pull request 'mobile update' (#33) from bugfix/iro4ka into master
All checks were successful
Build and Publish Images / build-and-push (push) Successful in 43s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/33
2026-03-10 14:11:49 +03:00
91f9ed5474 Merge pull request 'bugfix/iro4ka' (#32) from bugfix/iro4ka into master
All checks were successful
Build and Publish Images / build-and-push (push) Successful in 2m26s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/32
2026-03-10 13:55:40 +03:00
adad656df2 Merge pull request 'bugos' (#31) from bugfix/iro4ka into master
All checks were successful
Build and Publish Images / build-and-push (push) Successful in 2m39s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/31
2026-03-10 12:16:13 +03:00
3 changed files with 2 additions and 16 deletions

View File

@@ -231,7 +231,7 @@ pub async fn create_app(db: DatabaseConnection) -> Result<Router, DbErr> {
.url("/api-docs/openapi.json", ApiDoc::openapi()); .url("/api-docs/openapi.json", ApiDoc::openapi());
let allowed_origins = std::env::var("ALLOWED_ORIGINS") let allowed_origins = std::env::var("ALLOWED_ORIGINS")
.unwrap_or_else(|_| "http://localhost:3000,http://localhost:5173,http://localhost:5174,http://localhost:5175,http://localhost:8080,http://localhost:1420,http://tauri.localhost,https://tauri.localhost".to_string()); .unwrap_or_else(|_| "http://localhost:3000,http://localhost:5173,http://localhost:5174,http://localhost:5175,http://localhost:8080".to_string());
let origins: Vec<HeaderValue> = allowed_origins let origins: Vec<HeaderValue> = allowed_origins
.split(',') .split(',')

View File

@@ -12,20 +12,6 @@ export default defineConfig({
? 'https://family-budget.duckdns.org' ? 'https://family-budget.duckdns.org'
: 'http://localhost:8080', : 'http://localhost:8080',
changeOrigin: true, changeOrigin: true,
configure: (proxy) => {
if (process.env.TAURI_DEV_HOST) {
proxy.on('proxyRes', (proxyRes) => {
const cookies = proxyRes.headers['set-cookie'];
if (cookies) {
proxyRes.headers['set-cookie'] = cookies.map(cookie =>
cookie
.replace(/;\s*Secure/gi, '')
.replace(/;\s*Domain=[^;]*/gi, '')
);
}
});
}
},
} }
} }
} }

View File

@@ -6,7 +6,7 @@
"build": { "build": {
"beforeDevCommand": "npm run dev --prefix ../frontend", "beforeDevCommand": "npm run dev --prefix ../frontend",
"devUrl": "http://localhost:5173", "devUrl": "http://localhost:5173",
"beforeBuildCommand": "VITE_API_BASE_URL=https://family-budget.duckdns.org/api npm run build --prefix ../frontend", "beforeBuildCommand": "npm run build --prefix ../frontend",
"frontendDist": "../frontend/dist" "frontendDist": "../frontend/dist"
}, },
"app": { "app": {