';
}
return Response($output);
}
diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php
index 7d76618..53bbd96 100644
--- a/skolehjem/app/Http/Controllers/UserController.php
+++ b/skolehjem/app/Http/Controllers/UserController.php
@@ -68,17 +68,18 @@ class UserController extends Controller
"email" => "required|email|unique:users",
"password" => "required|max:60",
"phone" => "required|unique:users",
- "roles" => "max:255"
]);
// Log::debug("FINISHED VALIDATION?");
+ $rolez = $request->input("roles", [ "User" ]);
+
$user = new User($data);
// Log::debug("CREATED USER [NOT PERSISTED YET]");
- $user->assignRole([ "R1", "R2" ]);
+ $user->assignRole($rolez);
$user->save();
// Log::debug("SAVED USER");
@@ -166,16 +167,16 @@ class UserController extends Controller
//$user->save();
} else { // Else if you're not on the admin site (user site)
if ($request->input('password') != null) { // If you're editing the password
- if ($request->input('password') != $request->input('confirmpassword')) { // If new password and new password confirm is not the same, go back.
- return Response::detect("users.editpass");
- } elseif (!Hash::check($request->input('oldpassword'), $user->password)) { // If the written current password and current password in DB is not the same, go back.
- return Response::detect("users.editpass");
+ if ($request->input('password') != $request->input('confirmpassword')) { // If new password and new password confirm is not the same, go back with fail message.
+ return redirect()->route("users.accounteditpass")->with('error#notsamepass', '
Der stod ikke det samme i `Nyt Password` & `Bekræft Nyt Password`!
');
+ } elseif (!Hash::check($request->input('oldpassword'), $user->password)) { // If the written current password and current password in DB is not the same, go back with fail message.
+ return redirect()->route("users.accounteditpass")->with('error#oldpass', '
Det indtastede password i `Nuværende Password` er ikke dit nuværende password!
');
} else { // If new password and current password is the same AND current written and current DB password is the same. Then update and logout.
/** @var User $user */
$user->update($data);
Auth::logout();
- return redirect()->route("users.login");
+ return redirect()->route("users.login")->with('success#passwordchange', '
Dit password er hermed ændret!
');
}
} else { // Else if you're not editing the password but anything else (Email, Phone Number). Then update user.
$user->update($data);
@@ -289,10 +290,13 @@ class UserController extends Controller
$users = User::query()->where('name_first', 'LIKE',$request->search.'%')
->orWhere('name_last','LIKE', $request->search.'%')
->orWhere('phone','LIKE', $request->search.'%')
- ->orWhere('email','LIKE',$request->search. '%')->get();
+ ->orWhere('email','LIKE',$request->search. '%')
+ ->orWhere('name','LIKE',$request->search. '%')
+ ->get();
if(count($users) !== 0){
foreach ($users as $key => $user){
+
$roles = null;
$rolesString = null;
@@ -314,7 +318,7 @@ class UserController extends Controller
'
';
}
return Response($output);
}
diff --git a/skolehjem/app/Http/Controllers/UserEventController.php b/skolehjem/app/Http/Controllers/UserEventController.php
new file mode 100644
index 0000000..001e730
--- /dev/null
+++ b/skolehjem/app/Http/Controllers/UserEventController.php
@@ -0,0 +1,41 @@
+validate([
+ "user_id" => "required|max:255",
+ "event_id" => "required|max:255"
+ ]);
+
+ // Check the UserEvent table if there is a row that has the user_id AND the event_id
+ $getTableInfo = UserEvent::where('user_id', $request->user_id)
+ ->where('event_id', $request->event_id)->get();
+
+ // If the row has both, then go back and show an error - Cause you're not allowed to be on the same event twice.
+ if (count($getTableInfo) > 0)
+ return redirect()->route("events.index")->with('error#' . $request->event_id, '
Du har allerede tilmeldt dig denne Aktivitet!
');
+
+ // If not, then it keeps going and saves and shows a success message
+ $UserEvent = new UserEvent($data);
+ $UserEvent->save();
+
+ return redirect()->route("events.index")->with('signup#' . $request->event_id, '
Du er hermed tilmeldt denne aktivitet!
');
+ }
+}
diff --git a/skolehjem/app/UserEvent.php b/skolehjem/app/UserEvent.php
index 3899fd5..a947d8f 100644
--- a/skolehjem/app/UserEvent.php
+++ b/skolehjem/app/UserEvent.php
@@ -6,5 +6,13 @@ use Illuminate\Database\Eloquent\Model;
class UserEvent extends Model
{
- //
+ /**
+ * The attributes that are mass assignable.
+ *
+ * @var array
+ */
+ //protected variable which contains name of database field(s) to be filled.
+ protected $fillable = [
+ 'user_id', 'event_id'
+ ];
}
diff --git a/skolehjem/database/migrations/2020_07_28_061420_create_user_events_table.php b/skolehjem/database/migrations/2020_07_28_061420_create_user_events_table.php
index e129f3c..39bef20 100644
--- a/skolehjem/database/migrations/2020_07_28_061420_create_user_events_table.php
+++ b/skolehjem/database/migrations/2020_07_28_061420_create_user_events_table.php
@@ -15,8 +15,8 @@ class CreateUserEventsTable extends Migration
{
Schema::create('user_events', function (Blueprint $table) {
$table->id();
- $table->integer("user_id")->unique();
- $table->integer("event_id")->unique();
+ $table->integer("user_id");
+ $table->integer("event_id");
$table->timestamps();
diff --git a/skolehjem/database/seeds/RoleSeeder.php b/skolehjem/database/seeds/RoleSeeder.php
new file mode 100644
index 0000000..b734ecb
--- /dev/null
+++ b/skolehjem/database/seeds/RoleSeeder.php
@@ -0,0 +1,36 @@
+ "Admin",
+ "user" => "Userstuff",
+
+
+ ];
+
+ foreach ($roles as $key => $value) {
+
+ try {
+ if (\Spatie\Permission\Models\Role::findByName($key))
+ continue;
+ } catch (Exception $e) {
+ $permission = new \Spatie\Permission\Models\Role();
+
+ $permission->name = $key;
+ $permission->description = $value;
+
+ $permission->save();
+ }
+ }
+ }
+}
diff --git a/skolehjem/resources/views/admin/contacts/index.blade.php b/skolehjem/resources/views/admin/contacts/index.blade.php
index 3622a1b..04442cd 100644
--- a/skolehjem/resources/views/admin/contacts/index.blade.php
+++ b/skolehjem/resources/views/admin/contacts/index.blade.php
@@ -18,6 +18,7 @@
+
 . '){kind=icon}
}}){kind=logo}