Skip to content

Commit

Permalink
Merge pull request #192 from zelcash/development
Browse files Browse the repository at this point in the history 
v1.4.2
  • Loading branch information
@TheTrunk
TheTrunk authored Nov 5, 2020
2 parents ef20de4 + 317f19f commit 4638ea2
Show file tree
Hide file tree
Showing 8 changed files with 72 additions and 5 deletions.
4 changes: 2 additions & 2 deletions ZelBack/src/services/zelnodeService.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ async function adjustCruxID(req, res) {
const fluxDirPath = path.join(__dirname, '../../../config/userconfig.js');
const dataToWrite = `module.exports = {
initial: {
paddress: '${userconfig.initial.ipaddress || '127.0.0.1'}',
ipaddress: '${userconfig.initial.ipaddress || '127.0.0.1'}',
zelid: '${userconfig.initial.zelid || config.zelTeamZelId}',
cruxid: '${cruxid}',
kadena: '${userconfig.initial.kadena || ''}',
Expand Down Expand Up @@ -636,7 +636,7 @@ async function adjustKadenaAccount(req, res) {
const fluxDirPath = path.join(__dirname, '../../../config/userconfig.js');
const dataToWrite = `module.exports = {
initial: {
paddress: '${userconfig.initial.ipaddress || '127.0.0.1'}',
ipaddress: '${userconfig.initial.ipaddress || '127.0.0.1'}',
zelid: '${userconfig.initial.zelid || config.zelTeamZelId}',
cruxid: '${userconfig.initial.cruxid || ''}',
kadena: '${kadenaURI}',
Expand Down
28 changes: 28 additions & 0 deletions ZelFront/src/components/ZelAdmin.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
iconColor="red"
title="This action will log out your selected session."
@onConfirm="logoutSpecificSession(scope.$index, scope.row)"
@confirm="logoutSpecificSession(scope.$index, scope.row)"
>
<ElButton
size="mini"
Expand All @@ -63,6 +64,7 @@
iconColor="red"
title="This action will log out ALL your sessions include the one currently used!"
@onConfirm="logoutAllSessions()"
@confirm="logoutAllSessions()"
>
<ElButton slot="reference">
Log Out all sessions
Expand All @@ -88,6 +90,7 @@
iconColor="orange"
title="Flux will now update your Crux ID."
@onConfirm="adjustCruxID()"
@confirm="adjustCruxID()"
>
<ElButton slot="reference">
Update Crux ID
Expand Down Expand Up @@ -121,6 +124,7 @@
iconColor="orange"
title="Flux will now update your Kadena Account"
@onConfirm="adjustKadena()"
@confirm="adjustKadena()"
>
<ElButton slot="reference">
Update Kadena account
Expand All @@ -147,6 +151,7 @@
iconColor="orange"
title="Flux will now begin updating itself."
@onConfirm="updateZelFlux()"
@confirm="updateZelFlux()"
>
<ElButton slot="reference">
Update Flux
Expand All @@ -163,6 +168,7 @@
iconColor="red"
title="Rebuilds Flux User Interface. Useful for resolving minor UI issues."
@onConfirm="rebuildZelFront()"
@confirm="rebuildZelFront()"
>
<ElButton slot="reference">
Rebuild ZelFront
Expand All @@ -179,6 +185,7 @@
iconColor="red"
title="Reindexes ALL Flux databases and rebuilds them from scratch"
@onConfirm="reindexFlux()"
@confirm="reindexFlux()"
>
<ElButton slot="reference">
Reindex Flux databases
Expand All @@ -191,6 +198,7 @@
iconColor="red"
title="Reindexes Explorer tied databases and rebuilds them from scratch"
@onConfirm="reindexExplorer()"
@confirm="reindexExplorer()"
>
<ElButton slot="reference">
Reindex Explorer databases
Expand All @@ -216,6 +224,7 @@
iconColor="red"
title="Rescans ALL Flux databases and rebuilds them from scratch"
@onConfirm="rescanFlux()"
@confirm="rescanFlux()"
>
<ElButton slot="reference">
Rescan Flux databases
Expand All @@ -237,6 +246,7 @@
iconColor="red"
title="Rescans Explorer tied databases and rebuilds them from scratch"
@onConfirm="rescanExplorer()"
@confirm="rescanExplorer()"
>
<ElButton slot="reference">
Rescan Explorer databases
Expand Down Expand Up @@ -273,6 +283,7 @@
iconColor="red"
title="Rescans Global Applications from stored permanent messages given a blockheight."
@onConfirm="rescanGlobalApps()"
@confirm="rescanGlobalApps()"
>
<ElButton slot="reference">
Rescan Global Apps Information
Expand All @@ -289,6 +300,7 @@
iconColor="red"
title="Reindexes Global Application Speicifications from stored permanent messages"
@onConfirm="reindexGlobalApps()"
@confirm="reindexGlobalApps()"
>
<ElButton slot="reference">
Reindex Global Apps Information
Expand All @@ -305,6 +317,7 @@
iconColor="red"
title="Reindexes that drops information about where each application on the network is located and rebuilds collection indexes. Locations will be rebuild from incoming messages."
@onConfirm="reindexLocations()"
@confirm="reindexLocations()"
>
<ElButton slot="reference">
Reindex Global Apps Locations
Expand All @@ -321,6 +334,7 @@
iconColor="red"
title="This will restart Flux block processing which is a crucial process for Explorer and Apps functionality. Use with caution!"
@onConfirm="restartBlockProcessing()"
@confirm="restartBlockProcessing()"
>
<ElButton slot="reference">
Restart Block Processing
Expand All @@ -333,6 +347,7 @@
iconColor="red"
title="This will stop Flux block processing which is a crucial process for Explorer and Apps functionality. Your node may go offline if block processing is not running!"
@onConfirm="stopBlockProcessing()"
@confirm="stopBlockProcessing()"
>
<ElButton slot="reference">
Stop Block Processing
Expand All @@ -350,6 +365,7 @@
iconColor="orange"
title="Updates ZelCash daemon to the latest version"
@onConfirm="updateZelCash()"
@confirm="updateZelCash()"
>
<ElButton slot="reference">
Update ZelCash
Expand All @@ -366,6 +382,7 @@
iconColor="green"
title="Starts ZelCash daemon"
@onConfirm="startZelCash()"
@confirm="startZelCash()"
>
<ElButton slot="reference">
Start ZelCash
Expand All @@ -378,6 +395,7 @@
iconColor="red"
title="Stops ZelCash daemon"
@onConfirm="stopZelCash()"
@confirm="stopZelCash()"
>
<ElButton slot="reference">
Stop ZelCash
Expand All @@ -390,6 +408,7 @@
iconColor="orange"
title="Restarts ZelCash daemon"
@onConfirm="restartZelCash()"
@confirm="restartZelCash()"
>
<ElButton slot="reference">
Restart ZelCash
Expand All @@ -414,6 +433,7 @@
iconColor="red"
title="Rescan ZelCash daemon"
@onConfirm="rescanZelCash()"
@confirm="rescanZelCash()"
>
<ElButton slot="reference">
Rescan ZelCash
Expand All @@ -430,6 +450,7 @@
iconColor="red"
title="Reindexes ZelCash daemon"
@onConfirm="reindexZelCash()"
@confirm="reindexZelCash()"
>
<ElButton slot="reference">
Reindex ZelCash
Expand All @@ -447,6 +468,7 @@
iconColor="orange"
title="Updates Zel daemon to the latest version"
@onConfirm="updateZelBench()"
@confirm="updateZelBench()"
>
<ElButton slot="reference">
Update ZelBench
Expand All @@ -463,6 +485,7 @@
iconColor="green"
title="Starts ZelBench daemon"
@onConfirm="startZelBench()"
@confirm="startZelBench()"
>
<ElButton slot="reference">
Start ZelBench
Expand All @@ -475,6 +498,7 @@
iconColor="red"
title="Stops ZelBench daemon"
@onConfirm="stopZelBench()"
@confirm="stopZelBench()"
>
<ElButton slot="reference">
Stop ZelBench
Expand All @@ -487,6 +511,7 @@
iconColor="orange"
title="Restarts ZelBench daemon"
@onConfirm="restartZelBench()"
@confirm="restartZelBench()"
>
<ElButton slot="reference">
Restart ZelBench
Expand All @@ -503,6 +528,7 @@
iconColor="orange"
title="Runs a complete new test of node benchmarking"
@onConfirm="restartBenchmarks()"
@confirm="restartBenchmarks()"
>
<ElButton slot="reference">
Restart Benchmarks
Expand Down Expand Up @@ -553,6 +579,7 @@
iconColor="red"
title="This action will log out selected user session."
@onConfirm="logoutSpecificSession(scope.$index, scope.row)"
@confirm="logoutSpecificSession(scope.$index, scope.row)"
>
<ElButton
size="mini"
Expand All @@ -572,6 +599,7 @@
iconColor="red"
title="This action will log out ALL users including you!"
@onConfirm="logOutAllUsers()"
@confirm="logOutAllUsers()"
>
<ElButton slot="reference">
Log Out all users
Expand Down
19 changes: 19 additions & 0 deletions ZelFront/src/components/ZelApps.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
iconColor="red"
title="Stops Application"
@onConfirm="stopZelApp(scope.row.Names[0].substr(1, scope.row.Names[0].length))"
@confirm="stopZelApp(scope.row.Names[0].substr(1, scope.row.Names[0].length))"
>
<ElButton slot="reference">
Stop
Expand Down Expand Up @@ -131,6 +132,7 @@
iconColor="green"
title="Starts Application"
@onConfirm="startZelApp(scope.row.name)"
@confirm="startZelApp(scope.row.name)"
>
<ElButton slot="reference">
Start
Expand All @@ -143,6 +145,7 @@
iconColor="orange"
title="Retarts Application"
@onConfirm="restartZelApp(scope.row.name)"
@confirm="restartZelApp(scope.row.name)"
>
<ElButton slot="reference">
Restart
Expand All @@ -164,6 +167,7 @@
iconColor="red"
title="Removes Application"
@onConfirm="removeZelApp(scope.row.name)"
@confirm="removeZelApp(scope.row.name)"
>
<ElButton slot="reference">
Remove
Expand All @@ -185,6 +189,7 @@
iconColor="green"
title="Opens Application management centre"
@onConfirm="openAppManagement(scope.row.name)"
@confirm="openAppManagement(scope.row.name)"
>
<ElButton slot="reference">
Manage
Expand Down Expand Up @@ -285,6 +290,7 @@
iconColor="green"
title="Installs Application"
@onConfirm="installTemporaryLocalApp(scope.row.name)"
@confirm="installTemporaryLocalApp(scope.row.name)"
>
<ElButton slot="reference">
Install
Expand Down Expand Up @@ -358,6 +364,7 @@
iconColor="green"
title="Starts Application"
@onConfirm="startZelApp(scope.row.name)"
@confirm="startZelApp(scope.row.name)"
>
<ElButton slot="reference">
Start
Expand All @@ -370,6 +377,7 @@
iconColor="orange"
title="Retarts Application"
@onConfirm="restartZelApp(scope.row.name)"
@confirm="restartZelApp(scope.row.name)"
>
<ElButton slot="reference">
Restart
Expand All @@ -390,6 +398,7 @@
iconColor="red"
title="Removes Application"
@onConfirm="removeZelApp(scope.row.name)"
@confirm="removeZelApp(scope.row.name)"
>
<ElButton slot="reference">
Remove
Expand All @@ -410,6 +419,7 @@
iconColor="green"
title="Opens Application management centre"
@onConfirm="openAppManagement(scope.row.name)"
@confirm="openAppManagement(scope.row.name)"
>
<ElButton slot="reference">
Manage
Expand Down Expand Up @@ -967,6 +977,7 @@
iconColor="orange"
title="Download Log file?"
@onConfirm="downloadApplicationLog()"
@confirm="downloadApplicationLog()"
>
<ElButton slot="reference">
Download Log File
Expand Down Expand Up @@ -1011,6 +1022,7 @@
iconColor="green"
title="Starts ZelApp"
@onConfirm="startZelApp(managedApplication)"
@confirm="startZelApp(managedApplication)"
>
<ElButton slot="reference">
Start ZelApp
Expand All @@ -1023,6 +1035,7 @@
iconColor="red"
title="Stops ZelApp"
@onConfirm="stopZelApp(managedApplication)"
@confirm="stopZelApp(managedApplication)"
>
<ElButton slot="reference">
Stop ZelApp
Expand All @@ -1035,6 +1048,7 @@
iconColor="orange"
title="Restarts ZelApp"
@onConfirm="restartZelApp(managedApplication)"
@confirm="restartZelApp(managedApplication)"
>
<ElButton slot="reference">
Restart ZelApp
Expand All @@ -1051,6 +1065,7 @@
iconColor="orange"
title="Pauses ZelApp"
@onConfirm="pauseZelApp(managedApplication)"
@confirm="pauseZelApp(managedApplication)"
>
<ElButton slot="reference">
Pause ZelApp
Expand All @@ -1063,6 +1078,7 @@
iconColor="orange"
title="Unpauses ZelApp"
@onConfirm="unpauseZelApp(managedApplication)"
@confirm="unpauseZelApp(managedApplication)"
>
<ElButton slot="reference">
Unpause ZelApp
Expand All @@ -1079,6 +1095,7 @@
iconColor="orange"
title="Redeploys ZelApp without data removal"
@onConfirm="redeployZelAppSoft(managedApplication)"
@confirm="redeployZelAppSoft(managedApplication)"
>
<ElButton slot="reference">
Soft Redeploy ZelApp
Expand All @@ -1091,6 +1108,7 @@
iconColor="red"
title="Redeploys ZelApp with data removal"
@onConfirm="redeployZelAppHard(managedApplication)"
@confirm="redeployZelAppHard(managedApplication)"
>
<ElButton slot="reference">
Hard Redeploy ZelApp
Expand All @@ -1107,6 +1125,7 @@
iconColor="red"
title="Removes ZelApp"
@onConfirm="removeZelApp(managedApplication)"
@confirm="removeZelApp(managedApplication)"
>
<ElButton slot="reference">
Remove ZelApp
Expand Down
Loading

0 comments on commit 4638ea2

Please sign in to comment.