diff --git a/bootstrap/app.php b/bootstrap/app.php index 7b162da..b5b0221 100644 --- a/bootstrap/app.php +++ b/bootstrap/app.php @@ -11,7 +11,8 @@ return Application::configure(basePath: dirname(__DIR__)) health: '/up', ) ->withMiddleware(function (Middleware $middleware) { - // + $middleware->redirectUsersTo('/dashboard'); + $middleware->redirectGuestsTo('/'); }) ->withExceptions(function (Exceptions $exceptions) { // diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index 584104c..d4e1058 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -23,9 +23,13 @@ class UserFactory extends Factory */ public function definition(): array { + $judingPrefPossibilities = ['woodwinds','flute','clarinet','saxophones', 'low clarinets','oboe','bassoon','double reeds','brass','low brass','trumpet','trombone','horn','tuba','euphonium','percussion']; return [ - 'name' => fake()->name(), + 'first_name' => fake()->firstName(), + 'last_name' => fake()->lastName(), 'email' => fake()->unique()->safeEmail(), + 'judging_preference' => fake()->randomElement($judingPrefPossibilities), + 'cell_phone' => fake()->phoneNumber(), 'email_verified_at' => now(), 'password' => static::$password ??= Hash::make('password'), 'remember_token' => Str::random(10), diff --git a/resources/views/components/auth/form-button.blade.php b/resources/views/components/auth/form-button.blade.php index 546df99..509701b 100644 --- a/resources/views/components/auth/form-button.blade.php +++ b/resources/views/components/auth/form-button.blade.php @@ -1,6 +1,11 @@ @php $buttonClasses = "flex w-full justify-center rounded-md bg-indigo-600 px-3 py-1.5 text-sm font-semibold leading-6 text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600"; @endphp +@props(['href' => false])
- + @if($href) + merge(['class' => $buttonClasses, 'type'=>'submit']) }}>{{ $slot }} + @else + + @endif
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php index aa8cf28..0c8be39 100644 --- a/resources/views/welcome.blade.php +++ b/resources/views/welcome.blade.php @@ -1,29 +1,14 @@ @php use Illuminate\Support\Facades\Auth; @endphp - - - - - - - Document - @vite('resources/css/app.css') - - -

Hello, World

+ + Welcome to AuditionAdmin +
+
+
+ Login + Create Account +
+
+
-
- @csrf - @auth -

Logged in as: {{ Auth::user()->first_name }}

- Logout - @endauth - @guest() -

Register

-

Login

- @endguest - -
- - + diff --git a/routes/web.php b/routes/web.php index 1c499ec..b21fde3 100644 --- a/routes/web.php +++ b/routes/web.php @@ -3,19 +3,29 @@ use App\Http\Controllers\SchoolController; use Illuminate\Support\Facades\Route; -Route::get('/', function () { - return view('welcome'); -}); - Route::view('/test','test'); + + +Route::view('/','welcome')->middleware('guest'); Route::view('/profile','profile')->middleware('auth','verified'); Route::view('/dashboard', 'dashboard')->middleware('auth', 'verified'); -Route::get('/my_school', [SchoolController::class, 'my_school'])->middleware('auth','verified'); -Route::get('/schools/create', [SchoolController::class, 'create'])->middleware('auth','verified'); -Route::post('/schools', [SchoolController::class, 'store'])->middleware('auth','verified'); -Route::get('/schools/{school}/edit', [SchoolController::class, 'edit'])->middleware('auth','verified'); -Route::get('/schools/{school}', [SchoolController::class, 'show'])->middleware('auth','verified'); -Route::patch('/schools/{school}', [SchoolController::class, 'update'])->middleware('auth','verified'); +Route::middleware(['auth','verified'])->controller(SchoolController::class)->group(function() { + Route::get('/my_school','my_school'); + Route::get('/schools/create', 'create'); + Route::post('/schools','store'); + Route::get('/schools/{school}/edit','edit'); + Route::get('/schools/{school}','show'); + Route::patch('/schools/{school}','update'); +}); + + +//Route::get('/my_school', [SchoolController::class, 'my_school'])->middleware('auth','verified'); +//Route::get('/schools/create', [SchoolController::class, 'create'])->middleware('auth','verified'); +//Route::post('/schools', [SchoolController::class, 'store'])->middleware('auth','verified'); +//Route::get('/schools/{school}/edit', [SchoolController::class, 'edit'])->middleware('auth','verified'); +//Route::get('/schools/{school}', [SchoolController::class, 'show'])->middleware('auth','verified'); +//Route::patch('/schools/{school}', [SchoolController::class, 'update'])->middleware('auth','verified'); +