Skip to content

Commit f11961e

Browse files
kastovkastov
committed
refactor: restructure dashboard layout by removing unused components and updating routing to use MainLayout
1 parent 77c2d21 commit f11961e

File tree

62 files changed

+887
-691
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+887
-691
lines changed

‎index.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<!doctype html>
22
<html lang="en" dir="ltr">
33
<head>
4+
<!-- <script crossorigin="anonymous" src="//unpkg.com/react-scan/dist/auto.global.js"></script> -->
5+
46
<meta charset="UTF-8" />
57

68
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon-180x180.png" />

‎package-lock.json‎

Lines changed: 130 additions & 117 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"toc": "i18next-resources-for-ts toc -i ./public/locales/en -o @types/resources.ts"
3131
},
3232
"dependencies": {
33+
"@gfazioli/mantine-text-animate": "^1.0.2",
3334
"@hello-pangea/dnd": "^18.0.1",
3435
"@lukemorales/query-key-factory": "^1.3.4",
3536
"@mantine/carousel": "^7.17.3",
@@ -49,8 +50,8 @@
4950
"@stablelib/base64": "^2.0.1",
5051
"@stablelib/x25519": "^2.0.1",
5152
"@tabler/icons-react": "^3.31.0",
52-
"@tanstack/react-query": "^5.69.0",
53-
"@tanstack/react-query-devtools": "^5.69.0",
53+
"@tanstack/react-query": "^5.71.3",
54+
"@tanstack/react-query-devtools": "^5.71.3",
5455
"axios": "^1.8.4",
5556
"buffer": "^6.0.3",
5657
"clsx": "^2.1.1",
@@ -67,7 +68,7 @@
6768
"mantine-react-table": "^2.0.0-beta.9",
6869
"monaco-editor": "^0.52.2",
6970
"monaco-yaml": "^5.3.1",
70-
"motion": "^12.5.0",
71+
"motion": "^12.6.3",
7172
"nanoid": "^5.1.5",
7273
"react": "^18.3.1",
7374
"react-country-flag": "^3.1.0",
@@ -86,7 +87,7 @@
8687
"zustand": "^5.0.3"
8788
},
8889
"devDependencies": {
89-
"@eslint/compat": "^1.2.7",
90+
"@eslint/compat": "^1.2.8",
9091
"@eslint/eslintrc": "^3.3.1",
9192
"@eslint/js": "^9.23.0",
9293
"@ianvs/prettier-plugin-sort-imports": "^4.4.1",
@@ -95,11 +96,11 @@
9596
"@types/color-hash": "^2.0.0",
9697
"@types/crypto-js": "^4.2.2",
9798
"@types/mdx": "^2.0.13",
98-
"@types/node": "^22.13.14",
99+
"@types/node": "^22.13.17",
99100
"@types/react": "^18.3.5",
100101
"@types/react-dom": "^18.3.0",
101-
"@typescript-eslint/eslint-plugin": "^8.28.0",
102-
"@typescript-eslint/parser": "^8.28.0",
102+
"@typescript-eslint/eslint-plugin": "^8.29.0",
103+
"@typescript-eslint/parser": "^8.29.0",
103104
"@vitejs/plugin-react": "^4.3.4",
104105
"@vitejs/plugin-react-swc": "^3.8.1",
105106
"cross-env": "^7.0.3",
@@ -109,7 +110,7 @@
109110
"eslint-config-prettier": "^10.1.1",
110111
"eslint-import-resolver-typescript": "^4.3.1",
111112
"eslint-plugin-import": "^2.31.0",
112-
"eslint-plugin-perfectionist": "^4.10.1",
113+
"eslint-plugin-perfectionist": "^4.11.0",
113114
"eslint-plugin-react-hooks": "^5.2.0",
114115
"eslint-plugin-react-refresh": "^0.4.19",
115116
"eslint-plugin-storybook": "^0.12.0",
@@ -128,8 +129,8 @@
128129
"stylelint-config-standard-scss": "^14.0.0",
129130
"typesafe-i18n": "^5.26.2",
130131
"typescript": "^5.8.2",
131-
"typescript-eslint": "^8.28.0",
132-
"vite": "6.2.3",
132+
"typescript-eslint": "^8.29.0",
133+
"vite": "6.2.4",
133134
"vite-plugin-javascript-obfuscator": "^3.1.0",
134135
"vite-plugin-preload": "^0.4.2",
135136
"vite-plugin-remove-console": "^2.2.0",
@@ -150,4 +151,4 @@
150151
"inquirer": "9.3.5"
151152
}
152153
}
153-
}
154+
}

‎public/locales/en/remnawave.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
"hosts": "Hosts",
88
"inbounds": "Inbounds",
99
"nodes": "Nodes",
10-
"nodes-bandwidth-table": "Nodes Bandwidth table",
11-
"nodes-statistics": "Nodes Statistics",
10+
"nodes-bandwidth-table": "Bandwidth",
11+
"nodes-statistics": "Statistics",
1212
"users": "Users",
1313
"overview": "Overview",
1414
"management": "Management",
1515
"statistics": "Statistics",
1616
"subscription-settings": "Subscription Settings",
1717
"utils": "Utilities",
18-
"happ-routing-builder": "Happ Routing Builder",
18+
"happ-routing-builder": "Happ Routing",
1919
"templates": "Templates",
2020
"subscription": "Subscription",
2121
"subscription-page-builder": "Sub Page Builder"
@@ -893,4 +893,4 @@
893893
"button-link": "Button Link",
894894
"button-text": "Button Text"
895895
}
896-
}
896+
}

‎public/locales/ru/remnawave.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
"hosts": "Хосты",
88
"inbounds": "Инбаунды",
99
"nodes": "Ноды",
10-
"nodes-bandwidth-table": "Использование трафика",
11-
"nodes-statistics": "Статистика нод",
10+
"nodes-bandwidth-table": "Расход трафика",
11+
"nodes-statistics": "Статистика",
1212
"users": "Пользователи",
1313
"overview": "Обзор",
1414
"management": "Управление",
1515
"statistics": "Статистика",
1616
"subscription-settings": "Настройки подписки",
1717
"utils": "Утилиты",
18-
"happ-routing-builder": "Конструктор маршрутизации Happ",
18+
"happ-routing-builder": "Happ-роутинг",
1919
"templates": "Шаблоны",
2020
"subscription": "Подписка",
2121
"subscription-page-builder": "Sub Page Builder"
@@ -893,4 +893,4 @@
893893
"button-link": "Button Link",
894894
"button-text": "Button Text"
895895
}
896-
}
896+
}

‎src/app/layouts/dashboard/header/header.module.css‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎src/app/layouts/dashboard/header/header.tsx‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎src/app/layouts/dashboard/index.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
export * from './root/dashboard.layout'
2-
export * from './sidebar/sidebar.layout'
1+
export * from './main-layout/main.layout'

‎src/app/layouts/dashboard/main-layout/Main.module.css‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
.sidebarWrapper {
2+
z-index: 200;
3+
margin-left: 0.75rem;
4+
margin-bottom: 0.75rem;
5+
margin-top: 0.75rem;
6+
height: calc(100vh - 1.5rem);
7+
8+
background-color: light-dark(var(--mantine-color-gray-1), var(--mantine-color-dark-8));
9+
box-shadow: 0 0 20px 0 rgba(0, 0, 0, 0.5);
10+
border-radius: var(--mantine-radius-md);
11+
}
12+
13+
.logoWrapper {
14+
padding: var(--mantine-spacing-md) var(--mantine-spacing-xl) var(--mantine-spacing-xs)
15+
var(--mantine-spacing-xl);
16+
}
17+
18+
.header {
19+
backdrop-filter: blur(7px);
20+
margin-left: -300px;
21+
padding-left: 300px;
22+
background-color: transparent;
23+
}

0 commit comments

Comments
 (0)