YAO/YAO-portal
1
0
Fork 0
mirror of https://github.com/newnius/YAO-portal.git synced 2025-06-06 07:11:54 +00:00
Code Issues Releases Wiki Activity

update

Browse Source
This commit is contained in:
Newnius 2019-05-06 14:56:40 +08:00
parent e80f1c8480
commit 6229f86b06
11 changed files with 52 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.htaccess
View File

@ -5,3 +5,5 @@ RewriteRule ^auth$ /auth.php
RewriteRule ^help$ /help.php RewriteRule ^help$ /help.php
RewriteRule ^ucenter$ /ucenter.php RewriteRule ^ucenter$ /ucenter.php
ErrorDocument 404 /404.php

1
footer.php
View File

@ -16,7 +16,6 @@ require_once('config.inc.php');
<script src="https://cdn.jsdelivr.net/npm/bootstrap@3.3.7/dist/js/bootstrap.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/bootstrap@3.3.7/dist/js/bootstrap.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/eonasdan-bootstrap-datetimepicker@4.17.47/src/js/bootstrap-datetimepicker.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/eonasdan-bootstrap-datetimepicker@4.17.47/src/js/bootstrap-datetimepicker.min.js"></script>
<script src="static/config.js"></script>
<script src="static/util.js"></script> <script src="static/util.js"></script>
<script src="static/script.js"></script> <script src="static/script.js"></script>
<script async src="https://cdn.newnius.com/ana/ea.js"></script> <script async src="https://cdn.newnius.com/ana/ea.js"></script>

4
modals.php
View File

@ -85,7 +85,9 @@
<label>Workspace</label> <label>Workspace</label>
<div class="form-group form-group-lg"> <div class="form-group form-group-lg">
<label for="form-job-workspace" class="sr-only">Workspace</label> <label for="form-job-workspace" class="sr-only">Workspace</label>
<select id="form-job-workspace" class="form-control"></select> <select id="form-job-workspace" class="form-control">
<option value="">None</option>
</select>
</div> </div>
<label>Virtual Cluster</label> <label>Virtual Cluster</label>
<div class="form-group form-group-lg"> <div class="form-group form-group-lg">

6
static/agent.js
View File

@ -16,7 +16,7 @@ function register_events_agent() {
return; return;
var ajax = $.ajax({ var ajax = $.ajax({
url: window.config.BASE_URL + "/service?action=agent_add", url: "service?action=agent_add",
type: 'POST', type: 'POST',
data: { data: {
ip: ip, ip: ip,
@ -42,7 +42,7 @@ function register_events_agent() {
function load_agents(cluster) { function load_agents(cluster) {
$("#table-agent").bootstrapTable({ $("#table-agent").bootstrapTable({
url: window.config.BASE_URL + '/service?action=agent_list&who=' + cluster, url: 'service?action=agent_list&who=' + cluster,
responseHandler: agentResponseHandler, responseHandler: agentResponseHandler,
sidePagination: 'server', sidePagination: 'server',
cache: true, cache: true,
@ -123,7 +123,7 @@ window.agentOperateEvents = {
return; return;
} }
var ajax = $.ajax({ var ajax = $.ajax({
url: window.config.BASE_URL + "/service?action=agent_remove", url: "service?action=agent_remove",
type: 'POST', type: 'POST',
data: {id: row.id} data: {id: row.id}
}); });

5
static/config.js
View File

@ -1,5 +0,0 @@
window.config = {
'BASE_URL': 'http://127.0.0.1' /* No '/' at the end */
};

27
static/job.js
View File

@ -2,13 +2,20 @@ function register_events_job() {
$('#btn-job-add').click(function (e) { $('#btn-job-add').click(function (e) {
cb = function (workspaces) { cb = function (workspaces) {
$('#form-job-workspace').children().remove(); $('#form-job-workspace').children().remove();
var newGroupOption = '<option value="" selected>None</option>';
$('#form-job-workspace').append(newGroupOption);
$.each(workspaces, function (i, workspace) { $.each(workspaces, function (i, workspace) {
var newGroupOption = '<option value="' + workspace.git_repo + '">' + workspace.name + '</option>'; var newGroupOption = '<option value="' + workspace.git_repo + '">' + workspace.name + '</option>';
$('#form-job-workspace').append(newGroupOption); $('#form-job-workspace').append(newGroupOption);
}); });
}; };
wordspace_gets(null, cb); wordspace_gets(null, cb);
$('#form-job-name').val('');
$('#form-job-priority').val(25);
$('#form-job-cluster').val(1);
$('#modal-job').modal('show'); $('#modal-job').modal('show');
}); });
@ -38,15 +45,17 @@ function register_events_job() {
if (name.length === 0) { if (name.length === 0) {
return true; return true;
} }
if (workspace.length === 0) { $.each(tasks, function (i, task) {
return true; if (task['name'].length === 0) {
} return true;
}
});
$('#modal-job').modal('hide'); $('#modal-job').modal('hide');
var ajax = $.ajax({ var ajax = $.ajax({
url: window.config.BASE_URL + "/service?action=job_submit", url: "service?action=job_submit",
type: 'POST', type: 'POST',
data: { data: {
name: name, name: name,
@ -76,7 +85,7 @@ function register_events_job() {
function load_jobs(scope) { function load_jobs(scope) {
$("#table-job").bootstrapTable({ $("#table-job").bootstrapTable({
url: window.config.BASE_URL + '/service?action=job_list&who=' + scope, url: 'service?action=job_list&who=' + scope,
responseHandler: jobResponseHandler, responseHandler: jobResponseHandler,
sidePagination: 'server', sidePagination: 'server',
cache: true, cache: true,
@ -242,7 +251,7 @@ window.jobOperateEvents = {
return; return;
} }
var ajax = $.ajax({ var ajax = $.ajax({
url: window.config.BASE_URL + "/service?action=job_stop", url: "service?action=job_stop",
type: 'POST', type: 'POST',
data: {id: row.name} data: {id: row.name}
}); });
@ -263,7 +272,7 @@ window.jobOperateEvents = {
function load_job_status(name) { function load_job_status(name) {
$("#table-task").bootstrapTable({ $("#table-task").bootstrapTable({
url: window.config.BASE_URL + '/service?action=job_status&name=' + name, url: 'service?action=job_status&name=' + name,
responseHandler: jobStatusResponseHandler, responseHandler: jobStatusResponseHandler,
sidePagination: 'server', sidePagination: 'server',
cache: true, cache: true,
@ -361,7 +370,7 @@ window.jobStatusOperateEvents = {
var task = row.id; var task = row.id;
var ajax = $.ajax({ var ajax = $.ajax({
url: window.config.BASE_URL + "/service?action=task_logs", url: "service?action=task_logs",
type: 'GET', type: 'GET',
data: { data: {
job: job, job: job,

2
static/resource.js
View File

@ -4,7 +4,7 @@ function register_events_resource() {
function load_resources() { function load_resources() {
$("#table-resource").bootstrapTable({ $("#table-resource").bootstrapTable({
url: window.config.BASE_URL + '/service?action=resource_list', url: 'service?action=resource_list',
responseHandler: resourceResponseHandler, responseHandler: resourceResponseHandler,
sidePagination: 'server', sidePagination: 'server',
cache: true, cache: true,

4
static/script.js
View File

@ -2,7 +2,7 @@ $(function () {
$("#btn-signout").click(function (e) { $("#btn-signout").click(function (e) {
e.preventDefault(); e.preventDefault();
var ajax = $.ajax({ var ajax = $.ajax({
url: window.config.BASE_URL + "/service?action=user_signout", url: "service?action=user_signout",
type: 'POST', type: 'POST',
data: {} data: {}
}); });
@ -14,7 +14,7 @@ $(function () {
$("#btn-oauth-login").click(function (e) { $("#btn-oauth-login").click(function (e) {
e.preventDefault(); e.preventDefault();
var ajax = $.ajax({ var ajax = $.ajax({
url: window.config.BASE_URL + "/service?action=user_login", url: "service?action=user_login",
type: 'POST', type: 'POST',
data: {} data: {}
}); });

28
static/summary.js
View File

@ -11,7 +11,7 @@ function summary_render() {
var ctx_gpu_mem = document.getElementById('summary-chart-gpu-mem').getContext('2d'); var ctx_gpu_mem = document.getElementById('summary-chart-gpu-mem').getContext('2d');
var ajax = $.ajax({ var ajax = $.ajax({
url: window.config.BASE_URL + "/service?action=summary_get", url: "service?action=summary_get",
type: 'GET', type: 'GET',
data: {} data: {}
}); });
@ -28,8 +28,6 @@ function summary_render() {
data: Object.values(res['jobs']), data: Object.values(res['jobs']),
backgroundColor: ["rgb(54, 162, 235)", "rgb(255, 99, 132)", "rgb(255, 205, 86)"] backgroundColor: ["rgb(54, 162, 235)", "rgb(255, 99, 132)", "rgb(255, 205, 86)"]
}], }],
// These labels appear in the legend and in the tooltips when hovering different arcs
labels: Object.keys(res['jobs']) labels: Object.keys(res['jobs'])
}; };
var myPieChart = new Chart(ctx_jobs, { var myPieChart = new Chart(ctx_jobs, {
@ -52,8 +50,6 @@ function summary_render() {
data: Object.values(res['gpu']), data: Object.values(res['gpu']),
backgroundColor: ["rgb(54, 162, 235)", "rgb(255, 99, 132)"] backgroundColor: ["rgb(54, 162, 235)", "rgb(255, 99, 132)"]
}], }],
// These labels appear in the legend and in the tooltips when hovering different arcs
labels: Object.keys(res['gpu']) labels: Object.keys(res['gpu'])
}; };
var myPieChart2 = new Chart(ctx_gpu, { var myPieChart2 = new Chart(ctx_gpu, {
@ -78,7 +74,7 @@ function summary_render() {
var ajax_pool = $.ajax({ var ajax_pool = $.ajax({
url: window.config.BASE_URL + "/service?action=summary_get_pool_history", url: "service?action=summary_get_pool_history",
type: 'GET', type: 'GET',
data: {} data: {}
}); });
@ -120,7 +116,7 @@ function summary_render() {
"data": { "data": {
"labels": timestamps, "labels": timestamps,
"datasets": [{ "datasets": [{
"label": "My First Data set", "label": "CPU Load",
"data": cpu_util, "data": cpu_util,
"fill": true, "fill": true,
"borderColor": "rgb(75, 192, 192)", "borderColor": "rgb(75, 192, 192)",
@ -147,11 +143,17 @@ function summary_render() {
"data": { "data": {
"labels": timestamps, "labels": timestamps,
"datasets": [{ "datasets": [{
"label": "My First Data set", "label": "Using",
"data": mem_using, "data": mem_using,
"fill": true, "fill": true,
"borderColor": "rgb(75, 192, 192)", "borderColor": "rgb(75, 192, 192)",
"lineTension": 0.1 "lineTension": 0.1
}, {
"label": "Total",
"data": mem_total,
"fill": true,
"borderColor": "rgb(75, 192, 192)",
"lineTension": 0.1
}] }]
}, },
"options": { "options": {
@ -173,7 +175,7 @@ function summary_render() {
"data": { "data": {
"labels": timestamps, "labels": timestamps,
"datasets": [{ "datasets": [{
"label": "My First Data set", "label": "GPU Util",
"data": gpu_util, "data": gpu_util,
"fill": true, "fill": true,
"borderColor": "rgb(75, 192, 192)", "borderColor": "rgb(75, 192, 192)",
@ -200,11 +202,17 @@ function summary_render() {
"data": { "data": {
"labels": timestamps, "labels": timestamps,
"datasets": [{ "datasets": [{
"label": "My First Data set", "label": "Using",
"data": gpu_mem_using, "data": gpu_mem_using,
"fill": true, "fill": true,
"borderColor": "rgb(75, 192, 192)", "borderColor": "rgb(75, 192, 192)",
"lineTension": 0.1 "lineTension": 0.1
}, {
"label": "Total",
"data": gpu_mem_total,
"fill": true,
"borderColor": "rgb(75, 192, 192)",
"lineTension": 0.1
}] }]
}, },
"options": { "options": {

2
static/ucenter.js
View File

@ -38,7 +38,7 @@ $(function () {
function load_logs(scope) { function load_logs(scope) {
$("#table-log").bootstrapTable({ $("#table-log").bootstrapTable({
url: window.config.BASE_URL + '/service?action=log_gets&who=' + scope, url: 'service?action=log_gets&who=' + scope,
responseHandler: logResponseHandler, responseHandler: logResponseHandler,
sidePagination: 'server', sidePagination: 'server',
cache: true, cache: true,

8
static/workspace.js
View File

@ -20,7 +20,7 @@ function register_events_workspace() {
action = 'workspace_update'; action = 'workspace_update';
var ajax = $.ajax({ var ajax = $.ajax({
url: window.config.BASE_URL + "/service?action=" + action, url: "service?action=" + action,
type: 'POST', type: 'POST',
data: { data: {
id: id, id: id,
@ -48,7 +48,7 @@ function register_events_workspace() {
function load_workspaces(cluster) { function load_workspaces(cluster) {
$("#table-workspace").bootstrapTable({ $("#table-workspace").bootstrapTable({
url: window.config.BASE_URL + '/service?action=workspace_list&who=' + cluster, url: 'service?action=workspace_list&who=' + cluster,
responseHandler: workspaceResponseHandler, responseHandler: workspaceResponseHandler,
sidePagination: 'server', sidePagination: 'server',
cache: true, cache: true,
@ -125,7 +125,7 @@ function workspaceOperateFormatter(value, row, index) {
function wordspace_gets(cluster, cb) { function wordspace_gets(cluster, cb) {
var ajax = $.ajax({ var ajax = $.ajax({
url: window.config.BASE_URL + '/service?action=workspace_list&who=' + cluster, url: 'service?action=workspace_list&who=' + cluster,
type: 'GET', type: 'GET',
data: {} data: {}
}); });
@ -167,7 +167,7 @@ window.workspaceOperateEvents = {
return; return;
} }
var ajax = $.ajax({ var ajax = $.ajax({
url: window.config.BASE_URL + "/service?action=workspace_remove", url: "service?action=workspace_remove",
type: 'POST', type: 'POST',
data: {id: row.id} data: {id: row.id}
}); });