From c37b2a1d48a8635b4f0d05cba2d0b022b5fa7fea Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 25 Mar 2019 22:22:25 -0600 Subject: [PATCH] Add new Compose UI --- .../assets/js/components/ComposeModal.vue | 263 +++++++++++------- resources/assets/js/compose.js | 4 + .../admin/partial/template-full.blade.php | 14 +- .../views/admin/partial/template.blade.php | 12 +- resources/views/discover/home.blade.php | 1 + resources/views/discover/personal.blade.php | 11 +- .../views/discover/tags/category.blade.php | 7 + resources/views/discover/tags/show.blade.php | 6 + resources/views/profile/show.blade.php | 1 + resources/views/status/show.blade.php | 1 + resources/views/timeline/home.blade.php | 1 + resources/views/timeline/local.blade.php | 1 + .../views/timeline/partial/new-form.blade.php | 77 +---- webpack.mix.js | 3 + 14 files changed, 228 insertions(+), 174 deletions(-) create mode 100644 resources/assets/js/compose.js diff --git a/resources/assets/js/components/ComposeModal.vue b/resources/assets/js/components/ComposeModal.vue index edbaccf27..72b5e748c 100644 --- a/resources/assets/js/components/ComposeModal.vue +++ b/resources/assets/js/components/ComposeModal.vue @@ -1,9 +1,8 @@ +@endpush \ No newline at end of file diff --git a/resources/views/admin/partial/template.blade.php b/resources/views/admin/partial/template.blade.php index 4f8b0b959..1ad4eb997 100644 --- a/resources/views/admin/partial/template.blade.php +++ b/resources/views/admin/partial/template.blade.php @@ -24,4 +24,14 @@ -@endsection \ No newline at end of file +@endsection + +@push('scripts') + +@endpush \ No newline at end of file diff --git a/resources/views/discover/home.blade.php b/resources/views/discover/home.blade.php index ea8433a3e..315deb1c9 100644 --- a/resources/views/discover/home.blade.php +++ b/resources/views/discover/home.blade.php @@ -10,6 +10,7 @@ @push('scripts') + diff --git a/resources/views/discover/personal.blade.php b/resources/views/discover/personal.blade.php index 2e8a63a18..5efb150fe 100644 --- a/resources/views/discover/personal.blade.php +++ b/resources/views/discover/personal.blade.php @@ -1,7 +1,7 @@ @extends('layouts.app') @section('content') -
@@ -54,4 +54,11 @@ background: linear-gradient(to right, #FFC371, #FF5F6D); /* W3C, IE 10+/ Edge, F
-@endsection \ No newline at end of file +@endsection + +@push('scripts') + + +@endpush \ No newline at end of file diff --git a/resources/views/discover/tags/category.blade.php b/resources/views/discover/tags/category.blade.php index ea73b43c7..a10c21576 100644 --- a/resources/views/discover/tags/category.blade.php +++ b/resources/views/discover/tags/category.blade.php @@ -83,3 +83,10 @@ } @endpush + +@push('scripts') + + +@endpush \ No newline at end of file diff --git a/resources/views/discover/tags/show.blade.php b/resources/views/discover/tags/show.blade.php index 79b69afd8..00983bcc5 100644 --- a/resources/views/discover/tags/show.blade.php +++ b/resources/views/discover/tags/show.blade.php @@ -45,3 +45,9 @@ @endsection +@push('scripts') + + +@endpush \ No newline at end of file diff --git a/resources/views/profile/show.blade.php b/resources/views/profile/show.blade.php index 05850d1f1..ecaa11b49 100644 --- a/resources/views/profile/show.blade.php +++ b/resources/views/profile/show.blade.php @@ -21,6 +21,7 @@ @push('scripts') + + + +