Skip to content
This repository has been archived by the owner on Dec 2, 2020. It is now read-only.

Commit

Permalink
yarn conflict fix
Browse files Browse the repository at this point in the history
  • Loading branch information
talhasch committed Oct 16, 2019
2 parents 18965b4 + 313dc37 commit 564a47c
Show file tree
Hide file tree
Showing 4 changed files with 496 additions and 203 deletions.
11 changes: 8 additions & 3 deletions app/backend/esteem-client.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import axios from 'axios';
import { BACKEND_URL, SEARCH_API_URL, SEARCH_API_TOKEN } from '../config';
import {
BACKEND_URL,
SEARCH_API_URL,
SEARCH_API_TOKEN,
IMAGE_URL
} from '../config';

export const search = (q, sort, scrollId) =>
axios.post(
Expand Down Expand Up @@ -111,9 +116,9 @@ export const getMarketData = () =>

export const uploadImage = file => {
const fData = new FormData();
fData.append('postimage', file);
fData.append('file', file);

return axios.post('https://img.esteem.ws/backend.php', fData, {
return axios.post(`${IMAGE_URL}`, fData, {
headers: {
'Content-Type': 'multipart/form-data'
}
Expand Down
1 change: 1 addition & 0 deletions app/config.example.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ export const BACKEND_URL = 'SERVER_ADDRESS';
export const SEARCH_API_URL = 'SERVER_ADDRESS';
export const SEARCH_API_TOKEN = 'TOKEN';
export const NWS_ADDRESS = 'SERVER_ADDRESS';
export const IMAGE_URL = 'SERVER_ADDRESS';
Empty file modified resources/icons/512x512.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 564a47c

Please sign in to comment.