Merge pull request #22 from vamcart/master

Fix logo, slider upload and display problems

config/admin.js

@@ -3,6 +3,7 @@ module.exports = {
 	// dashboard UI language
 	language: process.env.LANGUAGE || 'en',
 	apiBaseUrl: process.env.API_BASE_URL || 'http://localhost:3001/api/v1',
+	assetsBaseURL: process.env.ASSETS_BASE_URL || 'http://localhost:3001',
 	apiWebSocketUrl: process.env.API_WEB_SOCKET_URL || 'ws://localhost:3001',
 	developerMode: process.env.DEVELOPER_MODE || true
 };

src/modules/settings/themeSettings/components/imageEditor.js

@@ -1,39 +1,40 @@
-import React from 'react';
-import api from 'lib/api';
-import ImageUpload from 'modules/shared/imageUpload';
-
-export default class ThemeImageUpload extends React.Component {
-	onDelete = () => {
-		const fileName = this.props.input.value;
-		api.theme.assets.deleteFile(fileName).then(() => {
-			this.props.input.onChange('');
-		});
-	};
-
-	onUpload = formData => {
-		api.theme.assets.uploadFile(formData).then(({ status, json }) => {
-			const fileName = json.file;
-			this.props.input.onChange(fileName);
-		});
-	};
-
-	render() {
-		let { input, label } = this.props;
-		const imageUrl =
-			input.value && input.value.length > 0
-				? '/assets/images/' + input.value
-				: null;
-
-		return (
-			<div>
-				<p>{label}</p>
-				<ImageUpload
-					uploading={false}
-					imageUrl={imageUrl}
-					onDelete={this.onDelete}
-					onUpload={this.onUpload}
-				/>
-			</div>
-		);
-	}
-}
+import React from 'react';
+import api from 'lib/api';
+import ImageUpload from 'modules/shared/imageUpload';
+import settings from 'lib/settings';
+
+export default class ThemeImageUpload extends React.Component {
+	onDelete = () => {
+		const fileName = this.props.input.value;
+		api.theme.assets.deleteFile(fileName).then(() => {
+			this.props.input.onChange('');
+		});
+	};
+
+	onUpload = formData => {
+		api.theme.assets.uploadFile(formData).then(({ status, json }) => {
+			const fileName = json.file;
+			this.props.input.onChange(fileName);
+		});
+	};
+
+	render() {
+		let { input, label } = this.props;
+		const imageUrl =
+			input.value && input.value.length > 0
+				? settings.assetsBaseURL + '/assets/images/' + input.value
+				: null;
+
+		return (
+			<div>
+				<p>{label}</p>
+				<ImageUpload
+					uploading={false}
+					imageUrl={imageUrl}
+					onDelete={this.onDelete}
+					onUpload={this.onUpload}
+				/>
+			</div>
+		);
+	}
+}