lanscape 1.3.8a1__py3-none-any.whl → 2.4.0a2__py3-none-any.whl

lanscape/ui/static/js/scan-config.js

@@ -13,6 +13,7 @@ $(document).ready(function() {
     
     $('#t_cnt_port_scan, #t_cnt_port_test').on('input', updatePortTotals);
     $('#ping_attempts, #ping_ping_count').on('input', updatePingTotals);
+    $('#task_scan_port_services').on('change', updateVisibility);
 
     // Lookup type toggles
     $('.lookup-type-input').on('change', onLookupTypeChanged);
@@ -43,6 +44,30 @@ function setScanConfig(configName) {
     $('#task_scan_ports').prop('checked', config.task_scan_ports);
     $('#task_scan_port_services').prop('checked', config.task_scan_port_services);
 
+    // port scan config
+    if (config.port_scan_config) {
+        $('#port_scan_timeout').val(config.port_scan_config.timeout);
+        $('#port_scan_retries').val(config.port_scan_config.retries);
+        $('#port_scan_retry_delay').val(config.port_scan_config.retry_delay);
+    } else {
+        // defaults if missing
+        $('#port_scan_timeout').val(1.0);
+        $('#port_scan_retries').val(0);
+        $('#port_scan_retry_delay').val(0.1);
+    }
+
+    // service config
+    if (config.service_scan_config) {
+        $('#service_lookup_type').val(config.service_scan_config.lookup_type || 'BASIC');
+        $('#service_timeout').val(config.service_scan_config.timeout);
+        $('#service_max_concurrent_probes').val(config.service_scan_config.max_concurrent_probes);
+    } else {
+        // defaults if missing
+        $('#service_lookup_type').val('BASIC');
+        $('#service_timeout').val(5.0);
+        $('#service_max_concurrent_probes').val(10);
+    }
+
     // lookup type (array of enum values as strings)
     setLookupTypeUI(config.lookup_type || []);
 
@@ -99,20 +124,41 @@ function getScanConfig() {
         poke_config: {
             attempts: parseInt($('#poke_attempts').val()),
             timeout: parseFloat($('#poke_timeout').val())
+        },
+        port_scan_config: {
+            timeout: parseFloat($('#port_scan_timeout').val()),
+            retries: parseInt($('#port_scan_retries').val()),
+            retry_delay: parseFloat($('#port_scan_retry_delay').val())
+        },
+        service_scan_config: {
+            timeout: parseFloat($('#service_timeout').val()),
+            lookup_type: $('#service_lookup_type').val(),
+            max_concurrent_probes: parseInt($('#service_max_concurrent_probes').val())
         }
     };
 }
 
 function getPortLists(callback=null) {
-    $.get('/api/port/list', function(data) {
-        const customSelectDropdown = $('#port_list');
+    const customSelectDropdown = $('#port_list');
+
+    const renderOptions = (items) => {
         customSelectDropdown.empty();
-    
-        // Populate the dropdown with the options
-        data.forEach(function(portList) {
-            customSelectDropdown.append('<option>' + portList + '</option>');
+        items.forEach((item) => {
+            const name = item.name || item;
+            const count = item.count;
+            const label = count !== undefined ? `${name} (${count} ports)` : name;
+            customSelectDropdown.append(`<option value="${name}">${label}</option>`);
         });
+    };
+
+    $.get('/api/port/list/summary', function(data) {
+        renderOptions(data || []);
         if (callback) callback();
+    }).fail(function() {
+        $.get('/api/port/list', function(data) {
+            renderOptions(data || []);
+            if (callback) callback();
+        });
     });
 }
 
@@ -168,6 +214,10 @@ function updateVisibility() {
     // Poke section only when POKE_THEN_ARP is selected
     const showPoke = types.has('POKE_THEN_ARP');
     toggleSection('#section-poke', showPoke);
+
+    // Service scan section visible only if stage enabled
+    const showService = $('#task_scan_port_services').is(':checked');
+    toggleSection('#section-service-scan', showService);
 }
 
 function toggleSection(selector, show) {

lanscape/ui/templates/base.html

@@ -24,24 +24,22 @@
 
         <div id="app-actions">
             <a href="/info">
-                <span 
-                    class="material-symbols-outlined"
+                <i 
+                    class="fa-duotone fa-light fa-circle-info"
                     data-bs-toggle="tooltip" 
                     data-bs-placement="top" 
                     title="App info">
-                    info
-                </span>
+                </i>
             </a>
 
             <a href="/shutdown-ui">
-                <span 
+                <i 
                     id="power-button" 
-                    class="material-symbols-outlined"
+                    class="fa-solid fa-power-off"
                     data-bs-toggle="tooltip" 
                     data-bs-placement="top" 
                     title="Shutdown App">
-                    power_settings_new
-                </span>
+                </i>
             </a>
         </div>
         

lanscape/ui/templates/core/head.html

@@ -3,7 +3,7 @@
 <title>LANscape</title>
 <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
 <link href="{{ url_for('static', filename='css/style.css') }}" rel="stylesheet">
-<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@20..48,100..700,0..1,-50..200" />
+<script src="https://kit.fontawesome.com/d0b7f59243.js" crossorigin="anonymous"></script>
 <link rel="apple-touch-icon" sizes="180x180" href="/static/img/ico/apple-touch-icon.png">
 <link rel="icon" type="image/png" sizes="32x32" href="/static/img/ico/favicon-32x32.png">
 <link rel="icon" type="image/png" sizes="16x16" href="/static/img/ico/favicon-16x16.png">

lanscape/ui/templates/info.html

@@ -14,7 +14,10 @@
 <div class="scroll-container" id="content">
     {% if update_available %} 
     <div class="container-fluid my-4">
-        <h3>New version available!</h3>
+        <h3>
+            <i class="fa-solid fa-cloud-arrow-up"></i>
+            New version available!
+        </h3>
         <p>
             A new version has been published to PyPi. 
             ({{app_version}} -> {{latest_version}})
@@ -26,7 +29,10 @@
     </div>  
     {% endif %}
     <div class="container-fluid my-4">
-        <h3>About</h3>
+        <h3>
+            <i class="fa-duotone fa-light fa-circle-question"></i>
+            About
+        </h3>
         <p>
             LANscape was born from my frustration with existing local network scanning tools 
             alongside my desire to dive deeper into technologies like 
@@ -36,14 +42,23 @@
             discover more about your network as well. Enjoy!
         </p>
         <a  href="https://github.com/mdennis281/" class="text-decoration-none" target="_blank">
-            <button class="btn btn-primary m-2">GitHub</button>
+            <button class="btn btn-primary m-2">
+                <i class="fa-brands fa-github"></i>
+                GitHub
+            </button>
         </a>
         <a  href="https://github.com/mdennis281/LANscape" class="text-decoration-none" target="_blank">
-            <button class="btn btn-secondary m-2">Project Repo</button>
+            <button class="btn btn-secondary m-2">
+                <i class="fa-solid fa-code-fork"></i>
+                Project Repo
+            </button>
         </a>
     </div>  
     <div class="container-fluid my-4">
-        <h3>Runtime Arguments</h3>
+        <h3>
+            <i class="fa-duotone fa-light fa-sliders"></i>
+            Runtime Arguments
+        </h3>
         <table class="table table-striped table-bordered">
             <thead class="table-dark">
                 <tr>

lanscape/ui/templates/main.html

@@ -3,45 +3,43 @@
 {% block content %}
 <div id="header">
       <!-- Header and Scan Submission Inline -->
-    <div class="d-flex justify-content-between align-items-center flex-nowrap">
+    <div class="d-flex justify-content-between align-items-center flex-wrap">
         <a href="/" class="text-decoration-none" aria-label="Go to homepage">
             <h1 class="title">
                 <span>LAN</span>scape 
             </h1>
         </a>
         <!-- Right side: settings + form -->
-        <div class="d-flex align-items-center justify-content-end ms-auto">
-            <form id="scan-form" class="d-flex align-items-center">
-                <div class="form-group me-2">
-                    <!-- Above subnet input -->
-                    <div class="label-container">
-                        <label for="subnet">Subnet:</label>
-                        <div id="subnet-info"></div>
-                    </div>
-                    <!-- Subnet input with dropdown -->
-                    <div class="input-group">
-                        <button
-                            type="button"
-                            id="settings-btn"
-                            class="btn btn-secondary start material-symbols-outlined"
-                            data-bs-toggle="tooltip"
-                            data-bs-placement="bottom"
-                            title="Advanced scan settings"
-                        >
-                            settings
-                        </button>
-                        <input type="text" id="subnet" name="subnet" class="form-control" value="{{ subnet }}" placeholder="Enter subnet">
-                        <button class="btn btn-secondary dropdown-toggle end" type="button" id="subnet-dropdown" data-bs-toggle="dropdown" aria-expanded="false"></button>
-                        <ul class="dropdown-menu" aria-labelledby="subnet-dropdown" id="dropdown-list">
-                            {% for subnet_option in alternate_subnets %}
-                            <li><a class="dropdown-item" href="#">{{ subnet_option['subnet'] }}</a></li>
-                            {% endfor %}
-                        </ul>
-                    </div>
+        <form id="scan-form" class="d-flex align-items-end">
+            <div class="form-group me-2">
+                <!-- Above subnet input -->
+                <div class="label-container">
+                    <label for="subnet">Subnet:</label>
+                    <div id="subnet-info"></div>
                 </div>
-                <button type="submit" id="scan-submit" class="btn btn-primary">Scan</button>
-            </form>
-        </div>
+                <!-- Subnet input with dropdown -->
+                <div class="input-group">
+                    <button
+                        type="button"
+                        id="settings-btn"
+                        class="btn btn-secondary start"
+                        data-bs-toggle="tooltip"
+                        data-bs-placement="bottom"
+                        title="Advanced scan settings"
+                    >
+                        <i class="fa-solid fa-gear"></i>
+                    </button>
+                    <input type="text" id="subnet" name="subnet" class="form-control" value="{{ subnet }}" placeholder="Enter subnet">
+                    <button class="btn btn-secondary dropdown-toggle end" type="button" id="subnet-dropdown" data-bs-toggle="dropdown" aria-expanded="false"></button>
+                    <ul class="dropdown-menu" aria-labelledby="subnet-dropdown" id="dropdown-list">
+                        {% for subnet_option in alternate_subnets %}
+                        <li><a class="dropdown-item" href="#">{{ subnet_option['subnet'] }}</a></li>
+                        {% endfor %}
+                    </ul>
+                </div>
+            </div>
+            <button type="submit" id="scan-submit" class="btn btn-primary">Scan</button>
+        </form>
     </div>
 
     <div id="scan-progress-bar"></div>
@@ -59,13 +57,12 @@
                 <h2>Scan Results</h2>
                 <div id="scan-actions">
                     <a href="" id="export-link">
-                        <span 
-                            class="material-symbols-outlined secondary-icon-btn"
+                        <i 
+                            class="fa-solid fa-upload secondary-icon-btn"
                             data-bs-toggle="tooltip" 
                             data-bs-placement="top" 
                             title="Export scan to json">
-                            ios_share
-                        </span>
+                        </i>
                     </a>
                 </div>
             </div>