failj/ntspi-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changes

Browse Source
This commit is contained in:
f4ilji
2024-12-04 01:03:59 +05:00
parent b896328241
commit 05e99d4e20
5 changed files with 44 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Filament/Components/Forms/UserDetailForm.php
+1 -4
View File
@@ -109,10 +109,7 @@ class UserDetailForm
->schema([ ->schema([
Forms\Components\Repeater::make('attendedConferences')->schema([ Forms\Components\Repeater::make('attendedConferences')->schema([
Forms\Components\TextInput::make('item')->label('')->string()->required() Forms\Components\TextInput::make('item')->label('')->string()->required()
])->label('Участие в конференциях')->defaultItems(0), ])->label('Участие в выставках, конференциях, проектах')->defaultItems(0),
Forms\Components\Repeater::make('participationScienceProjects')->schema([
Forms\Components\TextInput::make('item')->label('')->string()->required()
])->label('Участие в научных проектах')->defaultItems(0),
Forms\Components\Repeater::make('publications')->schema([ Forms\Components\Repeater::make('publications')->schema([
Forms\Components\TextInput::make('category_publication')->label('Категория публикаций')->string()->required(), Forms\Components\TextInput::make('category_publication')->label('Категория публикаций')->string()->required(),
Forms\Components\Repeater::make('publication')->schema([ Forms\Components\Repeater::make('publication')->schema([
database/migrations/2014_10_12_200000_add_two_factor_columns_to_users_table.php
-46
View File
@@ -1,46 +0,0 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
use Laravel\Fortify\Fortify;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('users', function (Blueprint $table) {
$table->text('two_factor_secret')
->after('password')
->nullable();
$table->text('two_factor_recovery_codes')
->after('two_factor_secret')
->nullable();
if (Fortify::confirmsTwoFactorAuthentication()) {
$table->timestamp('two_factor_confirmed_at')
->after('two_factor_recovery_codes')
->nullable();
}
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('users', function (Blueprint $table) {
$table->dropColumn(array_merge([
'two_factor_secret',
'two_factor_recovery_codes',
], Fortify::confirmsTwoFactorAuthentication() ? [
'two_factor_confirmed_at',
] : []));
});
}
};
database/seeders/DatabaseSeeder.php
+37 -37
View File
@@ -31,43 +31,43 @@ class DatabaseSeeder extends Seeder
'slug' => 'failj', 'slug' => 'failj',
'password' => "$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi", 'password' => "$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi",
]); ]);
User::factory()->count(50)->has(UserDetail::factory())->create(); // User::factory()->count(50)->has(UserDetail::factory())->create();
EventCategory::factory()->count(10)->create(); // EventCategory::factory()->count(10)->create();
Category::factory()->count(80)->create(); // Category::factory()->count(80)->create();
Post::factory()->count(1000)->create(); // Post::factory()->count(1000)->create();
Event::factory()->count(200)->create(); // Event::factory()->count(200)->create();
Faculty::factory()->count(6)->create(); // Faculty::factory()->count(6)->create();
Department::factory()->count(12)->create(); // Department::factory()->count(12)->create();
//
for ($i = 0; $i < 20; $i++) { // for ($i = 0; $i < 20; $i++) {
DB::table('workers_departments')->insert([ // DB::table('workers_departments')->insert([
'user_id' => User::inRandomOrder()->first()->id, // 'user_id' => User::inRandomOrder()->first()->id,
'department_id' => Department::inRandomOrder()->first()->id, // 'department_id' => Department::inRandomOrder()->first()->id,
'position' => $faker->word, // 'position' => $faker->word,
'created_at' => now(), // 'created_at' => now(),
'updated_at' => now(), // 'updated_at' => now(),
]); // ]);
} // }
//
for ($i = 0; $i < 20; $i++) { // for ($i = 0; $i < 20; $i++) {
DB::table('workers_faculties')->insert([ // DB::table('workers_faculties')->insert([
'user_id' => User::inRandomOrder()->first()->id, // 'user_id' => User::inRandomOrder()->first()->id,
'faculty_id' => Faculty::inRandomOrder()->first()->id, // 'faculty_id' => Faculty::inRandomOrder()->first()->id,
'position' => $faker->word, // 'position' => $faker->word,
'created_at' => now(), // 'created_at' => now(),
'updated_at' => now(), // 'updated_at' => now(),
]); // ]);
} // }
//
for ($i = 0; $i < 30; $i++) { // for ($i = 0; $i < 30; $i++) {
DB::table('teachers_departments')->insert([ // DB::table('teachers_departments')->insert([
'user_id' => User::inRandomOrder()->first()->id, // 'user_id' => User::inRandomOrder()->first()->id,
'department_id' => Department::inRandomOrder()->first()->id, // 'department_id' => Department::inRandomOrder()->first()->id,
'teaching_position' => $faker->word, // 'teaching_position' => $faker->word,
'created_at' => now(), // 'created_at' => now(),
'updated_at' => now(), // 'updated_at' => now(),
]); // ]);
} // }
// $this->call([RolesSeeder::class]); // $this->call([RolesSeeder::class]);
// $users = [ // $users = [
// [ // [
resources/js/Components/BuilderUi/Persons/Blocks/PublicationBlock.vue
+2 -2
View File
@@ -1,9 +1,9 @@
<!-- NavLink.vue --> <!-- NavLink.vue -->
<template> <template>
<div :id="generateSlug(nameList)"> <div>
<template v-for="el in list"> <template v-for="el in list">
<h3 class="my-4 font-medium text-gray-800">{{ el.category_publication }}</h3> <h2 :id="generateSlug(nameList)" class="my-4 font-medium text-gray-800">{{ el.category_publication }}</h2>
<ul class="list-disc ms-6 mt-3 space-y-1.5"> <ul class="list-disc ms-6 mt-3 space-y-1.5">
<template v-for="el in el.publication"> <template v-for="el in el.publication">
<li class="ps-1 text-sm text-gray-600 dark:text-neutral-400"> <li class="ps-1 text-sm text-gray-600 dark:text-neutral-400">
resources/js/Pages/Client/Persons/Show.vue
+4 -4
View File
@@ -10,6 +10,7 @@
<PageNavigateLinks :header-navs="headerNavs" /> <PageNavigateLinks :header-navs="headerNavs" />
<section class="w-full min-w-0 mt-1 max-w-6xl px-1 md:px-6" style=""> <section class="w-full min-w-0 mt-1 max-w-6xl px-1 md:px-6" style="">
<div class="w-full mx-auto sm:px-6 lg:px-8"> <div class="w-full mx-auto sm:px-6 lg:px-8">
@@ -46,16 +47,15 @@
<ul class="mt-5 flex flex-col gap-y-3"> <ul class="mt-5 flex flex-col gap-y-3">
<li class="flex items-center gap-x-2.5"> <li v-if="person.data.details.contactPhone" class="flex items-center gap-x-2.5">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="shrink-0 size-3.5"> <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="shrink-0 size-3.5">
<path stroke-linecap="round" stroke-linejoin="round" d="M2.25 6.75c0 8.284 6.716 15 15 15h2.25a2.25 2.25 0 0 0 2.25-2.25v-1.372c0-.516-.351-.966-.852-1.091l-4.423-1.106c-.44-.11-.902.055-1.173.417l-.97 1.293c-.282.376-.769.542-1.21.38a12.035 12.035 0 0 1-7.143-7.143c-.162-.441.004-.928.38-1.21l1.293-.97c.363-.271.527-.734.417-1.173L6.963 3.102a1.125 1.125 0 0 0-1.091-.852H4.5A2.25 2.25 0 0 0 2.25 4.5v2.25Z" /> <path stroke-linecap="round" stroke-linejoin="round" d="M2.25 6.75c0 8.284 6.716 15 15 15h2.25a2.25 2.25 0 0 0 2.25-2.25v-1.372c0-.516-.351-.966-.852-1.091l-4.423-1.106c-.44-.11-.902.055-1.173.417l-.97 1.293c-.282.376-.769.542-1.21.38a12.035 12.035 0 0 1-7.143-7.143c-.162-.441.004-.928.38-1.21l1.293-.97c.363-.271.527-.734.417-1.173L6.963 3.102a1.125 1.125 0 0 0-1.091-.852H4.5A2.25 2.25 0 0 0 2.25 4.5v2.25Z" />
</svg> </svg>
<a class="text-[13px] text-gray-500 underline hover:text-gray-800 hover:decoration-2 focus:outline-none focus:decoration-2 dark:text-neutral-500 dark:hover:text-neutral-400" href="#"> <a class="text-[13px] text-gray-500 underline hover:text-gray-800 hover:decoration-2 focus:outline-none focus:decoration-2 dark:text-neutral-500 dark:hover:text-neutral-400" href="#">
{{ person.data.details.contactPhone }} {{ person.data.details.contactPhone }}
</a> </a>
</li> </li>
<li class="flex items-center gap-x-2.5"> <li v-if="person.data.details.contactEmail" class="flex items-center gap-x-2.5">
<svg class="shrink-0 size-3.5" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"> <svg class="shrink-0 size-3.5" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
<rect width="20" height="16" x="2" y="4" rx="2"></rect> <rect width="20" height="16" x="2" y="4" rx="2"></rect>
<path d="m22 7-8.97 5.7a1.94 1.94 0 0 1-2.06 0L2 7"></path> <path d="m22 7-8.97 5.7a1.94 1.94 0 0 1-2.06 0L2 7"></path>
@@ -70,7 +70,7 @@
</div> </div>
</div> </div>
<div class="mt-10 sm:mt-14"> <div class="mt-5 sm:mt-7">
<EducationBlock v-if="person.data.details.education.length > 0" title="Направление подготовки" :educations="person.data.details.education" /> <EducationBlock v-if="person.data.details.education.length > 0" title="Направление подготовки" :educations="person.data.details.education" />
</div> </div>