Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

menu drawer #429

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+487 −479
Open

menu drawer #429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
449c3db
menu drawer
LexLuthr Mar 4, 2025
d358179
fix margin, menu on left
LexLuthr Mar 5, 2025
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
8 changes: 0 additions & 8 deletions web/api/webrpc/sector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package webrpc

import (
"context"
"fmt"
"strconv"
"strings"
"time"
Expand Down Expand Up @@ -194,8 +193,6 @@ func (a *WebRPC) SectorInfo(ctx context.Context, sp string, intid int64) (*Secto
return nil, xerrors.Errorf("invalid sp")
}

fmt.Println("SPID", spid)

si := &SectorInfo{
SpID: spid,
Miner: maddr.String(),
Expand Down Expand Up @@ -226,10 +223,6 @@ func (a *WebRPC) SectorInfo(ctx context.Context, sp string, intid int64) (*Secto
return nil, xerrors.Errorf("failed to fetch pipeline task info: %w", err)
}

if len(tasks) == 0 {
fmt.Println("NO PIPELINE")
}

// Fetch SnapDeals pipeline data
var snapTasks []SnapPipelineTask

Expand Down Expand Up @@ -265,7 +258,6 @@ func (a *WebRPC) SectorInfo(ctx context.Context, sp string, intid int64) (*Secto

var sle *sectorListEntry
if len(tasks) > 0 {
fmt.Println("FOUND THE PIPELINE")
task := tasks[0]
if task.PreCommitMsgCid != nil {
si.PreCommitMsg = *task.PreCommitMsgCid
Expand Down
299 changes: 152 additions & 147 deletions web/static/config/edit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,163 +1,168 @@
<!DOCTYPE html>
<html lang="en" data-bs-theme="dark">
<head>
<title>JSON Schema Editor</title>
<script type="module" src="/ux/curio-ux.mjs"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/axios/0.21.1/axios.min.js"></script>
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/@json-editor/[email protected]/dist/jsoneditor.min.js"></script>
<link href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.13.2/themes/ui-darkness/jquery-ui.min.css" rel="stylesheet">
<link href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.13.2/themes/ui-darkness/theme.min.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
</head>
<body style="visibility: hidden;">
<style>
#saveButton {
display: block;
position: fixed;
bottom: 20px;
right: 30px;
z-index: 99;
font-size: 18px;
border: none;
outline: none;
background-color: green;
color: white;
cursor: pointer;
padding: 15px;
border-radius: 4px;
}
<head>
<title>JSON Schema Editor</title>
<script type="module" src="/ux/curio-ux.mjs"></script>
<script type="module" src="/ux/components/Drawer.mjs"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/axios/0.21.1/axios.min.js"></script>
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/@json-editor/[email protected]/dist/jsoneditor.min.js"></script>
<link href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.13.2/themes/ui-darkness/jquery-ui.min.css" rel="stylesheet">
<link href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.13.2/themes/ui-darkness/theme.min.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
</head>
<body style="visibility: hidden;">
<style>
#saveButton {
display: block;
position: fixed;
bottom: 20px;
right: 30px;
z-index: 99;
font-size: 18px;
border: none;
outline: none;
background-color: green;
color: white;
cursor: pointer;
padding: 15px;
border-radius: 4px;
}

#saveButton:hover {
background-color: #555;
}
#saveButton:hover {
background-color: #555;
}

.help-button button {
font-size: 24px;
border-radius: 50%;
width: 50px;
height: 50px;
position: fixed;
bottom: 20px;
right: 120px;
z-index: 99;
}
.help-button button {
font-size: 24px;
border-radius: 50%;
width: 50px;
height: 50px;
position: fixed;
bottom: 20px;
right: 120px;
z-index: 99;
}

.help-text {
display: none;
position: fixed;
border: 1px solid #ccc;
background-color: gray;
padding: 10px;
width: 200px;
bottom: 20px;
right: 200px;
z-index: 100;
box-shadow: 0 4px 8px rgba(0,0,0,0.1);
}
.help-text {
display: none;
position: fixed;
border: 1px solid #ccc;
background-color: gray;
padding: 10px;
width: 200px;
bottom: 20px;
right: 200px;
z-index: 100;
box-shadow: 0 4px 8px rgba(0,0,0,0.1);
}

.hidden {
display: none;
}
.hidden {
display: none;
}

.show {
display: block;
}
.show {
display: block;
}

/* Fix for dark mode */
.card.bg-light {
background-color: rgb(11, 22, 34) !important;
}
input.form-control {
background: #111;
color: white;
font-weight: bold;
}
</style>
<curio-ux>
<section class="section container-fluid implementations">
<div class="row justify-content-center content">
<div class="col-md-8">
<div>
<button id="saveButton" class="saveButton">Save</button>
</div>
/* Fix for dark mode */
.card.bg-light {
background-color: rgb(11, 22, 34) !important;
}
input.form-control {
background: #111;
color: white;
font-weight: bold;
}
</style>
<curio-ux>
<section class="section container-fluid implementations">
<div class="row justify-content-center content">
<div class="col-md-8">
<div>
<button id="saveButton" class="saveButton">Save</button>
</div>

<div class="help-button">
<button id="helpBtn">?</button>
<p id="helpText" class="hidden help-text">Checking a box and entering a non default value will uncomment the corresponding configuration variable.
Unchecking a box will reset the value to default.</p>
</div>
<div class="help-button">
<button id="helpBtn">?</button>
<p id="helpText" class="hidden help-text">Checking a box and entering a non default value will uncomment the corresponding configuration variable.
Unchecking a box will reset the value to default.</p>
</div>

<div id="editor" data-bs-theme="dark"></div>
<script>
var editor;
var urlParams = new URLSearchParams(window.location.search);
var layer = urlParams.get('layer');
// Make simultaneous GET requests to fetch the existing data and JSON Schema
const layerPath = layer === 'default' ? 'config/default' : `config/layers/${layer}`;
Promise.all([
axios.get(`/api/${layerPath}`),
axios.get('/api/config/schema')
])
.then(responses => {
const existingData = responses[0].data;
const schema = responses[1].data;
<div id="editor" data-bs-theme="dark"></div>
<script>
console.log(document.querySelector('ui-drawer'));
console.log(document.querySelector('curio-ux'));

// Create a JSON Editor instance and pass the schema and existing data
const container = document.getElementById('editor');
const options = {
//mode: 'tree',
schema: schema,
startval: existingData,
theme: 'bootstrap5',
iconlib: 'jqueryui',
show_opt_in: true,
disable_edit_json: true,
form_name_root: "Configuration",
disable_properties: true,
};
var editor;
var urlParams = new URLSearchParams(window.location.search);
var layer = urlParams.get('layer');
// Make simultaneous GET requests to fetch the existing data and JSON Schema
const layerPath = layer === 'default' ? 'config/default' : `config/layers/${layer}`;
Promise.all([
axios.get(`/api/${layerPath}`),
axios.get('/api/config/schema')
])
.then(responses => {
const existingData = responses[0].data;
const schema = responses[1].data;

editor = new JSONEditor(container, options);
// Create a JSON Editor instance and pass the schema and existing data
const container = document.getElementById('editor');
const options = {
//mode: 'tree',
schema: schema,
startval: existingData,
theme: 'bootstrap5',
iconlib: 'jqueryui',
show_opt_in: true,
disable_edit_json: true,
form_name_root: "Configuration",
disable_properties: true,
};

document.getElementById("helpBtn").addEventListener("click", function() {
var helpText = document.getElementById("helpText");
if (helpText.classList.contains("hidden")) {
helpText.classList.remove("hidden");
helpText.classList.add("show");
} else {
helpText.classList.remove("show");
helpText.classList.add("hidden");
}
});
editor = new JSONEditor(container, options);

// Attach function to saveButton click event
var saveButton = document.getElementById('saveButton');
saveButton.addEventListener('click', function() {
if (layer === 'default'){
alert('Error: cannot edit defaults');
} else {
const value = editor.getValue();
console.log(value)
axios.post('/api/config/layers/' + layer, value)
.then(response => {
// Set cookie named 'message' with the value 'Data saved successfully'
document.cookie = 'message=The layer "' + layer + '" saved successfully. Please restart all nodes using the layer "' + layer + '".; path=/;';
window.location.href = '/pages/config/list/';
})
.catch(error => {
alert('Error saving data:', error);
document.getElementById("helpBtn").addEventListener("click", function() {
var helpText = document.getElementById("helpText");
if (helpText.classList.contains("hidden")) {
helpText.classList.remove("hidden");
helpText.classList.add("show");
} else {
helpText.classList.remove("show");
helpText.classList.add("hidden");
}
});
}
});
})
.catch(error => {
console.error('Error fetching data:', error);
});
</script>
</div>
</div>
</section></curio-ux>
</body>

// Attach function to saveButton click event
var saveButton = document.getElementById('saveButton');
saveButton.addEventListener('click', function() {
if (layer === 'default'){
alert('Error: cannot edit defaults');
} else {
const value = editor.getValue();
console.log(value)
axios.post('/api/config/layers/' + layer, value)
.then(response => {
// Set cookie named 'message' with the value 'Data saved successfully'
document.cookie = 'message=The layer "' + layer + '" saved successfully. Please restart all nodes using the layer "' + layer + '".; path=/;';
window.location.href = '/pages/config/list/';
})
.catch(error => {
alert('Error saving data:', error);
});
}
});
})
.catch(error => {
console.error('Error fetching data:', error);
});
</script>
</div>
</div>
</section>
</curio-ux>
</body>
</html>
3 changes: 2 additions & 1 deletion web/static/gc/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@
<head>
<title>Storage GC</title>
<script type="module" src="/ux/curio-ux.mjs"></script>
<script type="module" src="/ux/components/Drawer.mjs"></script>
<script type="module" src="/storage-gc.mjs"></script>
<script type="module" src="gc-marks.mjs"></script>
</head>

<body style="visibility:hidden" data-bs-theme="dark">
<curio-ux>
<div class="page">
<div class="page" style="margin-left: 20px; margin-right: 10px">
<section class="section">
<div class="row">
<h1>Storage GC Info</h1>
Expand Down
3 changes: 2 additions & 1 deletion web/static/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<script type="module" src="pipeline-stats.mjs"></script>
<script type="module" src="actor-summary.mjs"></script>
<script type="module" src="/ux/curio-ux.mjs"></script>
<script type="module" src="/ux/components/Drawer.mjs"></script>
<script type="module" src="/ux/components/Drawer.mjs"></script>
<script src="https://cdn.jsdelivr.net/npm/chartjs-plugin-datalabels@2"></script>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css"
Expand Down Expand Up @@ -45,7 +46,7 @@
</head>
<body style="visibility:hidden">
<curio-ux>
<div class="page">
<div class="page" style="margin-left: 20px; margin-right: 10px">
<div class="row">
<div class="col-md-auto" style="max-width: 1000px">
<div class="info-block">
Expand Down
3 changes: 2 additions & 1 deletion web/static/pages/actor/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
<script src="https://cdn.jsdelivr.net/npm/chartjs-plugin-datalabels@2"></script>
<script type="module" src="/ux/curio-ux.mjs"></script>
<script type="module" src="/ux/components/Drawer.mjs"></script>
<script type="module" src="actor-detail.mjs"></script>
</head>
<body style="visibility:hidden" data-bs-theme="dark">
<curio-ux>
<div class="page">
<div class="page" style="margin-left: 20px; margin-right: 10px">
<section class="section">
<div class="row">
<h1>Miner Info</h1>
Expand Down
Loading