-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #401 from brickbox-io/master
Merge pull request #398 from brickbox-io/dependabot/github_actions/actions/setup-node-3.3.0
- Loading branch information
Showing
29 changed files
with
551 additions
and
45 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| function OpenConfiguration(brick_id) { | ||
| var formData = new FormData(); | ||
| var xhttp = new XMLHttpRequest(); | ||
| var url = '/vm/brick/info' | ||
|
|
||
| formData.append('brick_id', brick_id); | ||
|
|
||
| xhttp.onload = function () { | ||
| var birck_info = JSON.parse(this.responseText); | ||
| console.log(birck_info); | ||
|
|
||
| document.getElementById('config-current_gpu').innerHTML = birck_info.gpu_count; | ||
| document.getElementById('config-current_gpu').dataset.count = birck_info.gpu_count; | ||
|
|
||
| document.getElementById('config-current_cpu').innerHTML = birck_info.cpu_count; | ||
| document.getElementById('config-current_cpu').dataset.count = birck_info.cpu_count; | ||
|
|
||
| document.getElementById('config-current_memory').innerHTML = birck_info.memory_quantity; | ||
| document.getElementById('config-current_memory').dataset.count = birck_info.memory_quantity; | ||
|
|
||
| document.getElementById('SaveResourceChanges').dataset.brick_id = brick_id; | ||
|
|
||
| $("#brick_configure").modal('toggle'); | ||
| }; | ||
|
|
||
| xhttp.open('POST', url, true); | ||
| xhttp.setRequestHeader("X-CSRFToken", csrftoken); | ||
| xhttp.send(formData); | ||
| } | ||
|
|
||
| function IncreaseResourceCount(resource) { | ||
| var count = parseInt(document.getElementById('config-current_'+ resource).dataset.count); | ||
| var new_count = parseInt(count) + 1; | ||
|
|
||
| document.getElementById('config-current_'+ resource).innerHTML = new_count; | ||
| document.getElementById('config-current_'+ resource).dataset.count = new_count; | ||
| } | ||
|
|
||
| function DecreaseResourceCount(resource) { | ||
| var count = parseInt(document.getElementById('config-current_'+ resource).dataset.count); | ||
| var new_count = parseInt(count) - 1; | ||
|
|
||
| document.getElementById('config-current_'+ resource).innerHTML = new_count; | ||
| document.getElementById('config-current_'+ resource).dataset.count = new_count; | ||
| } | ||
|
|
||
| function SaveResourceChanges(brick_id) { | ||
| var formData = new FormData(); | ||
| var xhttp = new XMLHttpRequest(); | ||
| var url = '/vm/brick/update_resources' | ||
|
|
||
| formData.append('brick_id', brick_id); | ||
| formData.append('gpu_count', document.getElementById('config-current_gpu').dataset.count); | ||
| formData.append('cpu_count', document.getElementById('config-current_cpu').dataset.count); | ||
| formData.append('memory_quantity', document.getElementById('config-current_memory').dataset.count); | ||
|
|
||
| xhttp.onload = function () { | ||
| $("#brick_configure").modal('toggle'); | ||
| }; | ||
|
|
||
| xhttp.open('POST', url, true); | ||
| xhttp.setRequestHeader("X-CSRFToken", csrftoken); | ||
| xhttp.send(formData); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| <div class="modal fade" tabindex="-1" role="dialog" aria-labelledby="ConfigureBrick" aria-hidden="true" id="brick_configure"> | ||
| <div class="modal-dialog modal-md"> | ||
| <div class="modal-content"> | ||
| <div class="modal-body"> | ||
| Configure Brick | ||
|
|
||
| <table> | ||
|
|
||
| <!-- Add/Remove GPUs --> | ||
| <tr> | ||
| <td> | ||
| GPUs | ||
| </td> | ||
| <td> | ||
| <button type="button" class="btn btn-default btn-link btn-icon btn-sm" onclick="DecreaseResourceCount('gpu')"> | ||
| <i class=" material-icons">indeterminate_check_box</i> | ||
| </button> | ||
|
|
||
| <span id="config-current_gpu"></span> | ||
|
|
||
| <button type="button" class="btn btn-default btn-link btn-icon btn-sm" onclick="IncreaseResourceCount('gpu')"> | ||
| <i class="material-icons">add_box</i> | ||
| </button> | ||
| </td> | ||
| </tr> | ||
|
|
||
|
|
||
| <!-- Add/Remove vCPUs --> | ||
| <tr> | ||
| <td> | ||
| vCPUs | ||
| </td> | ||
| <td> | ||
| <button type="button" class="btn btn-default btn-link btn-icon btn-sm" onclick="DecreaseResourceCount('cpu')" disabled> | ||
| <i class="material-icons">indeterminate_check_box</i> | ||
| </button> | ||
|
|
||
| <span id="config-current_cpu"></span> | ||
|
|
||
| <button type="button" class="btn btn-default btn-link btn-icon btn-sm" onclick="IncreaseResourceCount('cpu')" disabled> | ||
| <i class="material-icons">add_box</i> | ||
| </button> | ||
| </td> | ||
| </tr> | ||
|
|
||
| <!-- Increase/Decrease Memory --> | ||
| <tr> | ||
| <td> | ||
| Memory | ||
| </td> | ||
| <td> | ||
| <button type="button" class="btn btn-default btn-link btn-icon btn-sm" onclick="DecreaseResourceCount('memory')" disabled> | ||
| <i class="material-icons">indeterminate_check_box</i> | ||
| </button> | ||
|
|
||
| <span id="config-current_memory"></span> | ||
| <span id="config-current_memory">GB</span> | ||
|
|
||
| <button type="button" class="btn btn-default btn-link btn-icon btn-sm" onclick="IncreaseResourceCount('memory')" disabled> | ||
| <i class="material-icons">add_box</i> | ||
| </button> | ||
| </td> | ||
| </tr> | ||
|
|
||
|
|
||
| </table> | ||
|
|
||
| </div> | ||
|
|
||
| <div class="modal-footer"> | ||
| <button type="button" class="btn btn-default" data-dismiss="modal">Close</button> | ||
| <button type="button" class="btn btn-primary" id="SaveResourceChanges" onclick="SaveResourceChanges(this.dataset.brick_id)">Save changes</button> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| # Generated by Django 3.2.12 on 2022-06-13 18:33 | ||
|
|
||
| from django.db import migrations, models | ||
|
|
||
|
|
||
| class Migration(migrations.Migration): | ||
|
|
||
| dependencies = [ | ||
| ('bb_data', '0059_auto_20220511_1324'), | ||
| ] | ||
|
|
||
| operations = [ | ||
| migrations.AddField( | ||
| model_name='billinghistory', | ||
| name='invoice_number', | ||
| field=models.CharField(blank=True, max_length=100, null=True), | ||
| ), | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.