finished minor changes for beta release

This commit is contained in:
Russel Yasol
2024-05-28 18:46:37 +08:00
parent 0e5785cb79
commit 96566daeea
3 changed files with 149 additions and 90 deletions

View File

@@ -51,9 +51,10 @@
<li class="nav-item">
<a class="nav-link" href="/sms.html">SMS</a>
</li>
<li class="nav-item">
<li class="nav-item">
<a class="nav-link" href="/console">Console</a>
</li>
<li class="nav-item">
<a
class="nav-link active"
href="/deviceinfo.html"
@@ -145,92 +146,137 @@
<th>Project Contributors</th>
<td>
<!-- Button trigger modal -->
<p type="button" class="link-info link-opacity-50-hover link-offset-2" data-bs-toggle="modal" data-bs-target="#staticBackdrop">
Show Contributors
</p>
<p
type="button"
class="link-info link-opacity-50-hover link-offset-2"
data-bs-toggle="modal"
data-bs-target="#staticBackdrop"
>
Show Contributors
</p>
<!-- Modal -->
<div class="modal fade" id="staticBackdrop" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered">
<div class="modal-content">
<div class="modal-header">
<h1 class="modal-title fs-5" id="staticBackdropLabel">Contributors</h1>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<table>
<tbody>
<tr>
<th>
RGMII Toolkit and Documentation
</th>
<td class="col-md-2">
<a href="https://github.com/iamromulan" target="_blank">iamromulan</a>
</td>
</tr>
<!-- Modal -->
<div
class="modal fade"
id="staticBackdrop"
data-bs-backdrop="static"
data-bs-keyboard="false"
tabindex="-1"
aria-labelledby="staticBackdropLabel"
aria-hidden="true"
>
<div class="modal-dialog modal-dialog-centered">
<div class="modal-content">
<div class="modal-header">
<h1
class="modal-title fs-5"
id="staticBackdropLabel"
>
Contributors
</h1>
<button
type="button"
class="btn-close"
data-bs-dismiss="modal"
aria-label="Close"
></button>
</div>
<div class="modal-body">
<table>
<tbody>
<tr>
<th>
RGMII Toolkit and Documentation
</th>
<td class="col-md-2">
<a
href="https://github.com/iamromulan"
target="_blank"
>iamromulan</a
>
</td>
</tr>
<tr>
<th>
Simple Admin 2.0
</th>
<td class="col-md-2">
<a href="https://github.com/dr-dolomite" target="_blank">dr-dolomite</a>
</td>
</tr>
<tr>
<th>Simple Admin 2.0</th>
<td class="col-md-2">
<a
href="https://github.com/dr-dolomite"
target="_blank"
>dr-dolomite</a
>
</td>
</tr>
<tr>
<th>
SMS Feature
</th>
<td class="col-md-2">
<a href="https://github.com/snjzb" target="_blank">snjzb</a>
</td>
</tr>
<tr>
<th>SMS Feature</th>
<td class="col-md-2">
<a
href="https://github.com/snjzb"
target="_blank"
>snjzb</a
>
</td>
</tr>
<tr>
<th>
Original Simple Admin
</th>
<td class="col-md-2">
<a href="https://github.com/aesthernr" target="_blank">aesthernr</a>
</td>
</tr>
<tr>
<th>Original Simple Admin</th>
<td class="col-md-2">
<a
href="https://github.com/aesthernr"
target="_blank"
>aesthernr</a
>
</td>
</tr>
<tr>
<th>
Original Socat Bridge
</th>
<td class="col-md-2">
<a href="https://github.com/natecarlson" target="_blank">natecarlson</a>
</td>
</tr>
<tr>
<th>Original Socat Bridge</th>
<td class="col-md-2">
<a
href="https://github.com/natecarlson"
target="_blank"
>natecarlson</a
>
</td>
</tr>
<tr>
<th>
Original Simple Admin Fixes
</th>
<td class="col-md-2">
<a href="https://github.com/rbflurry/" target="_blank">rbflurry</a>
</td>
</tr>
<tr>
<th>Original Simple Admin Fixes</th>
<td class="col-md-2">
<a
href="https://github.com/rbflurry/"
target="_blank"
>rbflurry</a
>
</td>
</tr>
<tr>
<th>
SA Parsing Patch
</th>
<td class="col-md-2">
<a href="https://github.com/tarunVreddy" target="_blank">tarunVreddy</a>
</td>
</tr>
</tbody>
</table>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
<tr>
<th>SA Parsing Patch</th>
<td class="col-md-2">
<a
href="https://github.com/tarunVreddy"
target="_blank"
>tarunVreddy</a
>
</td>
</tr>
</tbody>
</table>
</div>
<div class="modal-footer">
<button
type="button"
class="btn btn-secondary"
data-bs-dismiss="modal"
>
Close
</button>
</div>
</div>
</div>
</div>
</td>
</tr>
</tbody>
@@ -388,19 +434,29 @@
this.manufacturer = lines[1].trim();
this.modelName = lines[3].trim();
this.firmwareVersion = lines[5].trim();
this.imsi = lines[7].trim();
this.iccid = lines[9].trim().replace("+ICCID: ", "");
this.imei = lines[11].trim();
this.lanIp = lines[13].trim().split(",")[3];
this.wwanIpv4 = lines[15].trim().split(",")[4].replace(/"/g, "");
this.wwanIpv6 = lines[16].trim().split(",")[4].replace(/"/g, "");
this.phoneNumber = lines[18].trim().split(",")[1].replace(/"/g, "");
if (this.phoneNumber === "") {
this.phoneNumber = "Unknown";
try {
this.imsi = lines[7].trim();
this.iccid = lines[9].trim().replace("+ICCID: ", "");
this.phoneNumber = lines[18]
.trim()
.split(",")[1]
.replace(/"/g, "");
if (this.phoneNumber === "") {
this.phoneNumber = "Unknown";
}
} catch (error) {
this.phoneNumber = "No SIM Card Inserted or Detected";
this.imsi = " ";
this.iccid = " ";
}
this.simpleAdminVersion = "SimpleAdminRev-Alpha-0.6";
this.simpleAdminVersion = "SimpleAdminRev-Beta-1.0";
this.isLoading = false;
},
@@ -445,7 +501,7 @@
alert("IMEI is the same as the current IMEI");
return;
}
this.showModal = true;
},

View File

@@ -604,24 +604,27 @@
atcmd = `AT+QNWPREFCFG="lte_band",${newCheckedValues.join(
":"
)}`;
console.log(atcmd);
this.sendATcommand(atcmd);
} else if (selectedMode === "NSA") {
atcmd = `AT+QNWPREFCFG="nsa_nr5g_band",${newCheckedValues.join(
":"
)}`;
console.log(atcmd);
this.sendATcommand(atcmd);
} else if (selectedMode === "SA") {
atcmd = `AT+QNWPREFCFG="nr5g_band",${newCheckedValues.join(
":"
)}`;
console.log(atcmd);
this.sendATcommand(atcmd);
} else {
alert("Invalid network mode selected");
}
// Do a 5 second countdown
// Do a 2 second countdown
this.showModal = true;
this.countdown = 5;
this.countdown = 2;
const interval = setInterval(() => {
this.countdown--;
if (this.countdown === 0) {

View File

@@ -326,7 +326,7 @@
Go to Cell Scanner
</a> -->
<p><a class="link-info link-opacity-50-hover link-offset-2" href="/scanner.html">Go to Cell Scanner</a></p>
<p><a class="link-info link-opacity-50-hover link-offset-2" href="/watchcat.html">Go to WatchCat</a></p>
<!-- <p><a class="link-info link-opacity-50-hover link-offset-2" href="/watchcat.html">Go to WatchCat</a></p> -->
<!-- </a> -->
</div>
</div>