Merge pull request #1702 from pixelfed/staging

Update ComposeModal and Profile components

CHANGELOG.md

@@ -12,6 +12,7 @@
 - Updated EmailService, added new domains [#1690](https://github.com/pixelfed/pixelfed/pull/1690)
 - Updated quill.js to v1.3.7 [#1692](https://github.com/pixelfed/pixelfed/pull/1690)
 - Cache ProfileController [#1700](https://github.com/pixelfed/pixelfed/pull/1700)
+- Updated ComposeUI v4, made cropping optional [#1702](https://github.com/pixelfed/pixelfed/pull/1702)
 
 ## Deprecated
 - Remove deprecated profile following/followers [#1697](https://github.com/pixelfed/pixelfed/pull/1697)

resources/assets/js/components/ComposeModal.vue

@@ -1,6 +1,6 @@
 <template>
 <div>
-	<input type="file" id="pf-dz" name="media" class="w-100 h-100 d-none file-input" draggable="true" multiple="true" v-bind:accept="config.uploader.media_types">
+	<input type="file" id="pf-dz" name="media" class="w-100 h-100 d-none file-input" draggable="true" v-bind:accept="config.uploader.media_types">
 	<div class="timeline">
 		<div v-if="uploading">
 			<div class="card status-card card-md-rounded-0 w-100 h-100 bg-light py-5" style="border-bottom: 1px solid #f1f1f1">
@@ -12,7 +12,7 @@
 		</div>
 		<div v-else>
 			<div class="card status-card card-md-rounded-0 w-100 h-100" style="display:flex;">
-				<div class="card-header d-inline-flex align-items-center bg-white">
+				<div class="card-header d-inline-flex align-items-center justify-content-between bg-white">
 					<div>
 						<a v-if="page == 1" href="#" @click.prevent="closeModal()" class="font-weight-bold text-decoration-none text-muted">
 							<i class="fas fa-times fa-lg"></i>
@@ -25,15 +25,20 @@
 							<span class="font-weight-bold mb-0">{{pageTitle}}</span>
 						</span>
 					</div>
-					<div class="text-right" style="flex-grow:1;">
+					<div v-if="page == 2">
+						<a href="#" class="text-center text-dark" @click.prevent="showCropPhotoCard"><i class="fas fa-magic fa-lg"></i></a>
+					</div>
+					<div>
 						<!-- <a v-if="page > 1" class="font-weight-bold text-decoration-none" href="#" @click.prevent="page--">Back</a> -->
 						<span v-if="pageLoading">
 							<div class="spinner-border spinner-border-sm" role="status">
 								<span class="sr-only">Loading...</span>
 							</div>
 						</span>
-						<a v-if="!pageLoading && (page > 1 && page <= 3) || (page == 1 && ids.length != 0)" class="font-weight-bold text-decoration-none" href="#" @click.prevent="nextPage">Next</a>
-						<a v-if="!pageLoading && page == 4" class="font-weight-bold text-decoration-none" href="#" @click.prevent="compose">Post</a>
+						<span v-else>
+							<a v-if="!pageLoading && (page > 1 && page <= 2) || (page == 1 && ids.length != 0) || page == 'cropPhoto'" class="font-weight-bold text-decoration-none" href="#" @click.prevent="nextPage">Next</a>
+							<a v-if="!pageLoading && page == 3" class="font-weight-bold text-decoration-none" href="#" @click.prevent="compose">Post</a>
+						</span>
 					</div>
 				</div>
 				<div class="card-body p-0 border-top">
@@ -43,7 +48,7 @@
 								<a class="btn btn-primary font-weight-bold" href="/i/compose">Compose Post</a>
 							</p>
 							<hr>
-							<p>
+							<p v-if="media.length == 0">
 								<button type="button" class="btn btn-outline-primary font-weight-bold" @click.prevent="addMedia">Compose Post <sup>BETA</sup></button>
 							</p>
 							<p>
@@ -60,7 +65,7 @@
 						</div>
 					</div>
 
-					<div v-if="page == 2" class="w-100 h-100">
+					<div v-if="page == 'cropPhoto'" class="w-100 h-100">
 						<div v-if="ids.length > 0">
 							<vue-cropper
 								ref="cropper"
@@ -75,7 +80,7 @@
 						</div>
 					</div>
 
-					<div v-if="page == 3" class="w-100 h-100">
+					<div v-if="page == 2" class="w-100 h-100">
 						<div slot="img" style="display:flex;min-height: 420px;align-items: center;">
 							<img :class="'d-block img-fluid w-100 ' + [media[carouselCursor].filter_class?media[carouselCursor].filter_class:'']" :src="media[carouselCursor].url" :alt="media[carouselCursor].description" :title="media[carouselCursor].description">
 						</div>
@@ -98,7 +103,7 @@
 						</div>
 					</div>
 
-					<div v-if="page == 4" class="w-100 h-100">
+					<div v-if="page == 3" class="w-100 h-100">
 						<div class="border-bottom mt-2">
 							<div class="media px-3">
 								<img :src="media[0].url" width="42px" height="42px" :class="[media[0].filter_class?'mr-2 ' + media[0].filter_class:'mr-2']">
@@ -177,7 +182,7 @@
 									</div>
 								</div>
 							</div>
-							<a class="list-group-item" @click.prevent="page = 'altText'">
+							<a href="#" class="list-group-item" @click.prevent="page = 'altText'">
 								<div class="text-dark">Write alt text</div>
 								<p class="text-muted small mb-0">Alt text describes your photos for people with visual impairments.</p>
 							</a>
@@ -227,7 +232,7 @@
 				</div>
 
 				<!-- card-footers -->
-				<div v-if="page == 2" class="card-footer bg-white d-flex justify-content-between">
+				<div v-if="page == 'cropPhoto'" class="card-footer bg-white d-flex justify-content-between">
 					<div>
 						<button type="button" class="btn btn-outline-secondary" @click="rotate"><i class="fas fa-undo"></i></button>
 					</div>
@@ -325,6 +330,7 @@ export default {
 
 			taggedUsernames: false,
 			namedPages: [
+				'cropPhoto',
 				'tagPeople',
 				'addLocation',
 				'advancedSettings',
@@ -642,12 +648,13 @@ export default {
 		},
 
 		nextPage() {
+			this.pageTitle = '';
 			switch(this.page) {
 				case 1:
-					this.page = 3;
+					this.page = 2;
 				break;
 
-				case 2:
+				case 'cropPhoto':
 					this.pageLoading = true;
 					let self = this;
 					this.$refs.cropper.getCroppedCanvas({  
@@ -664,14 +671,14 @@ export default {
 						axios.post(url, data).then(res => {
 							self.media[self.carouselCursor].url = res.data.url;
 							self.pageLoading = false;
-							self.page++;
+							self.page = 2;
 						}).catch(err => {
 						});
 					});
 				break;
 
+				case 2:
 				case 3:
-				case 4:
 					this.page++;
 				break;
 			}
@@ -732,16 +739,25 @@ export default {
 		onSubmitLocation(result) {
 			this.place = result;
 			this.pageTitle = '';
-			this.page = 4;
+			this.page = 3;
 			return;
 		},
 
 		goBack() {
 			this.pageTitle = '';
-			if(this.page == 'addToStory') {
-				this.page = 1;
-			} else {
-				this.namedPages.indexOf(this.page) != -1 ? this.page = 4 : this.page--;
+			
+			switch(this.page) {
+				case 'addToStory':
+					this.page = 1;
+				break;
+
+				case 'cropPhoto':
+					this.page = 2;
+				break;
+
+				default:
+					this.namedPages.indexOf(this.page) != -1 ? this.page = 3 : this.page--;
+				break;
 			}
 		},
 
@@ -755,6 +771,11 @@ export default {
 			this.page = 'addToStory';
 		},
 
+		showCropPhotoCard() {
+			this.pageTitle = 'Edit Photo';
+			this.page = 'cropPhoto';
+		},
+
 		toggleVisibility(state) {
 			let tags = {
 				public: 'Public',
@@ -764,7 +785,7 @@ export default {
 			this.visibility = state;
 			this.visibilityTag = tags[state];
 			this.pageTitle = '';
-			this.page = 4;
+			this.page = 3;
 		}
 	}
 }

resources/assets/js/components/Profile.vue

@@ -346,176 +346,176 @@
 		</div>
 	</div>
 	<b-modal ref="followingModal"
-	id="following-modal"
-	hide-footer
-	centered
-	title="Following"
-	body-class="list-group-flush p-0">
-	<div class="list-group">
-		<div class="list-group-item border-0" v-for="(user, index) in following" :key="'following_'+index">
-			<div class="media">
-				<a :href="user.url">
-					<img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '’s avatar'" width="30px" loading="lazy">
-				</a>
-				<div class="media-body">
-					<p class="mb-0" style="font-size: 14px">
-						<a :href="user.url" class="font-weight-bold text-dark">
-							{{user.username}}
-						</a>
-					</p>
-					<p class="text-muted mb-0" style="font-size: 14px">
-						{{user.display_name}}
-					</p>
+		id="following-modal"
+		hide-footer
+		centered
+		title="Following"
+		body-class="list-group-flush p-0">
+		<div class="list-group">
+			<div class="list-group-item border-0" v-for="(user, index) in following" :key="'following_'+index">
+				<div class="media">
+					<a :href="user.url">
+						<img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '’s avatar'" width="30px" loading="lazy">
+					</a>
+					<div class="media-body">
+						<p class="mb-0" style="font-size: 14px">
+							<a :href="user.url" class="font-weight-bold text-dark">
+								{{user.username}}
+							</a>
+						</p>
+						<p class="text-muted mb-0" style="font-size: 14px">
+							{{user.display_name}}
+						</p>
+					</div>
+					<div v-if="owner">
+						<a class="btn btn-outline-secondary btn-sm" href="#" @click.prevent="followModalAction(user.id, index, 'following')">Unfollow</a>
+					</div>
 				</div>
-				<div v-if="owner">
-					<a class="btn btn-outline-secondary btn-sm" href="#" @click.prevent="followModalAction(user.id, index, 'following')">Unfollow</a>
+			</div>
+			<div v-if="following.length == 0" class="list-group-item border-0">
+				<div class="list-group-item border-0">
+					<p class="p-3 text-center mb-0 lead"></p>
 				</div>
 			</div>
-		</div>
-		<div v-if="following.length == 0" class="list-group-item border-0">
-			<div class="list-group-item border-0">
-				<p class="p-3 text-center mb-0 lead"></p>
+			<div v-if="followingMore" class="list-group-item text-center" v-on:click="followingLoadMore()">
+				<p class="mb-0 small text-muted font-weight-light cursor-pointer">Load more</p>
 			</div>
 		</div>
-		<div v-if="followingMore" class="list-group-item text-center" v-on:click="followingLoadMore()">
-			<p class="mb-0 small text-muted font-weight-light cursor-pointer">Load more</p>
-		</div>
-	</div>
 	</b-modal>
 	<b-modal ref="followerModal"
-	id="follower-modal"
-	hide-footer
-	centered
-	title="Followers"
-	body-class="list-group-flush p-0">
-	<div class="list-group">
-		<div class="list-group-item border-0" v-for="(user, index) in followers" :key="'follower_'+index">
-			<div class="media">
-				<a :href="user.url">
-					<img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '’s avatar'" width="30px" loading="lazy">
-				</a>
-				<div class="media-body">
-					<p class="mb-0" style="font-size: 14px">
-						<a :href="user.url" class="font-weight-bold text-dark">
-							{{user.username}}
-						</a>
-					</p>
-					<p class="text-muted mb-0" style="font-size: 14px">
-						{{user.display_name}}
-					</p>
+		id="follower-modal"
+		hide-footer
+		centered
+		title="Followers"
+		body-class="list-group-flush p-0">
+		<div class="list-group">
+			<div class="list-group-item border-0" v-for="(user, index) in followers" :key="'follower_'+index">
+				<div class="media">
+					<a :href="user.url">
+						<img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '’s avatar'" width="30px" loading="lazy">
+					</a>
+					<div class="media-body">
+						<p class="mb-0" style="font-size: 14px">
+							<a :href="user.url" class="font-weight-bold text-dark">
+								{{user.username}}
+							</a>
+						</p>
+						<p class="text-muted mb-0" style="font-size: 14px">
+							{{user.display_name}}
+						</p>
+					</div>
 				</div>
 			</div>
+			<div v-if="followerMore" class="list-group-item text-center" v-on:click="followersLoadMore()">
+				<p class="mb-0 small text-muted font-weight-light cursor-pointer">Load more</p>
+			</div>
 		</div>
-		<div v-if="followerMore" class="list-group-item text-center" v-on:click="followersLoadMore()">
-			<p class="mb-0 small text-muted font-weight-light cursor-pointer">Load more</p>
-		</div>
-	</div>
 	</b-modal>
 	<b-modal ref="visitorContextMenu"
-	id="visitor-context-menu"
-	hide-footer
-	hide-header
-	centered
-	size="sm"
-	body-class="list-group-flush p-0">
-	<div class="list-group" v-if="relationship">
-		<div class="list-group-item cursor-pointer text-center rounded text-dark" @click="copyProfileLink">
-			Copy Link
-		</div>
-		<div v-if="user && !owner && !relationship.following" class="list-group-item cursor-pointer text-center rounded text-dark" @click="followProfile">
-			Follow
-		</div>
-		<div v-if="user && !owner && relationship.following" class="list-group-item cursor-pointer text-center rounded" @click="followProfile">
-			Unfollow
-		</div>
-		<div v-if="user && !owner && !relationship.muting" class="list-group-item cursor-pointer text-center rounded" @click="muteProfile">
-			Mute
-		</div>
-		<div v-if="user && !owner && relationship.muting" class="list-group-item cursor-pointer text-center rounded" @click="unmuteProfile">
-			Unmute
-		</div>
-		<div v-if="user && !owner" class="list-group-item cursor-pointer text-center rounded text-dark" @click="reportProfile">
-			Report User
-		</div>
-		<div v-if="user && !owner && !relationship.blocking" class="list-group-item cursor-pointer text-center rounded text-dark" @click="blockProfile">
-			Block
-		</div>
-		<div v-if="user && !owner && relationship.blocking" class="list-group-item cursor-pointer text-center rounded text-dark" @click="unblockProfile">
-			Unblock
-		</div>
-		<div v-if="user && owner" class="list-group-item cursor-pointer text-center rounded text-dark" @click="redirect('/settings/home')">
-			Settings
-		</div>
-		<div class="list-group-item cursor-pointer text-center rounded text-muted" @click="$refs.visitorContextMenu.hide()">
-			Close
+		id="visitor-context-menu"
+		hide-footer
+		hide-header
+		centered
+		size="sm"
+		body-class="list-group-flush p-0">
+		<div class="list-group" v-if="relationship">
+			<div class="list-group-item cursor-pointer text-center rounded text-dark" @click="copyProfileLink">
+				Copy Link
+			</div>
+			<div v-if="user && !owner && !relationship.following" class="list-group-item cursor-pointer text-center rounded text-dark" @click="followProfile">
+				Follow
+			</div>
+			<div v-if="user && !owner && relationship.following" class="list-group-item cursor-pointer text-center rounded" @click="followProfile">
+				Unfollow
+			</div>
+			<div v-if="user && !owner && !relationship.muting" class="list-group-item cursor-pointer text-center rounded" @click="muteProfile">
+				Mute
+			</div>
+			<div v-if="user && !owner && relationship.muting" class="list-group-item cursor-pointer text-center rounded" @click="unmuteProfile">
+				Unmute
+			</div>
+			<div v-if="user && !owner" class="list-group-item cursor-pointer text-center rounded text-dark" @click="reportProfile">
+				Report User
+			</div>
+			<div v-if="user && !owner && !relationship.blocking" class="list-group-item cursor-pointer text-center rounded text-dark" @click="blockProfile">
+				Block
+			</div>
+			<div v-if="user && !owner && relationship.blocking" class="list-group-item cursor-pointer text-center rounded text-dark" @click="unblockProfile">
+				Unblock
+			</div>
+			<div v-if="user && owner" class="list-group-item cursor-pointer text-center rounded text-dark" @click="redirect('/settings/home')">
+				Settings
+			</div>
+			<div class="list-group-item cursor-pointer text-center rounded text-muted" @click="$refs.visitorContextMenu.hide()">
+				Close
+			</div>
 		</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>
+		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>
-.o-square {
-	max-width: 320px;
-}
-.o-portrait {
-	max-width: 320px;
-}
-.o-landscape {
-	max-width: 320px;
-}
-.post-icon {
-	color: #fff;
-	position:relative;
-	margin-top: 10px;
-	z-index: 9;
-	opacity: 0.6;
-	text-shadow: 3px 3px 16px #272634;
-}
-.font-size-16px {
-	font-size: 16px;
-}
-.profile-website {
-	color: #003569;
-	text-decoration: none;
-	font-weight: 600;
-}
-.nav-topbar .nav-link {
-	color: #999;
-}
-.nav-topbar .nav-link .small {
-	font-weight: 600;
-}
+	.o-square {
+		max-width: 320px;
+	}
+	.o-portrait {
+		max-width: 320px;
+	}
+	.o-landscape {
+		max-width: 320px;
+	}
+	.post-icon {
+		color: #fff;
+		position:relative;
+		margin-top: 10px;
+		z-index: 9;
+		opacity: 0.6;
+		text-shadow: 3px 3px 16px #272634;
+	}
+	.font-size-16px {
+		font-size: 16px;
+	}
+	.profile-website {
+		color: #003569;
+		text-decoration: none;
+		font-weight: 600;
+	}
+	.nav-topbar .nav-link {
+		color: #999;
+	}
+	.nav-topbar .nav-link .small {
+		font-weight: 600;
+	}
 </style>
 <script type="text/javascript">
 	import VueMasonry from 'vue-masonry-css'
 
-	Vue.use(VueMasonry);
+
 	export default {
 		props: [
-		'profile-id',
-		'profile-layout',
-		'profile-settings',
-		'profile-username'
+			'profile-id',
+			'profile-layout',
+			'profile-settings',
+			'profile-username'
 		],
 		data() {
 			return {
@@ -557,6 +557,7 @@
 			this.fetchProfile();
 			let u = new URLSearchParams(window.location.search);
 			if(u.has('ui') && u.get('ui') == 'moment' && this.layout != 'moment') {
+				Vue.use(VueMasonry);
 				this.layout = 'moment';
 			}
 			if(u.has('ui') && u.get('ui') == 'metro' && this.layout != 'metro') {
@@ -581,6 +582,11 @@
 			if(u.has('md') && u.get('md') == 'following') {
 				this.followingModal();
 			}
+			if(document.querySelectorAll('body')[0].classList.contains('loggedIn') == true) {
+				axios.get('/api/v1/accounts/verify_credentials').then(res => {
+					this.user = res.data;
+				});
+			}
 		},
 
 		updated() {
@@ -591,12 +597,12 @@
 			fetchProfile() {
 				axios.get('/api/v1/accounts/' + this.profileId).then(res => {
 					this.profile = res.data;
+				}).then(res => {
+					this.fetchPosts();
 				});
-				if(document.querySelectorAll('body')[0].classList.contains('loggedIn') == true) {
-					axios.get('/api/v1/accounts/verify_credentials').then(res => {
-						this.user = res.data;
-					});
-				}
+			},
+
+			fetchPosts() {
 				let apiUrl = '/api/v1/accounts/' + this.profileId + '/statuses';
 				axios.get(apiUrl, {
 					params: {
@@ -614,7 +620,7 @@
 					this.timeline = data;
 					this.ownerCheck();
 					this.loading = false;
-					this.loadSponsor();
+					//this.loadSponsor();
 				}).catch(err => {
 					swal('Oops, something went wrong',
 						'Please release the page.',
@@ -825,7 +831,6 @@
 				});
 			},
 
-
 			unmuteProfile(status = null) {
 				if($('body').hasClass('loggedIn') == false) {
 					return;