diff --git a/config/database.php b/config/database.php index b5020f740..46fde4ba4 100644 --- a/config/database.php +++ b/config/database.php @@ -106,7 +106,7 @@ return [ 'redis' => [ - 'client' => env('REDIS_CLIENT', 'predis'), + 'client' => env('REDIS_CLIENT', 'phpredis'), 'default' => [ 'scheme' => env('REDIS_SCHEME', 'tcp'), diff --git a/contrib/nginx.conf b/contrib/nginx.conf index ecb90e15f..6d6fd15f8 100644 --- a/contrib/nginx.conf +++ b/contrib/nginx.conf @@ -18,6 +18,7 @@ server { index index.html index.htm index.php; charset utf-8; + client_max_body_size 15M; location / { try_files $uri $uri/ /index.php?$query_string; diff --git a/public/js/components.js b/public/js/components.js index c8164057d..94d407808 100644 Binary files a/public/js/components.js and b/public/js/components.js differ diff --git a/public/js/compose.js b/public/js/compose.js index 053e2c304..3a1341e4e 100644 Binary files a/public/js/compose.js and b/public/js/compose.js differ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index e5f88b545..c2e370196 100644 Binary files a/public/mix-manifest.json and b/public/mix-manifest.json differ diff --git a/resources/assets/js/components/ComposeModal.vue b/resources/assets/js/components/ComposeModal.vue index fc058a5f5..393a1d6dc 100644 --- a/resources/assets/js/components/ComposeModal.vue +++ b/resources/assets/js/components/ComposeModal.vue @@ -59,13 +59,11 @@ - - - - {{media.length}} - - {{pageTitle}} - + + + {{media.length}} + + {{pageTitle}} @@ -563,34 +561,6 @@

-
-
-
- Loading... -
-

- Processing Media -

-

- This may take a few seconds. -

-
-
- -
-
-
- Loading... -
-

- Processing Media -

-

- This may take a few seconds. -

-
-
- @@ -715,17 +685,12 @@ export default { 'editMedia', 'cameraRoll', 'tagPeopleHelp', - 'textOptions', - 'processingVideo', - 'processingPhoto' + 'textOptions' ], cameraRollMedia: [], taggedUsernames: [], taggedPeopleSearch: null, - textMode: false, - isProcessingMedia: false, - processPhotoInterval: undefined, - processVideoInterval: undefined + textMode: false } }, @@ -825,14 +790,9 @@ export default { self.ids.push(e.data.id); self.media.push(e.data); self.uploading = false; - - if(e.data.mime == 'video/mp4') { - self.processVideo(e.data); - return; - } else { - self.processPhoto(e.data); - return; - } + setTimeout(function() { + self.page = 2; + }, 300); }).catch(function(e) { switch(e.response.status) { case 451: @@ -1205,6 +1165,7 @@ export default { ctx.clearRect(0, 0, image.width, image.height); } } + }, tagSearch(input) { @@ -1247,58 +1208,7 @@ export default { showTextOptions() { this.page = 'textOptions'; this.pageTitle = 'Text Post Options'; - }, - - processPhoto(media) { - this.page = 'processingPhoto'; - this.pageTitle = ''; - this.processPhotoCheck(media); - }, - - processPhotoCheck(media) { - this.isProcessingMedia = true; - this.processMediaCheck(media); - this.processPhotoInterval = setInterval(() => { - this.processMediaCheck(media); - }, 2500); - }, - - processVideo(media) { - this.page = 'processingVideo'; - this.pageTitle = ''; - this.processVideoCheck(media); - }, - - processVideoCheck(media) { - this.isProcessingMedia = true; - this.processMediaCheck(media, 'video'); - this.processVideoInterval = setInterval(() => { - this.processMediaCheck(media, 'video'); - }, 2500); - }, - - processMediaCheck(media, type = 'photo') { - return axios.get('/api/compose/v0/media/processing', { - params: { - id: media.id - } - }).then(res => { - let data = res.data; - if(data.finished === true) { - this.isProcessingMedia = false; - this.page = 3; - if(type == 'photo') { - clearInterval(this.processPhotoInterval); - } else if (type == 'video') { - clearInterval(this.processVideoInterval); - } else { - } - return; - } - }); } - - } } - + \ No newline at end of file