Merge pull request #1344 from pixelfed/frontend-ui-refactor

Frontend ui refactor

public/mix-manifest.json

@@ -4,8 +4,8 @@
     "/css/app.css": "/css/app.css?id=3a974ff74b6b5905a73c",
     "/css/appdark.css": "/css/appdark.css?id=107806a000e2ca675a3c",
     "/css/landing.css": "/css/landing.css?id=d3610108213e88dc080c",
-    "/js/components.js": "/js/components.js?id=ddc135bc319514161701",
-    "/js/compose.js": "/js/compose.js?id=f69f248dc1cfcb8ae092",
+    "/js/components.js": "/js/components.js?id=25d082643150ee79150c",
+    "/js/compose.js": "/js/compose.js?id=905ec24258f595df861b",
     "/js/developers.js": "/js/developers.js?id=1359f11c7349301903f8",
     "/js/discover.js": "/js/discover.js?id=0625385218493e556ccc",
     "/js/loops.js": "/js/loops.js?id=0677173fdad43d0687ba",

resources/assets/js/components/ComposeModal.vue

@@ -49,7 +49,7 @@
 							<p class="text-center mb-0 font-weight-bold text-white"><i class="fas fa-plus mr-1"></i> Add Photo</p>
 						</div>
 						<div v-if="ids.length == 0" class="w-100 h-100 bg-light py-5 cursor-pointer" style="border-bottom: 1px solid #f1f1f1" v-on:click="addMedia($event)">
-							<p class="text-center mb-0 font-weight-bold p-5">Click here to add photos</p>
+							<p class="text-center mb-0 font-weight-bold p-5">{{composeMessage()}}</p>
 						</div>
 						<div v-if="ids.length > 0">
 							
@@ -527,6 +527,16 @@ export default {
 		closeModal() {
 			this.composeType = '';
 			$('#composeModal').modal('hide');
+		},
+
+		composeMessage() {
+			let config = this.config;
+			let composeType = this.composeType;
+			let video = config.uploader.media_types.includes('video/mp4');
+
+			return video ? 
+			'Click here to add photos or videos' :
+			'Click here to add photos';
 		}
 	}
 }