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

Add functionality to add new computers via the web interface #28

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add functionality to add new computers via the web interface #28

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
eeaae08
Add functionality to add new computers via the web interface
MRID0007 May 28, 2024
f2f017e
Implement add, delete, validation, and logging for computers
MRID0007 May 29, 2024
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
14 changes: 12 additions & 2 deletions data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ import (
"github.com/gocarina/gocsv"
)

// LoadComputerList loads the Computer and return the readed list or an error
// LoadComputerList loads the Computer and returns the read list or an error
func loadComputerList(computerCsvFilePath string) ([]Computer, error) {

var computers []Computer

computerCsvFilePointer, computerCsvFileOpenError := os.Open(computerCsvFilePath)
Expand All @@ -27,6 +26,17 @@ func loadComputerList(computerCsvFilePath string) ([]Computer, error) {
return computers, nil
}

// SaveComputerList saves the computer list to a CSV file
func saveComputerList(computerCsvFilePath string, computers []Computer) error {
file, err := os.OpenFile(computerCsvFilePath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0600)
if err != nil {
return err
}
defer file.Close()

return gocsv.MarshalFile(&computers, file)
}

// Test if Path is a File and it exists
func FileExists(name string) bool {
if fi, err := os.Stat(name); err == nil {
Expand Down
7 changes: 6 additions & 1 deletion main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (
var ComputerList []Computer

func main() {

// Start Processing Shell Arguments or use Default Values defined in const.go
httpPort, computerFilePath := processShellArgs()

Expand All @@ -36,6 +35,12 @@ func main() {
router.HandleFunc("/api/wakeup/computer/{computerName}", restWakeUpWithComputerName).Methods("GET")
router.HandleFunc("/api/wakeup/computer/{computerName}/", restWakeUpWithComputerName).Methods("GET")

// Define route for adding a new computer
router.HandleFunc("/api/add/computer", restAddComputer).Methods("POST")

// Define route for deleting a computer
router.HandleFunc("/api/delete/computer/{computerName}", restDeleteComputer).Methods("DELETE")

// Setup Webserver
httpListen := fmt.Sprint(":", httpPort)
log.Printf("Startup Webserver on \"%s\"", httpListen)
Expand Down
291 changes: 180 additions & 111 deletions pages/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,130 +1,199 @@
<!DOCTYPE html>
<html>
<head>
<title>GO-REST-WOL</title>
<!-- Required meta tags -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css" integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M" crossorigin="anonymous">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
<style>
.hideMe {
display: none;
}
</style>
</head>
<body>
<div class="container-fluid">
<div class="row">
<div class="col-12" role="main">
<h1><span class="fa fa-qq"></span> GO-REST-WOL <small>Your little Monster to Wakeup the lazy one</small></h1>
<div id="snackbar" class="alert hideMe">
Message comes here
<head>
<title>GO-REST-WOL</title>
<!-- Required meta tags -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css" integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M" crossorigin="anonymous">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
<style>
.hideMe {
display: none;
}
</style>
</head>
<body>
<div class="container-fluid">
<div class="row">
<div class="col-12" role="main">
<h1><span class="fa fa-qq"></span> GO-REST-WOL <small>Your little Monster to Wakeup the lazy one</small></h1>
<div id="snackbar" class="alert hideMe">
Message comes here
</div>
<!-- New Computer Form -->
<form id="newComputerForm">
<div class="form-group">
<label for="computerName">Computer Name</label>
<input type="text" class="form-control" id="computerName" placeholder="Enter computer name" required>
</div>
<table class="table">
<thead>
<tr>
<th></td>
<th>Computer</th>
<th>MAC Adress</th>
<th>Broadcast IP Address</th>
<th>API URL</th>
</tr>
</thead>
<tbody>
{{range .}}
<tr>
<td class="align-middle"><b><button id="bn_{{.Name}}" name="wolbutton" value="{{.Name}}" class="btn btn-success btn-sm" onclick="$.wakeUpComputerByName('{{.Name}}')">WakeUp</button></b></td>
<td class="align-middle">{{.Name}}</td>
<td class="align-middle">{{.Mac}}</td>
<td class="align-middle">{{.BroadcastIPAddress}}</td>
<td class="align-middle">/api/wakeup/computer/{{.Name}}</td>
</tr>
{{end}}
</tbody>
</table>
<hr>
<p>
<h3>REST API Usage</h3>
<b>/api/wakeup/computer/<span class="text-info">&lt;ComputerName&gt;</span></b>

<b>Returns a JSON Object</b>
<p>
<pre>
{
"success":true,
"message":"Succesfully Wakeup Computer Computer1 with Mac 64-07-2D-BB-BB-BF on Broadcast IP 192.168.10.254:9",
"error":null
}
</pre>
</p>
<dl class="dl-horizontal">
<dt>success</dt>
<dd>True or False if the WakeOnLan Paket was send</dd>
<dt>message</dt>
<dd>Message as string what happen</dd>
<dt>error</dt>
<dd>Encoded Jsonobject from GOLANG Error Object</dd>
</dl>
<div class="form-group">
<label for="macAddress">MAC Address</label>
<input type="text" class="form-control" id="macAddress" placeholder="Enter MAC address" required>
</div>
<div class="form-group">
<label for="broadcastIp">Broadcast IP Address</label>
<input type="text" class="form-control" id="broadcastIp" placeholder="Enter broadcast IP address" required>
</div>
<button type="submit" class="btn btn-primary">Add Computer</button>
</form>
<hr>
<table class="table">
<thead>
<tr>
<th></th>
<th>Computer</th>
<th>MAC Address</th>
<th>Broadcast IP Address</th>
<th>API URL</th>
<th></th>
</tr>
</thead>
<tbody id="computerList">
{{range .}}
<tr>
<td class="align-middle"><b><button id="bn_{{.Name}}" name="wolbutton" value="{{.Name}}" class="btn btn-success btn-sm" onclick="$.wakeUpComputerByName('{{.Name}}')">WakeUp</button></b></td>
<td class="align-middle">{{.Name}}</td>
<td class="align-middle">{{.Mac}}</td>
<td class="align-middle">{{.BroadcastIPAddress}}</td>
<td class="align-middle">/api/wakeup/computer/{{.Name}}</td>
<td class="align-middle"><b><button id="del_{{.Name}}" name="delbutton" value="{{.Name}}" class="btn btn-danger btn-sm" onclick="$.deleteComputer('{{.Name}}')">Delete</button></b></td>
</tr>
{{end}}
</tbody>
</table>
<hr>
<p>
<h3>REST API Usage</h3>
<b>/api/wakeup/computer/<span class="text-info">&lt;ComputerName&gt;</span></b>

</p>
<hr>
<b>Returns a JSON Object</b>
<p>
<span class="fa fa-github"></span> Project Page: <a href="https://github.com/dabondi/go-rest-wol">https://github.com/dabondi/go-rest-wol</a>
<pre>
{
"success":true,
"message":"Succesfully Wakeup Computer Computer1 with Mac 64-07-2D-BB-BB-BF on Broadcast IP 192.168.10.254:9",
"error":null
}
</pre>
</p>
<p>
<small>Build with <span class="fa fa-heart text-danger" aria-hidden="true"></span> by David Baumann, <span class="fa fa-github"></span> <a href="https://github.com/dabondi">https://github.com/dabondi</a></small>
</p>
</div>
<dl class="dl-horizontal">
<dt>success</dt>
<dd>True or False if the WakeOnLan Paket was send</dd>
<dt>message</dt>
<dd>Message as string what happen</dd>
<dt>error</dt>
<dd>Encoded Jsonobject from GOLANG Error Object</dd>
</dl>

</p>
<hr>
<p>
<span class="fa fa-github"></span> Project Page: <a href="https://github.com/dabondi/go-rest-wol">https://github.com/dabondi/go-rest-wol</a>
</p>
<p>
<small>Build with <span class="fa fa-heart text-danger" aria-hidden="true"></span> by David Baumann, <span class="fa fa-github"></span> <a href="https://github.com/dabondi">https://github.com/dabondi</a></small>
</p>
</div>
</div>
</div>

<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" integrity="sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script>

<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" integrity="sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script>
<script>
$(document).ready(function() {

<script>
$(document).ready(function() {
jQuery.showSnackBar = function(data){
$('#snackbar').text(data.message);
if( data.error != null) {
$('#snackbar').addClass('alert-danger');
$('#snackbar').removeClass('alert-success')
}else{
$('#snackbar').removeClass('alert-danger')
$('#snackbar').addClass('alert-success')
}
$('#snackbar').show();

jQuery.showSnackBar = function(data){
// After 2 seconds, hide the Div Again
setTimeout(function(){
$('#snackbar').hide();
}, 2000);
};

$('#snackbar').text(data.message);
if( data.error != null) {
$('#snackbar').addClass('alert-danger');
$('#snackbar').removeClass('alert-success')
}else{
$('#snackbar').removeClass('alert-danger')
$('#snackbar').addClass('alert-success')
jQuery.wakeUpComputerByName = function(computerName) {
$.ajax({
type: "GET",
url: "/api/wakeup/computer/" + computerName,
contentType: "application/json; charset=utf-8",
dataType: "json",
success: function(data) {
$.showSnackBar(data);
},
error: function(data,err)
{
$.showSnackBar(data);
console.error(data);
}
$('#snackbar').show();
})
};

// After 2 seconds, hide the Div Again
setTimeout(function(){
$('#snackbar').hide();
}, 2000);
// Function to handle the form submission
$('#newComputerForm').on('submit', function(event) {
event.preventDefault();
var newComputer = {
name: $('#computerName').val(),
mac: $('#macAddress').val(),
broadcastIp: $('#broadcastIp').val()
};

jQuery.wakeUpComputerByName = function(computerName) {
$.ajax({
type: "GET",
url: "/api/wakeup/computer/" + computerName,
contentType: "application/json; charset=utf-8",
dataType: "json",
success: function(data) {
$.showSnackBar(data);
},
error: function(data,err)
{
$.showSnackBar(data);
console.error(data);
$.ajax({
type: "POST",
url: "/api/add/computer",
contentType: "application/json; charset=utf-8",
data: JSON.stringify(newComputer),
success: function(data) {
$.showSnackBar({ message: "Computer added successfully", error: null });
if (data.success) {
// Add new computer to the table
$('#computerList').append('<tr>' +
'<td class="align-middle"><b><button id="bn_' + newComputer.name + '" name="wolbutton" value="' + newComputer.name + '" class="btn btn-success btn-sm" onclick="$.wakeUpComputerByName(\'' + newComputer.name + '\')">WakeUp</button></b></td>' +
'<td class="align-middle">' + newComputer.name + '</td>' +
'<td class="align-middle">' + newComputer.mac + '</td>' +
'<td class="align-middle">' + newComputer.broadcastIp + '</td>' +
'<td class="align-middle">/api/wakeup/computer/' + newComputer.name + '</td>' +
'<td class="align-middle"><b><button id="del_' + newComputer.name + '" name="delbutton" value="' + newComputer.name + '" class="btn btn-danger btn-sm" onclick="$.deleteComputer(\'' + newComputer.name + '\')">Delete</button></b></td>' +
'</tr>');
}
})
};


},
error: function(data, err) {
$.showSnackBar(data);
console.error(data);
}
});
});



</script>
</body>
// Function to handle the delete button
jQuery.deleteComputer = function(computerName) {
$.ajax({
type: "DELETE",
url: "/api/delete/computer/" + computerName,
contentType: "application/json; charset=utf-8",
dataType: "json",
success: function(data) {
$.showSnackBar(data);
if (data.success) {
$('#bn_' + computerName).closest('tr').remove();
}
},
error: function(data, err) {
$.showSnackBar(data);
console.error(data);
}
})
};
});
</script>
</body>
</html>
Loading