From 311b202085af843949962f5ea31230b023a22a8d Mon Sep 17 00:00:00 2001 From: Sue-Holding Date: Tue, 4 Feb 2025 19:39:32 +0100 Subject: [PATCH 1/9] updated views admin-dashboard, admin-settings, user-dashboard and user-settings with component styles --- resources/views/admin-dashboard.blade.php | 63 ++--------- resources/views/admin-settings.blade.php | 116 +++----------------- resources/views/user-dashboard.blade.php | 62 ++++------- resources/views/user-settings.blade.php | 127 ++++------------------ 4 files changed, 64 insertions(+), 304 deletions(-) diff --git a/resources/views/admin-dashboard.blade.php b/resources/views/admin-dashboard.blade.php index f0a30f9..a5ef7b1 100644 --- a/resources/views/admin-dashboard.blade.php +++ b/resources/views/admin-dashboard.blade.php @@ -1,71 +1,26 @@ @extends('layouts.app') @section('content') - +
+
- - + + + +

Welcome, John Doe

- -

Pending Reviews

- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ReviewFilm NameRatingUser IDActions
Amazing movie, loved it!Inception5/5User123 - - - -
Best Batman movie!The Dark Knight4.8/5User456 - - - -
-
+ +
+
diff --git a/resources/views/admin-settings.blade.php b/resources/views/admin-settings.blade.php index 65cbaeb..03860c1 100644 --- a/resources/views/admin-settings.blade.php +++ b/resources/views/admin-settings.blade.php @@ -1,113 +1,27 @@ @extends('layouts.app') @section('content') - +
+
- - + + + - -
-

Welcome, John Doe

-

Users List

+ +
+

Welcome, John Doe

+

Users List

- -
-
- - -
-
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
First NameLast NameRoleActions
JohnDoeAdmin - - -
JaneSmithUser - - -
-
+ + - -

Create New User

+ + -
-
- @csrf - - -
- - -
- - -
- - -
- - -
- - -
- - -
- -
-
-
- -
+
+
@endsection \ No newline at end of file diff --git a/resources/views/user-dashboard.blade.php b/resources/views/user-dashboard.blade.php index c1b8071..1a9eeba 100644 --- a/resources/views/user-dashboard.blade.php +++ b/resources/views/user-dashboard.blade.php @@ -1,52 +1,32 @@ @extends('layouts.app') @section('content') - +
- - - +
+ + + + - -
- + +
+ +

Welcome, John Doe

- - -
- Profile Picture - -
+ +
- -
-

Your Watchlist

- -
-
Gallery Image
-
Gallery Image
-
Gallery Image
-
Gallery Image
-
Gallery Image
-
Gallery Image
-
Gallery Image
-
Gallery Image
-
Gallery Image
-
-
+ + + + + + -
+
+ +
@endsection diff --git a/resources/views/user-settings.blade.php b/resources/views/user-settings.blade.php index 72b6d82..7d7c235 100644 --- a/resources/views/user-settings.blade.php +++ b/resources/views/user-settings.blade.php @@ -3,121 +3,32 @@ @section('content')
-
- {{-- Sidebar --}} - - -
-
- -

Welcome, John Doe

+ + + + + +
+ + +

Welcome, John Doe

- -
- Profile Picture - - -
+ + + + -
- - -
- @csrf - - -
- - -
- - -
- - -
- - -
- -
-
- - -
- @csrf - - -
- - -
- - -
- - -
+ + +
- -
- -
- - - -
- @csrf - - -
- - -
- - -
- - -
- - -
- -
-
- -
- -
-
+ + +
@endsection \ No newline at end of file From 0d13cd0168ced1c5cbeea6c511bd0e0a127c87b0 Mon Sep 17 00:00:00 2001 From: Sue-Holding Date: Tue, 4 Feb 2025 19:40:27 +0100 Subject: [PATCH 2/9] updated route path on user-dashboard and admin-dashboard --- routes/web.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/routes/web.php b/routes/web.php index 7eb95c2..cc09db8 100644 --- a/routes/web.php +++ b/routes/web.php @@ -58,19 +58,19 @@ Route::get('/user-dashboard', function () { return view ('user-dashboard'); -}); +})->name('user-dashboard'); Route::get('/admin-dashboard', function () { return view ('admin-dashboard'); -}); +})->name('admin-dashboard'); -Route::get('/actors', function () { - return view ('actors'); -}); +// Route::get('/actors', function () { +// return view ('actors'); +// }); -Route::get('/actorpage', function () { - return view ('actorpage'); -}); +// Route::get('/actorpage', function () { +// return view ('actorpage'); +// }); Route::get('/admin-settings', function () { return view ('admin-settings'); From 47e3e4e9bd9e9829ceeabcd4430a11595bbdfa11 Mon Sep 17 00:00:00 2001 From: Sue-Holding Date: Tue, 4 Feb 2025 19:41:15 +0100 Subject: [PATCH 3/9] components for buttons- create, approve, edit, delete --- resources/views/components/approve-button.blade.php | 1 + resources/views/components/create-button.blade.php | 3 +++ resources/views/components/delete-button.blade.php | 1 + resources/views/components/edit-button.blade.php | 1 + 4 files changed, 6 insertions(+) create mode 100644 resources/views/components/approve-button.blade.php create mode 100644 resources/views/components/create-button.blade.php create mode 100644 resources/views/components/delete-button.blade.php create mode 100644 resources/views/components/edit-button.blade.php diff --git a/resources/views/components/approve-button.blade.php b/resources/views/components/approve-button.blade.php new file mode 100644 index 0000000..56a55d8 --- /dev/null +++ b/resources/views/components/approve-button.blade.php @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/views/components/create-button.blade.php b/resources/views/components/create-button.blade.php new file mode 100644 index 0000000..a83773f --- /dev/null +++ b/resources/views/components/create-button.blade.php @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/resources/views/components/delete-button.blade.php b/resources/views/components/delete-button.blade.php new file mode 100644 index 0000000..cfb85e5 --- /dev/null +++ b/resources/views/components/delete-button.blade.php @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/views/components/edit-button.blade.php b/resources/views/components/edit-button.blade.php new file mode 100644 index 0000000..62f4b7c --- /dev/null +++ b/resources/views/components/edit-button.blade.php @@ -0,0 +1 @@ + \ No newline at end of file From ad0deea7eeeac51a149b243cdf7b9dd608ca7bac Mon Sep 17 00:00:00 2001 From: Sue-Holding Date: Tue, 4 Feb 2025 19:41:48 +0100 Subject: [PATCH 4/9] sidebar component for user and admin pages --- .../views/components/admin-sidebar.blade.php | 13 +++++++++++++ .../views/components/user-sidebar.blade.php | 19 +++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 resources/views/components/admin-sidebar.blade.php create mode 100644 resources/views/components/user-sidebar.blade.php diff --git a/resources/views/components/admin-sidebar.blade.php b/resources/views/components/admin-sidebar.blade.php new file mode 100644 index 0000000..5490fc6 --- /dev/null +++ b/resources/views/components/admin-sidebar.blade.php @@ -0,0 +1,13 @@ + + \ No newline at end of file diff --git a/resources/views/components/user-sidebar.blade.php b/resources/views/components/user-sidebar.blade.php new file mode 100644 index 0000000..ca1f818 --- /dev/null +++ b/resources/views/components/user-sidebar.blade.php @@ -0,0 +1,19 @@ + + \ No newline at end of file From 141c7a5f0ba6f74fbedd323a1d5689e422593132 Mon Sep 17 00:00:00 2001 From: Sue-Holding Date: Tue, 4 Feb 2025 19:42:18 +0100 Subject: [PATCH 5/9] components for profile photo and profile settings --- .../views/components/profile-photo.blade.php | 9 +++ .../profile-settings-form.blade.php | 69 +++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 resources/views/components/profile-photo.blade.php create mode 100644 resources/views/components/profile-settings-form.blade.php diff --git a/resources/views/components/profile-photo.blade.php b/resources/views/components/profile-photo.blade.php new file mode 100644 index 0000000..98ccb99 --- /dev/null +++ b/resources/views/components/profile-photo.blade.php @@ -0,0 +1,9 @@ +
+ Profile Picture + + +
\ No newline at end of file diff --git a/resources/views/components/profile-settings-form.blade.php b/resources/views/components/profile-settings-form.blade.php new file mode 100644 index 0000000..224852d --- /dev/null +++ b/resources/views/components/profile-settings-form.blade.php @@ -0,0 +1,69 @@ +
+ + +
+ @csrf + + +
+ + +
+ + +
+ + +
+ + +
+ +
+
+ + +
+ @csrf + + +
+ + +
+ + +
+ + +
+ + +
+ +
+
+ + +
+ @csrf + + +
+ + +
+ + +
+ + +
+ + +
+ +
+
+ +
\ No newline at end of file From 60d1b85f6c44bd0cf3291c074f7e888f554a9736 Mon Sep 17 00:00:00 2001 From: Sue-Holding Date: Tue, 4 Feb 2025 19:43:00 +0100 Subject: [PATCH 6/9] components for create new user form and search user --- .../components/create-new-user-form.blade.php | 41 +++++++++++++++ .../components/search-user-table.blade.php | 52 +++++++++++++++++++ 2 files changed, 93 insertions(+) create mode 100644 resources/views/components/create-new-user-form.blade.php create mode 100644 resources/views/components/search-user-table.blade.php diff --git a/resources/views/components/create-new-user-form.blade.php b/resources/views/components/create-new-user-form.blade.php new file mode 100644 index 0000000..e176b98 --- /dev/null +++ b/resources/views/components/create-new-user-form.blade.php @@ -0,0 +1,41 @@ + +

Create New User

+ +
+
+ @csrf + + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + + +
+
+
\ No newline at end of file diff --git a/resources/views/components/search-user-table.blade.php b/resources/views/components/search-user-table.blade.php new file mode 100644 index 0000000..433eaa6 --- /dev/null +++ b/resources/views/components/search-user-table.blade.php @@ -0,0 +1,52 @@ + +
+
+ + +
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
First NameLast NameRoleActions
JohnDoeAdmin + + + + + +
JaneSmithUser + + + + + +
+
\ No newline at end of file From 388033559a7778c0d4b1cfc8dcd4218a8a06f4a6 Mon Sep 17 00:00:00 2001 From: Sue-Holding Date: Tue, 4 Feb 2025 19:43:23 +0100 Subject: [PATCH 7/9] component for pending reviews table display --- .../pending-reviews-table.blade.php | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 resources/views/components/pending-reviews-table.blade.php diff --git a/resources/views/components/pending-reviews-table.blade.php b/resources/views/components/pending-reviews-table.blade.php new file mode 100644 index 0000000..3a7f453 --- /dev/null +++ b/resources/views/components/pending-reviews-table.blade.php @@ -0,0 +1,49 @@ + +

Pending Reviews

+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ReviewFilm NameRatingUser IDActions
Amazing movie, loved it!Inception5/5User123 + + + + + + + +
Best Batman movie!The Dark Knight4.8/5User456 + + + +
+
\ No newline at end of file From 45a71805ed32935e051dfa0e766050edc89369a3 Mon Sep 17 00:00:00 2001 From: Sue-Holding Date: Tue, 4 Feb 2025 19:43:50 +0100 Subject: [PATCH 8/9] component for watchlist gallery for profile page --- .../views/components/watchlist-gallery.blade.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 resources/views/components/watchlist-gallery.blade.php diff --git a/resources/views/components/watchlist-gallery.blade.php b/resources/views/components/watchlist-gallery.blade.php new file mode 100644 index 0000000..d8fd87c --- /dev/null +++ b/resources/views/components/watchlist-gallery.blade.php @@ -0,0 +1,16 @@ + +
+

Your Watchlist

+ +
+
Gallery Image
+
Gallery Image
+
Gallery Image
+
Gallery Image
+
Gallery Image
+
Gallery Image
+
Gallery Image
+
Gallery Image
+
Gallery Image
+
+
\ No newline at end of file From 089f48149114d67d75a2312096690d8e0bdf54e4 Mon Sep 17 00:00:00 2001 From: Sue-Holding Date: Wed, 5 Feb 2025 07:54:31 +0100 Subject: [PATCH 9/9] Updated code based on PR feedback --- resources/views/admin-dashboard.blade.php | 11 ++++------ resources/views/admin-settings.blade.php | 22 +++++++++---------- .../views/components/create-button.blade.php | 4 +--- resources/views/user-dashboard.blade.php | 10 ++++----- resources/views/user-settings.blade.php | 16 +++++--------- 5 files changed, 25 insertions(+), 38 deletions(-) diff --git a/resources/views/admin-dashboard.blade.php b/resources/views/admin-dashboard.blade.php index a5ef7b1..f8bae2c 100644 --- a/resources/views/admin-dashboard.blade.php +++ b/resources/views/admin-dashboard.blade.php @@ -1,9 +1,8 @@ @extends('layouts.app') @section('content') - -
-
+
+
@@ -20,8 +19,6 @@ -
-
- - +
+
@endsection diff --git a/resources/views/admin-settings.blade.php b/resources/views/admin-settings.blade.php index 03860c1..a7fd8ec 100644 --- a/resources/views/admin-settings.blade.php +++ b/resources/views/admin-settings.blade.php @@ -1,27 +1,25 @@ @extends('layouts.app') @section('content') - -
-
+
+
- - + +

Welcome, John Doe

Users List

- - + + - - + +
-
-
- +
+
@endsection \ No newline at end of file diff --git a/resources/views/components/create-button.blade.php b/resources/views/components/create-button.blade.php index a83773f..44d913d 100644 --- a/resources/views/components/create-button.blade.php +++ b/resources/views/components/create-button.blade.php @@ -1,3 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/views/user-dashboard.blade.php b/resources/views/user-dashboard.blade.php index 1a9eeba..6e3dfa0 100644 --- a/resources/views/user-dashboard.blade.php +++ b/resources/views/user-dashboard.blade.php @@ -1,9 +1,8 @@ @extends('layouts.app') @section('content') - -
-
+
+
@@ -26,7 +25,6 @@
-
-
- +
+ @endsection diff --git a/resources/views/user-settings.blade.php b/resources/views/user-settings.blade.php index 7d7c235..94c80a2 100644 --- a/resources/views/user-settings.blade.php +++ b/resources/views/user-settings.blade.php @@ -1,9 +1,8 @@ @extends('layouts.app') @section('content') - -
-
+
+
@@ -20,15 +19,12 @@ - - +
- - -
-
- + +
+ @endsection \ No newline at end of file