Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions src/apis.ts
Original file line number Diff line number Diff line change
@@ -1,38 +1,42 @@
const isProduction = process.env.NODE_ENV === 'production';
const mockPath = `${process.env.PUBLIC_URL}/__mocks__/apiRequests`;

const {
location: { hostname: domain },
} = window;

export const getAppData = isProduction
? 'localhost/getAppData'
? `//${domain}/get-app-data.php`
: `${mockPath}/getAppData.json`;

export const getDockerData = isProduction
? 'localhost/getDockerData'
? `//${domain}/get-docker-data.php`
: `${mockPath}/getDockerData.json`;

export const getMails = isProduction
? 'localhost/getMails'
? `//${domain}/get-mails.php`
: `${mockPath}/getMails.json`;

export const makeGetContainerData = (id: string) =>
isProduction
? `localhost/getContainerData/${id}`
? `//${domain}/get-container-data.php?id=${id}`
: `${mockPath}/containerData/${id}.json`;

export const makeGetToolsData = (id: string) =>
isProduction
? `localhost/getToolsData/${id}`
? `//${domain}/get-tools.php?id=${id}`
: `${mockPath}/tools/${id}.json`;

export const getVhosts = isProduction
? 'localhost/getVhosts'
? `//${domain}/get-vhosts.php`
: `${mockPath}/getVhosts.json`;

export const makeGetVhostDirectory = (id: string) =>
isProduction
? `localhost/vhosts/directory/${id}`
? `//${domain}/get-vhost-dir.php?id=${id}`
: `${mockPath}/vhosts/directory/${id}.json`;

export const makeGetVhostsDomain = (id: string) =>
export const makeGetVhostsDomain = (id: string, tld_suffix: string) =>
isProduction
? `localhost/vhosts/domain/${id}`
? `//${id}.${tld_suffix}/devilbox-api/status.json`
: `${mockPath}/vhosts/domain/${id}.json`;
5 changes: 4 additions & 1 deletion src/app/pages/Vhosts/saga.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
makeVhostsSelector,
makeDomainErrorSelector,
makeDirectoryErrorSelector,
makeTldSuffixSelector,
} from './selectors';
import {
getVhosts as GET_VHOSTS_API,
Expand Down Expand Up @@ -39,8 +40,10 @@ function* fetchDirectory(vhostId: string) {
}

function* fetchDomain(vhostId: string) {
const tldSuffix = yield select(makeTldSuffixSelector);

try {
yield axios.get(makeGetVhostsDomain(vhostId), { timeout: 1000 });
yield axios.get(makeGetVhostsDomain(vhostId, tldSuffix), { timeout: 1000 });
} catch (e) {
const selector = makeDomainErrorSelector(vhostId);
const error = yield select(selector);
Expand Down