diff --git a/kernel/RestController.php b/kernel/RestController.php new file mode 100644 index 0000000..a2c7b88 --- /dev/null +++ b/kernel/RestController.php @@ -0,0 +1,48 @@ +get('page') ?? 1; + $perPage = $request->get('per_page') ?? 10; + $query = $this->model->query(); + if ($page > 1) { + $query->skip(($page - 1) * $perPage)->take($perPage); + } else { + $query->take($perPage); + } + $res = $query->get()->toArray(); + + $this->renderApi($res); + } + + #[NoReturn] public function actionView($id): void + { + $model = $this->model->where("id", $id)->first(); + $res = []; + if ($model){ + $res = $model->toArray(); + } + + $this->renderApi($res); + } + + #[NoReturn] protected function renderApi(array $data): void + { + header("Content-Type: application/json"); + echo json_encode($data); + exit(); + } + +} \ No newline at end of file diff --git a/kernel/helpers/Slug.php b/kernel/helpers/Slug.php new file mode 100644 index 0000000..06b4918 --- /dev/null +++ b/kernel/helpers/Slug.php @@ -0,0 +1,165 @@ + '-', + 'limit' => null, + 'lowercase' => true, + 'replacements' => array(), + 'transliterate' => false, + ); + + // Merge options + $options = array_merge($defaults, $options); + + $char_map = array( + // Latin + 'À' => 'A', 'Á' => 'A', 'Â' => 'A', 'Ã' => 'A', 'Ä' => 'A', 'Å' => 'A', 'Æ' => 'AE', 'Ç' => 'C', + 'È' => 'E', 'É' => 'E', 'Ê' => 'E', 'Ë' => 'E', 'Ì' => 'I', 'Í' => 'I', 'Î' => 'I', 'Ï' => 'I', + 'Ð' => 'D', 'Ñ' => 'N', 'Ò' => 'O', 'Ó' => 'O', 'Ô' => 'O', 'Õ' => 'O', 'Ö' => 'O', 'Ő' => 'O', + 'Ø' => 'O', 'Ù' => 'U', 'Ú' => 'U', 'Û' => 'U', 'Ü' => 'U', 'Ű' => 'U', 'Ý' => 'Y', 'Þ' => 'TH', + 'ß' => 'ss', + 'à' => 'a', 'á' => 'a', 'â' => 'a', 'ã' => 'a', 'ä' => 'a', 'å' => 'a', 'æ' => 'ae', 'ç' => 'c', + 'è' => 'e', 'é' => 'e', 'ê' => 'e', 'ë' => 'e', 'ì' => 'i', 'í' => 'i', 'î' => 'i', 'ï' => 'i', + 'ð' => 'd', 'ñ' => 'n', 'ò' => 'o', 'ó' => 'o', 'ô' => 'o', 'õ' => 'o', 'ö' => 'o', 'ő' => 'o', + 'ø' => 'o', 'ù' => 'u', 'ú' => 'u', 'û' => 'u', 'ü' => 'u', 'ű' => 'u', 'ý' => 'y', 'þ' => 'th', + 'ÿ' => 'y', + + // Latin symbols + '©' => '(c)', + + // Greek + 'Α' => 'A', 'Β' => 'B', 'Γ' => 'G', 'Δ' => 'D', 'Ε' => 'E', 'Ζ' => 'Z', 'Η' => 'H', 'Θ' => '8', + 'Ι' => 'I', 'Κ' => 'K', 'Λ' => 'L', 'Μ' => 'M', 'Ν' => 'N', 'Ξ' => '3', 'Ο' => 'O', 'Π' => 'P', + 'Ρ' => 'R', 'Σ' => 'S', 'Τ' => 'T', 'Υ' => 'Y', 'Φ' => 'F', 'Χ' => 'X', 'Ψ' => 'PS', 'Ω' => 'W', + 'Ά' => 'A', 'Έ' => 'E', 'Ί' => 'I', 'Ό' => 'O', 'Ύ' => 'Y', 'Ή' => 'H', 'Ώ' => 'W', 'Ϊ' => 'I', + 'Ϋ' => 'Y', + 'α' => 'a', 'β' => 'b', 'γ' => 'g', 'δ' => 'd', 'ε' => 'e', 'ζ' => 'z', 'η' => 'h', 'θ' => '8', + 'ι' => 'i', 'κ' => 'k', 'λ' => 'l', 'μ' => 'm', 'ν' => 'n', 'ξ' => '3', 'ο' => 'o', 'π' => 'p', + 'ρ' => 'r', 'σ' => 's', 'τ' => 't', 'υ' => 'y', 'φ' => 'f', 'χ' => 'x', 'ψ' => 'ps', 'ω' => 'w', + 'ά' => 'a', 'έ' => 'e', 'ί' => 'i', 'ό' => 'o', 'ύ' => 'y', 'ή' => 'h', 'ώ' => 'w', 'ς' => 's', + 'ϊ' => 'i', 'ΰ' => 'y', 'ϋ' => 'y', 'ΐ' => 'i', + + // Turkish + 'Ş' => 'S', 'İ' => 'I', 'Ç' => 'C', 'Ü' => 'U', 'Ö' => 'O', 'Ğ' => 'G', + 'ş' => 's', 'ı' => 'i', 'ç' => 'c', 'ü' => 'u', 'ö' => 'o', 'ğ' => 'g', + + // Russian + 'А' => 'A', 'Б' => 'B', 'В' => 'V', 'Г' => 'G', 'Д' => 'D', 'Е' => 'E', 'Ё' => 'Yo', 'Ж' => 'Zh', + 'З' => 'Z', 'И' => 'I', 'Й' => 'J', 'К' => 'K', 'Л' => 'L', 'М' => 'M', 'Н' => 'N', 'О' => 'O', + 'П' => 'P', 'Р' => 'R', 'С' => 'S', 'Т' => 'T', 'У' => 'U', 'Ф' => 'F', 'Х' => 'H', 'Ц' => 'C', + 'Ч' => 'Ch', 'Ш' => 'Sh', 'Щ' => 'Sh', 'Ъ' => '', 'Ы' => 'Y', 'Ь' => '', 'Э' => 'E', 'Ю' => 'Yu', + 'Я' => 'Ya', + 'а' => 'a', 'б' => 'b', 'в' => 'v', 'г' => 'g', 'д' => 'd', 'е' => 'e', 'ё' => 'yo', 'ж' => 'zh', + 'з' => 'z', 'и' => 'i', 'й' => 'j', 'к' => 'k', 'л' => 'l', 'м' => 'm', 'н' => 'n', 'о' => 'o', + 'п' => 'p', 'р' => 'r', 'с' => 's', 'т' => 't', 'у' => 'u', 'ф' => 'f', 'х' => 'h', 'ц' => 'c', + 'ч' => 'ch', 'ш' => 'sh', 'щ' => 'sh', 'ъ' => '', 'ы' => 'y', 'ь' => '', 'э' => 'e', 'ю' => 'yu', + 'я' => 'ya', + + // Ukrainian + 'Є' => 'Ye', 'І' => 'I', 'Ї' => 'Yi', 'Ґ' => 'G', + 'є' => 'ye', 'і' => 'i', 'ї' => 'yi', 'ґ' => 'g', + + // Czech + 'Č' => 'C', 'Ď' => 'D', 'Ě' => 'E', 'Ň' => 'N', 'Ř' => 'R', 'Š' => 'S', 'Ť' => 'T', 'Ů' => 'U', + 'Ž' => 'Z', + 'č' => 'c', 'ď' => 'd', 'ě' => 'e', 'ň' => 'n', 'ř' => 'r', 'š' => 's', 'ť' => 't', 'ů' => 'u', + 'ž' => 'z', + + // Polish + 'Ą' => 'A', 'Ć' => 'C', 'Ę' => 'e', 'Ł' => 'L', 'Ń' => 'N', 'Ó' => 'o', 'Ś' => 'S', 'Ź' => 'Z', + 'Ż' => 'Z', + 'ą' => 'a', 'ć' => 'c', 'ę' => 'e', 'ł' => 'l', 'ń' => 'n', 'ó' => 'o', 'ś' => 's', 'ź' => 'z', + 'ż' => 'z', + + // Latvian + 'Ā' => 'A', 'Č' => 'C', 'Ē' => 'E', 'Ģ' => 'G', 'Ī' => 'i', 'Ķ' => 'k', 'Ļ' => 'L', 'Ņ' => 'N', + 'Š' => 'S', 'Ū' => 'u', 'Ž' => 'Z', + 'ā' => 'a', 'č' => 'c', 'ē' => 'e', 'ģ' => 'g', 'ī' => 'i', 'ķ' => 'k', 'ļ' => 'l', 'ņ' => 'n', + 'š' => 's', 'ū' => 'u', 'ž' => 'z' + ); + + // Make custom replacements + $str = preg_replace(array_keys($options['replacements']), $options['replacements'], $str); + + // Transliterate characters to ASCII + if ($options['transliterate']) { + $str = str_replace(array_keys($char_map), $char_map, $str); + } + + // Replace non-alphanumeric characters with our delimiter + $str = preg_replace('/[^\p{L}\p{Nd}]+/u', $options['delimiter'], $str); + + // Remove duplicate delimiters + $str = preg_replace('/(' . preg_quote($options['delimiter'], '/') . '){2,}/', '$1', $str); + + // Truncate slug to max. characters + $str = mb_substr($str, 0, ($options['limit'] ? $options['limit'] : mb_strlen($str, 'UTF-8')), 'UTF-8'); + + // Remove delimiter from ends + $str = trim($str, $options['delimiter']); + + return $options['lowercase'] ? mb_strtolower($str, 'UTF-8') : $str; + } + + + +} + +//// Example using French with unwanted characters ('?) +//echo "Qu'en est-il français? Ça marche alors?" . "\n"; +//echo url_slug("Qu'en est-il français? Ça marche alors?") . "\n\n"; +//// Example using transliteration +//echo "Что делать, если я не хочу, UTF-8?" . "\n"; +//echo url_slug("Что делать, если я не хочу, UTF-8?", array('transliterate' => true)) . "\n\n"; +//// Example using transliteration on an unsupported language +//echo "מה אם ×× ×™ לא רוצה UTF-8 תווים?" . "\n"; +//echo url_slug("מה אם ×× ×™ לא רוצה UTF-8 תווים?", array('transliterate' => true)) . "\n\n"; +//// Some other options +//echo "This is an Example String. What's Going to Happen to Me?" . "\n"; +//echo url_slug( +// "This is an Example String. What's Going to Happen to Me?", +// array( +// 'delimiter' => '_', +// 'limit' => 40, +// 'lowercase' => false, +// 'replacements' => array( +// '/\b(an)\b/i' => 'a', +// '/\b(example)\b/i' => 'Test' +// ) +// ) +//); +/* +Output: +This is an example string. Nothing fancy. +this-is-an-example-string-nothing-fancy +Qu'en est-il français? Ça marche alors? +qu-en-est-il-français-ça-marche-alors +Что делать, если я не хочу, UTF-8? +chto-delat-esli-ya-ne-hochu-utf-8 +מה אם ×× ×™ לא רוצה UTF-8 תווים? +מה-אם-×× ×™-לא-רוצה-utf-8-תווים +This is an Example String. What's Going to Happen to Me? +This_is_a_Test_String_What_s_Going_to_Ha +*/ \ No newline at end of file diff --git a/kernel/modules/post/controllers/PostRestController.php b/kernel/modules/post/controllers/PostRestController.php new file mode 100644 index 0000000..5de4ed6 --- /dev/null +++ b/kernel/modules/post/controllers/PostRestController.php @@ -0,0 +1,27 @@ +model = new Post(); + } + + public function actionView($id): void + { + $model = $this->model->where("id", $id)->first(); + $model->load("user"); + $res = []; + if ($model){ + $res = $model->toArray(); + } + + $this->renderApi($res); + } +} \ No newline at end of file diff --git a/kernel/modules/post/models/Post.php b/kernel/modules/post/models/Post.php index c2ae704..b3482d1 100644 --- a/kernel/modules/post/models/Post.php +++ b/kernel/modules/post/models/Post.php @@ -2,10 +2,13 @@ namespace kernel\modules\post\models; use \Illuminate\Database\Eloquent\Model; +use kernel\modules\user\models\User; /** * @property int $id * @property string $content + * @property string $title + * @property string $slug // * @property string $username * @property int $user_id * @method static where(int[] $array) @@ -14,15 +17,22 @@ use \Illuminate\Database\Eloquent\Model; class Post extends Model { protected $table = 'post'; - protected $fillable = ['content', 'user_id']; + protected $fillable = ['content', 'user_id', 'title', 'slug']; public static function labels(): array { return [ 'content' => 'Контент', + 'title' => 'Заголовок', + 'slug' => 'Slug', 'user_id' => 'Id пользователя', 'created_at' => 'Создан', 'updated_at' => 'Обновлен' ]; } + + public function user() + { + return $this->belongsTo(User::class); + } } \ No newline at end of file diff --git a/kernel/modules/post/models/forms/CreatePostForm.php b/kernel/modules/post/models/forms/CreatePostForm.php index 0530679..8e68ac9 100644 --- a/kernel/modules/post/models/forms/CreatePostForm.php +++ b/kernel/modules/post/models/forms/CreatePostForm.php @@ -9,7 +9,9 @@ class CreatePostForm extends FormModel public function rules(): array { return [ - 'content' => 'required|min-str-len:1', + 'content' => 'required|min-str-len:10', + 'title' => 'required|min-str-len:5', + 'slug' => '', 'user_id' => 'required', ]; } diff --git a/kernel/modules/post/routs/post.php b/kernel/modules/post/routs/post.php index 7b2ec42..8253a17 100644 --- a/kernel/modules/post/routs/post.php +++ b/kernel/modules/post/routs/post.php @@ -15,4 +15,18 @@ App::$collector->group(["prefix" => "admin"], function (RouteCollector $router){ App::$collector->any("/edit/{id}", [\kernel\modules\post\controllers\PostController::class, 'actionEdit']); App::$collector->get('/delete/{id}', [\kernel\modules\post\controllers\PostController::class, 'actionDelete']); }); +}); + +App::$collector->group(["prefix" => "api"], function (RouteCollector $router){ + App::$collector->group(["prefix" => "post"], function (RouteCollector $router){ + App::$collector->get('/', [\kernel\modules\post\controllers\PostRestController::class, 'actionIndex']); + App::$collector->get('/{id}', [\kernel\modules\post\controllers\PostRestController::class, 'actionView']); +// App::$collector->get('/page/{page_number}', [\kernel\modules\post\controllers\PostController::class, 'actionIndex']); +// App::$collector->get('/create', [\kernel\modules\post\controllers\PostController::class, 'actionCreate']); +// App::$collector->post("/", [\kernel\modules\post\controllers\PostController::class, 'actionAdd']); +// App::$collector->get('/{id}', [\kernel\modules\post\controllers\PostController::class, 'actionView']); +// App::$collector->any('/update/{id}', [\kernel\modules\post\controllers\PostController::class, 'actionUpdate']); +// App::$collector->any("/edit/{id}", [\kernel\modules\post\controllers\PostController::class, 'actionEdit']); +// App::$collector->get('/delete/{id}', [\kernel\modules\post\controllers\PostController::class, 'actionDelete']); + }); }); \ No newline at end of file diff --git a/kernel/modules/post/service/PostService.php b/kernel/modules/post/service/PostService.php index 87570e0..3849fff 100644 --- a/kernel/modules/post/service/PostService.php +++ b/kernel/modules/post/service/PostService.php @@ -2,6 +2,7 @@ namespace kernel\modules\post\service; +use kernel\helpers\Slug; use kernel\modules\post\models\Post; use kernel\FormModel; @@ -12,6 +13,8 @@ class PostService $model = new Post(); $model->content = $form_model->getItem('content'); $model->user_id = $form_model->getItem('user_id'); + $model->title = $form_model->getItem('title'); + $model->slug = Slug::url_slug($form_model->getItem('title'), ['transliterate' => true, 'lowercase' => true]); if ($model->save()){ return $model; } diff --git a/kernel/modules/post/views/form.php b/kernel/modules/post/views/form.php index 50f2fb5..ed898ea 100644 --- a/kernel/modules/post/views/form.php +++ b/kernel/modules/post/views/form.php @@ -8,6 +8,15 @@ use kernel\modules\post\models\Post; $form = new \itguild\forms\ActiveForm(); $form->beginForm(isset($model) ? "/admin/post/edit/" . $model->id : "/admin/post"); +$form->field(\itguild\forms\inputs\TextInput::class, 'title', [ + 'class' => "form-control", + 'placeholder' => 'Заголовок поста', + 'value' => $model->title ?? '' +]) + ->setLabel("Заголовок") + ->render(); + + $form->field(class: \itguild\forms\inputs\TextArea::class, name: "content", params: [ 'class' => "form-control", 'placeholder' => 'Контент', diff --git a/kernel/modules/secure/controllers/SecureController.php b/kernel/modules/secure/controllers/SecureController.php index 268c262..bfdcd1c 100644 --- a/kernel/modules/secure/controllers/SecureController.php +++ b/kernel/modules/secure/controllers/SecureController.php @@ -54,7 +54,7 @@ class SecureController extends AdminController { unset($_COOKIE['user_id']); setcookie('user_id', "", -1, '/', $_SERVER['SERVER_NAME'], false); - $this->redirect("/"); + $this->redirect("/", code: 302); } } \ No newline at end of file diff --git a/kernel/modules/secure/routs/secure.php b/kernel/modules/secure/routs/secure.php index 0d8975f..9cda940 100644 --- a/kernel/modules/secure/routs/secure.php +++ b/kernel/modules/secure/routs/secure.php @@ -6,7 +6,7 @@ use Phroute\Phroute\RouteCollector; App::$collector->filter("auth", function (){ if(!isset($_COOKIE['user_id'])) { - header('Location: /admin/login'); + header('Location: /admin/login', true, 302); return false; }