diff --git a/README.md b/README.md index 7bc423e..06be2cf 100644 --- a/README.md +++ b/README.md @@ -1,30 +1,49 @@ -

Laravel Logo

+# Biogaz Pers'o

Build Status -Total Downloads Latest Stable Version License

-## About Application - -This is a simple application that allows you to create, edit, delete and view whitelist. It also allows you to register and login to the application. The application is built using Laravel 10 and Bootstrap 5. - - -## Security Vulnerabilities - -If you discover a security vulnerability within Laravel, please send an e-mail to alexcaussades via [alexcaussades@gmail.com](mailto:alexcaussades@gmail.com). All security vulnerabilities will be promptly addressed. - -## Contributing - -Thank you for considering contributing to application. - - -## License - -The Laravel framework is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT). - -## Wiki Documentation - -[API Documentation](https://github.com/alexcaussades/L10/wiki/API) +## Navigateur supporté +![image](https://img.shields.io/badge/Firefox_Browser-FF7139?style=for-the-badge&logo=Firefox-Browser&logoColor=white) +![image](https://img.shields.io/badge/Google_Chrome-4285F4?style=for-the-badge&logo=Google-Chrome&logoColor=white) +![image](https://img.shields.io/badge/Opera-FF1B2D?style=for-the-badge&logo=Opera&logoColor=white) +![image](https://img.shields.io/badge/Microsoft_Edge-0078D7?style=for-the-badge&logo=Microsoft-Edge&logoColor=white) + +## Technologies utilisées +![image](https://img.shields.io/badge/PHP-777BB4?style=for-the-badge&logo=PHP&logoColor=white) +![image](https://img.shields.io/badge/Laravel-FF2D20?style=for-the-badge&logo=Laravel&logoColor=white) +![image](https://img.shields.io/badge/HTML5-E34F26?style=for-the-badge&logo=HTML5&logoColor=white) +![image](https://img.shields.io/badge/CSS3-1572B6?style=for-the-badge&logo=CSS3&logoColor=white) +![image](https://img.shields.io/badge/JavaScript-F7DF1E?style=for-the-badge&logo=JavaScript&logoColor=black) +![image](https://img.shields.io/badge/Bootstrap-563D7C?style=for-the-badge&logo=Bootstrap&logoColor=white) +![image](https://img.shields.io/badge/Sqlite-003B57?style=for-the-badge&logo=sqlite&logoColor=white) + +> [!NOTE] +> Gestion de la documentation du projet sera faite avec le [Wiki GitHub](https://github.com/alexcaussades/Ivatrac/wiki) + + +## Description +Ce projet a pour but de gérer le suivit du biogaz des sites de production. :hotsprings: + +## Prérequis +- [Git](https://git-scm.com/downloads) +- [PHP](https://windows.php.net/download/) +- [Composer](https://getcomposer.org/Composer-Setup.exe) + +Vous voulez suivre les étapes d'[installation pas à pas](https://github.com/alexcaussades/Gestion_Biogaz/wiki/%5BTech%5D-Installation) + +# Installation +Pour installer le projet, il suffit de suivre les étapes suivantes : + +```bash +git clone https://github.com/alexcaussades/Gestion_Biogaz.git +cd Gestion_biogaz +composer install +php -r "file_exists('.env') || copy('.env.example', '.env');" +php artisan key:generate +php artisan migrate +php artisan serve +```` \ No newline at end of file diff --git a/app/Http/Controllers/AuthIVAOController.php b/app/Http/Controllers/AuthIVAOController.php index 140c834..11f8bf2 100644 --- a/app/Http/Controllers/AuthIVAOController.php +++ b/app/Http/Controllers/AuthIVAOController.php @@ -66,6 +66,7 @@ public function sso(Request $request, $url = "home") "Content-type: application/x-www-form-urlencoded\r\n", "method" => "POST", "content" => http_build_query($token_req_data), + "verify_peer" => false, ], ]; $token_context = stream_context_create($token_options); diff --git a/app/Http/Controllers/frendly_userController.php b/app/Http/Controllers/frendly_userController.php index e2ab56a..82990cc 100644 --- a/app/Http/Controllers/frendly_userController.php +++ b/app/Http/Controllers/frendly_userController.php @@ -31,7 +31,7 @@ public function getFrendlyUser() for ($i = 0; $i < count($frendly_user); $i++) { $frendly_user_array[$i]["vid_friend"] = $frendly_user[$i]["friendId"]; $frendly_user_array[$i]["name_friend"] = $frendly_user[$i]["friend"]["firstName"]. " ". $frendly_user[$i]["friend"]["lastName"]; - $frendly_user_array[$i]["session"] = $frendly_user[$i]["session"]; + $frendly_user_array[$i]["session"] = $frendly_user[$i]["sessions"]; } //dd($frendly_user_array); return $frendly_user_array; diff --git a/app/Http/Controllers/whazzupController.php b/app/Http/Controllers/whazzupController.php index e1ea227..ca1d458 100644 --- a/app/Http/Controllers/whazzupController.php +++ b/app/Http/Controllers/whazzupController.php @@ -229,13 +229,14 @@ public function API_Delect_session($path = null, $method = 'GET', $data = null, return $response; } - public function API_request($path = null, $method = 'GET', $data = null, $headers = null) + public function API_request($path = null, $method = 'GET', $data = null, $headers = null, $verify = true) { $url = 'https://api.ivao.aero/' . $path; if (session("ivao_tokens")) { $headers = [ 'Authorization' => 'Bearer ' . session("ivao_tokens")["access_token"], 'Accept' => 'application/json', + ]; } else { $headers = [ diff --git a/database/changelog.json b/database/changelog.json index 25a498b..2ea8993 100644 --- a/database/changelog.json +++ b/database/changelog.json @@ -280,5 +280,25 @@ "description": "Add Database Airac for page online ATC and online pilot" } ] + }, + "12": { + "id": 13, + "name": "2024 / 01", + "date": "2024-07-15", + "version": "26.3.0", + "option": [ + { + "id": 0, + "type": "Bug Fix", + "btn": "danger", + "description": "Fixing the bug of the online friends" + }, + { + "id": 1, + "type": "Update", + "btn": "primary", + "description": "Update AIRAC 2407" + } + ] } } diff --git a/package-lock.json b/package-lock.json index 04f11c5..c064b8c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,9 +1,10 @@ { - "name": "L10", + "name": "Ivatrac", "lockfileVersion": 3, "requires": true, "packages": { "": { + "name": "Ivatrac", "devDependencies": { "axios": "^1.6.0", "laravel-vite-plugin": "^0.7.2", @@ -102,9 +103,9 @@ } }, "node_modules/follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", "dev": true, "funding": [ { @@ -112,6 +113,7 @@ "url": "https://github.com/sponsors/RubenVerborgh" } ], + "license": "MIT", "engines": { "node": ">=4.0" }, @@ -282,10 +284,11 @@ } }, "node_modules/vite": { - "version": "4.4.9", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.9.tgz", - "integrity": "sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==", + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.3.tgz", + "integrity": "sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==", "dev": true, + "license": "MIT", "dependencies": { "esbuild": "^0.18.10", "postcss": "^8.4.27", diff --git a/resources/views/friends/index.blade.php b/resources/views/friends/index.blade.php index 2bd4cc6..d624343 100644 --- a/resources/views/friends/index.blade.php +++ b/resources/views/friends/index.blade.php @@ -48,7 +48,7 @@ @if ($value["session"] == null) @else - {{$value["session"]["callsign"]}} + {{$value["session"][0]["callsign"]}} @endif
diff --git a/resources/views/friends/verify.blade.php b/resources/views/friends/verify.blade.php index a76d751..2687c0b 100644 --- a/resources/views/friends/verify.blade.php +++ b/resources/views/friends/verify.blade.php @@ -32,8 +32,8 @@
- {{$friends[$i]["session"]["callsign"]}} - {{Carbon::parse($friends[$i]["session"]["time"])->format('H:i')}} + {{$friends[$i]["sessions"][0]["callsign"]}} + {{Carbon::parse($friends[$i]["sessions"][0]["time"])->format('H:i')}} @endfor