danil-bodry/iiko-connector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix and refactor code

Browse Source
This commit is contained in:
Danil Bodry
2026-04-27 15:45:06 +03:00
parent 316d06b1d2
commit 05076eb367
17 changed files with 89 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/App.vue
View File

@@ -22,7 +22,7 @@
<script setup lang="ts">
import { watch } from 'vue'
import { useSettingsStore } from './stores/settings'
import { useSettingsStore } from '@/stores/settings'
const settings = useSettingsStore()

18
frontend/src/components/Layout/AppLayout.vue
View File

@@ -34,7 +34,7 @@
to="/dashboard"
class="flex items-center rounded-lg hover:bg-gray-100 transition-colors group"
:class="[
$route.path === '/dashboard' ? 'bg-primary-50 text-primary-700' : 'text-gray-700',
route.path === '/dashboard' ? 'bg-primary-50 text-primary-700' : 'text-gray-700',
sidebarCollapsed ? 'justify-center p-2' : 'px-4 py-3 space-x-3'
]"
:title="sidebarCollapsed ? t('app.dashboard') : ''"
@@ -50,7 +50,7 @@
to="/users"
class="flex items-center rounded-lg hover:bg-gray-100 transition-colors group"
:class="[
$route.path === '/users' ? 'bg-primary-50 text-primary-700' : 'text-gray-700',
route.path === '/users' ? 'bg-primary-50 text-primary-700' : 'text-gray-700',
sidebarCollapsed ? 'justify-center p-2' : 'px-4 py-3 space-x-3'
]"
:title="sidebarCollapsed ? t('app.users') : ''"
@@ -65,7 +65,7 @@
to="/restaurants"
class="flex items-center rounded-lg hover:bg-gray-100 transition-colors group"
:class="[
$route.path === '/restaurants' ? 'bg-primary-50 text-primary-700' : 'text-gray-700',
route.path === '/restaurants' ? 'bg-primary-50 text-primary-700' : 'text-gray-700',
sidebarCollapsed ? 'justify-center p-2' : 'px-4 py-3 space-x-3'
]"
:title="sidebarCollapsed ? t('app.restaurants') : ''"
@@ -81,7 +81,7 @@
to="/settings"
class="flex items-center rounded-lg hover:bg-gray-100 transition-colors group"
:class="[
$route.path === '/settings' ? 'bg-primary-50 text-primary-700' : 'text-gray-700',
route.path === '/settings' ? 'bg-primary-50 text-primary-700' : 'text-gray-700',
sidebarCollapsed ? 'justify-center p-2' : 'px-4 py-3 space-x-3'
]"
:title="sidebarCollapsed ? t('app.settings') : ''"
@@ -101,7 +101,7 @@
class="flex items-center rounded-lg hover:bg-gray-100 transition-colors no-router-link"
:class="[
sidebarCollapsed ? 'justify-center p-2' : 'px-4 py-3 space-x-3',
$route.path === '/phpmyadmin' ? 'bg-primary-50 text-primary-700' : 'text-gray-700'
route.path === '/phpmyadmin' ? 'bg-primary-50 text-primary-700' : 'text-gray-700'
]"
:title="sidebarCollapsed ? t('app.database') : ''"
>
@@ -209,12 +209,12 @@
<script setup lang="ts">
import { computed, ref, onMounted } from 'vue'
import { useRoute, useRouter } from 'vue-router'
import { useSettingsStore } from '../../stores/settings'
import { useUserStore } from '../../stores/user'
import { useSettingsStore } from '@/stores/settings'
import { useUserStore } from '@/stores/user'
import { useI18n } from 'vue-i18n'
import { useNotification } from '../../composables/useNotification'
import { useNotification } from '@/composables/useNotification'
const { notification } = useNotification()
const { notification, showNotification } = useNotification()
const settings = useSettingsStore()
const userStore = useUserStore()
const route = useRoute()

2
frontend/src/locales/en.json
View File

@@ -50,7 +50,7 @@
},
"dashboard": {
"totalUsers": "Total Users",
"activeSessions": "Active Sessions",
"totalRestaurants": "Total Restaurants",
"systemHealth": "System Health",
"uptime": "Uptime",
"vsLastMonth": "vs last month",

2
frontend/src/locales/ru.json
View File

@@ -50,7 +50,7 @@
},
"dashboard": {
"totalUsers": "Всего пользователей",
"activeSessions": "Активных сессий",
"totalRestaurants": "Всего ресторанов",
"systemHealth": "Здоровье системы",
"uptime": "Время работы",
"vsLastMonth": "по сравнению с прошлым месяцем",

6
frontend/src/main.ts
View File

@@ -3,12 +3,12 @@ import { createApp } from 'vue'
import { createPinia } from 'pinia'
import App from './App.vue'
import router from './router'
import './style.css'
import '@/style.css'
import { useSettingsStore } from './stores/settings'
import { useUserStore } from './stores/user'
import { createI18n } from 'vue-i18n'
import en from './locales/en.json'
import ru from './locales/ru.json'
import en from '@/locales/en.json'
import ru from '@/locales/ru.json'
// Функция определения языка браузера
function getBrowserLocale(): string {

22
frontend/src/router/index.ts
View File

@@ -1,15 +1,15 @@
import { createRouter, createWebHistory } from 'vue-router'
import { useUserStore } from '../stores/user'
import { useSettingsStore } from '../stores/settings'
import Login from '../views/auth/Login.vue'
import Setup from '../views/auth/Setup.vue'
import Register from '../views/auth/Register.vue'
import Dashboard from '../views/Dashboard.vue'
import Users from '../views/Users.vue'
import Restaurants from '../views/Restaurants.vue'
import AdminSettings from '../views/AdminSettings.vue'
import Profile from '../views/Profile.vue'
import NotFound from '../views/NotFound.vue'
import { useUserStore } from '@/stores/user'
import { useSettingsStore } from '@/stores/settings'
import Login from '@/views/auth/Login.vue'
import Setup from '@/views/auth/Setup.vue'
import Register from '@/views/auth/Register.vue'
import Dashboard from '@/views/Dashboard.vue'
import Users from '@/views/Users.vue'
import Restaurants from '@/views/Restaurants.vue'
import AdminSettings from '@/views/AdminSettings.vue'
import Profile from '@/views/Profile.vue'
import NotFound from '@/views/NotFound.vue'
const routes = [
{ path: '/login', component: Login, meta: { title: 'Login', requiresAuth: false } },

4
frontend/src/stores/user.ts
View File

@@ -10,7 +10,7 @@ export const useUserStore = defineStore('user', () => {
async function fetchProfile() {
try {
const res = await fetch('/api/admin/profile')
const res = await fetch('/api/profile')
if (res.ok) {
const data = await res.json()
id.value = data.id
@@ -27,7 +27,7 @@ export const useUserStore = defineStore('user', () => {
}
async function updateProfile(updates: { email?: string; password?: string; language?: string }) {
const res = await fetch('/api/admin/profile', {
const res = await fetch('/api/profile', {
method: 'PUT',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify(updates)

24
frontend/src/views/AdminSettings.vue
View File

@@ -58,22 +58,18 @@
<button type="submit" class="btn-primary">{{ t('settings.save') }}</button>
</div>
</form>
<div v-if="message" class="mt-4 p-3 rounded-lg" :class="messageClass">
{{ message }}
</div>
</div>
</AppLayout>
</template>
<script setup lang="ts">
import { ref, onMounted } from 'vue';
import AppLayout from '../components/Layout/AppLayout.vue';
import AppLayout from '@/components/Layout/AppLayout.vue';
import { useI18n } from 'vue-i18n'
import { useNotification } from '../composables/useNotification'
import { useNotification } from '@/composables/useNotification'
const { showNotification } = useNotification()
const { t, locale } = useI18n()
const { t } = useI18n()
interface FieldMeta {
key: string;
label: string;
@@ -86,11 +82,9 @@ interface FieldMeta {
const meta = ref<FieldMeta[]>([]);
const values = ref<Record<string, string>>({});
const message = ref('');
const messageClass = ref('');
async function loadMeta() {
const res = await fetch('/api/settings/meta');
const res = await fetch('/api/admin/settings/meta');
if (res.ok) {
meta.value = await res.json();
} else {
@@ -99,7 +93,7 @@ async function loadMeta() {
}
async function loadValues() {
const res = await fetch('/api/settings/all');
const res = await fetch('/api/admin/settings');
if (res.ok) {
values.value = await res.json();
} else {
@@ -128,13 +122,5 @@ async function saveSettings() {
}
}
function showMessage(text: string, cssClass: string) {
message.value = text;
messageClass.value = cssClass;
setTimeout(() => {
message.value = '';
}, 3000);
}
onMounted(loadData);
</script>

16
frontend/src/views/Dashboard.vue
View File

@@ -23,8 +23,8 @@
<div class="card hover:shadow-md transition-shadow">
<div class="flex items-center justify-between">
<div>
<p class="text-sm font-medium text-gray-600">{{ t('dashboard.activeSessions') }}</p>
<p class="text-3xl font-bold text-gray-900 mt-2">{{ stats.activeSessions }}</p>
<p class="text-sm font-medium text-gray-600">{{ t('dashboard.totalRestaurants') }}</p>
<p class="text-3xl font-bold text-gray-900 mt-2">{{ stats.totalRestaurants }}</p>
</div>
<div class="w-12 h-12 bg-green-100 rounded-xl flex items-center justify-center">
<svg class="w-6 h-6 text-green-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
@@ -175,13 +175,13 @@
<script setup lang="ts">
import { ref, onMounted, onUnmounted } from 'vue';
import AppLayout from '../components/Layout/AppLayout.vue';
import AppLayout from '@/components/Layout/AppLayout.vue';
import { useI18n } from 'vue-i18n'
const { t } = useI18n()
import { useNotification } from '../composables/useNotification'
import { useNotification } from '@/composables/useNotification'
const { showNotification } = useNotification()
const stats = ref({ totalUsers: 0, activeSessions: 0, systemHealth: 100, uptime: '99.9%' });
const stats = ref({ totalUsers: 0, totalRestaurants: 0, systemHealth: 100, uptime: '99.9%' });
const userGrowth = ref(12);
const sessionGrowth = ref(5);
const recentUsers = ref([]);
@@ -195,20 +195,18 @@ let interval: number;
async function loadDashboardData() {
try {
const [usersRes, sessionsRes, healthRes, restaurantsRes] = await Promise.all([
const [usersRes, healthRes, restaurantsRes] = await Promise.all([
fetch('/api/admin/users'),
fetch('/api/admin/active-sessions'),
fetch('/api/health'),
fetch('/api/admin/restaurants')
]);
const users = await usersRes.json();
const sessions = await sessionsRes.json();
const health = await healthRes.json();
const restaurants = await restaurantsRes.json();
stats.value.totalUsers = users.length;
stats.value.activeSessions = sessions.count || 0;
stats.value.totalRestaurants = restaurants.length;
recentUsers.value = users.slice(-5).reverse();
recentRestaurants.value = restaurants.slice(-5).reverse();

8
frontend/src/views/Profile.vue
View File

@@ -84,10 +84,12 @@
<script setup lang="ts">
import { ref, reactive, computed, onMounted } from 'vue';
import { useUserStore } from '../stores/user';
import { useUserStore } from '@/stores/user';
import { useI18n } from 'vue-i18n';
import AppLayout from '../components/Layout/AppLayout.vue';
import AppLayout from '@/components/Layout/AppLayout.vue';
import {useNotification} from "@/composables/useNotification";
const { showNotification } = useNotification();
const userStore = useUserStore();
const { t, locale } = useI18n();
@@ -129,7 +131,7 @@ async function saveProfile() {
if (ok) {
locale.value = form.language;
showNotification('profile.updateSuccess', 'success');
resetForm(); // очищаем поля пароля
resetForm();
} else {
showNotification('profile.updateError', 'error');
}

4
frontend/src/views/Restaurants.vue
View File

@@ -153,9 +153,9 @@
<script setup lang="ts">
import { ref, onMounted } from 'vue';
import AppLayout from '../components/Layout/AppLayout.vue';
import AppLayout from '@/components/Layout/AppLayout.vue';
import { useI18n } from 'vue-i18n';
import { useNotification } from '../composables/useNotification';
import { useNotification } from '@/composables/useNotification';
const { t } = useI18n();
const { showNotification } = useNotification();

6
frontend/src/views/Users.vue
View File

@@ -155,10 +155,10 @@
<script setup lang="ts">
import { ref, onMounted, computed } from 'vue';
import AppLayout from '../components/Layout/AppLayout.vue';
import { useUserStore } from '../stores/user';
import AppLayout from '@/components/Layout/AppLayout.vue';
import { useUserStore } from '@/stores/user';
import { useI18n } from 'vue-i18n';
import { useNotification } from '../composables/useNotification';
import { useNotification } from '@/composables/useNotification';
const { t } = useI18n();
const { showNotification } = useNotification();

4
frontend/src/views/auth/Login.vue
View File

@@ -103,8 +103,8 @@
<script setup lang="ts">
import { ref } from 'vue'
import { useRouter } from 'vue-router'
import { useSettingsStore } from '../../stores/settings'
import { useUserStore } from '../../stores/user'
import { useSettingsStore } from '@/stores/settings'
import { useUserStore } from '@/stores/user'
import { useI18n } from 'vue-i18n'
const settings = useSettingsStore()