favicon compress, rofls, calculator new parameters

.gitmodules

@@ -2,14 +2,15 @@
 	path = hotline.mjs
 	url = https://git.svoboda.works/mirzaev/hotline.mjs
 	branch = stable
-[submodule "womb3-simplex.mjs"]
+[submodule "damper.mjs"]
-	path = womb3-simplex.mjs
+	path = damper.mjs
-	url = https://git.svoboda.works/mirzaev/womb3-simplex.mjs
+	url = https://git.svoboda.works/mirzaev/damper.mjs.git
 	branch = stable
 [submodule "icons"]
 	path = icons
 	url = https://git.svoboda.works/mirzaev/icons
 	branch = stable
-[submodule "three.js"]
+[submodule "womb3-simplex.mjs"]
-	path = three.js
+	path = womb3-simplex.mjs
-	url = https://github.com/mrdoob/three.js.git
+	url = https://git.svoboda.works/mirzaev/womb3-simplex.mjs
+	branch = stable

composer.json

@@ -1,13 +1,13 @@
 {
-	"name": "kodorvan/perm",
+	"name": "kodorvan/site",
-	"description": "Лендинг для Перми от Ксении",
+	"description": "The kodorvan team main site",
-	"homepage": "https://git.svoboda.works/kodorvan/perm",
+	"homepage": "https://git.svoboda.works/kodorvan/site",
 	"type": "site",
 	"keywords": [
 		"minimal",
 		"baza",
 		"landing",
-		"perm"
+		"site"
 	],
 	"readme": "README.md",
 	"license": "WTFPL",
@@ -20,8 +20,8 @@
     }
 	],
 	"support": {
-		"wiki": "https://git.svoboda.works/kodorvan/perm/wiki",
+		"wiki": "https://git.svoboda.works/kodorvan/site/wiki",
-		"issues": "https://git.svoboda.works/kodorvan/perm/issues"
+		"issues": "https://git.svoboda.works/kodorvan/site/issues"
 	},
 	"require": {
 		"php": "^8.5",
@@ -41,12 +41,12 @@
 	},
 	"autoload": {
 		"psr-4": {
-			"kodorvan\\perm\\": "kodorvan/perm/system"
+			"kodorvan\\site\\": "kodorvan/site/system"
 		}
 	},
 	"autoload-dev": {
 		"psr-4": {
-			"kodorvan\\perm\\tests\\": "kodorvan/perm/tests"
+			"kodorvan\\site\\tests\\": "kodorvan/site/tests"
 		}
 	},
 	"scripts": {

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "7f073bad5c03fc54b0098f63afbc0cd9",
+    "content-hash": "3d3b850ebd1027cf1790dfa901746eab",
     "packages": [
         {
             "name": "mirzaev/baza",

install.sh

@@ -1,14 +1,16 @@
 #!/bin/bash
 
+git submodule update --init --recursive
+
 if [ -d author/project ]; then
-	mv author/project author/perm
+	mv author/project author/site
 fi
 
 if [ -d author ]; then
 	mv author kodorvan
 fi
 
-for i in kodorvan/perm/system/settings/*.sample; do
+for i in kodorvan/site/system/settings/*.sample; do
   echo $i;
   if [ ! -f "${i/.sample/}" ]; then
     cp -n "$i" "${i/.sample/}";
@@ -16,26 +18,26 @@ for i in kodorvan/perm/system/settings/*.sample; do
   fi
 done
 
-if ! [ -d kodorvan/perm/system/public/js/modules ]; then
+if ! [ -d kodorvan/site/system/public/js/modules ]; then
-	mkdir kodorvan/perm/system/public/js/modules -p
+	mkdir kodorvan/site/system/public/js/modules -p
 fi
 
-if ! [ -L kodorvan/perm/system/public/js/modules/damper.mjs ]; then
+if ! [ -L kodorvan/site/system/public/js/modules/damper.mjs ]; then
-	ln -s ../../../../../../damper.mjs/damper.mjs kodorvan/perm/system/public/js/modules/damper.mjs;
+	ln -s ../../../../../../damper.mjs/damper.mjs kodorvan/site/system/public/js/modules/damper.mjs;
 fi
 
-if ! [ -L kodorvan/perm/system/public/js/modules/hotline.mjs ]; then
+if ! [ -L kodorvan/site/system/public/js/modules/hotline.mjs ]; then
-	ln -s ../../../../../../hotline.mjs/hotline.mjs kodorvan/perm/system/public/js/modules/hotline.mjs;
+	ln -s ../../../../../../hotline.mjs/hotline.mjs kodorvan/site/system/public/js/modules/hotline.mjs;
 fi
 
-if ! [ -L kodorvan/perm/system/public/js/modules/womb3-simplex.mjs ]; then
+if ! [ -L kodorvan/site/system/public/js/modules/womb3-simplex.mjs ]; then
-	ln -s ../../../../../../womb3-simplex.mjs/womb3-simplex.mjs kodorvan/perm/system/public/js/modules/womb3-simplex.mjs;
+	ln -s ../../../../../../womb3-simplex.mjs/womb3-simplex.mjs kodorvan/site/system/public/js/modules/womb3-simplex.mjs;
 fi
 
-if ! [ -L kodorvan/perm/system/public/js/modules/simplex-noise.mjs ]; then
+if ! [ -L kodorvan/site/system/public/js/modules/simplex-noise.mjs ]; then
-	ln -s ../../../../../../womb3-simplex.mjs/simplex-noise.mjs kodorvan/perm/system/public/js/modules/simplex-noise.mjs;
+	ln -s ../../../../../../womb3-simplex.mjs/simplex-noise.mjs kodorvan/site/system/public/js/modules/simplex-noise.mjs;
 fi
 
-if ! [ -d kodorvan/perm/system/public/css/icons ]; then
+if ! [ -L kodorvan/site/system/public/css/icons ]; then
-	ln -s ../../../../../icons/css kodorvan/perm/system/public/css/icons;
+	ln -s ../../../../../icons/css kodorvan/site/system/public/css/icons;
 fi

kodorvan/perm/system/public/images/favicon/favicon.svg

@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="129.54482mm"
-   height="125.09652mm"
-   viewBox="0 0 129.54482 125.09652"
-   version="1.1"
-   id="svg1"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs1">
-    <linearGradient
-       id="linearGradient3">
-      <stop
-         style="stop-color:#0060c6;stop-opacity:1;"
-         offset="0.20645721"
-         id="stop3" />
-      <stop
-         style="stop-color:#000356;stop-opacity:1;"
-         offset="0.9989059"
-         id="stop4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1">
-      <stop
-         style="stop-color:#6fc4ff;stop-opacity:1;"
-         offset="0.17076893"
-         id="stop1" />
-      <stop
-         style="stop-color:#0adf70;stop-opacity:0.63586265;"
-         offset="1"
-         id="stop2" />
-    </linearGradient>
-    <radialGradient
-       xlink:href="#linearGradient3"
-       id="radialGradient4"
-       cx="69.684677"
-       cy="90.595695"
-       fx="69.684677"
-       fy="90.595695"
-       r="49.385239"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4657787,-0.63256258,0.71685408,1.6610996,-96.020968,-9.4714476)" />
-    <radialGradient
-       xlink:href="#linearGradient1"
-       id="radialGradient8"
-       cx="133.0006"
-       cy="106.39822"
-       fx="133.0006"
-       fy="106.39822"
-       r="64.772408"
-       gradientTransform="matrix(-2.5562072,0.53679846,-0.45438206,-2.1637443,446.93777,196.26702)"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <path
-     style="display:inline;fill:url(#radialGradient4);fill-opacity:0.983988;fill-rule:nonzero;stroke-width:2.22122;paint-order:stroke fill markers"
-     id="path2"
-     d="M 114.14959,66.009985 A 49.385239,49.385239 0 0 1 65.162476,115.39362 49.385239,49.385239 0 0 1 15.38553,66.806211 49.385239,49.385239 0 0 1 63.570075,16.639189 49.385239,49.385239 0 0 1 114.12391,64.41774" />
-  <path
-     id="path1"
-     style="display:inline;fill:url(#radialGradient8);stroke-width:2.64583;paint-order:stroke fill markers"
-     d="m 129.54482,60.324142 c 0,35.56901 -28.68229,64.483468 -64.250152,64.770218 C 29.72681,125.38111 0.58206084,96.932842 0.00858984,61.368452 -0.27814616,43.586256 6.6315828,27.351873 18.057823,15.455519 L 32.789578,50.834474 64.751888,64.645522 63.781478,106.2899 99.850468,58.627162 73.743498,34.999493 88.406328,0 c 7.79332,3.057143 14.862732,7.58429 20.856772,13.249271 5.99404,5.664982 10.91271,12.467797 14.40455,20.076274 3.49183,7.608477 5.55683,16.022617 5.84353,24.910247" />
-  <path
-     id="path5"
-     style="display:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
-     d="m 156.03189,48.675988 c 0,0 -0.48124,1.149734 -0.48124,1.149734 7.47158,3.127366 13.76035,8.757556 18.60133,15.033917 3.47372,4.503708 5.77328,8.679785 8.08747,12.343411 1.02716,1.626109 1.99256,3.317001 2.88786,5.073729 5.57385,10.936769 8.27496,24.254811 6.33597,38.307871 -1.81681,13.16752 -7.63944,25.96117 -17.4307,35.65948 -5.03375,4.98596 -10.97996,9.0142 -17.69827,11.85196 -7.22782,3.05296 -15.1235,4.63388 -23.42167,4.73245 -0.85262,0.0108 -1.69223,0.004 -2.51863,-0.0189 -14.1633,-0.39672 -25.57791,-5.05285 -34.17105,-11.0133 C 85.038155,154.03818 77.884734,143.64417 73.765338,134.02513 68.088136,120.76851 67.595266,108.31489 69.031333,98.509565 70.913466,85.658549 76.262275,76.52398 79.737684,71.524371 c 3.696594,-5.317797 5.945701,-7.392864 5.945701,-7.392864 0,0 -2.33932,1.972559 -6.214586,7.199789 -3.636021,4.904518 -9.303495,13.993979 -11.461258,27.018426 -1.64637,9.937638 -1.344521,22.656968 4.328486,36.278968 4.114552,9.87985 11.373099,20.61326 22.855995,28.64738 8.830228,6.17816 20.582878,10.99648 35.149578,11.4045 0.84878,0.0238 1.71085,0.0347 2.58621,0.0316 8.48799,-0.0368 16.67375,-1.34049 24.38977,-4.07858 7.17719,-2.54687 13.78867,-6.28188 19.64994,-11.14174 11.39583,-9.44885 19.35723,-22.68375 22.78331,-37.34635 3.64637,-15.60541 1.86385,-31.494338 -4.58101,-44.839852 -1.02738,-2.127422 -2.16303,-4.170709 -3.39713,-6.124429 -2.75251,-4.35753 -6.99513,-8.511352 -12.19307,-12.129511 -7.56806,-5.267932 -15.28231,-8.267232 -23.06649,-11.525444 0,0 -0.48124,1.149734 -0.48124,1.149734 z"
-     transform="translate(-67.625562,-48.675988)" />
-</svg>

kodorvan/perm/system/views/themes/default/elements/companies.html

@@ -1,27 +0,0 @@
-<section id="companies" class="unselectable">
-  {% for alt, file in integrations %}
-	<img class="{{ file }}" src="/themes/{{ theme }}/images/logotypes/{{ file }}.svg" alt="{{ alt }}" ondragstart="return false"/>
-	{% endfor %}
-</section>
-
-<script>
-document.addEventListener('core.initialized', () => 
-	core.modules.connect(["hotline"]).then((connected) => {
-		// Imported the hotline.mjs module
-
-		// Initializing an instance of the hotline.mjs
-		const instance = new connected.hotline(document.getElementById("companies"));
-
-		// Initializing settings of the hotline instance
-		instance.alive = true;
-		instance.wheel = false;
-		instance.movable = false;
-		instance.hover = false;
-		instance.delta = 3;
-		instance.step = 0.2;
-
-		// Starting the hotline instance
-		instance.start();
-	})
-);
-</script>

kodorvan/site/system/controllers/core.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace kodorvan\perm\controllers;
+namespace kodorvan\site\controllers;
 
 // Files of the project
-use kodorvan\perm\views\templater,
+use kodorvan\site\views\templater,
-	kodorvan\perm\models\core as models;
+	kodorvan\site\models\core as models;
 
 // Library for languages support
 use mirzaev\languages\language;
@@ -20,7 +20,7 @@ use mirzaev\minimal\core as minimal,
 /**
  * Controllers core
  *
- * @package kodorvan\perm\controllers
+ * @package kodorvan\site\controllers
  *
  * @param language $language Language
  * @param response $response Response

kodorvan/site/system/controllers/index.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace kodorvan\perm\controllers;
+namespace kodorvan\site\controllers;
 
 // Files of the project
-use kodorvan\perm\controllers\core;
+use kodorvan\site\controllers\core;
 
 // Framework for PHP
 use mirzaev\minimal\http\enumerations\content,
@@ -14,7 +14,7 @@ use mirzaev\minimal\http\enumerations\content,
 /**
  * Index
  *
- * @package kodorvan\perm\controllers
+ * @package kodorvan\site\controllers
  *
  * @param array $errors Registry of errors
  *
@@ -195,39 +195,37 @@ final class index extends core
 					'site' => 'Сайт',
 					'chat_robot' => 'Чат-робот',
 					'program' => 'Программа',
-					'module' => 'Модуль',
-					'parser' => 'Парсер',
-					'script' => 'Скрипт',
 					'game' => 'Видеоигра',
-					/* 'site' => 'Сайты и браузерные расширения',
+					'script' => 'Скрипт, парсер, макрос',
-					'chat_robot' => 'Чат-роботы (любой мессенджер)',
+					'module' => 'Модуль, плагин, расширение',
-					'program' => 'Программа (Android, iOS, Windows)',
-					'module' => 'Модуль для любой программы',
-					'parser' => 'Парсер данных API, HTTP и эмуляция',
-					'script' => 'Скрипт (автоматизация процессов)',
-					'game' => 'Видеоигра (Android, iOS, Windows)' */
 				],
 				'purposes' => [
-					'funnel' => 'Воронка',
+					'funnel' => 'Воронка (обработка пользователя)',
-					'contacts' => 'Контакты',
+					'contacts' => 'Контакты (сбор данных)',
-					'neural_network' => 'Нейросети',
+					'ai' => 'Внедрение ИИ',
-					'gallery' => 'Галерея',
+					'archive' => 'Архив (галерея, библиотека, реестр)',
-					'crm' => 'CRM',
+					'crm' => 'Индивидуальная CRM',
-					'landing' => 'Лендинг',
+					'landing' => 'Лендинг (посадочная страница)',
-					'marketplace' => 'Маркетплейс',
+					'marketplace' => 'Маркетплейс, магазин, витрина',
-					'search' => 'Поиск',
+					'saas' => 'SaaS проект',
-					'calculate' => 'Расчёты',
+					'search' => 'Поиск и анализ',
-					'logic' => 'Логика',
+					'calculate' => 'Автоматизированное вычисление (калькулятор)',
-					'game' => 'Игра',
+					'individual' => 'Индивидуальная разработка',
-					'special' => 'Особенный',
 				],
 				'integrations' => [
 					'one_c' => '1C',
 					'bitrix24' => 'Битрикс24',
 					'moy_sklad' => 'Мой Склад',
-					'telegram' => 'Телеграм',
 					'mail' => 'Почта',
-					'excel' => 'Excel'
+					'excel' => 'Excel',
+					'ozon' => 'OZON',
+					'wildberries' => 'Wildberries',
+					'yandex_market' => 'Яндекс Маркет',
+					'avito' => 'Авито',
+					'vk' => 'ВКонтакте',
+					'max' => 'МАКС',
+					'telegram' => 'Телеграм',
+					'neural_networks' => 'Нейросети'
 				]
 			];
 
@@ -249,19 +247,19 @@ final class index extends core
 
 			// Initializing contacts data
 			$this->view->integrations = [
+				'Вайлдберриз' => 'wildberries',
+				'ОЗОН' => 'ozon',
 				'Мой Склад' => 'moy_sklad',
 				'1С Предприятие' => '1c',
 				'Битрикс 24' => 'bitrix24',
 				'ВКонтакте' => 'vk',
 				'МАКС' => 'max',
-				/* 'yandex_direct', */
-				'Яндекс Директ' => 'yandex_market',
-				'ОЗОН' => 'ozon',
-				'Вайлдберриз' => 'wildberries',
 				'Авито' => 'avito',
 				'YClients' => 'yclients',
 				'ЮКасса' => 'yookassa',
-				'OpenAI' => 'openai'
+				'OpenAI' => 'openai',
+				/* 'yandex_direct', */
+				'Яндекс Директ' => 'yandex_market',
 			];
 
 			// Render page

kodorvan/site/system/controllers/offer.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace kodorvan\perm\controllers;
+namespace kodorvan\site\controllers;
 
 // Files of the project
-use kodorvan\perm\controllers\core;
+use kodorvan\site\controllers\core;
 
 // Framework for PHP
 use mirzaev\minimal\http\enumerations\content,
@@ -14,7 +14,7 @@ use mirzaev\minimal\http\enumerations\content,
 /**
  * Offer
  *
- * @package kodorvan\perm\controllers
+ * @package kodorvan\site\controllers
  *
  * @param array $errors Registry of errors
  *

kodorvan/site/system/controllers/project.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace kodorvan\perm\controllers;
+namespace kodorvan\site\controllers;
 
 // Files of the project
-use kodorvan\perm\controllers\core;
+use kodorvan\site\controllers\core;
 
 // PHP framework
 use mirzaev\minimal\http\enumerations\content,
@@ -19,7 +19,7 @@ use PHPMailer\PHPMailer\PHPMailer as mail,
 /**
  * Index
  *
- * @package kodorvan\perm\controllers
+ * @package kodorvan\site\controllers
  *
  * @param array $errors Registry of errors
  *
@@ -83,20 +83,20 @@ final class project extends core
 			$mail->setLanguage('ru');
 			$mail->CharSet = mail::CHARSET_UTF8;
 			$mail->isSMTP();
-			$mail->Host = 'smtp.mail.ru';
+			$mail->Host = MAIL_SERVER['host'];
 			$mail->SMTPAuth = true;
-			$mail->Username = 'system@kodorvan.tech';
+			$mail->Username = MAIL_SERVER['sender']['mail'];
-			$mail->Password = 'c6oQF2nY0javI312eDS0';
+			$mail->Password = MAIL_SERVER['password'];
 			$mail->SMTPSecure = mail::ENCRYPTION_SMTPS;
 			$mail->Port = 465;
-			$mail->setFrom('system@kodorvan.tech', 'Система');
+			$mail->setFrom(MAIL_SERVER['sender']['mail'], MAIL_SERVER['sender']['name']);
-			$mail->addAddress('request@kodorvan.tech', 'Заявки');
+			$mail->addAddress(MAIL_SERVER['receiver']['mail'], MAIL_SERVER['receiver']['name']);
 
 			// The message
 			$mail->isHTML(true);
 			$mail->Subject = empty($request['project']['name']) ? 'Заказ' : 'Заказ: ' . $request['project']['name'];
 			$mail->Body = $this->view->render('messages/request.html', $request);
-			$mail->AltBody = 'This is the body in plain text for non-HTML mail clients';
+			/* $mail->AltBody = 'This is the body in plain text for non-HTML mail clients'; */
 
 			// Attachments
 			foreach ($files as $name => $file) {

kodorvan/site/system/models/core.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace kodorvan\perm\models;
+namespace kodorvan\site\models;
 
 // Framework for PHP
 use mirzaev\minimal\model,
@@ -14,7 +14,7 @@ use exception;
 /**
  * Models core
  *
- * @package kodorvan\perm\models
+ * @package kodorvan\site\models
  *
  * @method void __construct() Constructor
  *