diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index f9d10d6..10e17e0 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -56,12 +56,16 @@ class ProfileController extends Controller $incoming_fields = $request->validate ([ "avatar" => "image|max:4096", "bio" => "sometimes|nullable|string", + "about_you" => "sometimes|nullable|string", + "status" => "sometimes|nullable|string", + "mood" => "sometimes|nullable|string", "general" => "sometimes|nullable|string", "music" => "sometimes|nullable|string", "movies" => "sometimes|nullable|string", "television" => "sometimes|nullable|string", "books" => "sometimes|nullable|string", - "heroes" => "sometimes|nullable|string" + "heroes" => "sometimes|nullable|string", + "blurbs" => "sometimes|nullable|string" ]); $user = auth ()->user (); @@ -84,12 +88,18 @@ class ProfileController extends Controller } $user->bio = $incoming_fields["bio"]; + $user->about_you = $incoming_fields["about_you"]; + $user->status = $incoming_fields["status"]; + $user->mood = $incoming_fields["mood"]; + $user->interests_general = $incoming_fields["general"]; $user->interests_music = $incoming_fields["music"]; $user->interests_movies = $incoming_fields["movies"]; $user->interests_television = $incoming_fields["television"]; $user->interests_books = $incoming_fields["books"]; $user->interests_heroes = $incoming_fields["heroes"]; + + $user->blurbs = $incoming_fields["blurbs"]; $user->save (); $user->actor->summary = $user->bio; diff --git a/app/Models/User.php b/app/Models/User.php index dd457a2..deaab6a 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -24,10 +24,11 @@ class User extends Authenticatable 'password', "bio", - "avatar", "status", - "mood", "about_you", + "mood", + + "avatar", // interests "interests_general", @@ -35,7 +36,9 @@ class User extends Authenticatable "interests_movies", "interests_television", "interests_books", - "interests_heroes" + "interests_heroes", + + "blurbs" ]; /** diff --git a/database/migrations/2024_12_25_222706_add_fields_to_user_table.php b/database/migrations/2024_12_25_222706_add_fields_to_user_table.php index dc3b4a4..ea2fa06 100644 --- a/database/migrations/2024_12_25_222706_add_fields_to_user_table.php +++ b/database/migrations/2024_12_25_222706_add_fields_to_user_table.php @@ -18,6 +18,7 @@ return new class extends Migration $table->string ("status")->nullable (); $table->string ("mood")->nullable (); $table->string ("about_you")->nullable (); + $table->text ("blurbs")->nullable (); // interests $table->string ("interests_general")->nullable (); @@ -26,8 +27,6 @@ return new class extends Migration $table->string ("interests_television")->nullable (); $table->string ("interests_books")->nullable (); $table->string ("interests_heroes")->nullable (); - - $table->integer ("friends")->default (0); }); } @@ -39,7 +38,18 @@ return new class extends Migration Schema::table('users', function (Blueprint $table) { $table->dropColumn ("bio"); $table->dropColumn ("avatar"); - $table->dropColumn ("friends"); + + $table->dropColumn ("status"); + $table->dropColumn ("mood"); + $table->dropColumn ("about_you"); + $table->dropColumn ("blurbs"); + + $table->dropColumn ("interests_general"); + $table->dropColumn ("interests_music"); + $table->dropColumn ("interests_movies"); + $table->dropColumn ("interests_television"); + $table->dropColumn ("interests_books"); + $table->dropColumn ("interests_heroes"); }); } }; diff --git a/resources/views/components/create_note.blade.php b/resources/views/components/create_note.blade.php index b3bc87b..27feb9a 100644 --- a/resources/views/components/create_note.blade.php +++ b/resources/views/components/create_note.blade.php @@ -5,12 +5,12 @@ @endif - +
- - + +
Markdown is supported diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index 97c54df..6936b71 100644 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -40,6 +40,23 @@
max limit: 256 characters
+
+ + + @error("about_you") +

{{ $message }}

+ @enderror +
+
+ + + @error("status") +

{{ $message }}

+ @enderror +
+
+ +

Interests:


@@ -88,7 +105,7 @@ what you would normally paste into the 'Blurbs' section. Include HTML tags.
- +
diff --git a/resources/views/users/profile.blade.php b/resources/views/users/profile.blade.php index feaedc8..facd2d0 100644 --- a/resources/views/users/profile.blade.php +++ b/resources/views/users/profile.blade.php @@ -257,6 +257,10 @@

{!! $actor->summary !!}

+ + @if ($user) + {!! $user->blurbs !!} + @endif