From 00784dc7a7b25f6b11c26b95c50c8b68b5ff70a6 Mon Sep 17 00:00:00 2001 From: alexcaussades Date: Sun, 25 Jun 2023 22:18:59 +0200 Subject: [PATCH] Remove whitelist systeme (#13) --- .../Controllers/DiscordNotfyController.php | 59 ------ app/Http/Controllers/whitelistController.php | 86 --------- database/database.sqlite | Bin 176128 -> 176128 bytes .../2023_06_25_201456_removewhite.php | 26 +++ resources/views/navbar-metar.blade.php | 4 - resources/views/navbar.blade.php | 4 - resources/views/serveur/index.blade.php | 36 +--- routes/web.php | 180 +----------------- 8 files changed, 35 insertions(+), 360 deletions(-) delete mode 100644 app/Http/Controllers/DiscordNotfyController.php delete mode 100644 app/Http/Controllers/whitelistController.php create mode 100644 database/migrations/2023_06_25_201456_removewhite.php diff --git a/app/Http/Controllers/DiscordNotfyController.php b/app/Http/Controllers/DiscordNotfyController.php deleted file mode 100644 index 6cbb2b5..0000000 --- a/app/Http/Controllers/DiscordNotfyController.php +++ /dev/null @@ -1,59 +0,0 @@ -PostNotify(); - } - - public function PostNotify2() - { - $reponse = Http::post("https://discord.com/api/webhooks/1095038427973558433/DFUjcyw9kMDlcB2N-XCsKQrr2hJpGzQN_YDik1H4oqplDNPOl1usJlBL7I9z_O3Kko-9", [ - "embeds" => [ - [ - "title" => "Ceci est un test pour le webhook et les notifications discord pour les feactures de l'application", - "description" => "Bonjour tout le monde, je suis un test pour le webhook et les notifications discord pour les feactures de l'application, pour plus d'information veuillez contacter le developpeur de l'application ou le support technique de l'application.", - "color" => 16711680 - ] - ] - ]); - return $reponse->json(); - } - - - public function PostNotify() - { - $reponse = Http::post("https://discord.com/api/webhooks/1094916096324284477/Ulamwc2-t-asqRJyPabHwKuJ0Eel0_1hqphweOiIaLzoRQFr3vScn1Zv40xp7XAMu4Q3", [ - "embeds" => [ - [ - "title" => "test", - "description" => "test", - "color" => 16711680 - ] - ] - ]); - return $reponse->json(); - } - - public function newAddWhiteList($nameRp, $discordName, $email) - { - $reponse = Http::post("https://discord.com/api/webhooks/1095038427973558433/DFUjcyw9kMDlcB2N-XCsKQrr2hJpGzQN_YDik1H4oqplDNPOl1usJlBL7I9z_O3Kko-9", [ - "embeds" => [ - [ - "title" => "Ajout de la liste d'attente de la whitelist de " . $nameRp, - "description" => "l'utilisateur " . $nameRp . " a fait une demande d'ajout sur la liste d'attente de la whitelist du serveur. sont UsersName Discord est : " . $discordName . "\n Adresse email : " . $email . "\n URL de la demande : https://127.0.0.1:8000/whitelist/LudivicRamirez/34/", - "color" => 16711680 - ] - ] - ]); - return $reponse->json(); - } -} diff --git a/app/Http/Controllers/whitelistController.php b/app/Http/Controllers/whitelistController.php deleted file mode 100644 index b9629f6..0000000 --- a/app/Http/Controllers/whitelistController.php +++ /dev/null @@ -1,86 +0,0 @@ -name_rp = $request->name_rp; - $whitelist->id_users = $request->id_users; - $whitelist->naissance = $request->dateofnaissance; - $whitelist->Profession = $request->profession; - $whitelist->savoir = $request->savoir; - $whitelist->description = $request->description; - $whitelist->slug = Str::slug($request->name_rp); - $whitelist->save(); - Log::notice("Demande de whitelist de " . $request->name_rp . " par " . $request->id_users); - users::where('id', $request->id_users)->update(['whiteList' => 2]); - } - - public function update(Request $request, $id) - { - $whitelist = whitelist::find($id); - $whitelist->name_rp = $request->name_rp; - $whitelist->id_users = $request->id_users; - $whitelist->naissance = $request->naissance; - $whitelist->Profession = $request->Profession; - $whitelist->savoir = $request->savoir; - $whitelist->description = $request->description; - Log::notice("Modification de la demande de whitelist de " . $request->name_rp . " par " . $request->id_users); - $whitelist->save(); - } - - public function delete($id) - { - $whitelist = whitelist::find($id); - $whitelist->delete(); - Log::notice("Suppression de la demande de whitelist de " . $whitelist->name_rp . " par " . $whitelist->id_users); - } - - public function linkUser($id) - { - $whitelist = whitelist::where('id_users', $id)->first(); - return $whitelist; - } - - public function view(Request $request) - { - - $whitelist = whitelist::where('slug', $request->slug)->first(); - return $whitelist; - } - - public function viewAll() - { - $whitelist = whitelist::all(); - return $whitelist; - } - - public function count_whitelist_attente() - { - $users = users::where('whiteList', 2)->count(); - return $users; - } - - public function count_whitelist_accepte() - { - $users = users::where('whiteList', 3)->count(); - return $users; - } - - public function update_users_whitelist($id, $number) - { - - $users = users::where('id', $id )->update(['whiteList' => $number]); - return $users; - } -} diff --git a/database/database.sqlite b/database/database.sqlite index e29be6c7ad8152b5d10fd7512e250aa44bbf0a5e..e1aa083047539d9d96d5b02930fcfb49d16a574d 100644 GIT binary patch delta 420 zcmZp8z}4`8Yl5_3ECU0BHV{h!F&hw@Ow=)EjNO>9gkOP=cL5Xs9R3`BLw-@dSA1vr z7V#DFx$z149#2v-qOa-2AfC z@{G)qRL;#uWbK&5mN2mMx3lnn;J?6so4=j^DE~A5sr*wn3l`+_Pj1)e6}imI$t=&9 zSdbZCTAW%`%n5Xj?Bo^t;fw-J2HOl6SrnK#Szm2u4`7sHVd0+7cyhaH2;&`TQMUCA zLJYMGyeD`wxVyPExYlyHaIj2QC}0%ltObgL;lzdR+iMFLjo7$2{xgP(D=IR!Ze#Y%L`Jn?j delta 327 zcmZp8z}4`8Yl5_31Oo$uHW0&r;Y1x{#)ypxOZeq@d5lcNo)%P2Y)*Y{|EjH{I~g+@VE0H<$uOMb+ceWKL6x) zeO{4EyqwJPjEM!A@ukJ7Ma7(aEX<0NSLlZ`@;4c5Ghk#`wG8|V`OWxxcu(+VaCdWSaINKXVO!6^!g+!97-uYN3`-RYAM API -
  • - whitelist -
  • Metar
    • @@ -25,7 +22,6 @@ Autres
      -
    • WhiteList Gestion
    • Another action
    • Logout
      • diff --git a/resources/views/navbar.blade.php b/resources/views/navbar.blade.php index 5493461..13154d3 100644 --- a/resources/views/navbar.blade.php +++ b/resources/views/navbar.blade.php @@ -14,9 +14,6 @@
    • API
      • -
    • - Whitelist -
    • Metar
      • @@ -25,7 +22,6 @@ Autres
        -
      • WhiteList Gestion
      • Another action
      • Logout
        • diff --git a/resources/views/serveur/index.blade.php b/resources/views/serveur/index.blade.php index bd35094..3c1a23b 100644 --- a/resources/views/serveur/index.blade.php +++ b/resources/views/serveur/index.blade.php @@ -68,9 +68,6 @@
        -
        - -
        @endauth @@ -84,17 +81,6 @@

        • Email : {{ auth()->user()->email }}
          • - @if (auth()->user()->whiteList == 2) -
        • Whitelist : - En attente de validation -
          • - @elseif (auth()->user()->whiteList == 3) -
        • Whitelist : Accepté
          • - @elseif (auth()->user()->whiteList == 4) -
        • Whitelist : Refuser
          • - @else -
        • Whitelist :
          • - @endif
        • Discord :

        @@ -116,25 +102,7 @@
        - @if (auth()->user()->whiteList == 1) -
        -

        Crée votre Personnage

        - - @include("serveur.creat_perso") -
        - @endif - - @if (auth()->user()->whiteList == 2) -
        -

        Votre Personnage

        - @include("serveur.perso") -
        - @endif - - @if (auth()->user()->whiteList == 3) - -
        -

        Votre Connexion Serveur !

        - @endif + +
        diff --git a/routes/web.php b/routes/web.php index 866bd43..12fe3b6 100644 --- a/routes/web.php +++ b/routes/web.php @@ -2,28 +2,22 @@ -use App\Models\whitelist; use Illuminate\Http\Request; use Illuminate\Http\Response; use Illuminate\Support\Facades\DB; use App\Http\Controllers\Controller; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Route; -use Illuminate\Support\Facades\Cookie; use App\Http\Controllers\AtcController; use Illuminate\Support\Facades\Session; use App\Http\Controllers\metarController; -use App\Http\Controllers\RolesController; use App\Http\Controllers\usersController; use Illuminate\Support\Facades\Validator; use App\Http\Controllers\logginController; -use Illuminate\Database\DBAL\TimestampType; use App\Http\Controllers\AutAdminController; use App\Http\Controllers\PilotIvaoController; use App\Http\Controllers\whitelistController; use App\Http\Controllers\ApiGestionController; -use App\Http\Controllers\ApiPilotIvaoController; -use App\Http\Controllers\DiscordNotfyController; use App\Http\Requests\registerValidationRequest; use App\Http\Controllers\CreatAuhUniqueUsersController; @@ -58,114 +52,6 @@ return response()->view('welcome'); })->where('client', '[0-9]+'); -Route::get('discord', function (DiscordNotfyController $discordNotfyController) { - $discordNotfyController->newAddWhiteList("Ludovic Ramirez", "Legolas#5525", "Ludovic@gmail.com"); - return redirect()->route("welcome"); -}); - -Route::get("/whitelist", function (Request $request) { - $accounts = whitelist::all(); - return view("whitelist", ["accounts" => $accounts]); -})->name("whitelist"); - - -Route::prefix("gestion-white/")->group(function () { - Route::get("/", function (Request $request, whitelistController $whitelistController) { - $whitelistController = $whitelistController->viewAll(); - return view("serveur.whitelist.whitelistview", ["whitelist" => $whitelistController]); - })->name("whitelist-admin")->middleware("auth"); - - Route::get("/check/{slug}", function (Request $request, whitelistController $whitelistController) { - $request->merge([ - "slug" => $request->slug - ]); - - $whitelistController = $whitelistController->view($request); - $users = new usersController(); - $users = $users->get_info_user($whitelistController->id_users); - if ($whitelistController == null) { - return redirect()->route("whitelist"); - } - return view("serveur.whitelist.whitelistcheck", ["slug" => $whitelistController, "users" => $users]); - })->name("whitelist-admin.check1")->middleware("auth"); - - Route::post("/check/{slug}", function (Request $request, whitelistController $whitelistController) { - $request->merge([ - "slug" => $request->slug - ]); - - $whitelistController = $whitelistController->check($request); - if ($whitelistController == null) { - return redirect()->route("whitelist"); - } - return redirect()->route("whitelist-admin", ["slug" => $whitelistController]); - })->name("whitelist-admin.check")->middleware("auth"); - - Route::get("/edit/{slug}", function (Request $request, whitelistController $whitelistController) { - $request->merge([ - "slug" => $request->slug - ]); - - $whitelistController = $whitelistController->view($request); - $users = new usersController(); - $users = $users->get_info_user($whitelistController->id_users); - if ($whitelistController == null) { - return redirect()->route("whitelist"); - } - return view("serveur.whitelist.whitelistupdate", ["slug" => $whitelistController, "users" => $users]); - })->name("whitelist-admin.edit1")->middleware("auth"); - - // TODO: faire la route pour l'update de la whitelist sur une page externe @alexcaussades #9 - Route::post("/edit/{slug}", function (Request $request, whitelistController $whitelistController) { - $request->merge([ - "slug" => $request->slug - ]); - - $whitelistController = $whitelistController->edit($request); - if ($whitelistController == null) { - return redirect()->route("whitelist"); - } - return redirect()->route("whitelist-admin", ["slug" => $whitelistController]); - })->name("whitelist-admin.edit")->middleware("auth"); - - Route::get("/delete/{slug}", function (Request $request, whitelistController $whitelistController) { - $request->merge([ - "slug" => $request->slug - ]); - - $whitelistController = $whitelistController->delete($request); - if ($whitelistController == null) { - return redirect()->route("whitelist"); - } - return redirect()->route("whitelist"); - })->name("whitelist-admin.delete")->middleware("admin"); - - Route::post("/add-serveur/{id}", function (Request $request, whitelistController $whitelistController, usersController $usersController) { - $request->merge([ - "id" => $request->id - ]); - - if ($whitelistController == null) { - return redirect()->route("serveur"); - } - $usercontroller = new whitelistController(); - $usercontroller->update_users_whitelist($request->id, "3"); - return redirect()->route("whitelist-admin"); - })->name("whitelist-admin-add-serveur")->middleware("auth"); - - Route::post("/refus-serveur/{id}", function (Request $request, whitelistController $whitelistController, usersController $usersController) { - $request->merge([ - "id" => $request->id - ]); - - if ($whitelistController == null) { - return redirect()->route("serveur"); - } - $usercontroller = new whitelistController(); - $usercontroller->update_users_whitelist($request->id, "2"); - return redirect()->route("whitelist-admin"); - })->name("whitelist-admin-refus-serveur")->middleware("auth"); -}); Route::prefix("auth/")->group(function () { Route::get("add", [CreatAuhUniqueUsersController::class, "creatAuthUniqueUses"]); @@ -230,25 +116,24 @@ }); Route::prefix("serveur/")->group(function () { - Route::get("/", function (usersController $usersController, whitelistController $whitelistController, Request $request) { + Route::get("/", function (usersController $usersController, Request $request) { if (!Auth::user()) { return redirect()->route("auth.login"); } else { $users = $usersController->get_info_user(auth()->user()->id); $role = $usersController->get_role_user(auth()->user()->role); - $whitelist = $whitelistController->linkUser(auth()->user()->id); - $whitelistAttente = $whitelistController->count_whitelist_attente(); + - return view("serveur/index", ["users" => $users, "role" => $role, "whitelist" => $whitelist, "whitelistAttente" => $whitelistAttente]); + return view("serveur/index", ["users" => $users, "role" => $role]); } })->name("serveur"); - Route::post("/", function (usersController $usersController, whitelistController $whitelistController, Request $request) { - $whitelistController->create($request); + Route::post("/", function (usersController $usersController, Request $request) { + $users = $usersController->get_info_user(auth()->user()->id); $role = $usersController->get_role_user(auth()->user()->role); - $whitelist = $whitelistController->linkUser(auth()->user()->id); - return view("serveur.index", ["users" => $users, "role" => $role, "whitelist" => $whitelist]); + + return view("serveur.index", ["users" => $users, "role" => $role]); })->name("serveur.index"); Route::get("api", function (Request $request) { @@ -366,57 +251,6 @@ })->middleware(["auth:modo"])->name("logs.modo.delete"); }); -Route::prefix("install/")->group(function () { - Route::get("roles", function (RolesController $rolesController) { - $rolesController->create("register", "en attente de validation de sont compte"); - $rolesController->create("user", "utilisateur sans whitelist"); - $rolesController->create("whitelist", "utilisateur avec whitelist"); - $rolesController->create("moderator_groupe_whitelist", "moderateur de sont groupe de whitelist"); - $rolesController->create("administrateur_groupe_whitelist", "administrateur de sont groupe de la whitelist"); - $rolesController->create("moderator_whitelist", "moderateur de la whitelist"); - $rolesController->create("administrateur_whitelist", "administrateur de la whitelist"); - $rolesController->create("staff", "Staff de la whitelist"); - $rolesController->create("administrateur", "administrateur du site"); - $rolesController->create("super_administrateur", "super administrateur du site"); - $roles_get = \App\Models\Roles::all(); - return $roles_get; - }); - - Route::get("roles/{id}", function (RolesController $rolesController, Request $request) { - $roles_get = \App\Models\Roles::find($request->id); - return $roles_get; - }); - - Route::get("/", function () { - return [ - "roles" => "install/roles", - "users" => "install/users", - "whitelist" => "install/whitelist", - "discord" => "install/discord", - "atc" => "install/atc", - "auth" => "install/auth", - ]; - }); - - Route::get("admin", function (usersController $users_websiteController, Request $request) { - $request->merge([ - "name" => "Alexandre Caussades", - "email" => "alexcaussades@gmail.com", - "password" => Env("MY_PASS_APP"), - "role" => "10", - "whitelist" => "1", - "discordusers" => "Legolas#5525", - "condition" => "1", - "age" => "1", - "discord" => "1", - "name_rp" => "Darius Lambert", - ]); - $users_websiteController->install_superadmin($request); - $users_websiteController = \App\Models\users::all(); - return $users_websiteController; - }); -}); - Route::prefix("metar")->group(function () { Route::get("/", function (Request $request) { return view("metar.index");