From 83eccb6ce31a894ceb4941b5899019ba09e57cac Mon Sep 17 00:00:00 2001 From: "Shishkevich D." <135337715+shishkevichd@users.noreply.github.com> Date: Sat, 21 Jun 2025 08:36:12 +0000 Subject: [PATCH] refactor: use new page templates --- web/html/common/head.html | 31 -- web/html/common/js.html | 14 - web/html/common/page.html | 58 +++ web/html/inbounds.html | 27 +- web/html/index.html | 744 +++++++++++++++++++------------------- web/html/login.html | 326 +++++++++-------- web/html/settings.html | 131 ++++--- web/html/xray.html | 178 +++++---- 8 files changed, 756 insertions(+), 753 deletions(-) delete mode 100644 web/html/common/head.html delete mode 100644 web/html/common/js.html create mode 100644 web/html/common/page.html diff --git a/web/html/common/head.html b/web/html/common/head.html deleted file mode 100644 index 35901769..00000000 --- a/web/html/common/head.html +++ /dev/null @@ -1,31 +0,0 @@ -{{define "head"}} - - - - - - - - - {{ .host }} – {{ i18n .title}} - -
-{{end}} \ No newline at end of file diff --git a/web/html/common/js.html b/web/html/common/js.html deleted file mode 100644 index 1c2d64b3..00000000 --- a/web/html/common/js.html +++ /dev/null @@ -1,14 +0,0 @@ -{{define "js"}} - - - - - - - - - -{{end}} \ No newline at end of file diff --git a/web/html/common/page.html b/web/html/common/page.html new file mode 100644 index 00000000..f1c58fe1 --- /dev/null +++ b/web/html/common/page.html @@ -0,0 +1,58 @@ +{{ define "page/head_start" }} + + + + + + + + + + + {{ .host }} – {{ i18n .title}} +{{ end }} + +{{ define "page/head_end" }} + +{{ end }} + +{{ define "page/body_start" }} + +
+{{ end }} + +{{ define "page/body_scripts" }} + + + + + + + + + +{{ end }} + +{{ define "page/body_end" }} + + +{{ end }} \ No newline at end of file diff --git a/web/html/inbounds.html b/web/html/inbounds.html index 5ee541df..7b00ae5e 100644 --- a/web/html/inbounds.html +++ b/web/html/inbounds.html @@ -1,6 +1,4 @@ - - -{{template "head" .}} +{{ template "page/head_start" .}} +{{ template "page/head_end" .}} - +{{ template "page/body_start" .}} @@ -657,7 +656,7 @@ -{{template "js" .}} +{{template "page/body_scripts" .}} @@ -666,6 +665,13 @@ {{template "component/aThemeSwitch" .}} {{template "component/aCustomStatistic" .}} {{template "component/aPersianDatepicker" .}} +{{template "modals/inboundModal"}} +{{template "modals/promptModal"}} +{{template "modals/qrcodeModal"}} +{{template "modals/textModal"}} +{{template "modals/inboundInfoModal"}} +{{template "modals/clientsModal"}} +{{template "modals/clientsBulkModal"}} - -{{template "modals/inboundModal"}} -{{template "modals/promptModal"}} -{{template "modals/qrcodeModal"}} -{{template "modals/textModal"}} -{{template "modals/inboundInfoModal"}} -{{template "modals/clientsModal"}} -{{template "modals/clientsBulkModal"}} - - +{{ template "page/body_end" .}} \ No newline at end of file diff --git a/web/html/index.html b/web/html/index.html index 2a6fb0ad..61e3947f 100644 --- a/web/html/index.html +++ b/web/html/index.html @@ -1,6 +1,4 @@ - - -{{template "head" .}} +{{ template "page/head_start" .}} +{{ template "page/head_end" .}} - - - - - - - - - - - -