From 9c90f63b3e4aff86151a663a064429567fc71d84 Mon Sep 17 00:00:00 2001 From: Elsio Sanchez <45974454+elsiosanchez@users.noreply.github.com> Date: Wed, 4 Nov 2020 17:42:23 -0400 Subject: [PATCH] moving config.json to config folder (#536) * moving config.json to config folder * delete config Co-authored-by: elsiosanchez --- {src/api/ADempiere => config}/config.json | 0 src/api/ADempiere/instances.js | 4 +++- src/utils/ADempiere/resource.js | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) rename {src/api/ADempiere => config}/config.json (100%) diff --git a/src/api/ADempiere/config.json b/config/config.json similarity index 100% rename from src/api/ADempiere/config.json rename to config/config.json diff --git a/src/api/ADempiere/instances.js b/src/api/ADempiere/instances.js index e253ecca..833dd720 100644 --- a/src/api/ADempiere/instances.js +++ b/src/api/ADempiere/instances.js @@ -1,5 +1,6 @@ /** * Instance for connection to API RESTful with axios + * @author EdwinBetanc0urt * @author elsiosanchez * @param {string} url to resource request * @param {string} method rest, 'get' and 'post' (as default) @@ -23,7 +24,7 @@ export function ApiRest({ }) return request.interceptors } - const config = require('@/api/ADempiere/config.json') + const config = require('../../../config/config.json') const apiRestAddress = config.adempiereStore.images.protocol + config.adempiereStore.images.baseUrl + config.adempiereStore.images.port + config.service const axios = require('axios') const request = axios.create({ @@ -56,6 +57,7 @@ export function ApiRest({ /** * Evaluate the response if is a success or error * @author EdwinBetanc0urt + * @author elsiosanchez * @param {object} response * @returns {mixed} */ diff --git a/src/utils/ADempiere/resource.js b/src/utils/ADempiere/resource.js index 9e108619..c0ff19ac 100644 --- a/src/utils/ADempiere/resource.js +++ b/src/utils/ADempiere/resource.js @@ -25,6 +25,7 @@ export function buildImageFromArray({ /** * Build a base 64 image from arrayBuffer + * @author EdwinBetanc0urt * @author elsiosanchez * @param {array} arrayBuffer * @param {string} contentType @@ -43,6 +44,7 @@ export function buildImageFromArrayBuffer({ /** * Get path to get file + * @author EdwinBetanc0urt * @author elsiosanchez * @param {string} file * @param {number} width @@ -57,7 +59,7 @@ export function getImagePath({ operation = 'fit' }) { // TODO: Evaluate path url 'http://domain:port/adempiere-api', 'adempiere-api' is part of urn - const config = require('@/api/ADempiere/config.json') + const config = require('../../../config/config.json') const url = config.adempiereStore.images.protocol + config.adempiereStore.images.baseUrl + config.adempiereStore.images.port + config.service const urn = `/img?action=${operation}&width=${width}&height=${height}&url=${file}` const uri = `${url}${urn}`