From bc6e2eee0c7fc939dc0cf36b627b237acf6cf0b1 Mon Sep 17 00:00:00 2001 From: Valeria Fadeeva Date: Sat, 7 Jun 2025 09:16:22 +0500 Subject: [PATCH] Update --- .trunk/.gitignore | 9 + .trunk/configs/.isort.cfg | 2 + .trunk/configs/.markdownlint.yaml | 2 + .trunk/configs/.shellcheckrc | 7 + .trunk/configs/ruff.toml | 5 + .trunk/configs/svgo.config.mjs | 14 + .trunk/trunk.yaml | 41 +++ public/index.html | 468 ++++++++++++++++++++---------- pull.sh | 2 +- push.sh | 2 +- status.sh | 5 + 11 files changed, 394 insertions(+), 163 deletions(-) create mode 100644 .trunk/.gitignore create mode 100644 .trunk/configs/.isort.cfg create mode 100644 .trunk/configs/.markdownlint.yaml create mode 100644 .trunk/configs/.shellcheckrc create mode 100644 .trunk/configs/ruff.toml create mode 100644 .trunk/configs/svgo.config.mjs create mode 100644 .trunk/trunk.yaml create mode 100755 status.sh diff --git a/.trunk/.gitignore b/.trunk/.gitignore new file mode 100644 index 0000000..15966d0 --- /dev/null +++ b/.trunk/.gitignore @@ -0,0 +1,9 @@ +*out +*logs +*actions +*notifications +*tools +plugins +user_trunk.yaml +user.yaml +tmp diff --git a/.trunk/configs/.isort.cfg b/.trunk/configs/.isort.cfg new file mode 100644 index 0000000..b9fb3f3 --- /dev/null +++ b/.trunk/configs/.isort.cfg @@ -0,0 +1,2 @@ +[settings] +profile=black diff --git a/.trunk/configs/.markdownlint.yaml b/.trunk/configs/.markdownlint.yaml new file mode 100644 index 0000000..b40ee9d --- /dev/null +++ b/.trunk/configs/.markdownlint.yaml @@ -0,0 +1,2 @@ +# Prettier friendly markdownlint config (all formatting rules disabled) +extends: markdownlint/style/prettier diff --git a/.trunk/configs/.shellcheckrc b/.trunk/configs/.shellcheckrc new file mode 100644 index 0000000..8c7b1ad --- /dev/null +++ b/.trunk/configs/.shellcheckrc @@ -0,0 +1,7 @@ +enable=all +source-path=SCRIPTDIR +disable=SC2154 + +# If you're having issues with shellcheck following source, disable the errors via: +# disable=SC1090 +# disable=SC1091 diff --git a/.trunk/configs/ruff.toml b/.trunk/configs/ruff.toml new file mode 100644 index 0000000..f5a235c --- /dev/null +++ b/.trunk/configs/ruff.toml @@ -0,0 +1,5 @@ +# Generic, formatter-friendly config. +select = ["B", "D3", "E", "F"] + +# Never enforce `E501` (line length violations). This should be handled by formatters. +ignore = ["E501"] diff --git a/.trunk/configs/svgo.config.mjs b/.trunk/configs/svgo.config.mjs new file mode 100644 index 0000000..55b4a7a --- /dev/null +++ b/.trunk/configs/svgo.config.mjs @@ -0,0 +1,14 @@ +export default { + plugins: [ + { + name: "preset-default", + params: { + overrides: { + removeViewBox: false, // https://github.com/svg/svgo/issues/1128 + sortAttrs: true, + removeOffCanvasPaths: true, + }, + }, + }, + ], +}; diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml new file mode 100644 index 0000000..7bf420a --- /dev/null +++ b/.trunk/trunk.yaml @@ -0,0 +1,41 @@ +# This file controls the behavior of Trunk: https://docs.trunk.io/cli +# To learn more about the format of this file, see https://docs.trunk.io/reference/trunk-yaml +version: 0.1 +cli: + version: 1.24.0 +# Trunk provides extensibility via plugins. (https://docs.trunk.io/plugins) +plugins: + sources: + - id: trunk + ref: v1.7.0 + uri: https://github.com/trunk-io/plugins +# Many linters and tools depend on runtimes - configure them here. (https://docs.trunk.io/runtimes) +runtimes: + enabled: + - go@1.21.0 + - node@22.16.0 + - python@3.10.8 +# This is the section where you manage your linters. (https://docs.trunk.io/check/configuration) +lint: + enabled: + - bandit@1.8.3 + - black@25.1.0 + - checkov@3.2.437 + - git-diff-check + - isort@6.0.1 + - markdownlint@0.45.0 + - oxipng@9.1.5 + - prettier@3.5.3 + - ruff@0.11.13 + - shellcheck@0.10.0 + - shfmt@3.6.0 + - svgo@3.3.2 + - taplo@0.9.3 + - trufflehog@3.88.35 +actions: + disabled: + - trunk-announce + - trunk-check-pre-push + - trunk-fmt-pre-commit + enabled: + - trunk-upgrade-available diff --git a/public/index.html b/public/index.html index 9733cd7..f7f1154 100644 --- a/public/index.html +++ b/public/index.html @@ -3,16 +3,28 @@ - + LeraFoxQueen : Найдём свою любовь вместе - - - + + + -

В свободное время успешно окончила курсы визажа, работала с другими выпускницами на платных фотосессиях.

+

+ В свободное время успешно окончила курсы визажа, работала с + другими выпускницами на платных фотосессиях. +

-

У меня есть домашние животные: два кота и кошка, Мэйнкуны.

+

+ У меня есть домашние животные: два кота и кошка, Мэйнкуны. +

Отдых

@@ -354,12 +371,18 @@

Мои цели:

-

Заключение

Призываю быть адекватным человеком, здраво оценивать свои @@ -449,7 +472,9 @@ aria-labelledby="exampleModalLabel" aria-hidden="true" > -

+

@@ -462,14 +487,21 @@ aria-label="Close" >

-
+
+ required + />
@@ -478,12 +510,18 @@ class="form-control" id="sender_name" name="sender_name" - required> - + required + /> +
- @@ -502,8 +540,9 @@ max="100" value="0" step="1" - required> - + required + /> +
@@ -512,80 +551,158 @@ class="form-control" id="telegram_name" name="telegram_name" - required> - + required + /> +
-
-
- - -
- -
- - -
-
-
-
- - -
- -
- - -
-
-
-
- - -
- -
- - -
-
-
-
- - -
- -
- - -
-
- -
-
- - -
- - -
-
- - +
+
+ +
-
- + +
+ +
-
-
+
+
+ + +
+ +
+ + +
+
+
+
+ + +
+ +
+ + +
+
+
+
+ + +
+ +
+ + +
+
+ +
+
+ + +
+ +
+ + +
+
+ +
+ +
+
- - - + + +
@@ -633,86 +750,89 @@ @@ -832,11 +952,37 @@ href="/" class="d-flex align-items-center link-body-emphasis text-decoration-none" > - - - - - + + + + + Найдём свою любовь вместе diff --git a/pull.sh b/pull.sh index 83f2170..b5d54fb 100755 --- a/pull.sh +++ b/pull.sh @@ -2,4 +2,4 @@ git pull -echo "Ready" +echo "Finish!" diff --git a/push.sh b/push.sh index 434d0f3..73ef16b 100755 --- a/push.sh +++ b/push.sh @@ -3,4 +3,4 @@ git add . && git commit -m "Update" git push -echo "Ready" +echo "Finish!" diff --git a/status.sh b/status.sh new file mode 100755 index 0000000..0bc7221 --- /dev/null +++ b/status.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +git status + +echo "Finish!"