From 83d90193859b4783fda0c837aa77c0728848bafd Mon Sep 17 00:00:00 2001 From: b1ek Date: Wed, 17 May 2023 07:02:20 +1000 Subject: [PATCH] fix invalid port --- .env.example | 2 +- conf/nginx/nginx.conf | 2 +- pairent_frontend_react/src/constants.js | 4 ++-- static/index.html | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.env.example b/.env.example index de209ae..c0ba556 100644 --- a/.env.example +++ b/.env.example @@ -2,7 +2,7 @@ APP_DEBUG=false APP_PORT=80 DB_HOST=db -DB_PORT=3306a +DB_PORT=3306 DB_PASSWORD= DB_DATABASE=pairent diff --git a/conf/nginx/nginx.conf b/conf/nginx/nginx.conf index 580c430..1aaf8e4 100644 --- a/conf/nginx/nginx.conf +++ b/conf/nginx/nginx.conf @@ -26,7 +26,7 @@ http { server { listen 80; - location ~ ^/(api|admin|index.html|/)$ { + location ~ ^/(api|admin)/ { proxy_pass http://back; } diff --git a/pairent_frontend_react/src/constants.js b/pairent_frontend_react/src/constants.js index 7e07e9a..67ea348 100644 --- a/pairent_frontend_react/src/constants.js +++ b/pairent_frontend_react/src/constants.js @@ -7,8 +7,8 @@ const api_path = path => API_ROOT + path; * Api root path * @type {string} */ -const API_ROOT = window.location.protocol + '//127.0.0.1:8000'; -// ДЛЯ ПРОДА ПОСТАВИТЬ ЭТО: '//pairent.vvsu.ru' +const API_ROOT = window.location.protocol + '//' + window.location.host; +// ДЛЯ ПРОДА ПОСТАВИТЬ ЭТО: '//' + window.location.host /** OpenID Connect Client Config * @type {import('oidc-client-ts').OidcClientSettings} diff --git a/static/index.html b/static/index.html index 7b2ba46..0db5bc4 100644 --- a/static/index.html +++ b/static/index.html @@ -9,7 +9,7 @@ href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap" rel="stylesheet" /> - +