Skip to content

Commit

Permalink
Merge pull request #1237 from RunOnFlux/development
Browse files Browse the repository at this point in the history
V4.32.1
  • Loading branch information
TheTrunk authored Feb 28, 2024
2 parents 7459a63 + c413495 commit 9f5613e
Show file tree
Hide file tree
Showing 18 changed files with 20 additions and 21 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion HomeUI/dist/css/2252.css → HomeUI/dist/css/9327.css

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion HomeUI/dist/js/2252.js

This file was deleted.

1 change: 0 additions & 1 deletion HomeUI/dist/js/3515.js

This file was deleted.

2 changes: 1 addition & 1 deletion HomeUI/dist/js/6981.js → HomeUI/dist/js/3982.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions HomeUI/dist/js/5923.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion HomeUI/dist/js/6345.js → HomeUI/dist/js/6314.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion HomeUI/dist/js/9957.js → HomeUI/dist/js/7322.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion HomeUI/dist/js/2072.js → HomeUI/dist/js/9167.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions HomeUI/dist/js/9327.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion HomeUI/dist/js/index.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions HomeUI/src/views/Home.vue
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<template>
<div>
<b-card title="Welcome to Flux - The biggest decentralyzed computational network">
<b-card title="Welcome to Flux - The biggest decentralized computational network">
<list-entry
title="Dasboard"
title="Dashboard"
:data="dashboard"
/>
<list-entry
Expand Down Expand Up @@ -195,7 +195,7 @@ export default {
dashboard: 'Check Flux network information, resources available or a map with server locations.',
xdao: 'See the list of changes proposed to Flux network, create new ones and vote.',
applications: 'Buy on marketplace, register your own app, manage your active apps.',
administration: 'Tools for the infrastructe administrators, node operators.',
administration: 'Tools for the infrastructure administrators, node operators.',
websocket: null,
errorMessage: '',
loginPhrase: '',
Expand Down
15 changes: 7 additions & 8 deletions HomeUI/src/views/apps/Management.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5797,7 +5797,7 @@ export default {
const port = this.selectedIp.split(':')[1] || 16127;
const folder = encodeURIComponent(fullpath);
const filename = encodeURIComponent(saveAs);
return `http://${ip}:${port}/ioutils/fileupload/${folder}/${filename}/${this.appName}`;
return `https://${ip.replace(/\./g, '-')}-${port}.node.api.runonflux.io/ioutils/fileupload/${folder}/${filename}/${this.appName}`;
},
addAndConvertFileSizes(sizes, targetUnit = 'auto', decimal = 2) {
const multiplierMap = {
Expand Down Expand Up @@ -5988,7 +5988,7 @@ export default {
};
const url = this.selectedIp.split(':')[0];
const urlPort = this.selectedIp.split(':')[1] || 16127;
const response = await fetch(`http://${url}:${urlPort}/apps/appendrestoretask`, {
const response = await fetch(`https://${url.replace(/\./g, '-')}-${urlPort}.node.api.runonflux.io/apps/appendrestoretask`, {
method: 'POST',
body: JSON.stringify(postRestoreData),
headers,
Expand Down Expand Up @@ -6166,7 +6166,7 @@ export default {
}
const url = this.selectedIp.split(':')[0];
const urlPort = this.selectedIp.split(':')[1] || 16127;
const response = await fetch(`http://${url}:${urlPort}/apps/appendbackuptask`, {
const response = await fetch(`https://${url.replace(/\./g, '-')}-${urlPort}.node.api.runonflux.io/apps/appendbackuptask`, {
method: 'POST',
body: JSON.stringify(postBackupData),
headers,
Expand Down Expand Up @@ -6283,7 +6283,7 @@ export default {
}
const url = this.selectedIp.split(':')[0];
const urlPort = this.selectedIp.split(':')[1] || 16127;
const response = await fetch(`http://${url}:${urlPort}/apps/appendrestoretask`, {
const response = await fetch(`https://${url.replace(/\./g, '-')}-${urlPort}.node.api.runonflux.io/apps/appendrestoretask`, {
method: 'POST',
body: JSON.stringify(postBackupData),
headers,
Expand Down Expand Up @@ -6542,7 +6542,7 @@ export default {
const url = this.selectedIp.split(':')[0];
const urlPort = this.selectedIp.split(':')[1] || 16127;
const zelidauth = localStorage.getItem('zelidauth');
this.socket = io.connect(`http://${url}:${urlPort}`);
this.socket = io.connect(`https://${url.replace(/\./g, '-')}-${urlPort}.node.api.runonflux.io`);
let userValue = '';
if (this.enableUser) {
Expand Down Expand Up @@ -7720,13 +7720,12 @@ export default {
const urlPort = this.selectedIp.split(':')[1] || 16127;
let response = null;
if (postObject) {
response = await axios.post(`http://${url}:${urlPort}${command}`, postObject, axiosConfig);
response = await axios.post(`https://${url.replace(/\./g, '-')}-${urlPort}.node.api.runonflux.io${command}`, postObject, axiosConfig);
} else {
response = await axios.get(`http://${url}:${urlPort}${command}`, axiosConfig);
response = await axios.get(`https://${url.replace(/\./g, '-')}-${urlPort}.node.api.runonflux.io${command}`, axiosConfig);
}
return response;
} catch (error) {
this.showToast('danger', command);
this.showToast('danger', error.message || error);
return null;
}
Expand Down
2 changes: 1 addition & 1 deletion HomeUI/src/views/apps/marketplace/AppView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1215,7 +1215,7 @@ export default {
throw new Error(resp.data.message || resp.data);
}
showToast('success', 'Successful upload of Contact Parameter to Flux Storage');
appSpecification.contacts = [`F_S_CONTACTS==https://storage.runonflux.io/v1/contacts/${contactsid}`];
appSpecification.contacts = [`F_S_CONTACTS=https://storage.runonflux.io/v1/contacts/${contactsid}`];
}
}
if (props.appData.version >= 6) {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "flux",
"version": "4.32.0",
"version": "4.32.1",
"description": "Flux, Your Gateway to a Decentralized World",
"repository": {
"type": "git",
Expand Down

0 comments on commit 9f5613e

Please sign in to comment.