UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-23 06:51:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1876 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2019-12-05 19:20:36 -07:00 committed by GitHub
commit cfcd002f5b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 39 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
public/js/app.js vendored
View file

Binary file not shown.

BIN
public/js/profile.js vendored
View file

Binary file not shown.

BIN
public/mix-manifest.json
View file

Binary file not shown.

4
resources/assets/js/app.js vendored
View file

@ -99,8 +99,8 @@ window.App.util = {
return '<iframe src="'+u+'" class="pixelfed__embed" style="max-width: 100%; border: 0" width="400" allowfullscreen="allowfullscreen"></iframe><script async defer src="'+window.location.origin +'/embed.js"><\/script>';
}),
profile: (function(url) {
// placeholder
console.error('This method is not supported yet');
let u = url + '/embed';
return '<iframe src="'+u+'" class="pixelfed__embed" style="max-width: 100%; border: 0" width="400" allowfullscreen="allowfullscreen"></iframe><script async defer src="'+window.location.origin +'/embed.js"><\/script>';
})
}

39
resources/assets/js/components/Profile.vue
View file

@ -422,6 +422,9 @@
<div class="list-group-item cursor-pointer text-center rounded text-dark" @click="copyProfileLink">
Copy Link
</div>
<div v-if="profile.locked == false" class="list-group-item cursor-pointer text-center rounded text-dark" @click="showEmbedProfileModal">
Embed
</div>
<div v-if="user && !owner && !relationship.following" class="list-group-item cursor-pointer text-center rounded text-dark" @click="followProfile">
Follow
</div>
@ -471,6 +474,21 @@
</p>
</div>
</b-modal>
<b-modal ref="embedModal"
id="ctx-embed-modal"
hide-header
hide-footer
centered
rounded
size="md"
body-class="p-2 rounded">
<div>
<textarea class="form-control disabled" rows="1" style="border: 1px solid #efefef; font-size: 14px; line-height: 12px; height: 37px; margin: 0 0 7px; resize: none; white-space: nowrap;" v-model="ctxEmbedPayload"></textarea>
<hr>
<button :class="copiedEmbed ? 'btn btn-primary btn-block btn-sm py-1 font-weight-bold disabed': 'btn btn-primary btn-block btn-sm py-1 font-weight-bold'" @click="ctxCopyEmbed" :disabled="copiedEmbed">{{copiedEmbed ? 'Embed Code Copied!' : 'Copy Embed Code'}}</button>
<p class="mb-0 px-2 small text-muted">By using this embed, you agree to our <a href="/site/terms">Terms of Use</a></p>
</div>
</b-modal>
</div>
</template>
<style type="text/css" scoped>
@ -545,7 +563,9 @@
bookmarksPage: 2,
collections: [],
collectionsPage: 2,
isMobile: false
isMobile: false,
ctxEmbedPayload: null,
copiedEmbed: false
}
},
beforeMount() {
@ -1083,6 +1103,8 @@
},
statusUrl(status) {
return status.url;
if(status.local == true) {
return status.url;
}
@ -1091,12 +1113,25 @@
},
profileUrl(status) {
return status.url;
if(status.local == true) {
return status.account.url;
}
return '/i/web/profile/_/' + status.account.id;
}
},
showEmbedProfileModal() {
this.ctxEmbedPayload = window.App.util.embed.profile(this.profile.url)
this.$refs.embedModal.show();
},
ctxCopyEmbed() {
navigator.clipboard.writeText(this.ctxEmbedPayload);
this.$refs.embedModal.hide();
this.$refs.visitorContextMenu.hide();
},
}
}
</script>