diff --git a/docker-compose.yml b/docker-compose.yml
index a666872..e2d9f51 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -35,7 +35,7 @@ services:
PMA_HOST: iiko-db
PMA_PORT: 3306
UPLOAD_LIMIT: 10M
- # PMA_ABSOLUTE_URI: https://phpmyadmin.dev.xserver.su/
+ PMA_ABSOLUTE_URI: https://iiko-app.dev.xserver.su/phpmyadmin/
TZ: Europe/Moscow
ports:
- "7102:80"
diff --git a/frontend/src/components/Layout/AppLayout.vue b/frontend/src/components/Layout/AppLayout.vue
index 41e0520..1e7483f 100644
--- a/frontend/src/components/Layout/AppLayout.vue
+++ b/frontend/src/components/Layout/AppLayout.vue
@@ -92,6 +92,30 @@
{{ t('app.settings') }}
+
+
+
+
+
+ {{ t('app.database') }}
+
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 9afb73a..22fa14e 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -2,6 +2,7 @@
"app": {
"title": "Admin Panel",
"dashboard": "Dashboard",
+ "database": "Data Base",
"users": "Users",
"restaurants": "Restaurants",
"settings": "Settings",
diff --git a/frontend/src/locales/ru.json b/frontend/src/locales/ru.json
index 27c4786..c89c4c7 100644
--- a/frontend/src/locales/ru.json
+++ b/frontend/src/locales/ru.json
@@ -2,6 +2,7 @@
"app": {
"title": "Панель администратора",
"dashboard": "Панель управления",
+ "database": "База Данных",
"users": "Пользователи",
"restaurants": "Рестораны",
"settings": "Настройки",
diff --git a/iiko-app.dev.xserver.su.nginx.conf b/iiko-app.dev.xserver.su.nginx.conf
index 9683fa0..ed98508 100644
--- a/iiko-app.dev.xserver.su.nginx.conf
+++ b/iiko-app.dev.xserver.su.nginx.conf
@@ -42,7 +42,7 @@ server {
proxy_set_header X-Forwarded-Proto $scheme;
}
- location /phpmyadmin/ {
+ location /phpmyadmin {
allow 80.68.9.83;
allow 185.51.125.202;
@@ -64,7 +64,7 @@ server {
deny all;
- proxy_pass http://127.0.0.1:7102/;
+ proxy_pass http://127.0.0.1:7102;
proxy_http_version 1.1;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;