From df7d30a5de20cba96826e870f4da91aed410e96b Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 26 Mar 2019 13:13:30 -0600 Subject: [PATCH 1/3] Add Classic Compose UI fallback --- app/Http/Controllers/StatusController.php | 2 +- resources/views/status/compose.blade.php | 13 ++++ .../views/timeline/partial/new-form.blade.php | 77 ++++++++++++++++++- 3 files changed, 90 insertions(+), 2 deletions(-) create mode 100644 resources/views/status/compose.blade.php diff --git a/app/Http/Controllers/StatusController.php b/app/Http/Controllers/StatusController.php index e07431081..a77d6affc 100644 --- a/app/Http/Controllers/StatusController.php +++ b/app/Http/Controllers/StatusController.php @@ -95,7 +95,7 @@ class StatusController extends Controller { $this->authCheck(); - return redirect('/'); + return view('status.compose'); } public function store(Request $request) diff --git a/resources/views/status/compose.blade.php b/resources/views/status/compose.blade.php new file mode 100644 index 000000000..5ed1041dd --- /dev/null +++ b/resources/views/status/compose.blade.php @@ -0,0 +1,13 @@ +@extends('layouts.app') + +@section('content') + +
+
+
+ @include('timeline.partial.new-form') +
+
+
+ +@endsection \ No newline at end of file diff --git a/resources/views/timeline/partial/new-form.blade.php b/resources/views/timeline/partial/new-form.blade.php index 32aee7324..ebd4f5c95 100644 --- a/resources/views/timeline/partial/new-form.blade.php +++ b/resources/views/timeline/partial/new-form.blade.php @@ -1 +1,76 @@ - \ No newline at end of file +
+
+
{{__('Create New Post')}}
+
+
+ +
+ @csrf + + +
+
+ + +
+ + Max Size: @maxFileSize(). Supported formats: jpeg, png, gif, bmp. Limited to {{config('pixelfed.max_album_length')}} photos per post. + +
+
+ +

+ 0 + / + {{config('pixelfed.max_caption_length')}} +

+
+
+ +
+
+ +
+ +
+ + Set the visibility of this post. + +
+
+ +
+ + +
+ + Please mark all NSFW and controversial content, as per our content policy. + +
+
+ +
+ +
+ + No filter selected. + +
+
+ + +
+
+
+ +
+
+
\ No newline at end of file From 8d89f415db2a9cb4f5d9b28d12627ebaffc827f7 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 26 Mar 2019 13:16:29 -0600 Subject: [PATCH 2/3] Update ComposeModal, add fallback link --- resources/assets/js/components/ComposeModal.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/assets/js/components/ComposeModal.vue b/resources/assets/js/components/ComposeModal.vue index b06d14bb0..bb7f9e930 100644 --- a/resources/assets/js/components/ComposeModal.vue +++ b/resources/assets/js/components/ComposeModal.vue @@ -16,6 +16,7 @@
{{mediaDrawer ? 'Hide' : 'Show'}} Media Toolbar
About
+ Classic Compose UI
Close
From aa6afb8ca1e502104a2509564d3c5db4df668c37 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 26 Mar 2019 13:19:00 -0600 Subject: [PATCH 3/3] Update compiled assets --- public/js/compose.js | Bin 24196 -> 24321 bytes public/mix-manifest.json | Bin 709 -> 709 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/public/js/compose.js b/public/js/compose.js index 70aff59d9a5611f57c694c35f3b65c1e820e4b0d..0b09e16c07496fb96228de80218dbad649110cae 100644 GIT binary patch delta 234 zcmZqK%h z)1BSWI4#L2)qL_@&XaKVTCQj~o1eQ7&Ti-SfwOOMn{UqGe;~jLGT3VJc}a0L4JDAN zo3j*5g;{|1Yj0j`Y{)wKoT=bs2S3iqXU%0N#|5$LW)!8SSt;pf>L=&t7UUPFD%IBN qM3?BrmuV}JtxPRse*KG{$P=(3b#8oP96X>F-v*? delta 200 zcmZqN$Jnx$al<5L7BlmVtjX6o<$22zixi4%Gc}YFJq&|3A7Vbq%HkQ3oH6+sk2`yE zvXP~6lEq{b-ji@P3tu#xoyJ!PXW!%VfwK+y%{O;*hBI%@;C~>%3NqMg@_9*dHVq|^ z(VMdrOohP?*u2=-kaco_negN|UyjW=miek`P%D*m@=9}ZG_6zhQc}|rOLIzW6ZKLn N3i69eifd~%tpNl6Kj#1d diff --git a/public/mix-manifest.json b/public/mix-manifest.json index a632ff400847efca87f482f4a8647d73b8a0c2e8..13b505216ff046c1fab9d5e3cf34d68f3e958051 100644 GIT binary patch delta 33 ocmX@gdX#lTHlv8SNs@tKszI_@szq9AQc7ByVY21sdPX-!0JZT7VgLXD delta 33 ocmX@gdX#lTHlv88fl;!ViFul7qLGD}k(s$!vSI4xdPX-!0H+NJNB{r;