diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php
index 36efc44..f72cfd8 100644
--- a/skolehjem/app/Http/Controllers/UserController.php
+++ b/skolehjem/app/Http/Controllers/UserController.php
@@ -274,6 +274,10 @@ class UserController extends Controller
return redirect()->route('users.login');
}
+ /*******************************************/
+ /* Account */
+ /*******************************************/
+
public function account()
{
return Response::detect("users.account");
@@ -284,6 +288,11 @@ class UserController extends Controller
return Response::detect("users.edit");
}
+ public function accounteditpic()
+ {
+ return Response::detect("users.editpic");
+ }
+
public function accounteditpass()
{
return Response::detect("users.editpass");
@@ -293,10 +302,11 @@ class UserController extends Controller
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
- * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
+ * @return \Illuminate\Http\RedirectResponse
*/
public function accountupdate(Request $request)
{
+ /** @var User $user */
$user = User::find(Auth::id());
if ($request->input('password') != null) { // If you're editing the password
@@ -327,6 +337,10 @@ class UserController extends Controller
else
return redirect()->route("users.login")->with('success#passwordchange', '
Dit password er hermed ændret!
');
}
+ } else if($request->file("resource")) { // Else if you're editing the profile pic
+ $user->update([ "resource_id" => ResourceController::store($request)->id ]);
+
+ return redirect()->route("users.account");
} else { // Else if you're not editing the password but anything else (Email, Phone Number). Then update user.
$data = $request->only(['email', 'phone']);
$user->update($data);
@@ -343,6 +357,10 @@ class UserController extends Controller
return redirect()->route("users.index");
}
+ /*******************************************/
+ /* Search and settings */
+ /*******************************************/
+
public function search(Request $request){
if($request->ajax()){
$output = "".
@@ -489,16 +507,7 @@ class UserController extends Controller
}
}
-
-
- /* public function generateCookie(Request $cookieValue){
- $response = new Response('Set Cookie');
- $response->withCookie(cookie()->forever('languagesSetting', $cookieValue));
- return $response;
- }*/
-
-
- public function setLanguages(Request $request){
+ public function setLanguages(Request $request){
if($request->ajax()){
if($request->lang === "en"){
$response = new Response('Set Cookie');
diff --git a/skolehjem/app/User.php b/skolehjem/app/User.php
index 1f8aca1..220a042 100644
--- a/skolehjem/app/User.php
+++ b/skolehjem/app/User.php
@@ -29,7 +29,7 @@ class User extends Authenticatable
*/
//protected variable which contains name of database field(s) to be filled.
protected $fillable = [
- 'name_first', "name_last", 'email', 'password', "phone"
+ 'name_first', "name_last", 'email', 'password', "phone", "resource_id"
];
/**
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 ef119d6..5cffaaf 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
@@ -28,6 +28,7 @@ class CreateUsersTable extends Migration
$table->string('password');
$table->integer("phone")->unique();
$table->rememberToken();
+ $table->foreignId("resource_id")->nullable()->constrained("resources", "id");
$table->timestamps();
});
}
diff --git a/skolehjem/resources/views/app/users/account.blade.php b/skolehjem/resources/views/app/users/account.blade.php
index 3881bd8..b8a8368 100644
--- a/skolehjem/resources/views/app/users/account.blade.php
+++ b/skolehjem/resources/views/app/users/account.blade.php
@@ -11,8 +11,10 @@
{{__('msg.navn')}}: {{ Auth::user()->name_first . " " . Auth::user()->name_last }}
{{__('msg.email')}}: {{ Auth::user()->email }}
{{__('msg.telefon')}} Nr.: {{ Auth::user()->phone }}
+
{!! session()->get('success#credentialschanged') !!}
{{__('msg.redigeroplysninger')}}
{{__('msg.ændrepassword')}}
+ {{__('msg.ændrebillede')}}
@endsection
diff --git a/skolehjem/resources/views/app/users/editpic.blade.php b/skolehjem/resources/views/app/users/editpic.blade.php
new file mode 100644
index 0000000..4e8d261
--- /dev/null
+++ b/skolehjem/resources/views/app/users/editpic.blade.php
@@ -0,0 +1,30 @@
+@extends("app.layout.base")
+
+@section("title")
+ Account
+@endsection
+
+@section("content")
+
+ {{__('msg.konto')}}
+
+
+@endsection
diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php
index 99bc284..bd2f41d 100644
--- a/skolehjem/routes/web.php
+++ b/skolehjem/routes/web.php
@@ -25,6 +25,7 @@ Route::get("/account", "UserController@account")->name("users.account");
Route::get("/account/edit", "UserController@accountedit")->name("users.accountedit");
Route::get("/account/editpass", "UserController@accounteditpass")->name("users.accounteditpass");
Route::put("/account/update", "UserController@accountupdate")->name("users.accountupdate");
+Route::get("/account/editpic", "UserController@accounteditpic")->name("users.accounteditpic");
Route::get("/events/signups", "EventController@signups")->name("events.signups");
Route::get("/events/accountsignups", "EventController@accountsignups")->name("events.accountsignups");
Route::get("phones", "PhoneController@index")->name("phones.index");
@@ -33,6 +34,7 @@ Route::get("/app/washing-reservations", "WashingReservationController@appindex")
Route::get("/settings", "SettingsController@index")->name("settings.index");
Route::post("/events/signup", "UserEventController@createajax")->name("userevents.createajax");
+
//Search/Filter
Route::get("/contactsapi", "ContactController@search")->name("contacts.search");
Route::get("/eventsapi", "EventController@search")->name("events.search");