Skip to content

Commit 79ffee9

Browse files
authored
Migrate List Mail Accounts to .units-table (hestiacp#3672)
* Bump npm deps * Migrate List Mail Accounts to .units-table * Apply some Prettier formatting
1 parent 6160219 commit 79ffee9

File tree

12 files changed

+750
-584
lines changed

12 files changed

+750
-584
lines changed

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@
2727
"normalize.css": "^8.0.1"
2828
},
2929
"devDependencies": {
30-
"@prettier/plugin-php": "^0.19.5",
31-
"@typescript-eslint/eslint-plugin": "^5.59.8",
32-
"@typescript-eslint/parser": "^5.59.7",
30+
"@prettier/plugin-php": "^0.19.6",
31+
"@typescript-eslint/eslint-plugin": "^5.59.9",
32+
"@typescript-eslint/parser": "^5.59.9",
3333
"cssnano": "^6.0.1",
34-
"esbuild": "^0.17.19",
34+
"esbuild": "^0.18.0",
3535
"eslint": "^8.42.0",
3636
"eslint-config-prettier": "^8.8.0",
3737
"eslint-plugin-editorconfig": "^4.0.3",
3838
"eslint-plugin-import": "^2.27.5",
3939
"husky": "^8.0.3",
4040
"lint-staged": "^13.2.2",
41-
"markdownlint-cli2": "^0.7.1",
41+
"markdownlint-cli2": "^0.8.0",
4242
"postcss": "^8.4.24",
4343
"postcss-import": "^15.1.0",
4444
"postcss-path-replace": "^1.0.4",
@@ -48,10 +48,10 @@
4848
"prettier-plugin-nginx": "^1.0.3",
4949
"prettier-plugin-sh": "^0.12.8",
5050
"prettier-plugin-sql": "^0.14.0",
51-
"stylelint": "^15.6.3",
51+
"stylelint": "^15.7.0",
5252
"stylelint-config-standard": "^33.0.0",
53-
"typescript": "^5.0.4",
54-
"vitepress": "1.0.0-beta.1",
53+
"typescript": "^5.1.3",
54+
"vitepress": "1.0.0-beta.2",
5555
"vue": "^3.3.4"
5656
},
5757
"browserslist": [

web/templates/includes/panel.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<div class="top-bar-left">
1010

1111
<!-- Logo / Home Button -->
12-
<a href="/" class="top-bar-logo" title="<?= htmlentities($_SESSION['APP_NAME']);?>">
13-
<img src="/images/logo-header.svg" alt="<?= htmlentities($_SESSION['APP_NAME']);?>" width="54" height="29">
12+
<a href="/" class="top-bar-logo" title="<?= htmlentities($_SESSION["APP_NAME"]) ?>">
13+
<img src="/images/logo-header.svg" alt="<?= htmlentities($_SESSION["APP_NAME"]) ?>" width="54" height="29">
1414
</a>
1515

1616
<!-- Usage Statistics -->

web/templates/pages/add_firewall_ipset.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ function generate_iplist($country, $type) {
8080
class="form-select js-datasource-select"
8181
tabindex="-1"
8282
onchange="this.nextElementSibling.value=this.value"
83-
data-country-iplists="<?= htmlspecialchars(json_encode($country_iplists), ENT_QUOTES, 'UTF-8') ?>"
84-
data-blacklist-iplists="<?= htmlspecialchars(json_encode($blacklist_iplists), ENT_QUOTES, 'UTF-8') ?>"
83+
data-country-iplists="<?= htmlspecialchars(json_encode($country_iplists), ENT_QUOTES, "UTF-8") ?>"
84+
data-blacklist-iplists="<?= htmlspecialchars(json_encode($blacklist_iplists), ENT_QUOTES, "UTF-8") ?>"
8585
>
8686
<option value=""><?= _("Clear") ?></option>
8787
</select>

web/templates/pages/edit_firewall.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
class="form-select js-ip-list-select"
5555
tabindex="-1"
5656
onchange="this.nextElementSibling.value=this.value"
57-
data-ipset-lists="<?= htmlspecialchars($ipset_lists_json, ENT_QUOTES, 'UTF-8') ?>"
57+
data-ipset-lists="<?= htmlspecialchars($ipset_lists_json, ENT_QUOTES, "UTF-8") ?>"
5858
>
5959
<option value=""><?= _("Clear") ?></option>
6060
</select>

web/templates/pages/list_backup.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,18 +90,18 @@
9090
<li class="units-table-row-action shortcut-d" data-key-action="href">
9191
<a
9292
class="units-table-row-action-link"
93-
href="/download/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>"
93+
href="/download/backup/?backup=<?= $key ?>&token=<?= $_SESSION["token"] ?>"
9494
title="<?= _("Download") ?>"
9595
>
9696
<i class="fas fa-file-arrow-down icon-lightblue"></i>
9797
<span class="u-hide-desktop"><?= _("Download") ?></span>
9898
</a>
9999
</li>
100-
<?php if ($read_only !== 'true') { ?>
100+
<?php if ($read_only !== "true") { ?>
101101
<li class="units-table-row-action shortcut-enter" data-key-action="href">
102102
<a
103103
class="units-table-row-action-link data-controls"
104-
href="/list/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>"
104+
href="/list/backup/?backup=<?= $key ?>&token=<?= $_SESSION["token"] ?>"
105105
title="<?= _("Restore") ?>"
106106
>
107107
<i class="fas fa-arrow-rotate-left icon-green"></i>

web/templates/pages/list_ip.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,12 @@
8080
++$i;
8181
?>
8282
<div class="l-unit animate__animated animate__fadeIn js-unit"
83-
data-sort-ip="<?=str_replace('.', '', $key)?>"
84-
data-sort-date="<?=strtotime($data[$key]['DATE'] .' '. $data[$key]['TIME'] )?>"
85-
data-sort-netmask="<?=str_replace('.', '', $data[$key]['NETMASK'])?>"
86-
data-sort-interface="<?=$data[$key]['INTERFACE']?>"
87-
data-sort-domains="<?=$data[$key]['U_WEB_DOMAINS']?>"
88-
data-sort-owner="<?=$data[$key]['OWNER']?>">
83+
data-sort-ip="<?= str_replace(".", "", $key) ?>"
84+
data-sort-date="<?= strtotime($data[$key]["DATE"] . " " . $data[$key]["TIME"]) ?>"
85+
data-sort-netmask="<?= str_replace(".", "", $data[$key]["NETMASK"]) ?>"
86+
data-sort-interface="<?= $data[$key]["INTERFACE"] ?>"
87+
data-sort-domains="<?= $data[$key]["U_WEB_DOMAINS"] ?>"
88+
data-sort-owner="<?= $data[$key]["OWNER"] ?>">
8989

9090
<div class="l-unit__col l-unit__col--right">
9191
<div class="clearfix l-unit__stat-col--left super-compact">
@@ -101,9 +101,9 @@
101101
<div class="actions-panel__col actions-panel__delete shortcut-delete" data-key-action="js">
102102
<a
103103
class="data-controls js-confirm-action"
104-
href="/delete/ip/?ip=<?=$key?>&token=<?=$_SESSION['token']?>"
104+
href="/delete/ip/?ip=<?= $key ?>&token=<?= $_SESSION["token"] ?>"
105105
data-confirm-title="<?= _("Delete") ?>"
106-
data-confirm-message="<?= sprintf(_('Are you sure you want to delete IP address %s?'), $key) ?>"
106+
data-confirm-message="<?= sprintf(_("Are you sure you want to delete IP address %s?"), $key) ?>"
107107
>
108108
<i class="fas fa-trash icon-red icon-dim"></i>
109109
</a>

0 commit comments

Comments
 (0)