diff --git a/WEB/.gitignore b/WEB/.gitignore index b71b1ea..09ee516 100644 --- a/WEB/.gitignore +++ b/WEB/.gitignore @@ -22,3 +22,4 @@ Homestead.json Homestead.yaml Thumbs.db +.idea \ No newline at end of file diff --git a/WEB/app/Http/Controllers/Api/AuthController.php b/WEB/app/Http/Controllers/Api/AuthController.php index 9f675c2..c348fdc 100644 --- a/WEB/app/Http/Controllers/Api/AuthController.php +++ b/WEB/app/Http/Controllers/Api/AuthController.php @@ -13,10 +13,11 @@ use Illuminate\Validation\Rule; class AuthController extends Controller { // AuthController.php - public function login(Request $request) { + public function login(Request $request) + { $fields = $request->validate([ 'email' => 'required|string|email', - 'password' => 'required|string' + 'password' => 'required|string', ]); // Log::info('Tentative de connexion', $request->all()); @@ -24,18 +25,18 @@ class AuthController extends Controller $user = User::where('email', $fields['email'])->first(); // Vérification du mot de passe haché (Sécurité) - if(!$user || !Hash::check($fields['password'], $user->password)) { + if (! $user || ! Hash::check($fields['password'], $user->password)) { return response([ 'status' => 'error', - 'message' => 'Identifiants invalides' + 'message' => 'Identifiants invalides', ], 401); } // Vérification si le compte est actif - if (!$user->is_active) { + if (! $user->is_active) { return response([ 'status' => 'error', - 'message' => 'Votre compte a été désactivé par un administrateur.' + 'message' => 'Votre compte a été désactivé par un administrateur.', ], 403); } @@ -49,7 +50,7 @@ class AuthController extends Controller return response([ 'status' => 'success', 'user' => $user, - 'token' => $token + 'token' => $token, ], 200); } @@ -62,14 +63,14 @@ class AuthController extends Controller 'password' => 'required|string|min:8|confirmed', ]); - Log::info('Tentative de création', $request->all()); if ($validator->fails()) { - Log::info( $validator->errors()); + Log::info($validator->errors()); + return response()->json([ 'status' => 'error', - 'errors' => $validator->errors() + 'errors' => $validator->errors(), ], 422); } @@ -87,7 +88,7 @@ class AuthController extends Controller 'status' => 'success', 'message' => 'Compte créé avec succès', 'user' => $user, - 'token' => $token + 'token' => $token, ], 201); } @@ -100,15 +101,15 @@ class AuthController extends Controller 'email' => [ 'sometimes', 'email', - Rule::unique('users')->ignore($user->id) // Empêche les doublons en BDD + Rule::unique('users')->ignore($user->id), // Empêche les doublons en BDD ], ]); // 2. Vérification de sécurité (RGPD/Confidentialité) - if (!Hash::check($request->current_password, $user->password)) { + if (! Hash::check($request->current_password, $user->password)) { return response()->json([ 'status' => 'error', - 'message' => 'Le mot de passe actuel est incorrect' + 'message' => 'Le mot de passe actuel est incorrect', ], 403); } @@ -119,7 +120,7 @@ class AuthController extends Controller return response()->json([ 'status' => 'success', - 'user' => $user + 'user' => $user, ]); } } diff --git a/WEB/app/Http/Controllers/Api/EmotionController.php b/WEB/app/Http/Controllers/Api/EmotionController.php index 35b3f74..b7ed1fb 100644 --- a/WEB/app/Http/Controllers/Api/EmotionController.php +++ b/WEB/app/Http/Controllers/Api/EmotionController.php @@ -4,7 +4,6 @@ namespace App\Http\Controllers\Api; use App\Http\Controllers\Controller; use Illuminate\Http\Request; -use App\Models\EmotionRecord; use Illuminate\Support\Facades\Log; class EmotionController extends Controller @@ -18,7 +17,7 @@ class EmotionController extends Controller { Log::info('Tentative d\'enregistrement d\'émotion', [ 'user' => $request->user()->id, - 'data' => $request->all() + 'data' => $request->all(), ]); try { @@ -35,7 +34,8 @@ class EmotionController extends Controller return response()->json($record, 201); } catch (\Exception $e) { - Log::error('Erreur enregistrement émotion : ' . $e->getMessage()); + Log::error('Erreur enregistrement émotion : '.$e->getMessage()); + return response()->json(['error' => 'Erreur serveur'], 500); } } diff --git a/WEB/app/Http/Controllers/Api/InformationController.php b/WEB/app/Http/Controllers/Api/InformationController.php index e443770..7a7c6c2 100644 --- a/WEB/app/Http/Controllers/Api/InformationController.php +++ b/WEB/app/Http/Controllers/Api/InformationController.php @@ -4,7 +4,6 @@ namespace App\Http\Controllers\Api; use App\Http\Controllers\Controller; use App\Models\Information; -use Illuminate\Http\Request; class InformationController extends Controller { @@ -16,7 +15,7 @@ class InformationController extends Controller return response()->json([ 'status' => 'success', - 'data' => $informations + 'data' => $informations, ]); } @@ -24,16 +23,16 @@ class InformationController extends Controller { $information = Information::where('is_published', true)->find($id); - if (!$information) { + if (! $information) { return response()->json([ 'status' => 'error', - 'message' => 'Information non trouvée' + 'message' => 'Information non trouvée', ], 404); } return response()->json([ 'status' => 'success', - 'data' => $information + 'data' => $information, ]); } } diff --git a/WEB/app/Http/Controllers/Api/StressDiagnosticController.php b/WEB/app/Http/Controllers/Api/StressDiagnosticController.php index 272970d..552b0f0 100644 --- a/WEB/app/Http/Controllers/Api/StressDiagnosticController.php +++ b/WEB/app/Http/Controllers/Api/StressDiagnosticController.php @@ -4,7 +4,6 @@ namespace App\Http\Controllers\Api; use App\Http\Controllers\Controller; use App\Models\StressEvent; -use Illuminate\Http\Request; class StressDiagnosticController extends Controller { diff --git a/WEB/app/Http/Controllers/DashboardController.php b/WEB/app/Http/Controllers/DashboardController.php index 6d36f90..eb12918 100644 --- a/WEB/app/Http/Controllers/DashboardController.php +++ b/WEB/app/Http/Controllers/DashboardController.php @@ -2,8 +2,6 @@ namespace App\Http\Controllers; -use Illuminate\Http\Request; -use App\Models\User; use Illuminate\Support\Facades\Auth; class DashboardController extends Controller @@ -17,7 +15,7 @@ class DashboardController extends Controller $stats = [ 'relaxation_time' => '45 min', 'stress_status' => 'Stable', - 'last_diagnostic' => 'il y a 3 jours' + 'last_diagnostic' => 'il y a 3 jours', ]; return view('welcome', compact('user', 'stats')); diff --git a/WEB/app/Http/Controllers/Web/AuthController.php b/WEB/app/Http/Controllers/Web/AuthController.php index e7b653f..c2cb3fd 100644 --- a/WEB/app/Http/Controllers/Web/AuthController.php +++ b/WEB/app/Http/Controllers/Web/AuthController.php @@ -24,6 +24,7 @@ class AuthController extends Controller if (Auth::attempt($credentials)) { $request->session()->regenerate(); + return redirect()->intended('/'); } @@ -61,6 +62,7 @@ class AuthController extends Controller Auth::logout(); $request->session()->invalidate(); $request->session()->regenerateToken(); + return redirect('/login'); } } diff --git a/WEB/app/Http/Controllers/Web/DiagnosticController.php b/WEB/app/Http/Controllers/Web/DiagnosticController.php index 4bf5a02..ab2174e 100644 --- a/WEB/app/Http/Controllers/Web/DiagnosticController.php +++ b/WEB/app/Http/Controllers/Web/DiagnosticController.php @@ -3,7 +3,9 @@ namespace App\Http\Controllers\Web; use App\Http\Controllers\Controller; +use App\Models\ResultatDiag; use App\Models\StressEvent; +use App\Services\StressCalculator; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; @@ -14,23 +16,25 @@ class DiagnosticController extends Controller $events = StressEvent::all(); $history = []; if (Auth::check()) { - $history = \App\Models\ResultatDiag::where('id_user', Auth::id()) + $history = ResultatDiag::where('id_user', Auth::id()) ->orderBy('date_passage', 'desc') ->take(5) ->get(); } + return view('diagnostics.index', compact('events', 'history')); } public function history() { - $history = \App\Models\ResultatDiag::where('id_user', Auth::id()) + $history = ResultatDiag::where('id_user', Auth::id()) ->orderBy('date_passage', 'desc') ->get(); + return view('diagnostics.history', compact('history')); } - public function store(Request $request, \App\Services\StressCalculator $calculator) + public function store(Request $request, StressCalculator $calculator) { // Logique pour calculer le score Holmes-Rahe $totalPoints = 0; @@ -43,7 +47,7 @@ class DiagnosticController extends Controller // Enregistrement si l'utilisateur est connecté if (Auth::check()) { - \App\Models\ResultatDiag::create([ + ResultatDiag::create([ 'id_user' => Auth::id(), 'score_total' => $totalPoints, 'niveau_stress' => $niveauStress, diff --git a/WEB/app/Http/Controllers/Web/EmotionController.php b/WEB/app/Http/Controllers/Web/EmotionController.php index 29f338a..f8a7719 100644 --- a/WEB/app/Http/Controllers/Web/EmotionController.php +++ b/WEB/app/Http/Controllers/Web/EmotionController.php @@ -12,6 +12,7 @@ class EmotionController extends Controller public function index() { $records = EmotionRecord::where('user_id', Auth::id())->latest()->get(); + return view('emotions.index', compact('records')); } @@ -20,14 +21,14 @@ class EmotionController extends Controller $request->validate([ 'emotion' => 'required|string', 'intensity' => 'required|integer|min:1|max:5', - 'note' => 'nullable|string' + 'note' => 'nullable|string', ]); EmotionRecord::create([ 'user_id' => Auth::id(), 'emotion' => $request->emotion, 'intensity' => $request->intensity, - 'note' => $request->note + 'note' => $request->note, ]); return redirect()->back()->with('success', 'Émotion enregistrée'); diff --git a/WEB/app/Http/Controllers/Web/ProfileController.php b/WEB/app/Http/Controllers/Web/ProfileController.php index 8a4d817..e7aaafa 100644 --- a/WEB/app/Http/Controllers/Web/ProfileController.php +++ b/WEB/app/Http/Controllers/Web/ProfileController.php @@ -23,7 +23,7 @@ class ProfileController extends Controller $validated = $request->validate([ 'name' => ['required', 'string', 'max:255'], - 'email' => ['required', 'string', 'email', 'max:255', 'unique:users,email,' . $user->id], + 'email' => ['required', 'string', 'email', 'max:255', 'unique:users,email,'.$user->id], ]); $user->fill($validated); diff --git a/WEB/app/Http/Controllers/Web/RelaxationController.php b/WEB/app/Http/Controllers/Web/RelaxationController.php index ad04898..99dd5fe 100644 --- a/WEB/app/Http/Controllers/Web/RelaxationController.php +++ b/WEB/app/Http/Controllers/Web/RelaxationController.php @@ -4,9 +4,7 @@ namespace App\Http\Controllers\Web; use App\Http\Controllers\Controller; use App\Models\RelaxationActivity; -use App\Models\Favorite; use Illuminate\Http\Request; -use Illuminate\Support\Facades\Auth; class RelaxationController extends Controller { diff --git a/WEB/app/Models/ResultatDiag.php b/WEB/app/Models/ResultatDiag.php index a1e4545..28d05c0 100644 --- a/WEB/app/Models/ResultatDiag.php +++ b/WEB/app/Models/ResultatDiag.php @@ -16,7 +16,7 @@ class ResultatDiag extends Model 'date_passage', 'score_total', 'niveau_stress', - 'event_ids' + 'event_ids', ]; public function user() @@ -26,8 +26,11 @@ class ResultatDiag extends Model public function getEventsAttribute() { - if (!$this->event_ids) return collect(); + if (! $this->event_ids) { + return collect(); + } $ids = explode(';', $this->event_ids); + return StressEvent::whereIn('id', $ids)->get(); } } diff --git a/WEB/app/Models/Role.php b/WEB/app/Models/Role.php index 8aefa89..86b36a9 100644 --- a/WEB/app/Models/Role.php +++ b/WEB/app/Models/Role.php @@ -2,8 +2,8 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Factories\HasFactory; +use Illuminate\Database\Eloquent\Model; class Role extends Model { diff --git a/WEB/app/Providers/AppServiceProvider.php b/WEB/app/Providers/AppServiceProvider.php index 8eeef63..e9c1cd6 100644 --- a/WEB/app/Providers/AppServiceProvider.php +++ b/WEB/app/Providers/AppServiceProvider.php @@ -2,6 +2,7 @@ namespace App\Providers; +use Illuminate\Support\Facades\URL; use Illuminate\Support\ServiceProvider; class AppServiceProvider extends ServiceProvider @@ -20,7 +21,7 @@ class AppServiceProvider extends ServiceProvider public function boot(): void { if (config('app.env') === 'production' || config('app.env') === 'local') { - \Illuminate\Support\Facades\URL::forceScheme('https'); + URL::forceScheme('https'); } } } diff --git a/WEB/app/Services/StressCalculator.php b/WEB/app/Services/StressCalculator.php index 70d66fb..ac3069d 100644 --- a/WEB/app/Services/StressCalculator.php +++ b/WEB/app/Services/StressCalculator.php @@ -5,7 +5,9 @@ namespace App\Services; class StressCalculator { public const LEVEL_HIGH = 'Élevé'; + public const LEVEL_MODERATE = 'Modéré'; + public const LEVEL_LOW = 'Faible'; public function calculateScore(array $points): int diff --git a/WEB/bootstrap/providers.php b/WEB/bootstrap/providers.php index 22744d1..ec5248a 100644 --- a/WEB/bootstrap/providers.php +++ b/WEB/bootstrap/providers.php @@ -1,6 +1,9 @@ [ - 'authenticate_session' => Laravel\Sanctum\Http\Middleware\AuthenticateSession::class, - 'encrypt_cookies' => Illuminate\Cookie\Middleware\EncryptCookies::class, - 'validate_csrf_token' => Illuminate\Foundation\Http\Middleware\ValidateCsrfToken::class, + 'authenticate_session' => AuthenticateSession::class, + 'encrypt_cookies' => EncryptCookies::class, + 'validate_csrf_token' => ValidateCsrfToken::class, ], ]; diff --git a/WEB/database/factories/UserFactory.php b/WEB/database/factories/UserFactory.php index 2b7bb52..158ba32 100644 --- a/WEB/database/factories/UserFactory.php +++ b/WEB/database/factories/UserFactory.php @@ -2,6 +2,7 @@ namespace Database\Factories; +use App\Models\Role; use App\Models\User; use Illuminate\Database\Eloquent\Factories\Factory; use Illuminate\Support\Facades\Hash; @@ -30,7 +31,7 @@ class UserFactory extends Factory 'email_verified_at' => now(), 'password' => static::$password ??= Hash::make('password'), 'remember_token' => Str::random(10), - 'id_role' => \App\Models\Role::first() ?? \App\Models\Role::create(['libelle' => 'Utilisateur']), + 'id_role' => Role::first() ?? Role::create(['libelle' => 'Utilisateur']), ]; } diff --git a/WEB/database/migrations/2026_01_01_000001_create_roles_table.php b/WEB/database/migrations/2026_01_01_000001_create_roles_table.php index 31f2aac..ef00cef 100644 --- a/WEB/database/migrations/2026_01_01_000001_create_roles_table.php +++ b/WEB/database/migrations/2026_01_01_000001_create_roles_table.php @@ -4,13 +4,19 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -return new class extends Migration { - public function up(): void { +return new class extends Migration +{ + public function up(): void + { Schema::create('roles', function (Blueprint $table) { $table->id(); $table->string('libelle'); $table->timestamps(); }); } - public function down(): void { Schema::dropIfExists('roles'); } + + public function down(): void + { + Schema::dropIfExists('roles'); + } }; diff --git a/WEB/database/migrations/2026_01_01_000002_create_users_table.php b/WEB/database/migrations/2026_01_01_000002_create_users_table.php index e2c7f8d..17d53b0 100644 --- a/WEB/database/migrations/2026_01_01_000002_create_users_table.php +++ b/WEB/database/migrations/2026_01_01_000002_create_users_table.php @@ -4,8 +4,10 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -return new class extends Migration { - public function up(): void { +return new class extends Migration +{ + public function up(): void + { Schema::create('users', function (Blueprint $table) { $table->id(); $table->string('name'); @@ -17,5 +19,9 @@ return new class extends Migration { $table->timestamps(); }); } - public function down(): void { Schema::dropIfExists('users'); } + + public function down(): void + { + Schema::dropIfExists('users'); + } }; diff --git a/WEB/database/migrations/2026_01_01_000003_create_stress_events_table.php b/WEB/database/migrations/2026_01_01_000003_create_stress_events_table.php index 5d83e8d..c37ddda 100644 --- a/WEB/database/migrations/2026_01_01_000003_create_stress_events_table.php +++ b/WEB/database/migrations/2026_01_01_000003_create_stress_events_table.php @@ -4,8 +4,10 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -return new class extends Migration { - public function up(): void { +return new class extends Migration +{ + public function up(): void + { Schema::create('stress_events', function (Blueprint $table) { $table->id(); $table->string('event_name'); @@ -13,5 +15,9 @@ return new class extends Migration { $table->timestamps(); }); } - public function down(): void { Schema::dropIfExists('stress_events'); } + + public function down(): void + { + Schema::dropIfExists('stress_events'); + } }; diff --git a/WEB/database/migrations/2026_01_01_000004_create_relaxation_activities_table.php b/WEB/database/migrations/2026_01_01_000004_create_relaxation_activities_table.php index 59547c0..65ccfea 100644 --- a/WEB/database/migrations/2026_01_01_000004_create_relaxation_activities_table.php +++ b/WEB/database/migrations/2026_01_01_000004_create_relaxation_activities_table.php @@ -4,8 +4,10 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -return new class extends Migration { - public function up(): void { +return new class extends Migration +{ + public function up(): void + { Schema::create('relaxation_activities', function (Blueprint $table) { $table->id(); $table->string('title'); @@ -17,5 +19,9 @@ return new class extends Migration { $table->timestamps(); }); } - public function down(): void { Schema::dropIfExists('relaxation_activities'); } + + public function down(): void + { + Schema::dropIfExists('relaxation_activities'); + } }; diff --git a/WEB/database/migrations/2026_01_01_000005_create_resultat_diags_table.php b/WEB/database/migrations/2026_01_01_000005_create_resultat_diags_table.php index 67ec290..e78bd9d 100644 --- a/WEB/database/migrations/2026_01_01_000005_create_resultat_diags_table.php +++ b/WEB/database/migrations/2026_01_01_000005_create_resultat_diags_table.php @@ -4,8 +4,10 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -return new class extends Migration { - public function up(): void { +return new class extends Migration +{ + public function up(): void + { Schema::create('resultat_diags', function (Blueprint $table) { $table->id(); $table->foreignId('id_user')->constrained('users')->onDelete('cascade'); @@ -16,5 +18,9 @@ return new class extends Migration { $table->timestamps(); }); } - public function down(): void { Schema::dropIfExists('resultat_diags'); } + + public function down(): void + { + Schema::dropIfExists('resultat_diags'); + } }; diff --git a/WEB/database/migrations/2026_01_01_000006_create_emotion_records_table.php b/WEB/database/migrations/2026_01_01_000006_create_emotion_records_table.php index 0425622..161325d 100644 --- a/WEB/database/migrations/2026_01_01_000006_create_emotion_records_table.php +++ b/WEB/database/migrations/2026_01_01_000006_create_emotion_records_table.php @@ -4,8 +4,10 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -return new class extends Migration { - public function up(): void { +return new class extends Migration +{ + public function up(): void + { Schema::create('emotion_records', function (Blueprint $table) { $table->id(); $table->foreignId('user_id')->constrained('users')->onDelete('cascade'); @@ -15,5 +17,9 @@ return new class extends Migration { $table->timestamps(); }); } - public function down(): void { Schema::dropIfExists('emotion_records'); } + + public function down(): void + { + Schema::dropIfExists('emotion_records'); + } }; diff --git a/WEB/database/seeders/DatabaseSeeder.php b/WEB/database/seeders/DatabaseSeeder.php index c2fd04a..e1d5b1a 100644 --- a/WEB/database/seeders/DatabaseSeeder.php +++ b/WEB/database/seeders/DatabaseSeeder.php @@ -2,8 +2,8 @@ namespace Database\Seeders; -use App\Models\User; use App\Models\Role; +use App\Models\User; use Illuminate\Database\Console\Seeds\WithoutModelEvents; use Illuminate\Database\Seeder; use Illuminate\Support\Facades\Hash; diff --git a/WEB/database/seeders/RelaxationActivitySeeder.php b/WEB/database/seeders/RelaxationActivitySeeder.php index 3d074fc..f3d89d2 100644 --- a/WEB/database/seeders/RelaxationActivitySeeder.php +++ b/WEB/database/seeders/RelaxationActivitySeeder.php @@ -16,7 +16,7 @@ class RelaxationActivitySeeder extends Seeder 'type' => 'audio', 'category' => 'Méditation', 'url' => 'https://www.youtube.com/watch?v=sz7cpV7ERsY', - 'image_url' => 'https://images.unsplash.com/photo-1506126613408-eca07ce68773?ixlib=rb-4.0.3&auto=format&fit=crop&w=800&q=80' + 'image_url' => 'https://images.unsplash.com/photo-1506126613408-eca07ce68773?ixlib=rb-4.0.3&auto=format&fit=crop&w=800&q=80', ], [ 'title' => 'Yoga Doux pour le Soir', @@ -24,7 +24,7 @@ class RelaxationActivitySeeder extends Seeder 'type' => 'video', 'category' => 'Sport', 'url' => 'https://www.youtube.com/watch?v=v7AYKMP6rOE', - 'image_url' => 'https://images.unsplash.com/photo-1544367567-0f2fcb009e0b?ixlib=rb-4.0.3&auto=format&fit=crop&w=800&q=80' + 'image_url' => 'https://images.unsplash.com/photo-1544367567-0f2fcb009e0b?ixlib=rb-4.0.3&auto=format&fit=crop&w=800&q=80', ], [ 'title' => 'Bruits de Plage et Vagues', @@ -32,7 +32,7 @@ class RelaxationActivitySeeder extends Seeder 'type' => 'audio', 'category' => 'Musique', 'url' => 'https://www.youtube.com/watch?v=0_fS_pS_B0U', - 'image_url' => 'https://images.unsplash.com/photo-1507525428034-b723cf961d3e?ixlib=rb-4.0.3&auto=format&fit=crop&w=800&q=80' + 'image_url' => 'https://images.unsplash.com/photo-1507525428034-b723cf961d3e?ixlib=rb-4.0.3&auto=format&fit=crop&w=800&q=80', ], [ 'title' => 'Comprendre le Cycle du Stress', @@ -40,7 +40,7 @@ class RelaxationActivitySeeder extends Seeder 'type' => 'article', 'category' => 'Lecture', 'url' => 'https://www.santepubliquefrance.fr', - 'image_url' => 'https://images.unsplash.com/photo-1512820790803-83ca734da794?ixlib=rb-4.0.3&auto=format&fit=crop&w=800&q=80' + 'image_url' => 'https://images.unsplash.com/photo-1512820790803-83ca734da794?ixlib=rb-4.0.3&auto=format&fit=crop&w=800&q=80', ], [ 'title' => 'Musique Classique pour la Concentration', @@ -48,7 +48,7 @@ class RelaxationActivitySeeder extends Seeder 'type' => 'audio', 'category' => 'Musique', 'url' => 'https://www.youtube.com/watch?v=5Qq3m9G4_4A', - 'image_url' => 'https://images.unsplash.com/photo-1514119412350-e174d90d280e?ixlib=rb-4.0.3&auto=format&fit=crop&w=800&q=80' + 'image_url' => 'https://images.unsplash.com/photo-1514119412350-e174d90d280e?ixlib=rb-4.0.3&auto=format&fit=crop&w=800&q=80', ], [ 'title' => 'Techniques de Respiration Wim Hof', @@ -56,8 +56,8 @@ class RelaxationActivitySeeder extends Seeder 'type' => 'video', 'category' => 'Respiration', 'url' => 'https://www.youtube.com/watch?v=tybOi4hjZFQ', - 'image_url' => 'https://images.unsplash.com/photo-1518199266791-5375a83190b7?ixlib=rb-4.0.3&auto=format&fit=crop&w=800&q=80' - ] + 'image_url' => 'https://images.unsplash.com/photo-1518199266791-5375a83190b7?ixlib=rb-4.0.3&auto=format&fit=crop&w=800&q=80', + ], ]; foreach ($activities as $activity) { diff --git a/WEB/database/seeders/RoleSeeder.php b/WEB/database/seeders/RoleSeeder.php index cb48f07..68479e4 100644 --- a/WEB/database/seeders/RoleSeeder.php +++ b/WEB/database/seeders/RoleSeeder.php @@ -2,7 +2,7 @@ namespace Database\Seeders; -use Illuminate\Database\Console\Seeds\WithoutModelEvents; +use App\Models\Role; use Illuminate\Database\Seeder; class RoleSeeder extends Seeder @@ -18,7 +18,7 @@ class RoleSeeder extends Seeder ]; foreach ($roles as $role) { - \App\Models\Role::create($role); + Role::create($role); } } } diff --git a/WEB/database/seeders/StressEventSeeder.php b/WEB/database/seeders/StressEventSeeder.php index 8eef590..2a3e6e1 100644 --- a/WEB/database/seeders/StressEventSeeder.php +++ b/WEB/database/seeders/StressEventSeeder.php @@ -2,7 +2,7 @@ namespace Database\Seeders; -use Illuminate\Database\Console\Seeds\WithoutModelEvents; +use App\Models\StressEvent; use Illuminate\Database\Seeder; class StressEventSeeder extends Seeder @@ -56,7 +56,7 @@ class StressEventSeeder extends Seeder ]; foreach ($events as $event) { - \App\Models\StressEvent::create($event); + StressEvent::create($event); } } } diff --git a/WEB/routes/api.php b/WEB/routes/api.php index ed06216..0c5c41f 100644 --- a/WEB/routes/api.php +++ b/WEB/routes/api.php @@ -1,9 +1,11 @@ group(function () { // Route pour enregistrer un diagnostic effectué sur mobile Route::post('/stress-diagnostics', [StressDiagnosticController::class, 'store']); - Route::get('/emotions', [App\Http\Controllers\Api\EmotionController::class, 'index']); - Route::post('/emotions', [App\Http\Controllers\Api\EmotionController::class, 'store']); + Route::get('/emotions', [EmotionController::class, 'index']); + Route::post('/emotions', [EmotionController::class, 'store']); // Routes pour les informations (accessibles aux utilisateurs connectés) - Route::get('/informations', [App\Http\Controllers\Api\InformationController::class, 'index']); - Route::get('/informations/{id}', [App\Http\Controllers\Api\InformationController::class, 'show']); + Route::get('/informations', [InformationController::class, 'index']); + Route::get('/informations/{id}', [InformationController::class, 'show']); }); diff --git a/WEB/routes/web.php b/WEB/routes/web.php index c6669c5..973b5e3 100644 --- a/WEB/routes/web.php +++ b/WEB/routes/web.php @@ -1,15 +1,13 @@ name('home'); diff --git a/Wear/.gitignore b/Wear/.gitignore index aa724b7..de25127 100644 --- a/Wear/.gitignore +++ b/Wear/.gitignore @@ -13,3 +13,4 @@ .externalNativeBuild .cxx local.properties +.idea \ No newline at end of file diff --git a/mobile/.gitignore b/mobile/.gitignore index 6f0d006..de2f783 100644 --- a/mobile/.gitignore +++ b/mobile/.gitignore @@ -43,3 +43,5 @@ app.*.map.json /android/app/debug /android/app/profile /android/app/release + +.idea \ No newline at end of file