Fixed https and correct domain name

master
Jared 6 years ago
parent 0f499d3ae9
commit 905d6a9d80

@ -24,7 +24,7 @@ function save() {
authCode += 1; authCode += 1;
if ($('#tools').is(':checked')) if ($('#tools').is(':checked'))
authCode += 2; authCode += 2;
$.getJSON('http://130.237.3.207/addcard/' + cardID + '/' + name + '/' + authCode, function(data) { $.getJSON('https://rfid.elab.kth.se/addcard/' + cardID + '/' + name + '/' + authCode, function(data) {
}); });
overlay_out(); overlay_out();
@ -32,7 +32,7 @@ function save() {
$(document).ready(function() { $(document).ready(function() {
jQuery.ajaxSetup({ cache: false }); jQuery.ajaxSetup({ cache: false });
$.getJSON('http://130.237.3.207/gethistory', function(data) { $.getJSON('https://rfid.elab.kth.se/gethistory', function(data) {
eventHistory = data.reverse(); eventHistory = data.reverse();
var newHistory = '<div class="event-wrapper">'; var newHistory = '<div class="event-wrapper">';
@ -61,7 +61,7 @@ $(document).ready(function() {
$('.recent').on('click', '.event', function() { $('.recent').on('click', '.event', function() {
var cardID = $(this).attr('card-id'); var cardID = $(this).attr('card-id');
$('.card-id').text(cardID); $('.card-id').text(cardID);
$.getJSON('http://130.237.3.207/getcardinfo/' + cardID, function(data) { $.getJSON('https://rfid.elab.kth.se/getcardinfo/' + cardID, function(data) {
$('#name').val(data.name); $('#name').val(data.name);
if (data.fridge) if (data.fridge)
$('#fridge').prop('checked', true); $('#fridge').prop('checked', true);
@ -138,7 +138,7 @@ function lock_fridge() {
var period = parseFloat($('#period').val()) var period = parseFloat($('#period').val())
if (isNaN(period)) if (isNaN(period))
return; return;
$.getJSON('http://130.237.3.207/lock-fridge/' + period, function(data) { $.getJSON('https://rfid.elab.kth.se/lock-fridge/' + period, function(data) {
location.reload() location.reload()
}); });
} }

@ -6,7 +6,7 @@
<link rel="stylesheet" type="text/css" href="static/style.css"> <link rel="stylesheet" type="text/css" href="static/style.css">
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Roboto:300,400" rel="stylesheet">
<script <script
src="http://code.jquery.com/jquery-3.1.1.js" src="https://code.jquery.com/jquery-3.1.1.js"
integrity="sha256-16cdPddA6VdVInumRGo6IbivbERE8p7CQR3HzTBuELA=" integrity="sha256-16cdPddA6VdVInumRGo6IbivbERE8p7CQR3HzTBuELA="
crossorigin="anonymous"></script> crossorigin="anonymous"></script>
<script src="https://use.fontawesome.com/5c9d51f09a.js"></script> <script src="https://use.fontawesome.com/5c9d51f09a.js"></script>

@ -6,7 +6,7 @@
<link rel="stylesheet" type="text/css" href="static/style.css"> <link rel="stylesheet" type="text/css" href="static/style.css">
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Roboto:300,400" rel="stylesheet">
<script <script
src="http://code.jquery.com/jquery-3.1.1.js" src="https://code.jquery.com/jquery-3.1.1.js"
integrity="sha256-16cdPddA6VdVInumRGo6IbivbERE8p7CQR3HzTBuELA=" integrity="sha256-16cdPddA6VdVInumRGo6IbivbERE8p7CQR3HzTBuELA="
crossorigin="anonymous"></script> crossorigin="anonymous"></script>
<script src="https://use.fontawesome.com/5c9d51f09a.js"></script> <script src="https://use.fontawesome.com/5c9d51f09a.js"></script>

@ -6,7 +6,7 @@
<link rel="stylesheet" type="text/css" href="static/style.css"> <link rel="stylesheet" type="text/css" href="static/style.css">
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Roboto:300,400" rel="stylesheet">
<script <script
src="http://code.jquery.com/jquery-3.1.1.js" src="https://code.jquery.com/jquery-3.1.1.js"
integrity="sha256-16cdPddA6VdVInumRGo6IbivbERE8p7CQR3HzTBuELA=" integrity="sha256-16cdPddA6VdVInumRGo6IbivbERE8p7CQR3HzTBuELA="
crossorigin="anonymous"></script> crossorigin="anonymous"></script>
<script src="https://use.fontawesome.com/5c9d51f09a.js"></script> <script src="https://use.fontawesome.com/5c9d51f09a.js"></script>

Loading…
Cancel
Save