From 3f0678397a4bd7c0894162b63e4b94489509e908 Mon Sep 17 00:00:00 2001 From: erishBRBS Date: Tue, 6 May 2025 16:22:05 +0800 Subject: [PATCH] phpmyadmin service added --- .env | 6 +++--- app/Http/Controllers/API/UserController.php | 7 +++++++ composer.json | 2 +- composer.lock | 2 +- docker-compose.yml | 15 ++++++++++++++- public/.DS_Store | Bin public/.htaccess | 0 public/css/app.css | 0 public/favicon.ico | 0 public/index.php | 0 public/js/app.js | 0 public/robots.txt | 0 public/svg/1.apk | Bin public/svg/2.apk | Bin public/svg/403.svg | 0 public/svg/404.svg | 0 public/svg/500.svg | 0 public/svg/503.svg | 0 public/svg/uni1.apk | Bin routes/api.php | 5 +++++ 20 files changed, 31 insertions(+), 6 deletions(-) mode change 100644 => 100755 public/.DS_Store mode change 100644 => 100755 public/.htaccess mode change 100644 => 100755 public/css/app.css mode change 100644 => 100755 public/favicon.ico mode change 100644 => 100755 public/index.php mode change 100644 => 100755 public/js/app.js mode change 100644 => 100755 public/robots.txt mode change 100644 => 100755 public/svg/1.apk mode change 100644 => 100755 public/svg/2.apk mode change 100644 => 100755 public/svg/403.svg mode change 100644 => 100755 public/svg/404.svg mode change 100644 => 100755 public/svg/500.svg mode change 100644 => 100755 public/svg/503.svg mode change 100644 => 100755 public/svg/uni1.apk diff --git a/.env b/.env index 1c4b55f..5fa11dc 100644 --- a/.env +++ b/.env @@ -9,9 +9,9 @@ LOG_CHANNEL=stack DB_CONNECTION=mysql DB_HOST=db_mysql DB_PORT=3306 -DB_DATABASE="unioilLoyaltyApp" -DB_USERNAME="admin_erish" -DB_PASSWORD="laravel" +DB_DATABASE=unioilLoyaltyApp +DB_USERNAME=admin_erish +DB_PASSWORD=laravel BROADCAST_DRIVER=log CACHE_DRIVER=file diff --git a/app/Http/Controllers/API/UserController.php b/app/Http/Controllers/API/UserController.php index 39c473f..8f0b960 100644 --- a/app/Http/Controllers/API/UserController.php +++ b/app/Http/Controllers/API/UserController.php @@ -114,6 +114,13 @@ class UserController extends Controller 'is_active' => 1, ]); + return response()->json([ + 'success' => false, + 'testDITO' =>$request->username, + 'testDITO2' =>$admin, + ], 200); + + if($admin->count()) { if($admin[0]['status'] == 1) diff --git a/composer.json b/composer.json index 5874c3f..9574a30 100644 --- a/composer.json +++ b/composer.json @@ -23,8 +23,8 @@ }, "require-dev": { "beyondcode/laravel-dump-server": "^2.0", + "fakerphp/faker": "*", "filp/whoops": "^2.0", - "fakerphp/faker": "^1.9", "mockery/mockery": "^1.0", "nunomaduro/collision": "^8.0", "phpunit/phpunit": "^10.0" diff --git a/composer.lock b/composer.lock index 95d9858..af3329e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ed9b7b9d24984ea7151f827620821d79", + "content-hash": "fd8524023e7a69526ee6118304ac60d3", "packages": [ { "name": "aws/aws-crt-php", diff --git a/docker-compose.yml b/docker-compose.yml index 276e5e5..7e98311 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -42,6 +42,19 @@ services: networks: - app_network + phpmyadmin: + image: phpmyadmin/phpmyadmin + container_name: phpmyadmin + restart: unless-stopped + environment: + PMA_HOST: db_mysql # Hostname of your MySQL container + PMA_PORT: 3306 + MYSQL_ROOT_PASSWORD: laravel # Root password (match with your db container) + ports: + - "8080:80" # Exposes phpMyAdmin on port 8080 + networks: + - app_network + nginx: image: nginx:alpine container_name: nginx @@ -64,4 +77,4 @@ volumes: networks: app_network: - driver: bridge \ No newline at end of file + driver: bridge diff --git a/public/.DS_Store b/public/.DS_Store old mode 100644 new mode 100755 diff --git a/public/.htaccess b/public/.htaccess old mode 100644 new mode 100755 diff --git a/public/css/app.css b/public/css/app.css old mode 100644 new mode 100755 diff --git a/public/favicon.ico b/public/favicon.ico old mode 100644 new mode 100755 diff --git a/public/index.php b/public/index.php old mode 100644 new mode 100755 diff --git a/public/js/app.js b/public/js/app.js old mode 100644 new mode 100755 diff --git a/public/robots.txt b/public/robots.txt old mode 100644 new mode 100755 diff --git a/public/svg/1.apk b/public/svg/1.apk old mode 100644 new mode 100755 diff --git a/public/svg/2.apk b/public/svg/2.apk old mode 100644 new mode 100755 diff --git a/public/svg/403.svg b/public/svg/403.svg old mode 100644 new mode 100755 diff --git a/public/svg/404.svg b/public/svg/404.svg old mode 100644 new mode 100755 diff --git a/public/svg/500.svg b/public/svg/500.svg old mode 100644 new mode 100755 diff --git a/public/svg/503.svg b/public/svg/503.svg old mode 100644 new mode 100755 diff --git a/public/svg/uni1.apk b/public/svg/uni1.apk old mode 100644 new mode 100755 diff --git a/routes/api.php b/routes/api.php index 568f61e..be644bc 100644 --- a/routes/api.php +++ b/routes/api.php @@ -254,3 +254,8 @@ Route::get('mobile/stationfuels','API\StationController@get_station_fuels'); //mobile version Route::get('mobile/getVersion/{platform}','API\SystemPreferenceController@mobile_version'); + + +Route::get('/test', function () { + return 'Test route'; +}); \ No newline at end of file