chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

fix conflicts

This commit is contained in:
talon 2019-05-03 23:13:22 -04:00
parent 5ddcdc6c7a 4f7ae39807
commit 768369866e
11 changed files with 1203 additions and 1492 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2615
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

22
package.json
View File

@ -14,27 +14,27 @@
"axios": "^0.18",
"bootstrap": ">=4.3.1",
"cross-env": "^5.2.0",
"jquery": "^3.2",
"jquery": "^3.4.1",
"lodash": "^4.17.11",
"popper.js": "^1.14.7",
"popper.js": "^1.15.0",
"resolve-url-loader": "^2.3.2",
"sass": "^1.17.2",
"sass": "^1.19.0",
"sass-loader": "^7.1.0",
"vue": "^2.6.7",
"vue-template-compiler": "^2.6.7"
"vue": "^2.6.10",
"vue-template-compiler": "^2.6.10"
},
"dependencies": {
"bootstrap-vue": "^2.0.0-rc.13",
"bootstrap-vue": "^2.0.0-rc.19",
"emoji-mart-vue": "^2.6.6",
"filesize": "^3.6.1",
"howler": "^2.1.1",
"infinite-scroll": "^3.0.4",
"howler": "^2.1.2",
"infinite-scroll": "^3.0.6",
"laravel-echo": "^1.5.3",
"laravel-mix": "^4.0.14",
"node-sass": "^4.11.0",
"laravel-mix": "^4.0.15",
"node-sass": "^4.12.0",
"opencollective": "^1.0.3",
"opencollective-postinstall": "^2.0.2",
"plyr": "^3.5.0",
"plyr": "^3.5.4",
"promise-polyfill": "8.1.0",
"pusher-js": "^4.4.0",
"quill": "^1.3.6",

4
public/css/app.css vendored
View File

File diff suppressed because one or more lines are too long

4
public/css/appdark.css vendored
View File

File diff suppressed because one or more lines are too long

2
public/css/landing.css vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/app.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/components.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/timeline.js vendored
View File

File diff suppressed because one or more lines are too long

12
public/mix-manifest.json
View File

@ -1,15 +1,15 @@
{
"/js/activity.js": "/js/activity.js?id=7915246c3bc2b7e9770e",
"/js/app.js": "/js/app.js?id=3cd2f5b91d50cb028347",
"/css/app.css": "/css/app.css?id=2d3c430e75bf39ed42de",
"/css/appdark.css": "/css/appdark.css?id=bbae27254436deab7c81",
"/css/landing.css": "/css/landing.css?id=856b55a76ff762684ef0",
"/js/components.js": "/js/components.js?id=7e2c0820d0ca5af5aeaa",
"/js/app.js": "/js/app.js?id=1f05f00eec0e86f49dd4",
"/css/app.css": "/css/app.css?id=b407fd02a5b7526f85b4",
"/css/appdark.css": "/css/appdark.css?id=b4a7cf4f8dd06abe699e",
"/css/landing.css": "/css/landing.css?id=d3610108213e88dc080c",
"/js/components.js": "/js/components.js?id=25d082643150ee79150c",
"/js/compose.js": "/js/compose.js?id=4d8c53b4575f463214f2",
"/js/developers.js": "/js/developers.js?id=1359f11c7349301903f8",
"/js/discover.js": "/js/discover.js?id=75fb12b06ee23fa05186",
"/js/profile.js": "/js/profile.js?id=b267c34e3f9168a8b307",
"/js/search.js": "/js/search.js?id=0d3d080dc05f4f49b204",
"/js/status.js": "/js/status.js?id=bf48fe9060a74d1180f2",
"/js/timeline.js": "/js/timeline.js?id=15eec012c1274e64c892"
"/js/timeline.js": "/js/timeline.js?id=ded47e282e9b3339c1fd"
}

5
resources/assets/js/components.js vendored
View File

@ -9,7 +9,10 @@ import VueTouch from 'vue-touch';
Vue.use(BootstrapVue);
Vue.use(InfiniteLoading);
Vue.use(Loading);
Vue.use(VueTimeago);
Vue.use(VueTimeago, {
name: 'Timeago',
locale: 'en'
);
Vue.use(VueTouch, { name: 'v-touch' })
VueTouch.registerCustomEvent('doubletap', {

25
resources/assets/js/components/Timeline.vue
View File

@ -419,6 +419,9 @@
fetchProfile() {
axios.get('/api/v1/accounts/verify_credentials').then(res => {
this.profile = res.data;
if(this.profile.is_admin == true) {
this.modes.mod = true;
}
$('.profile-card .loader').addClass('d-none');
$('.profile-card .contents').removeClass('d-none');
$('.profile-card .card-footer').removeClass('d-none');
@ -653,7 +656,7 @@
},
deletePost(status, index) {
if($('body').hasClass('loggedIn') == false || status.account.id !== this.profile.id) {
if($('body').hasClass('loggedIn') == false || this.ownerOrAdmin(status) == false) {
return;
}
@ -834,12 +837,12 @@
modeModToggle() {
this.modes.mod = !this.modes.mod;
window.ls.set('pixelfed-classicui-settings', this.modes);
//window.ls.set('pixelfed-classicui-settings', this.modes);
},
modeNotifyToggle() {
this.modes.notify = !this.modes.notify;
window.ls.set('pixelfed-classicui-settings', this.modes);
//window.ls.set('pixelfed-classicui-settings', this.modes);
},
modeDarkToggle() {
@ -863,12 +866,12 @@
this.modes.dark = true;
});
}
window.ls.set('pixelfed-classicui-settings', this.modes);
//window.ls.set('pixelfed-classicui-settings', this.modes);
},
modeInfiniteToggle() {
this.modes.infinite = !this.modes.infinite
window.ls.set('pixelfed-classicui-settings', this.modes);
//window.ls.set('pixelfed-classicui-settings', this.modes);
},
followingModal() {
@ -991,6 +994,18 @@
this.following.splice(index, 1);
}
})
},
owner(status) {
return this.profile.id === status.account.id;
},
admin() {
return this.profile.is_admin == true;
},
ownerOrAdmin(status) {
return this.owner(status) || this.admin();
}
}
}