diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index 429ee40..db261d4 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -24,8 +24,8 @@ class UserController extends Controller { $this->middleware([ "auth" ])->only("logout"); - $this->middleware([ "guest" ])->only("login"); - $this->middleware([ "lang" ])->except(["login", "showLogin", "showForgot", "forgot"]); + $this->middleware([ "guest" ])->only(["login", "signup"]); + $this->middleware([ "lang" ])->except(["login", "showLogin", "showForgot", "forgot","signup"]); $this->middleware([ "check.auth:user.show" ])->only("show", "index"); $this->middleware([ "check.auth:user.create" ])->only("create"); @@ -74,6 +74,8 @@ class UserController extends Controller "email" => "required", "password" => "required|max:60", "phone" => "required|max:8|min:8", + //"eduenddate" => "", + //"education" => "required" ]); @@ -618,4 +620,11 @@ class UserController extends Controller return 'phone'; } } + + + public function signup(){ + //return redirect()->route("users.signup"); + return Response::detect("users.signup"); + } + } diff --git a/skolehjem/app/Http/Controllers/WashingReservationController.php b/skolehjem/app/Http/Controllers/WashingReservationController.php index 37ab1b3..d34471e 100644 --- a/skolehjem/app/Http/Controllers/WashingReservationController.php +++ b/skolehjem/app/Http/Controllers/WashingReservationController.php @@ -40,7 +40,8 @@ class WashingReservationController extends Controller { WashingReservation::query()->where('time', '<', date('Y-m-d H:i:s', strtotime('-1 hour')))->delete(); - $reservations = WashingReservation::query()->orderBY('time' , 'asc')->paginate($request->query("limit", 20)); + $reservations = WashingReservation::query()->orderBy('time', 'asc')->paginate(20); + return Response::detect("washing-reservations.index", [ "reservations" => $reservations]); } diff --git a/skolehjem/database/migrations/2014_10_12_000000_create_users_table.php b/skolehjem/database/migrations/2014_10_12_000000_create_users_table.php index ad43751..2034183 100644 --- a/skolehjem/database/migrations/2014_10_12_000000_create_users_table.php +++ b/skolehjem/database/migrations/2014_10_12_000000_create_users_table.php @@ -26,6 +26,8 @@ class CreateUsersTable extends Migration $table->string('email')->unique(); $table->timestamp('email_verified_at')->nullable(); $table->string('password'); + //$table->date('eduenddate')->nullable(); + //$table->string('education'); $table->string("phone", 8)->unique(); $table->rememberToken(); $table->foreignId("resource_id")->nullable()->constrained("resources", "id"); diff --git a/skolehjem/database/seeds/UserSeeder.php b/skolehjem/database/seeds/UserSeeder.php index b481f16..16e29d5 100644 --- a/skolehjem/database/seeds/UserSeeder.php +++ b/skolehjem/database/seeds/UserSeeder.php @@ -24,6 +24,8 @@ class UserSeeder extends Seeder $user->email = "admin@admin.local"; $user->setPasswordAttribute("1234"); $user->phone = "12345678"; + //$user->eduenddate = "2024-01-03"; + //$user->education = "Datatekniker med programmering"; //Gives Administrator role to the Admin $user->assignRole("Administrator"); @@ -41,6 +43,8 @@ class UserSeeder extends Seeder $user->email = "x@x.x"; $user->setPasswordAttribute("1"); $user->phone = "12345679"; + //$user->eduenddate = "2024-02-03"; + //$user->education = "Datatekniker med programmering"; //Gives Administrator role to the Admin $user->assignRole("Administrator"); diff --git a/skolehjem/resources/views/app/news/index.blade.php b/skolehjem/resources/views/app/news/index.blade.php index 6a511ce..5dee4f4 100644 --- a/skolehjem/resources/views/app/news/index.blade.php +++ b/skolehjem/resources/views/app/news/index.blade.php @@ -59,7 +59,8 @@ .information{ text-align: center; - background-color: rgba(0, 0, 0, 0.2); + background-color: rgba(240,240,240,0.8); + border-bottom: 1px solid rgba(0, 0, 0, .1); width: 100%; height: 25px; } diff --git a/skolehjem/resources/views/app/users/signup.blade.php b/skolehjem/resources/views/app/users/signup.blade.php new file mode 100644 index 0000000..1b72a9b --- /dev/null +++ b/skolehjem/resources/views/app/users/signup.blade.php @@ -0,0 +1,55 @@ +@extends("user.layout.base") + +@section("title") + Sign up +@endsection + +@section("content") + +
+ +
+ Syddansk Erhvervsskole +
+
+ @csrf + + + + + + + + + + + + + + +
+ +
+ + + + +@endsection diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php index c8574d3..1c595b5 100644 --- a/skolehjem/routes/web.php +++ b/skolehjem/routes/web.php @@ -40,6 +40,7 @@ Route::get("/about", "AboutController@index")->name("about.index"); Route::post("/events/cancelsignup", "UserEventController@createajaxcancel")->name("userevents.createajaxcancel"); Route::post("/account/cancelmailwants", "UserController@createajaxcancel")->name("users.createajaxcancel"); Route::delete("/notifications/delete", "EventController@deleteNotifications")->name("notifications.delete"); +//Route::get("/signup", "UserController@signup")->name("users.signup"); //Search/Filter Route::get("/contactsapi", "ContactController@search")->name("contacts.search");