diff --git a/README.md b/README.md index 9fd7176b..7e5767ab 100755 --- a/README.md +++ b/README.md @@ -34,16 +34,13 @@ The system continuously scans the network for, **New devices**, **New connection ## 🧩 Notification Integrations - [Apprise](https://hub.docker.com/r/caronc/apprise), [Pushsafer](https://www.pushsafer.com/), [NTFY](https://ntfy.sh/) - Webhooks ([sample JSON](docs/webhook_json_sample.json)) - - (❗Experimental) Home Assistant via [MQTT](https://www.home-assistant.io/integrations/mqtt/) + - Home Assistant via [MQTT](https://www.home-assistant.io/integrations/mqtt/) - discovery ~10s per device, deleting not supported, use [MQTT Explorer](https://mqtt-explorer.com/) for now ## 🔐 Security - Configurable login to prevent unauthorized use. -- Set `PIALERT_WEB_PROTECTION = True` in `pialert.conf` to enable. -- The default password is `123456`. -- To change password run `/home/pi/pialert/back/pialert-cli` ## 📑 Features - Display: @@ -108,13 +105,14 @@ Instructions for [pucherot's original code can be found here](https://github.com - Please see the [Git commit history](https://github.com/jokob-sk/Pi.Alert/commits/main) for a full list of people and their contributions to the project -[main]: ./docs/img/1_devices.jpg "Main screen" -[screen1]: ./docs/img/2_1_device_details.jpg "Screen 1" -[screen2]: ./docs/img/2_2_device_sessions.jpg "Screen 2" -[screen3]: ./docs/img/2_3_device_presence.jpg "Screen 3" -[screen4]: ./docs/img/3_presence.jpg "Screen 4" -[screen5]: ./docs/img/2_4_network.png "Screen 5" -[screen6]: ./docs/img/2_5_device_nmap_ready.jpg "Screen 6" +[main]: ./docs/img/devices_split.png "Main screen" +[screen1]: ./docs/img/devices_details.png "Screen 1" +[screen2]: ./docs/img/events.png "Screen 2" +[screen3]: ./docs/img/presence.png "Screen 3" +[screen4]: ./docs/img/maintenance.png "Screen 4" +[screen5]: ./docs/img/network.png "Screen 5" +[screen6]: ./docs/img/settings.png "Screen 6" +[screen7]: ./docs/img/help_faq.png "Screen 6" [report1]: ./docs/img/4_report_1.jpg "Report sample 1" [report2]: ./docs/img/4_report_2.jpg "Report sample 2" [main_dark]: /docs/img/1_devices_dark.jpg "Main screen dark" diff --git a/dockerfiles/README.md b/dockerfiles/README.md index c8318bb2..f5c46787 100755 --- a/dockerfiles/README.md +++ b/dockerfiles/README.md @@ -44,15 +44,13 @@ ### Config (`pialert.conf`) -- Download [pialert.conf from here](https://github.com/jokob-sk/Pi.Alert/tree/main/config). +- Modify [pialert.conf](https://github.com/jokob-sk/Pi.Alert/tree/main/config) or manage the configuration via Settings. - ❗ Set the `SCAN_SUBNETS` variable. * The adapter will probably be `eth0` or `eth1`. (Run `iwconfig` to find your interface name(s)) * Specify the network filter (which **significantly** speeds up the scan process). For example, the filter `192.168.1.0/24` covers IP ranges 192.168.1.0 to 192.168.1.255. * Examples for one and two subnets (❗ Note the `['...', '...']` format for two or more subnets): - * One subnet: `SCAN_SUBNETS = '192.168.1.0/24 --interface=eth0'` + * One subnet: `SCAN_SUBNETS = ['192.168.1.0/24 --interface=eth0']` * Two subnets: `SCAN_SUBNETS = ['192.168.1.0/24 --interface=eth0', '192.168.1.0/24 --interface=eth1']` -- Set your reporting preferences. -- I recommend to check for new settings every time you rebuilt the container. ### 🛑 **Common issues** diff --git a/docs/img/1_devices.jpg b/docs/img/1_devices.jpg deleted file mode 100755 index 83fce54e..00000000 Binary files a/docs/img/1_devices.jpg and /dev/null differ diff --git a/docs/img/1_devices_dark.jpg b/docs/img/1_devices_dark.jpg deleted file mode 100755 index 1b768f8f..00000000 Binary files a/docs/img/1_devices_dark.jpg and /dev/null differ diff --git a/docs/img/2_1_device_details.jpg b/docs/img/2_1_device_details.jpg deleted file mode 100755 index 90ad2133..00000000 Binary files a/docs/img/2_1_device_details.jpg and /dev/null differ diff --git a/docs/img/2_2_device_sessions.jpg b/docs/img/2_2_device_sessions.jpg deleted file mode 100755 index 063c63c1..00000000 Binary files a/docs/img/2_2_device_sessions.jpg and /dev/null differ diff --git a/docs/img/2_3_device_presence.jpg b/docs/img/2_3_device_presence.jpg deleted file mode 100755 index 7ab0123e..00000000 Binary files a/docs/img/2_3_device_presence.jpg and /dev/null differ diff --git a/docs/img/2_4_network.png b/docs/img/2_4_network.png deleted file mode 100755 index ee6b8c17..00000000 Binary files a/docs/img/2_4_network.png and /dev/null differ diff --git a/docs/img/3_presence.jpg b/docs/img/3_presence.jpg deleted file mode 100755 index 7589dcca..00000000 Binary files a/docs/img/3_presence.jpg and /dev/null differ diff --git a/docs/img/5_maintain.jpg b/docs/img/5_maintain.jpg deleted file mode 100755 index 69c2f569..00000000 Binary files a/docs/img/5_maintain.jpg and /dev/null differ diff --git a/docs/img/@eaDir/device_details.png@SynoEAStream b/docs/img/@eaDir/device_details.png@SynoEAStream new file mode 100755 index 00000000..28532238 Binary files /dev/null and b/docs/img/@eaDir/device_details.png@SynoEAStream differ diff --git a/docs/img/@eaDir/devices_dark.png@SynoEAStream b/docs/img/@eaDir/devices_dark.png@SynoEAStream new file mode 100755 index 00000000..28532238 Binary files /dev/null and b/docs/img/@eaDir/devices_dark.png@SynoEAStream differ diff --git a/docs/img/@eaDir/devices_light.png@SynoEAStream b/docs/img/@eaDir/devices_light.png@SynoEAStream new file mode 100755 index 00000000..28532238 Binary files /dev/null and b/docs/img/@eaDir/devices_light.png@SynoEAStream differ diff --git a/docs/img/@eaDir/devices_split.png@SynoEAStream b/docs/img/@eaDir/devices_split.png@SynoEAStream new file mode 100755 index 00000000..28532238 Binary files /dev/null and b/docs/img/@eaDir/devices_split.png@SynoEAStream differ diff --git a/docs/img/@eaDir/events.png@SynoEAStream b/docs/img/@eaDir/events.png@SynoEAStream new file mode 100755 index 00000000..28532238 Binary files /dev/null and b/docs/img/@eaDir/events.png@SynoEAStream differ diff --git a/docs/img/@eaDir/help_faq.png@SynoEAStream b/docs/img/@eaDir/help_faq.png@SynoEAStream new file mode 100755 index 00000000..28532238 Binary files /dev/null and b/docs/img/@eaDir/help_faq.png@SynoEAStream differ diff --git a/docs/img/@eaDir/maintenance.png@SynoEAStream b/docs/img/@eaDir/maintenance.png@SynoEAStream new file mode 100755 index 00000000..28532238 Binary files /dev/null and b/docs/img/@eaDir/maintenance.png@SynoEAStream differ diff --git a/docs/img/@eaDir/network.png@SynoEAStream b/docs/img/@eaDir/network.png@SynoEAStream new file mode 100755 index 00000000..28532238 Binary files /dev/null and b/docs/img/@eaDir/network.png@SynoEAStream differ diff --git a/docs/img/@eaDir/presence.png@SynoEAStream b/docs/img/@eaDir/presence.png@SynoEAStream new file mode 100755 index 00000000..28532238 Binary files /dev/null and b/docs/img/@eaDir/presence.png@SynoEAStream differ diff --git a/docs/img/@eaDir/settings.png@SynoEAStream b/docs/img/@eaDir/settings.png@SynoEAStream new file mode 100755 index 00000000..28532238 Binary files /dev/null and b/docs/img/@eaDir/settings.png@SynoEAStream differ diff --git a/docs/img/device_details.png b/docs/img/device_details.png new file mode 100755 index 00000000..2f13a37b Binary files /dev/null and b/docs/img/device_details.png differ diff --git a/docs/img/devices_dark.png b/docs/img/devices_dark.png new file mode 100755 index 00000000..9316353d Binary files /dev/null and b/docs/img/devices_dark.png differ diff --git a/docs/img/devices_light.png b/docs/img/devices_light.png new file mode 100755 index 00000000..552e0c71 Binary files /dev/null and b/docs/img/devices_light.png differ diff --git a/docs/img/devices_split.png b/docs/img/devices_split.png new file mode 100755 index 00000000..b8df5cb9 Binary files /dev/null and b/docs/img/devices_split.png differ diff --git a/docs/img/events.png b/docs/img/events.png new file mode 100755 index 00000000..2c8ce861 Binary files /dev/null and b/docs/img/events.png differ diff --git a/docs/img/help_faq.png b/docs/img/help_faq.png new file mode 100755 index 00000000..cbea16f8 Binary files /dev/null and b/docs/img/help_faq.png differ diff --git a/docs/img/maintenance.png b/docs/img/maintenance.png new file mode 100755 index 00000000..752a10a5 Binary files /dev/null and b/docs/img/maintenance.png differ diff --git a/docs/img/network.png b/docs/img/network.png new file mode 100755 index 00000000..859cd040 Binary files /dev/null and b/docs/img/network.png differ diff --git a/docs/img/presence.png b/docs/img/presence.png new file mode 100755 index 00000000..dafaaa98 Binary files /dev/null and b/docs/img/presence.png differ diff --git a/docs/img/settings.png b/docs/img/settings.png new file mode 100755 index 00000000..3cdfee05 Binary files /dev/null and b/docs/img/settings.png differ diff --git a/docs/img/size_h_1250_w_1000.txt b/docs/img/size_h_1250_w_1000.txt new file mode 100644 index 00000000..a380c4d5 --- /dev/null +++ b/docs/img/size_h_1250_w_1000.txt @@ -0,0 +1 @@ +Screenshot size: height: 1250px width: 1000px \ No newline at end of file diff --git a/front/css/pialert.css b/front/css/pialert.css index 5c42b1ca..af548be4 100755 --- a/front/css/pialert.css +++ b/front/css/pialert.css @@ -100,6 +100,24 @@ color: gray; } +.header-server-time +{ + padding:8px; + color: white; +} + +.header-status +{ + padding:0px; +} +.header-status:hover +{ + background-color: rgba(0, 0, 0, 0); +} +.navbar-nav > li > a +{ + line-height: 30px; +} /* ----------------------------------------------------------------------------- Customized Main Menu ----------------------------------------------------------------------------- */ diff --git a/front/help_faq.php b/front/help_faq.php index fd8e9c66..a209f5f5 100755 --- a/front/help_faq.php +++ b/front/help_faq.php @@ -215,8 +215,6 @@ if ($_SESSION["login"] != 1) - -
diff --git a/front/maintenance.php b/front/maintenance.php index f8d1442f..a8fbc4e5 100755 --- a/front/maintenance.php +++ b/front/maintenance.php @@ -417,13 +417,6 @@ if (submit && isset($_POST['skinselector_set'])) { - - - - -
- - diff --git a/front/network.php b/front/network.php index 4add5ac6..79093313 100755 --- a/front/network.php +++ b/front/network.php @@ -68,7 +68,7 @@ $str_tab_header = '
  • - ' + ' .$node_name.' ' .$str_port.$node_badge. '
    • '; @@ -98,10 +98,10 @@ - - @@ -127,7 +127,7 @@ @@ -218,10 +218,10 @@ ' - '; @@ -407,7 +407,7 @@ '
    + MAC: ' + ' .$node_mac. '
    - '.$node_parent_mac.' + '.$node_parent_mac.'
    - '.$row['name'].' + '.$row['name'].' ' + ' .$row['last_ip']. '
    - '.$row['name'].' + '.$row['name'].' ' diff --git a/front/php/server/devices.php b/front/php/server/devices.php index f3e85644..4b221774 100755 --- a/front/php/server/devices.php +++ b/front/php/server/devices.php @@ -10,6 +10,7 @@ // External files require '/home/pi/pialert/front/php/templates/timezone.php'; + require '/home/pi/pialert/front/php/templates/language/lang.php'; require '/home/pi/pialert/front/php/server/db.php'; require '/home/pi/pialert/front/php/server/util.php'; diff --git a/front/php/templates/header.php b/front/php/templates/header.php index 8780bb6d..2ed8899a 100755 --- a/front/php/templates/header.php +++ b/front/php/templates/header.php @@ -137,9 +137,19 @@ if ($ENABLED_DARKMODE === True) {