From e99d2b285c440d8d31492e9b6acb8913afc2a285 Mon Sep 17 00:00:00 2001 From: Louis Jeckel Date: Mon, 21 Sep 2020 10:34:27 +0200 Subject: [PATCH] update longer links --- app/Events/FileProcessingUpdate.php | 2 +- app/Http/Controllers/Admin/PublishController.php | 5 ++++- app/test | 13 +++++++++++++ resources/js/components/Publish/Step1UploadFile.vue | 6 +++--- 4 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 app/test diff --git a/app/Events/FileProcessingUpdate.php b/app/Events/FileProcessingUpdate.php index 93e8397..7cc2d03 100644 --- a/app/Events/FileProcessingUpdate.php +++ b/app/Events/FileProcessingUpdate.php @@ -28,7 +28,7 @@ class FileProcessingUpdate implements ShouldBroadcast $this->file = $file; $this->data = [ 'status' => $status, - 'data' => array_merge(['file_id' => $file->id], $data) + 'data' => ['file_id' => $file->id] ]; } diff --git a/app/Http/Controllers/Admin/PublishController.php b/app/Http/Controllers/Admin/PublishController.php index 0e8e311..6b6db3c 100644 --- a/app/Http/Controllers/Admin/PublishController.php +++ b/app/Http/Controllers/Admin/PublishController.php @@ -54,7 +54,10 @@ class PublishController extends Controller public function file(Request $request, PdfFile $file) { - return response()->json($file); + return response()->json([ + 'file' => $file, + 'links' => $file->trackedLinks()->pluck('title') + ]); } diff --git a/app/test b/app/test new file mode 100644 index 0000000..0033031 --- /dev/null +++ b/app/test @@ -0,0 +1,13 @@ +[{ +"content": "Le Président Américain devrait très prochainement autoriser plusieurs Etats à importer des médicaments depuis le Canada. Et parmi eux, la Floride n'est pas prioritaire par hasard ", "headline": +"TRUMP ET LES LABOS : \"U.S. DRUGS FROM CANADA\" !\""}, { +"content": "", "headline": +"LES USA RECRUTENT À LA TV POUR LES ESSAIS CLINIQUES D'UN VACCIN DONT LA DEUXIÈME ADJOINTE À MARSEILLE AFFIRME \"MOI, JE LE FAIS PAS\" ! "}, { +"content": "", "headline": +"AGENCES DE COM SANTÉ : SUDLER, C'EST TERMINÉ "}, { +"content": "", "headline": +"BIOGEN ENCORE PLOMBÉ PAR LA JUSTICE SUR SON TECFIDERA - DES ANNONCES \"DIFFICILES\" SONT ATTENDUES"}, { +"content": "", "headline": +"POURQUOI J&J S'EST OFFERT MOMENTA"}, { +"content": "", "headline": +"VISITE GUIDÉE ET EN IMAGE SUR LES SITES SANOFI"}] diff --git a/resources/js/components/Publish/Step1UploadFile.vue b/resources/js/components/Publish/Step1UploadFile.vue index 90ae82a..bdb08b1 100644 --- a/resources/js/components/Publish/Step1UploadFile.vue +++ b/resources/js/components/Publish/Step1UploadFile.vue @@ -207,11 +207,11 @@ if(e.status === 'done'){ this.progressMode = 'determinate'; - this.links = e.data.links; - axios.get('/publish/file/'+e.data.file_id).then(data => { - this.$root.publishState.file = data.data; + this.$root.publishState.file = data.data.file; + this.links = data.data.links; + this.status = 'done'; this.$emit('can-continue', {value: true}); }) -- 2.39.5