Module5 task1 #13
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <?php | ||
| return [ | ||
| 'db' => [ | ||
| 'host' => 'MySQL-8.2', | ||
| 'user' => 'root', | ||
| 'password' => '', | ||
| 'database' => 'yeticave', | ||
| ], | ||
| 'sender' => [] | ||
| ]; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| <?php | ||
| /** | ||
| * Подключение к базе данных | ||
| * @param array $config Настройки подключения | ||
| * @return mysqli|bool Возваращемый тип данных | ||
| */ | ||
| function dbConnect(array $config):mysqli|bool | ||
| { | ||
| if (!isset($config['db']['host'], $config['db']['user'], $config['db']['password'], $config['db']['database'])) { | ||
| exit; | ||
| } | ||
| $dbConfig = $config['db']; | ||
|
|
||
| $con = mysqli_connect($dbConfig['host'], $dbConfig['user'], $dbConfig['password'], $dbConfig['database']); | ||
|
|
||
|
|
||
| if (!$con) { | ||
| echo "Подключения к базе данных не установлено"; | ||
| exit("Connection error: " . mysqli_connect_error()); | ||
| } else { | ||
| echo "Подключения к базе данных установлено"; | ||
| } | ||
|
|
||
| mysqli_set_charset($con, "utf8"); | ||
|
|
||
| return $con; | ||
|
|
||
| } | ||
| // Запрос на получение новых лотов | ||
| function getNewLotsFromDb(mysqli $con) | ||
|
There was a problem hiding this comment. phpdoc и прописать тип возвращаемого значения в сигнатуре |
||
| { | ||
| $sql = "SELECT l.id, l.title, l.start_price, l.image_url, c.name AS category_name, r.amount AS current_price, l.created_at | ||
| FROM lots l | ||
| JOIN categories c ON c.id = l.category_id | ||
| LEFT JOIN rates r ON r.lot_id = l.id | ||
| WHERE l.ended_at > NOW() | ||
| GROUP BY l.id, l.title, l.start_price, l.image_url, c.name, current_price | ||
| ORDER BY l.created_at DESC | ||
| LIMIT 3;"; | ||
|
|
||
| $result = mysqli_query($con, $sql); | ||
|
|
||
| if (!$result) { | ||
| $error = mysqli_error($con); | ||
| print("SQL Error: $error"); | ||
|
|
||
| } | ||
|
|
||
| return mysqli_fetch_all($result, MYSQLI_ASSOC); | ||
| } | ||
|
|
||
| // Запрос на получения всех категорий | ||
| function getAllCategoriesFromDb(mysqli $con) | ||
|
|
||
| { | ||
| $sql = "SELECT * FROM categories;"; | ||
| $result = mysqli_query($con, $sql); | ||
|
|
||
| if (!$result) { | ||
| $error = mysqli_error($con); | ||
| print("SQL Error: $error"); | ||
| } | ||
|
|
||
| return mysqli_fetch_all($result, MYSQLI_ASSOC); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| <?php | ||
| /** | ||
|
There was a problem hiding this comment. перенести описание к той функции, для которой оно написано |
||
| * Подключает шаблон, передает туда данные и возвращает итоговый HTML контент | ||
| * @param string $name Путь к файлу шаблона относительно папки templates | ||
| * @param array $data Ассоциативный массив с данными для шаблона | ||
| * @return string Итоговый HTML | ||
| */ | ||
|
|
||
|
|
||
| /** | ||
| *Форматирует время лота | ||
|
|
||
| *@param string $data | ||
| *@return array | ||
| */ | ||
| function remainingTime(string $date): array | ||
|
There was a problem hiding this comment. можно тоже в перенести в functions/template.php |
||
| { | ||
| $timeDifference = strtotime($date) - time(); | ||
| if ($timeDifference<=0){ | ||
| return [0,0]; | ||
|
|
||
| } | ||
| $hours = floor($timeDifference / 3600); | ||
| $minutes = floor(($timeDifference / 3600) % 60); | ||
|
|
||
| return [$hours, $minutes]; | ||
| } | ||
|
|
||
| /** | ||
| * Форматирует cумму лота и добавляет знак рубля | ||
| * @param int|float $price | ||
| * @return string | ||
| */ | ||
| function formatAmount(int|float $price): string | ||
|
|
||
| { | ||
| $price = number_format($price, 0, '.', ' '); | ||
| return $price . ' ₽'; | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,188 +1,27 @@ | ||
| <?php | ||
| require_once ('templates/data.php'); | ||
| require_once ('functions/functions.php'); | ||
| require_once ('functions/db.php'); | ||
| require_once ('helpers.php'); | ||
| require_once ('init.php'); | ||
|
|
||
| $config = require 'configdb.php'; | ||
| $connectionDB = dbConnect($config); | ||
| $newLots = getNewLotsFromDb($connectionDB); | ||
| $newLots = getAllCategoriesFromDb($connectionDB); | ||
|
|
||
|
|
||
| $mainContent = includeTemplate('main.php', [ | ||
| 'categories' => $categories, | ||
| 'lots' => $lots, | ||
| ]); | ||
|
|
||
| $layoutContent = includeTemplate('layout.php', [ | ||
| 'content' => $mainContent, | ||
| 'title' => "Главная", | ||
| 'isAuth' => $isAuth, | ||
| 'userName' => $userName, | ||
| 'categories' => $categories, | ||
| ]); | ||
|
|
||
| print($layoutContent); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Передать в нее $config['db']
и тогда внутри можно будет использовать ключи
$config['host'], $config['user'], ...