From c66a7dd66e35cc130bfff3ff7bc903d77871c08a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ndor=20M=C3=A1t=C3=A9=20Magony?= Date: Tue, 1 Apr 2025 07:50:41 +0200 Subject: [PATCH] =?UTF-8?q?F=C3=A9lk=C3=A9sz=20Login?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/Http/Controllers/UserController.php | 14 +++++ Backend/peepal_backend/app/Models/User.php | 49 ++++++++++------ .../0001_01_01_000000_create_users_table.php | 49 ---------------- .../0001_01_01_000001_create_cache_table.php | 35 ------------ .../0001_01_01_000002_create_jobs_table.php | 57 ------------------- ...14_create_personal_access_tokens_table.php | 33 ----------- ...25_03_31_083919_user_tabla_letrehozas1.php | 26 +++++++++ .../database/seeders/DatabaseSeeder.php | 7 +-- .../database/seeders/felhasznaloFeltoltes.php | 27 +++++++++ Backend/peepal_backend/routes/api.php | 2 + frontend/peepal_react/src/App.js | 2 +- .../Bejel_Regisz/Bejelentkezes.jsx | 35 ++++++++++++ .../src/{ => WC_Komponens}/NavBar/Menusor.jsx | 0 frontend/peepal_react/src/index.js | 2 - 14 files changed, 139 insertions(+), 199 deletions(-) create mode 100644 Backend/peepal_backend/app/Http/Controllers/UserController.php delete mode 100644 Backend/peepal_backend/database/migrations/0001_01_01_000000_create_users_table.php delete mode 100644 Backend/peepal_backend/database/migrations/0001_01_01_000001_create_cache_table.php delete mode 100644 Backend/peepal_backend/database/migrations/0001_01_01_000002_create_jobs_table.php delete mode 100644 Backend/peepal_backend/database/migrations/2025_03_05_150714_create_personal_access_tokens_table.php create mode 100644 Backend/peepal_backend/database/migrations/2025_03_31_083919_user_tabla_letrehozas1.php create mode 100644 Backend/peepal_backend/database/seeders/felhasznaloFeltoltes.php rename frontend/peepal_react/src/{ => WC_Komponens}/NavBar/Menusor.jsx (100%) diff --git a/Backend/peepal_backend/app/Http/Controllers/UserController.php b/Backend/peepal_backend/app/Http/Controllers/UserController.php new file mode 100644 index 0000000..6385bf9 --- /dev/null +++ b/Backend/peepal_backend/app/Http/Controllers/UserController.php @@ -0,0 +1,14 @@ +json(User::all()); + } +} diff --git a/Backend/peepal_backend/app/Models/User.php b/Backend/peepal_backend/app/Models/User.php index 749c7b7..1de5346 100644 --- a/Backend/peepal_backend/app/Models/User.php +++ b/Backend/peepal_backend/app/Models/User.php @@ -2,47 +2,62 @@ namespace App\Models; -// use Illuminate\Contracts\Auth\MustVerifyEmail; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Notifiable; +use Laravel\Sanctum\HasApiTokens; class User extends Authenticatable { - /** @use HasFactory<\Database\Factories\UserFactory> */ - use HasFactory, Notifiable; + use HasApiTokens, HasFactory, Notifiable; + + /** + * The table associated with the model. + * + * @var string + */ + protected $table = 'users_table'; /** * The attributes that are mass assignable. * - * @var list + * @var array */ protected $fillable = [ - 'name', + 'nev', 'email', - 'password', + 'felh_nev', + 'jelszo', + 'is_admin', ]; /** * The attributes that should be hidden for serialization. * - * @var list + * @var array */ protected $hidden = [ - 'password', - 'remember_token', + 'jelszo', ]; /** - * Get the attributes that should be cast. + * The attributes that should be cast. * - * @return array + * @var array */ - protected function casts(): array + protected $casts = [ + 'is_admin' => 'boolean', + 'email_verified_at' => 'datetime', + ]; + + /** + * Automatically hash the password when it's set + * + * @param string $value + * @return void + */ + public function setPasswordAttribute($value) { - return [ - 'email_verified_at' => 'datetime', - 'password' => 'hashed', - ]; + $this->attributes['password'] = \Illuminate\Support\Facades\Hash::make($value); } -} +} \ No newline at end of file diff --git a/Backend/peepal_backend/database/migrations/0001_01_01_000000_create_users_table.php b/Backend/peepal_backend/database/migrations/0001_01_01_000000_create_users_table.php deleted file mode 100644 index 05fb5d9..0000000 --- a/Backend/peepal_backend/database/migrations/0001_01_01_000000_create_users_table.php +++ /dev/null @@ -1,49 +0,0 @@ -id(); - $table->string('name'); - $table->string('email')->unique(); - $table->timestamp('email_verified_at')->nullable(); - $table->string('password'); - $table->rememberToken(); - $table->timestamps(); - }); - - Schema::create('password_reset_tokens', function (Blueprint $table) { - $table->string('email')->primary(); - $table->string('token'); - $table->timestamp('created_at')->nullable(); - }); - - Schema::create('sessions', function (Blueprint $table) { - $table->string('id')->primary(); - $table->foreignId('user_id')->nullable()->index(); - $table->string('ip_address', 45)->nullable(); - $table->text('user_agent')->nullable(); - $table->longText('payload'); - $table->integer('last_activity')->index(); - }); - } - - /** - * Reverse the migrations. - */ - public function down(): void - { - Schema::dropIfExists('users'); - Schema::dropIfExists('password_reset_tokens'); - Schema::dropIfExists('sessions'); - } -}; diff --git a/Backend/peepal_backend/database/migrations/0001_01_01_000001_create_cache_table.php b/Backend/peepal_backend/database/migrations/0001_01_01_000001_create_cache_table.php deleted file mode 100644 index b9c106b..0000000 --- a/Backend/peepal_backend/database/migrations/0001_01_01_000001_create_cache_table.php +++ /dev/null @@ -1,35 +0,0 @@ -string('key')->primary(); - $table->mediumText('value'); - $table->integer('expiration'); - }); - - Schema::create('cache_locks', function (Blueprint $table) { - $table->string('key')->primary(); - $table->string('owner'); - $table->integer('expiration'); - }); - } - - /** - * Reverse the migrations. - */ - public function down(): void - { - Schema::dropIfExists('cache'); - Schema::dropIfExists('cache_locks'); - } -}; diff --git a/Backend/peepal_backend/database/migrations/0001_01_01_000002_create_jobs_table.php b/Backend/peepal_backend/database/migrations/0001_01_01_000002_create_jobs_table.php deleted file mode 100644 index 425e705..0000000 --- a/Backend/peepal_backend/database/migrations/0001_01_01_000002_create_jobs_table.php +++ /dev/null @@ -1,57 +0,0 @@ -id(); - $table->string('queue')->index(); - $table->longText('payload'); - $table->unsignedTinyInteger('attempts'); - $table->unsignedInteger('reserved_at')->nullable(); - $table->unsignedInteger('available_at'); - $table->unsignedInteger('created_at'); - }); - - Schema::create('job_batches', function (Blueprint $table) { - $table->string('id')->primary(); - $table->string('name'); - $table->integer('total_jobs'); - $table->integer('pending_jobs'); - $table->integer('failed_jobs'); - $table->longText('failed_job_ids'); - $table->mediumText('options')->nullable(); - $table->integer('cancelled_at')->nullable(); - $table->integer('created_at'); - $table->integer('finished_at')->nullable(); - }); - - Schema::create('failed_jobs', function (Blueprint $table) { - $table->id(); - $table->string('uuid')->unique(); - $table->text('connection'); - $table->text('queue'); - $table->longText('payload'); - $table->longText('exception'); - $table->timestamp('failed_at')->useCurrent(); - }); - } - - /** - * Reverse the migrations. - */ - public function down(): void - { - Schema::dropIfExists('jobs'); - Schema::dropIfExists('job_batches'); - Schema::dropIfExists('failed_jobs'); - } -}; diff --git a/Backend/peepal_backend/database/migrations/2025_03_05_150714_create_personal_access_tokens_table.php b/Backend/peepal_backend/database/migrations/2025_03_05_150714_create_personal_access_tokens_table.php deleted file mode 100644 index e828ad8..0000000 --- a/Backend/peepal_backend/database/migrations/2025_03_05_150714_create_personal_access_tokens_table.php +++ /dev/null @@ -1,33 +0,0 @@ -id(); - $table->morphs('tokenable'); - $table->string('name'); - $table->string('token', 64)->unique(); - $table->text('abilities')->nullable(); - $table->timestamp('last_used_at')->nullable(); - $table->timestamp('expires_at')->nullable(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - */ - public function down(): void - { - Schema::dropIfExists('personal_access_tokens'); - } -}; diff --git a/Backend/peepal_backend/database/migrations/2025_03_31_083919_user_tabla_letrehozas1.php b/Backend/peepal_backend/database/migrations/2025_03_31_083919_user_tabla_letrehozas1.php new file mode 100644 index 0000000..1d6216d --- /dev/null +++ b/Backend/peepal_backend/database/migrations/2025_03_31_083919_user_tabla_letrehozas1.php @@ -0,0 +1,26 @@ + id(); + $t -> string("nev"); + $t -> string("email"); + $t -> string("felh_nev"); + $t -> string('jelszo'); + $t -> boolean('is_admin')->default(false); + $t -> timestamps(); + }); + } + + public function down(): void + { + Schema::dropIfExists("users_table"); + } +}; diff --git a/Backend/peepal_backend/database/seeders/DatabaseSeeder.php b/Backend/peepal_backend/database/seeders/DatabaseSeeder.php index d01a0ef..3584f12 100644 --- a/Backend/peepal_backend/database/seeders/DatabaseSeeder.php +++ b/Backend/peepal_backend/database/seeders/DatabaseSeeder.php @@ -13,11 +13,8 @@ class DatabaseSeeder extends Seeder */ public function run(): void { - // User::factory(10)->create(); - - User::factory()->create([ - 'name' => 'Test User', - 'email' => 'test@example.com', + $this -> call([ + felhasznaloFeltoltes::class, ]); } } diff --git a/Backend/peepal_backend/database/seeders/felhasznaloFeltoltes.php b/Backend/peepal_backend/database/seeders/felhasznaloFeltoltes.php new file mode 100644 index 0000000..ca566fd --- /dev/null +++ b/Backend/peepal_backend/database/seeders/felhasznaloFeltoltes.php @@ -0,0 +1,27 @@ +insert([ + 'nev' => 'Magony Sándor', + 'email' => 'magonys2006@gmail.com', + 'felh_nev' => 'peepal_admin', + 'jelszo' => Hash::make('123456'), + 'is_admin' => true, + 'created_at' => now(), + 'updated_at' => now() + ]); + } +} diff --git a/Backend/peepal_backend/routes/api.php b/Backend/peepal_backend/routes/api.php index 8dfed5c..4f523d9 100644 --- a/Backend/peepal_backend/routes/api.php +++ b/Backend/peepal_backend/routes/api.php @@ -1,5 +1,6 @@ { + try { + const response = await fetch('/users', { + method: 'GET', + headers: { + 'Accept': 'application/json', + 'Content-Type': 'application/json', + // Include the CSRF token for Laravel if your API is protected + 'X-CSRF-TOKEN': document.querySelector('meta[name="csrf-token"]')?.getAttribute('content'), + }, + credentials: 'include', // Includes cookies in the request + }); + console.log(response) + + if (!response.ok) { + throw new Error(`HTTP error! Status: ${response.status}`); + } + + const data = await response.json(); + setUsers(data); + console.log(users) + } catch (err) { + console.log(err) + } + }; + + useEffect(() => { + fetchUsers(); + }, []); + + return (
diff --git a/frontend/peepal_react/src/NavBar/Menusor.jsx b/frontend/peepal_react/src/WC_Komponens/NavBar/Menusor.jsx similarity index 100% rename from frontend/peepal_react/src/NavBar/Menusor.jsx rename to frontend/peepal_react/src/WC_Komponens/NavBar/Menusor.jsx diff --git a/frontend/peepal_react/src/index.js b/frontend/peepal_react/src/index.js index 65b1962..843956c 100644 --- a/frontend/peepal_react/src/index.js +++ b/frontend/peepal_react/src/index.js @@ -7,11 +7,9 @@ import { BrowserRouter } from 'react-router-dom'; const root = ReactDOM.createRoot(document.getElementById('root')); root.render( - - ); // If you want to start measuring performance in your app, pass a function