2024-01 (#158)

* change frendly users * changement des informations de session * change info sessios vers2 * update readme * update changelog V13
LegoMask · Jul 20, 2024 · 69178ef · 69178ef
1 parent 2769f68
commit 69178ef
Show file tree

Hide file tree

Showing 8 changed files with 79 additions and 35 deletions.
diff --git a/README.md b/README.md
@@ -1,30 +1,49 @@
-<p align="center"><a href="https://laravel.com" target="_blank"><img src="https://raw.githubusercontent.com/laravel/art/master/logo-lockup/5%20SVG/2%20CMYK/1%20Full%20Color/laravel-logolockup-cmyk-red.svg" width="400" alt="Laravel Logo"></a></p>
+# Biogaz Pers'o
 
 <p align="center">
 <a href="https://github.com/laravel/framework/actions"><img src="https://github.com/laravel/framework/workflows/tests/badge.svg" alt="Build Status"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/dt/laravel/framework" alt="Total Downloads"></a>
 <a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/v/laravel/framework" alt="Latest Stable Version"></a>
 <a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/l/laravel/framework" alt="License"></a>
 </p>
 
-## 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
+````
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git a/resources/views/friends/index.blade.php b/resources/views/friends/index.blade.php
@@ -48,7 +48,7 @@
                 @if ($value["session"] == null)
                     <td></td>
                 @else
-                <td>{{$value["session"]["callsign"]}}</td>
+                <td>{{$value["session"][0]["callsign"]}}</td>
                 @endif
                 <td class="d-flex inline-flex">
                     <form action="{{route("friends.destroy")}}" method="get">

diff --git a/resources/views/friends/verify.blade.php b/resources/views/friends/verify.blade.php
@@ -32,8 +32,8 @@
                         <button class="btn btn-dark btn-sm" type="submit">{{$friends[$i]["friendId"]}}</button>
                     </form>
                 </td>
-                <td>{{$friends[$i]["session"]["callsign"]}}</td>
-                <td>{{Carbon::parse($friends[$i]["session"]["time"])->format('H:i')}}</td>
+                <td>{{$friends[$i]["sessions"][0]["callsign"]}}</td>
+                <td>{{Carbon::parse($friends[$i]["sessions"][0]["time"])->format('H:i')}}</td>
                 </tr>
                 @endfor
         </tbody>