Merge pull request #1500 from pixelfed/frontend-ui-refactor

Add Profile Sponsors

app/Http/Controllers/ProfileSponsorController.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use App\ProfileSponsor;
+use Auth;
+
+class ProfileSponsorController extends Controller
+{
+	public function get(Request $request, $id)
+	{
+		$res = ProfileSponsor::whereProfileId($id)->firstOrFail()->sponsors;
+		return response($res)->header('Content-Type', 'application/json');
+	}
+}

app/Http/Controllers/SettingsController.php

@@ -4,11 +4,13 @@ namespace App\Http\Controllers;
 
 use App\AccountLog;
 use App\Following;
+use App\ProfileSponsor;
 use App\Report;
 use App\UserFilter;
 use Auth, Cookie, DB, Cache, Purify;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
+use Illuminate\Support\Str;
 use App\Http\Controllers\Settings\{
     ExportSettings,
     LabsSettings,
@@ -166,5 +168,49 @@ class SettingsController extends Controller
 
         return response()->json([200])->cookie($cookie);
     }
+
+    public function sponsor()
+    {
+        $default = [
+            'patreon' => null,
+            'liberapay' => null,
+            'opencollective' => null
+        ];
+        $sponsors = ProfileSponsor::whereProfileId(Auth::user()->profile->id)->first();
+        $sponsors = $sponsors ? json_decode($sponsors->sponsors, true) : $default;
+        return view('settings.sponsor', compact('sponsors'));
+    }
+
+    public function sponsorStore(Request $request)
+    {
+        $this->validate($request, [
+            'patreon' => 'nullable|string',
+            'liberapay' => 'nullable|string',
+            'opencollective' => 'nullable|string'
+        ]);
+
+        $patreon = Str::startsWith($request->input('patreon'), 'patreon.com/') ? e($request->input('patreon')) : null;
+        $liberapay = Str::startsWith($request->input('liberapay'), 'liberapay.com/') ? e($request->input('liberapay')) : null;
+        $opencollective = Str::startsWith($request->input('opencollective'), 'opencollective.com/') ? e($request->input('opencollective')) : null;
+
+        if(empty($patreon) && empty($liberapay) && empty($opencollective)) {
+            return redirect(route('settings'))->with('error', 'An error occured. Please try again later.');;
+        }
+
+        $res = [
+            'patreon' => $patreon,
+            'liberapay' => $liberapay,
+            'opencollective' => $opencollective
+        ];
+
+        $sponsors = ProfileSponsor::firstOrCreate([
+            'profile_id' => Auth::user()->profile_id ?? Auth::user()->profile->id
+        ]);
+        $sponsors->sponsors = json_encode($res);
+        $sponsors->save();
+        $sponsors = $res;
+        return redirect(route('settings'))->with('status', 'Sponsor settings successfully updated!');;
+    }
+
 }
 

app/ProfileSponsor.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ProfileSponsor extends Model
+{
+    public $fillable = ['profile_id'];
+
+    public function profile()
+    {
+    	return $this->belongsTo(Profile::class);
+    }
+}

database/migrations/2019_07_11_234836_create_profile_sponsors_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateProfileSponsorsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('profile_sponsors', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->bigInteger('profile_id')->unsigned()->unique()->index();
+            $table->json('sponsors')->nullable();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('profile_sponsors');
+    }
+}

package.json

@@ -15,26 +15,26 @@
         "bootstrap": ">=4.3.1",
         "cross-env": "^5.2.0",
         "jquery": "^3.4.1",
-        "lodash": "^4.17.11",
+        "lodash": ">=4.17.13",
         "popper.js": "^1.15.0",
         "resolve-url-loader": "^2.3.2",
-        "sass": "^1.21.0",
+        "sass": "^1.22.3",
         "sass-loader": "^7.1.0",
         "vue": "^2.6.10",
         "vue-template-compiler": "^2.6.10"
     },
     "dependencies": {
-        "bootstrap-vue": "^2.0.0-rc.23",
+        "bootstrap-vue": "^2.0.0-rc.26",
         "emoji-mart-vue": "^2.6.6",
         "filesize": "^3.6.1",
         "howler": "^2.1.2",
         "infinite-scroll": "^3.0.6",
         "laravel-echo": "^1.5.4",
-        "laravel-mix": "^4.0.16",
+        "laravel-mix": "^4.1.2",
         "node-sass": "^4.12.0",
         "opencollective": "^1.0.3",
         "opencollective-postinstall": "^2.0.2",
-        "plyr": "^3.5.4",
+        "plyr": "^3.5.6",
         "promise-polyfill": "8.1.0",
         "pusher-js": "^4.4.0",
         "quill": "^1.3.6",

resources/assets/js/components/Profile.vue

@@ -19,7 +19,12 @@
 									<div class="d-block d-md-none">
 										<div class="row">
 											<div class="col-5">
-											<img class="rounded-circle box-shadow mr-5" :src="profile.avatar" width="77px" height="77px">
+												<img class="rounded-circle box-shadow mr-2" :src="profile.avatar" width="77px" height="77px">
+												<p v-if="sponsorList.patreon || sponsorList.liberapay || sponsorList.opencollective" class="text-center mt-1 mr-2">
+													<button type="button" @click="showSponsorModal" class="btn btn-sm btn-outline-secondary font-weight-bold py-0">
+														Sponsor
+													</button>
+												</p>
 											</div>
 											<div class="col-7 pl-2">
 												<p class="align-middle">
@@ -45,6 +50,12 @@
 									</div>
 									<div class="d-none d-md-block">
 										<img class="rounded-circle box-shadow" :src="profile.avatar" width="172px" height="172px">
+										<p v-if="sponsorList.patreon || sponsorList.liberapay || sponsorList.opencollective" class="text-center mt-3">
+											<button type="button" @click="showSponsorModal" class="btn btn-outline-secondary font-weight-bold py-0">
+												<i class="fas fa-heart text-danger"></i>
+												Sponsor
+											</button>
+										</p>
 									</div>
 								</div>
 							</div>
@@ -97,7 +108,7 @@
 										<span class="font-weight-bold pr-3">{{profile.display_name}}</span>
 									</p>
 									<div v-if="profile.note" class="mb-0 lead" v-html="profile.note"></div>
-								<p v-if="profile.website" class="mb-0"><a :href="profile.website" class="font-weight-bold" rel="me external nofollow noopener" target="_blank">{{profile.website}}</a></p>
+									<p v-if="profile.website" class=""><a :href="profile.website" class="font-weight-bold" rel="me external nofollow noopener" target="_blank">{{profile.website}}</a></p>
 								</div>
 							</div>
 						</div>
@@ -475,6 +486,26 @@
 	</div>
 </div>
 </b-modal>
+<b-modal ref="sponsorModal"
+id="sponsor-modal"
+hide-footer
+:title="'Sponsor ' + profileUsername"
+centered
+size="md"
+body-class="px-5">
+<div>
+	<p class="font-weight-bold">External Links</p>
+	<p v-if="sponsorList.patreon" class="pt-2">
+		<a :href="'https://' + sponsorList.patreon" rel="nofollow" class="font-weight-bold">{{sponsorList.patreon}}</a>
+	</p>
+	<p v-if="sponsorList.liberapay" class="pt-2">
+		<a :href="'https://' + sponsorList.liberapay" rel="nofollow" class="font-weight-bold">{{sponsorList.liberapay}}</a>
+	</p>
+	<p v-if="sponsorList.opencollective" class="pt-2">
+		<a :href="'https://' + sponsorList.opencollective" rel="nofollow" class="font-weight-bold">{{sponsorList.opencollective}}</a>
+	</p>
+</div>
+</b-modal>
 </div>
 </template>
 <!-- <style type="text/css" scoped="">
@@ -536,7 +567,8 @@ export default {
 				following: [],
 				followingCursor: 1,
 				followingMore: true,
-			warning: false
+				warning: false,
+				sponsorList: [],
 			}
 		},
 		beforeMount() {
@@ -588,6 +620,7 @@ export default {
 					this.timeline = data;
 					this.ownerCheck();
 					this.loading = false;
+					this.loadSponsor();
 				}).catch(err => {
 					swal(
 						'Oops, something went wrong',
@@ -1085,6 +1118,17 @@ export default {
 					c += 'bg-pixelfed';
 				}
 				return c;
+			},
+
+			loadSponsor() {
+				axios.get('/api/local/profile/sponsor/' + this.profileId)
+				.then(res => {
+					this.sponsorList = res.data;
+				});
+			},
+
+			showSponsorModal() {
+				this.$refs.sponsorModal.show();
 			}
 		}
 	}

resources/views/settings/partial/sidebar.blade.php

@@ -33,6 +33,9 @@
       <li class="nav-item pl-3 {{request()->is('settings/security*')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('settings.security')}}">Security</a>
       </li>
+      <li class="nav-item pl-3 {{request()->is('settings/sponsor*')?'active':''}}">
+        <a class="nav-link font-weight-light text-muted" href="{{route('settings.sponsor')}}">Sponsor</a>
+      </li>
       <li class="nav-item">
         <hr>
       </li>

resources/views/settings/sponsor.blade.php

@@ -0,0 +1,48 @@
+@extends('settings.template')
+
+@section('section')
+
+<div class="title">
+	<h3 class="font-weight-bold">Sponsor</h3>
+	<p class="lead">Add crowdfunding links to your profile.</p>
+</div>
+<hr>
+<form method="post" action="{{route('settings.sponsor')}}">
+	@csrf
+
+	<div class="form-group row">
+		<label for="patreon" class="col-sm-3 col-form-label font-weight-bold text-right">Patreon</label>
+		<div class="col-sm-9">
+			<input type="text" class="form-control" id="patreon" name="patreon" placeholder="patreon.com/dansup" value="{{$sponsors['patreon']}}">
+			<p class="help-text small text-muted font-weight-bold">
+				Example: patreon.com/dansup
+			</p>
+		</div>
+	</div>
+	<div class="form-group row">
+		<label for="liberapay" class="col-sm-3 col-form-label font-weight-bold text-right">Liberapay</label>
+		<div class="col-sm-9">
+			<input type="text" class="form-control" id="liberapay" name="liberapay" placeholder="liberapay.com/pixelfed" value="{{$sponsors['liberapay']}}">
+			<p class="help-text small text-muted font-weight-bold">
+				Example: liberapay.com/pixelfed
+			</p>
+		</div>
+	</div>
+	<div class="form-group row">
+		<label for="opencollective" class="col-sm-3 col-form-label font-weight-bold text-right">OpenCollective</label>
+		<div class="col-sm-9">
+			<input type="text" class="form-control" id="opencollective" name="opencollective" placeholder="opencollective.com/pixelfed" value="{{$sponsors['opencollective']}}">
+			<p class="help-text small text-muted font-weight-bold">
+				Example: opencollective.com/pixelfed
+			</p>
+		</div>
+	</div>
+	<hr>
+	<div class="form-group row">
+		<div class="col-12 text-right">
+			<button type="submit" class="btn btn-primary font-weight-bold float-right">Submit</button>
+		</div>
+	</div>
+</form>
+
+@endsection

routes/web.php

@@ -114,6 +114,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
             Route::get('exp/rec', 'ApiController@userRecommendations');
             Route::post('discover/tag/subscribe', 'HashtagFollowController@store')->middleware('throttle:maxHashtagFollowsPerHour,60')->middleware('throttle:maxHashtagFollowsPerDay,1440');;
             Route::get('discover/tag/list', 'HashtagFollowController@getTags');
+            Route::get('profile/sponsor/{id}', 'ProfileSponsorController@get');
         });
     });
 
@@ -261,6 +262,8 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
         Route::get('invites/create', 'UserInviteController@create')->name('settings.invites.create');
         Route::post('invites/create', 'UserInviteController@store');
         Route::get('invites', 'UserInviteController@show')->name('settings.invites');
+        Route::get('sponsor', 'SettingsController@sponsor')->name('settings.sponsor');
+        Route::post('sponsor', 'SettingsController@sponsorStore');
     });
 
     Route::group(['prefix' => 'site'], function () {