From 2de3c56f4744f41dcf761cd658125089920d5956 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Mon, 27 Jan 2020 20:23:13 -0700
Subject: [PATCH 1/3] Update StoryCompose component, add upload progress

---
 resources/assets/js/components/StoryCompose.vue | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/resources/assets/js/components/StoryCompose.vue b/resources/assets/js/components/StoryCompose.vue
index 9ec338eb0..7d9ca47f8 100644
--- a/resources/assets/js/components/StoryCompose.vue
+++ b/resources/assets/js/components/StoryCompose.vue
@@ -79,6 +79,12 @@
 				</p>
 			</div>
 
+			<!-- UPLOADING -->
+			<div v-if="page == 'uploading'" class="card card-body bg-transparent border-0 shadow-none d-flex justify-content-center align-items-center" style="height: 90vh;">
+				<p v-if="uploadProgress != 100" class="display-4 mb-0">Uploading {{uploadProgress}}%</p>
+				<p v-else class="display-4 mb-0">Publishing Story</p>
+			</div>
+
 			<div v-if="page == 'edit'" class="card card-body bg-transparent border-0 shadow-none d-flex justify-content-center" style="height: 90vh;">
 				<div class="text-center flex-fill mt-5 pt-5">
 					<img src="/img/pixelfed-icon-grey.svg" width="60px" height="60px">
@@ -152,10 +158,11 @@
 					'crop',
 					'edit',
 					'confirm',
-					'error'
+					'error',
+					'uploading'
 				],
 				uploading: false,
-				uploadProgress: 100,
+				uploadProgress: 0,
 				cropper: {
 					aspectRatio: 9/16,
 					viewMode: 1,
@@ -192,6 +199,7 @@
 				let self = this;
 				self.uploading = true;
 				let io = document.querySelector('#pf-dz');
+				self.page = 'uploading';
 				Array.prototype.forEach.call(io.files, function(io, i) {
 					if(self.media && self.media.length + i >= self.config.uploader.album_limit) {
 						swal('Error', 'You can only upload ' + self.config.uploader.album_limit + ' photos per album', 'error');
@@ -213,7 +221,7 @@
 
 					let xhrConfig = {
 						onUploadProgress: function(e) {
-							let progress = Math.round( (e.loaded * 100) / e.total );
+							let progress = Math.floor( (e.loaded * 100) / e.total );
 							self.uploadProgress = progress;
 						}
 					};

From 14f2c09df581ce6713c07e30c4c60ab5e3ae9a81 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Mon, 27 Jan 2020 20:24:12 -0700
Subject: [PATCH 2/3] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d6ad13e4..fd857a64e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
 - Updated StoryController, orientate story media and strip exif ([07a13fcf](https://github.com/pixelfed/pixelfed/commit/07a13fcf))
 - Updated admin reports, fixed 404 bug ([dbd5c4cf](https://github.com/pixelfed/pixelfed/commit/dbd5c4cf))
 - Updated AdminController, abstracted dashboard stats to AdminStatsService ([41abe9d2](https://github.com/pixelfed/pixelfed/commit/41abe9d2))
+- Updated StoryCompose component, added upload progress page ([2de3c56f](https://github.com/pixelfed/pixelfed/commit/2de3c56f))
 
 ### Changed
 

From 405bcd7d7a70a18c166f141819331a9441ae2c60 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Mon, 27 Jan 2020 20:24:46 -0700
Subject: [PATCH 3/3] Update compiled assets

---
 public/js/story-compose.js | Bin 70104 -> 70498 bytes
 public/mix-manifest.json   | Bin 1815 -> 1815 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/js/story-compose.js b/public/js/story-compose.js
index 6efb0c458b453a3fc86baf33a0446849d83b3d6f..c47dd5c61c1af67383b2e263bf44054a1fe616b8 100644
GIT binary patch
delta 1103
zcmZ`&UuaWT80W;MY0_yFwQOuL@zT0`&B^tqwWHqVG;9xJ)Wy_Qhf=$F)5PS4q&H1&
zl6z<x2AfY~FFj}(tWOeMDQv<;D`O9vI$K+*24xCEp_4td!v4HD2V>uDoQ1(2&Ub#_
zzu)(rkMlh^*YxxGri+ujixPz|;iP~K_609H=)N~3Az-kFybn?KH}7epp`bJ=w7G&3
zjtMdiby}LEv!SsQ!Y)M3alyN(6?4U0MpNSIXp()7z2-OAW!tWcIVG7O8!ir;*TvUt
z_EQ;6%bUMQwpQmx+LPWK`%~^}3rf;%qKgg3KweAc6NN&Ut@Q19E3OuD8HEP+`?9fs
z#7*EKUHq`bb4UNJ?c@AlDe(VI7yMiYCkzX+MdSZJnt@_0qZU%|2H&8r<tb#C_1@6d
zmhSEY!2>-#33KPW-@08C8-%B1Xc#m1*v=L@qz{t>rtIlZ3K{2=6P$;VRG8DX;z%m1
zl@grHWwl}<v5sNX)oMSC_h!|L40E;GZ%1ji|C684akllehK`#boqo1?8zm)8jr$}*
zNV!reL)NFP-D!lmj8^7k!@R;AHpu(#%tfFYI~xLwo=E1Sv$1A?Z%*$*Y4hZCe+yi*
zHH^Ua;Cw&G*;+fu<ywcCy`Tbvd4DEjH85K{Y@Ydg+WtzKA1|wMJtZqRl~9u@UDhV>
zh|Z_k!An1SHoSX_FZ_FpjR>>v^0ijrvR&nXxZ~<q2ztAB?fy&f&BO*7ykqWq3C!XT
ze>v%%J$yu@gtE>XN1Lf22;&C(>_!C{%r!sp!Z1JDMk|#O2+oB_sZz=Ik#Zw;+d_Fg
z*2}(JkO4hjFrVv}Zw>%*EMBn#t;IU;WseubcB`bpUSEQL%g8MsJGG=fkGQvV=+$*E
z*&P(*qMt-W14DOxL<%QER`kcnFu%W*ML@i7xgF$@<!2zHw=Kur+a7Dkf86nd^wa|&
z57sAP43FxIZct`c-Uj9O6~zIS-&^f!w`!F{H46(enAJ4h`gMnkN=DUTAVP0R$@>g8
zv)bb|h=e0>ju1(ZqakRAkB~qVN7rq}<eGPfK_ZHt60_<kU%-Qbs9-I0*V-8LRa=|c
z1cjr&z6|Y|soy?u!ZrW2y2YF3Be0)&P1kgqOW>rAOFE9}xU6HUV`DDvKy@_rz7uVq
eddG>jOmzdAQ=MpYGon*vH#&xlxjSyuV*3Z?;*wne

delta 811
zcmXw1ZAg<*6z0xN=lo`+mO1Azd0%>+o0^sRCPnpQp(YVzwZWXrO*W@CxBKcUDKd)w
z<V7YG_CqkEsKo_mphZ~b$NY>w#FEM%ffM`s5m-cLQ~x~oJm=i=oO{l>UwXvvyT!hC
zMuvGK<Kk*qP9V3Lq9~kOs9|#i@{v&@O#U(HVqC1%w6n=Ft%j>&i*RvXh(+bCF>;z!
zAWU1>j0n=hDMVTgeZk2@^s{=KNYdzNs;j0Vttf^z@Y#vd0!@Kdo44l-y;C}n5Q#Z~
zXD~79w@C3Rr=B-+m|WCbkkB2}tDyGsg)}4(X{#<1a|d}-iK^aVt#g_io9dP8mdRLW
zGTT%|0zKQRlb}lS^zuBaB{$m~sFupEtj5VP?{ZkHl^UMs-5!q{Dq6|HQZmWuh>aFX
zR5ph@lzpHhN(9+DuP*{~hr$=+omt?~C{pRs&gMuk$Ga4$k}h@Wq(CNp6{PL%JXlq|
zx-bvj{^8qBfA?BJiW=|R;5~HGw-S2RU|$O0o4&Vz5BzBm81WCq0J%P-0`h3+A%cDl
zFW<$&GSn8cwZ`Ivb?hH@fxCbBPc+WXW=hopkIBHR<B^zU*%pDMjCf!^nd2FRju<wa
zWq}M*I9i^JJsuMz)fe+FkH@}`cdzB#8g++rvdFHnonYC=XqY<yZ;ba#KpK?G0tQK_
zq(B}AV7p{GaCJRmm?+zbOl%HEl;rD#2?_Mbq#c3Clc_Agg{f7*x#>#~(9fhJXtiZ_
zhq#hyIY(x?QpodJd1xTB?a;mD^;iOs{KdmSniq{xAp2n{A22bPCdKStm$6YPko@3o
zkhBHU0j~u!HVJ&G(P>fJt#!;<?pRJa8~VV5!3L<9yL>MKwC290LSg#zyCE8miq-S+
xsM0$vMO(!frt4pkq8a4<BtvrVUm1$`J_F1DONQbi5%!`abOH(flSxP_`VZweHzfc7

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index e15e3271b7d1097151ea19730f7c941973aad993..89fe1711b791c48ac57f1acb7710e613e8b7d1a1 100644
GIT binary patch
delta 32
ncmbQvH=S=oA)AOnqETY9fkk4nNlH?(nOTydfoa<0R<=n1qnQd2

delta 32
ncmbQvH=S=oA)81_nyH0RQksQvibb+Pia}DcaZ2jsR<=n1rN0VR