Merge branch 'main' of https://gitd3ti.vokasi.uns.ac.id/ryanindrajaya/backend-laravel

.env.example

@@ -11,13 +11,21 @@ LOG_LEVEL=debug
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
 DB_PORT=3306
+<<<<<<< HEAD
 DB_DATABASE=uts
+=======
+DB_DATABASE=laravel
+>>>>>>> d550565de2bb4644ab6379018c2c091785cfa31c
 DB_USERNAME=root
 DB_PASSWORD=
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
+<<<<<<< HEAD
 FILESYSTEM_DRIVER=local
+=======
+FILESYSTEM_DISK=local
+>>>>>>> d550565de2bb4644ab6379018c2c091785cfa31c
 QUEUE_CONNECTION=sync
 SESSION_DRIVER=file
 SESSION_LIFETIME=120
@@ -34,7 +42,11 @@ MAIL_PORT=1025
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
+<<<<<<< HEAD
 MAIL_FROM_ADDRESS=null
+=======
+MAIL_FROM_ADDRESS="hello@example.com"
+>>>>>>> d550565de2bb4644ab6379018c2c091785cfa31c
 MAIL_FROM_NAME="${APP_NAME}"
 
 AWS_ACCESS_KEY_ID=
@@ -46,7 +58,20 @@ AWS_USE_PATH_STYLE_ENDPOINT=false
 PUSHER_APP_ID=
 PUSHER_APP_KEY=
 PUSHER_APP_SECRET=
+<<<<<<< HEAD
 PUSHER_APP_CLUSTER=mt1
 
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+=======
+PUSHER_HOST=
+PUSHER_PORT=443
+PUSHER_SCHEME=https
+PUSHER_APP_CLUSTER=mt1
+
+VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+VITE_PUSHER_HOST="${PUSHER_HOST}"
+VITE_PUSHER_PORT="${PUSHER_PORT}"
+VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
+VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+>>>>>>> d550565de2bb4644ab6379018c2c091785cfa31c

.gitattributes

@@ -8,3 +8,7 @@
 
 /.github export-ignore
 CHANGELOG.md export-ignore
+<<<<<<< HEAD
+=======
+.styleci.yml export-ignore
+>>>>>>> d550565de2bb4644ab6379018c2c091785cfa31c

README.md

+<<<<<<< HEAD
 <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"></a></p>
+=======
+<<<<<<< HEAD
+<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>
+>>>>>>> d550565de2bb4644ab6379018c2c091785cfa31c
 
 <p align="center">
 <a href="https://travis-ci.org/laravel/framework"><img src="https://travis-ci.org/laravel/framework.svg" alt="Build Status"></a>
@@ -25,7 +30,13 @@ ## Learning Laravel
 
 Laravel has the most extensive and thorough [documentation](https://laravel.com/docs) and video tutorial library of all modern web application frameworks, making it a breeze to get started with the framework.
 
+<<<<<<< HEAD
 If you don't feel like reading, [Laracasts](https://laracasts.com) can help. Laracasts contains over 1500 video tutorials on a range of topics including Laravel, modern PHP, unit testing, and JavaScript. Boost your skills by digging into our comprehensive video library.
+=======
+You may also try the [Laravel Bootcamp](https://bootcamp.laravel.com), where you will be guided through building a modern Laravel application from scratch.
+
+If you don't feel like reading, [Laracasts](https://laracasts.com) can help. Laracasts contains over 2000 video tutorials on a range of topics including Laravel, modern PHP, unit testing, and JavaScript. Boost your skills by digging into our comprehensive video library.
+>>>>>>> d550565de2bb4644ab6379018c2c091785cfa31c
 
 ## Laravel Sponsors
 
@@ -62,3 +73,11 @@ ## Security Vulnerabilities
 ## License
 
 The Laravel framework is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).
+<<<<<<< HEAD
+=======
+=======
+# backend-laravel
+
+Sebuah website sederhana dibangun dengan Framework Laravel
+>>>>>>> b6498d5745f801462835e1b1af2bed37a98bc7af
+>>>>>>> d550565de2bb4644ab6379018c2c091785cfa31c

app/Exceptions/Handler.php

@@ -8,16 +8,35 @@
 class Handler extends ExceptionHandler
 {
     /**
+<<<<<<< HEAD
      * A list of the exception types that are not reported.
      *
      * @var array<int, class-string<Throwable>>
+=======
+     * A list of exception types with their corresponding custom log levels.
+     *
+     * @var array<class-string<\Throwable>, \Psr\Log\LogLevel::*>
+     */
+    protected $levels = [
+        //
+    ];
+
+    /**
+     * A list of the exception types that are not reported.
+     *
+     * @var array<int, class-string<\Throwable>>
+>>>>>>> d550565de2bb4644ab6379018c2c091785cfa31c
      */
     protected $dontReport = [
         //
     ];
 
     /**
+<<<<<<< HEAD
      * A list of the inputs that are never flashed for validation exceptions.
+=======
+     * A list of the inputs that are never flashed to the session on validation exceptions.
+>>>>>>> d550565de2bb4644ab6379018c2c091785cfa31c
      *
      * @var array<int, string>
      */

app/Http/Kernel.php

@@ -16,7 +16,11 @@ class Kernel extends HttpKernel
     protected $middleware = [
         // \App\Http\Middleware\TrustHosts::class,
         \App\Http\Middleware\TrustProxies::class,
+<<<<<<< HEAD
         \Fruitcake\Cors\HandleCors::class,
+=======
+        \Illuminate\Http\Middleware\HandleCors::class,
+>>>>>>> d550565de2bb4644ab6379018c2c091785cfa31c
         \App\Http\Middleware\PreventRequestsDuringMaintenance::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,
@@ -33,7 +37,10 @@ class Kernel extends HttpKernel
             \App\Http\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
+<<<<<<< HEAD
             // \Illuminate\Session\Middleware\AuthenticateSession::class,
+=======
+>>>>>>> d550565de2bb4644ab6379018c2c091785cfa31c
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
@@ -56,14 +63,30 @@ class Kernel extends HttpKernel
     protected $routeMiddleware = [
         'auth' => \App\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
+<<<<<<< HEAD
+=======
+        'auth.session' => \Illuminate\Session\Middleware\AuthenticateSession::class,
+>>>>>>> d550565de2bb4644ab6379018c2c091785cfa31c
         'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
         'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
         'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
+<<<<<<< HEAD
         'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
         'isAdmin' => \App\Http\Middleware\AdminAuth::class,
         'isUser' => \App\Http\Middleware\UserAuth::class,
     ];
-}
\ No newline at end of file
+}
+=======
+        'signed' => \App\Http\Middleware\ValidateSignature::class,
+        'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
+        'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
+        'isAdmin' => \App\Http\Middleware\isAdmin::class,
+        'isUser' => \App\Http\Middleware\isUser::class,
+        'isLogged' => \App\Http\Middleware\isLogged::class,
+        'isNotLogged' => \App\Http\Middleware\isNotLogged::class,
+    ];
+}
+>>>>>>> d550565de2bb4644ab6379018c2c091785cfa31c

app/Http/Middleware/Authenticate.php

@@ -14,8 +14,16 @@ class Authenticate extends Middleware
      */
     protected function redirectTo($request)
     {
+<<<<<<< HEAD
         if (!$request->expectsJson()) {
             return route('login');
         }
     }
-}
\ No newline at end of file
+}
+=======
+        if (! $request->expectsJson()) {
+            return route('login');
+        }
+    }
+}
+>>>>>>> d550565de2bb4644ab6379018c2c091785cfa31c

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -29,4 +29,4 @@ public function handle(Request $request, Closure $next, ...$guards)
 
         return $next($request);
     }
-}
\ No newline at end of file
+}

app/Http/Middleware/ValidateSignature.php

+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Routing\Middleware\ValidateSignature as Middleware;
+
+class ValidateSignature extends Middleware
+{
+    /**
+     * The names of the query string parameters that should be ignored.
+     *
+     * @var array<int, string>
+     */
+    protected $except = [
+        // 'fbclid',
+        // 'utm_campaign',
+        // 'utm_content',
+        // 'utm_medium',
+        // 'utm_source',
+        // 'utm_term',
+    ];
+}

app/Http/Middleware/isAdmin.php

+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+class isAdmin
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
+     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
+     */
+    public function handle(Request $request, Closure $next)
+    {
+        if (Auth::user()?->role == 2) {
+            return $next($request);
+        } else if (Auth::user()?->role == 1) {
+            return redirect('/user/profile98');
+        } else {
+            return redirect('/');
+        }
+    }
+}

app/Http/Middleware/isLogged.php

+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+class isLogged
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
+     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
+     */
+    public function handle(Request $request, Closure $next)
+    {
+        if (Auth::check()) {
+            if (Auth::user()->role == 1) {
+                return redirect('/user/profile98');
+            } else if (Auth::user()->role == 2) {
+                return redirect('/admin/dashboard98');
+            } else {
+                return redirect('/');
+            }
+        } else {
+            return $next($request);
+        }
+    }
+}

app/Http/Middleware/isNotLogged.php

+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+class isNotLogged
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
+     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
+     */
+    public function handle(Request $request, Closure $next)
+    {
+        if (!Auth::check()) {
+            return $next($request);
+        } else {
+            return redirect('/');
+        }
+    }
+}

app/Http/Middleware/isUser.php

+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+class isUser
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
+     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
+     */
+    public function handle(Request $request, Closure $next)
+    {
+        if (Auth::user()?->role == 1) {
+            return $next($request);
+        } else if (Auth::user()?->role == 2) {
+            return redirect('/admin/dashboard98');
+        } else {
+            return redirect('/');
+        }
+    }
+}

app/Models/Agama.php

@@ -8,7 +8,24 @@
 class Agama extends Model
 {
     use HasFactory;
+<<<<<<< HEAD
     protected $fillable = [
         'nama_agama'
     ];
-}
\ No newline at end of file
+}
+=======
+
+    protected $fillable = [
+        'nama_agama',
+    ];
+
+    /**
+     * The attributes that should be cast.
+     *
+     * @var array<string, string>
+     */
+    protected $casts = [
+        'nama_agama' => 'string',
+    ];
+}
+>>>>>>> d550565de2bb4644ab6379018c2c091785cfa31c

app/Models/DetailUser.php

+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class DetailUser extends Model
+{
+    use HasFactory;
+
+    protected $fillable = [
+        'user_id',
+        'alamat',
+        'tempat_lahir',
+        'tanggal_lahir',
+        'agama_id',
+        'foto_ktp'
+    ];
+
+    /**
+     * The attributes that should be cast.
+     *
+     * @var array<string, string>
+     */
+    protected $casts = [
+        'user_id' => 'integer',
+        'alamat' => 'string',
+        'tempat_lahir' => 'string',
+        'tanggal_lahir' => 'datetime',
+        'agama_id' => 'integer',
+        'foto_ktp' => 'string'
+    ];
+}

app/Models/User.php

@@ -45,4 +45,4 @@ class User extends Authenticatable
     protected $casts = [
         'email_verified_at' => 'datetime',
     ];
-}
\ No newline at end of file
+}

app/Providers/AuthServiceProvider.php

@@ -2,13 +2,22 @@
 
 namespace App\Providers;
 
+<<<<<<< HEAD
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
 use Illuminate\Support\Facades\Gate;
+=======
+// use Illuminate\Support\Facades\Gate;
+use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
+>>>>>>> d550565de2bb4644ab6379018c2c091785cfa31c
 
 class AuthServiceProvider extends ServiceProvider
 {
     /**
+<<<<<<< HEAD
      * The policy mappings for the application.
+=======
+     * The model to policy mappings for the application.
+>>>>>>> d550565de2bb4644ab6379018c2c091785cfa31c
      *
      * @var array<class-string, class-string>
      */

app/Providers/EventServiceProvider.php

@@ -10,7 +10,11 @@
 class EventServiceProvider extends ServiceProvider
 {
     /**
+<<<<<<< HEAD
      * The event listener mappings for the application.
+=======
+     * The event to listener mappings for the application.
+>>>>>>> d550565de2bb4644ab6379018c2c091785cfa31c
      *
      * @var array<class-string, array<int, class-string>>
      */
@@ -29,4 +33,17 @@ public function boot()
     {
         //
     }
+<<<<<<< HEAD
+=======
+
+    /**
+     * Determine if events and listeners should be automatically discovered.
+     *
+     * @return bool
+     */
+    public function shouldDiscoverEvents()
+    {
+        return false;
+    }
+>>>>>>> d550565de2bb4644ab6379018c2c091785cfa31c
 }

composer.json

@@ -5,6 +5,7 @@
     "keywords": ["framework", "laravel"],
     "license": "MIT",
     "require": {
+<<<<<<< HEAD
         "php": "^7.3|^8.0",
         "fruitcake/laravel-cors": "^2.0",
         "guzzlehttp/guzzle": "^7.0.1",
@@ -20,6 +21,22 @@
         "mockery/mockery": "^1.4.4",
         "nunomaduro/collision": "^5.10",
         "phpunit/phpunit": "^9.5.10"
+=======
+        "php": "^7.1",
+        "guzzlehttp/guzzle": "^7.2",
+        "laravel/framework": "^9.19",
+        "laravel/sanctum": "^3.0",
+        "laravel/tinker": "^2.7"
+    },
+    "require-dev": {
+        "fakerphp/faker": "^1.9.1",
+        "laravel/pint": "^1.0",
+        "laravel/sail": "^1.0.1",
+        "mockery/mockery": "^1.4.4",
+        "nunomaduro/collision": "^6.1",
+        "phpunit/phpunit": "^9.5.10",
+        "spatie/laravel-ignition": "^1.0"
+>>>>>>> d550565de2bb4644ab6379018c2c091785cfa31c
     },
     "autoload": {
         "psr-4": {
@@ -56,7 +73,14 @@
     "config": {
         "optimize-autoloader": true,
         "preferred-install": "dist",
+<<<<<<< HEAD
         "sort-packages": true
+=======
+        "sort-packages": true,
+        "allow-plugins": {
+            "pestphp/pest-plugin": true
+        }
+>>>>>>> d550565de2bb4644ab6379018c2c091785cfa31c
     },
     "minimum-stability": "dev",
     "prefer-stable": true

config/app.php

 <?php
 
+<<<<<<< HEAD
+=======
+use Illuminate\Support\Facades\Facade;
+
+>>>>>>> d550565de2bb4644ab6379018c2c091785cfa31c
 return [
 
     /*
@@ -54,7 +59,11 @@
 
     'url' => env('APP_URL', 'http://localhost'),
 
+<<<<<<< HEAD
     'asset_url' => env('ASSET_URL', null),
+=======
+    'asset_url' => env('ASSET_URL'),
+>>>>>>> d550565de2bb4644ab6379018c2c091785cfa31c
 
     /*
     |--------------------------------------------------------------------------
@@ -125,6 +134,27 @@
 
     /*
     |--------------------------------------------------------------------------
+<<<<<<< HEAD
+=======
+    | Maintenance Mode Driver
+    |--------------------------------------------------------------------------
+    |
+    | These configuration options determine the driver used to determine and
+    | manage Laravel's "maintenance mode" status. The "cache" driver will
+    | allow maintenance mode to be controlled across multiple machines.
+    |
+    | Supported drivers: "file", "cache"
+    |
+    */
+
+    'maintenance' => [
+        'driver' => 'file',
+        // 'store'  => 'redis',
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+>>>>>>> d550565de2bb4644ab6379018c2c091785cfa31c
     | Autoloaded Service Providers
     |--------------------------------------------------------------------------
     |
@@ -188,6 +218,7 @@
     |
     */
 
+<<<<<<< HEAD
     'aliases' => [
 
         'App' => Illuminate\Support\Facades\App::class,
@@ -231,5 +262,10 @@
         'View' => Illuminate\Support\Facades\View::class,
 
     ],
+=======
+    'aliases' => Facade::defaultAliases()->merge([
+        // 'ExampleClass' => App\Example\ExampleClass::class,
+    ])->toArray(),
+>>>>>>> d550565de2bb4644ab6379018c2c091785cfa31c
 
 ];