Skip to content
This repository has been archived by the owner on Oct 20, 2024. It is now read-only.

2024-01 #158

Merged
merged 5 commits into from
Jul 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 42 additions & 23 deletions README.md
Original file line number Diff line number Diff line change
@@ -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
````
1 change: 1 addition & 0 deletions app/Http/Controllers/AuthIVAOController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/frendly_userController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion app/Http/Controllers/whazzupController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
20 changes: 20 additions & 0 deletions database/changelog.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
}
}
17 changes: 10 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion resources/views/friends/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
4 changes: 2 additions & 2 deletions resources/views/friends/verify.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading