From ef1309b2e34347d8dc0be959722e2398a78c5fe7 Mon Sep 17 00:00:00 2001 From: aslan Date: Tue, 23 Jan 2024 11:20:15 +0300 Subject: [PATCH] add ReceptionScreen web resource --- .../Controllers/OnlineDocumentsController.php | 65 ------------------- .../Controllers/ReceptionScreenController.php | 65 +++++++++++++++++++ ...st.php => StoreReceptionScreenRequest.php} | 2 +- ...t.php => UpdateReceptionScreenRequest.php} | 2 +- ...nlineDocuments.php => ReceptionScreen.php} | 2 +- ...tsPolicy.php => ReceptionScreenPolicy.php} | 14 ++-- ...Factory.php => ReceptionScreenFactory.php} | 4 +- ..._082251_create_reception_screens_table.php | 28 ++++++++ ...2024_01_22_070323_create_submenu_table.php | 33 ++++++++++ ...> 2024_01_22_074748_create_file_table.php} | 6 +- database/seeders/DatabaseSeeder.php | 2 +- database/seeders/OnlineDocumentsSeeder.php | 41 ------------ database/seeders/ReceptionScreenSeeder.php | 32 +++++++++ .../index.blade.php | 0 .../views/layouts/admin-layout.blade.php | 10 +-- routes/web.php | 4 +- 16 files changed, 176 insertions(+), 134 deletions(-) delete mode 100644 app/Http/Controllers/OnlineDocumentsController.php create mode 100644 app/Http/Controllers/ReceptionScreenController.php rename app/Http/Requests/{StoreOnlineDocumentsRequest.php => StoreReceptionScreenRequest.php} (90%) rename app/Http/Requests/{UpdateOnlineDocumentsRequest.php => UpdateReceptionScreenRequest.php} (90%) rename app/Models/{OnlineDocuments.php => ReceptionScreen.php} (88%) rename app/Policies/{OnlineDocumentsPolicy.php => ReceptionScreenPolicy.php} (71%) rename database/factories/{DocumentsOnlineFactory.php => ReceptionScreenFactory.php} (83%) create mode 100644 database/migrations/2024_01_18_082251_create_reception_screens_table.php create mode 100644 database/migrations/2024_01_22_070323_create_submenu_table.php rename database/migrations/{2024_01_18_082251_create_online_documents_table.php => 2024_01_22_074748_create_file_table.php} (71%) delete mode 100644 database/seeders/OnlineDocumentsSeeder.php create mode 100644 database/seeders/ReceptionScreenSeeder.php rename resources/views/{online-documents => admin-reception-screen}/index.blade.php (100%) diff --git a/app/Http/Controllers/OnlineDocumentsController.php b/app/Http/Controllers/OnlineDocumentsController.php deleted file mode 100644 index a17a55f..0000000 --- a/app/Http/Controllers/OnlineDocumentsController.php +++ /dev/null @@ -1,65 +0,0 @@ - + * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\ReceptionScreen> */ -class DocumentsOnlineFactory extends Factory +class ReceptionScreenFactory extends Factory { /** * Define the model's default state. diff --git a/database/migrations/2024_01_18_082251_create_reception_screens_table.php b/database/migrations/2024_01_18_082251_create_reception_screens_table.php new file mode 100644 index 0000000..5127218 --- /dev/null +++ b/database/migrations/2024_01_18_082251_create_reception_screens_table.php @@ -0,0 +1,28 @@ +id(); + $table->string('name'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('reception_screens'); + } +}; diff --git a/database/migrations/2024_01_22_070323_create_submenu_table.php b/database/migrations/2024_01_22_070323_create_submenu_table.php new file mode 100644 index 0000000..c935591 --- /dev/null +++ b/database/migrations/2024_01_22_070323_create_submenu_table.php @@ -0,0 +1,33 @@ +id(); + $table->string('name'); + $table->string('description'); + $table->string('parent'); + $table->string('meta_title'); + $table->string('meta_description'); + $table->string('meta_keywords'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('submenu'); + } +}; diff --git a/database/migrations/2024_01_18_082251_create_online_documents_table.php b/database/migrations/2024_01_22_074748_create_file_table.php similarity index 71% rename from database/migrations/2024_01_18_082251_create_online_documents_table.php rename to database/migrations/2024_01_22_074748_create_file_table.php index 7d3240a..1e08781 100644 --- a/database/migrations/2024_01_18_082251_create_online_documents_table.php +++ b/database/migrations/2024_01_22_074748_create_file_table.php @@ -11,12 +11,10 @@ return new class extends Migration */ public function up(): void { - Schema::create('online_documents', function (Blueprint $table) { + Schema::create('file', function (Blueprint $table) { $table->id(); $table->string('name'); $table->string('url'); - $table->string('parent'); - $table->string('children'); $table->timestamps(); }); } @@ -26,6 +24,6 @@ return new class extends Migration */ public function down(): void { - Schema::dropIfExists('online_documents'); + Schema::dropIfExists('file'); } }; diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index f7a49d3..e35b20d 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -21,7 +21,7 @@ class DatabaseSeeder extends Seeder 'password' => 123456 ]); $this->call([ - OnlineDocumentsSeeder::class + ReceptionScreenSeeder::class ]); } } diff --git a/database/seeders/OnlineDocumentsSeeder.php b/database/seeders/OnlineDocumentsSeeder.php deleted file mode 100644 index 0f5009e..0000000 --- a/database/seeders/OnlineDocumentsSeeder.php +++ /dev/null @@ -1,41 +0,0 @@ -insert([ - [ - 'name' => 'Подать документы онлайн', - 'url' => '', - 'parent' => '0', - 'children' => '2/3', - 'created_at' => Carbon::now(), - ], - [ - 'name' => 'По образовательным программам высшего образования', - 'url' => '', - 'parent' => '1', - 'children' => '', - 'created_at' => Carbon::now(), - ], - [ - 'name' => 'По образовательным программам среднего профессионального образования (колледж)', - 'url' => '', - 'parent' => '1', - 'children' => '', - 'created_at' => Carbon::now(), - ] - ]); - } -} diff --git a/database/seeders/ReceptionScreenSeeder.php b/database/seeders/ReceptionScreenSeeder.php new file mode 100644 index 0000000..cca647b --- /dev/null +++ b/database/seeders/ReceptionScreenSeeder.php @@ -0,0 +1,32 @@ +insert([ + [ + 'name' => 'Пункт 1 с файлами', + 'created_at' => Carbon::now(), + ], + [ + 'name' => 'Пункт 2 с файлами', + 'created_at' => Carbon::now(), + ], + [ + 'name' => 'Пункт 3 с файлами', + 'created_at' => Carbon::now(), + ] + ]); + } +} diff --git a/resources/views/online-documents/index.blade.php b/resources/views/admin-reception-screen/index.blade.php similarity index 100% rename from resources/views/online-documents/index.blade.php rename to resources/views/admin-reception-screen/index.blade.php diff --git a/resources/views/layouts/admin-layout.blade.php b/resources/views/layouts/admin-layout.blade.php index bf09bd5..c913209 100644 --- a/resources/views/layouts/admin-layout.blade.php +++ b/resources/views/layouts/admin-layout.blade.php @@ -49,16 +49,8 @@