lanscape 2.0.2a4__py3-none-any.whl → 2.1.0b1__py3-none-any.whl

lanscape/ui/shutdown_handler.py

@@ -8,7 +8,7 @@ from flask import request
 from lanscape.core.runtime_args import parse_args
 
 
-log = logging.getLogger('shutdown_handler')
+log = logging.getLogger('ShutdownHandler')
 
 
 class FlaskShutdownHandler:

lanscape/ui/static/css/style.css

@@ -34,6 +34,9 @@
     --danger-border-color: #922; /* Bold red for danger borders */
     
     --footer-height: 25px;
+
+    --fa-primary-color: var(--text-accent-color);
+    --fa-secondary-color: var(--text-placeholder);
 }
 
 body {
@@ -244,7 +247,7 @@ details {
     transition: all .5s ease-in-out
 }
 
-#app-actions a .material-symbols-outlined {
+#app-actions a .fa-solid {
     font-size: inherit
 }
 #app-actions {
@@ -257,9 +260,12 @@ details {
     color: var(--text-color);
     text-decoration: none;
     cursor: pointer;
+    --fa-primary-color: var(--text-accent-color);
+    --fa-secondary-color: var(--text-placeholder);
 }
-#app-actions a:hover {
-    color: var(--text-placeholder)
+#app-actions a i:hover {
+    --fa-primary-color: var(--text-color);
+    --fa-secondary-color: var(--text-accent-color);
 }
 
 #power-button {
@@ -274,10 +280,10 @@ details {
     display: flex;
     justify-content: space-around;
     align-items: center;
-    a {
-        text-decoration: none;
-        margin: 0 3px;
-    }
+}
+
+#scan-actions i {
+    font-size: 20px;
 }
 
 #advanced-modal {
@@ -796,13 +802,7 @@ html {
 }
 
 
-.material-symbols-outlined {
-  font-variation-settings:
-  'FILL' 0,
-  'wght' 400,
-  'GRAD' 0,
-  'opsz' 24
-}
+/* FontAwesome Solid Icon Styling */
 
 #shutdown-sub-sub {
     color: var(--text-almost-hidden);
@@ -942,7 +942,7 @@ html {
     border-radius: 999px;
     color: var(--text-color);
 }
-#device-modal .chip .material-symbols-outlined {
+#device-modal .chip .fa-solid {
     font-size: 16px;
 }
 

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

@@ -23,12 +23,12 @@
                         <button
                             type="button"
                             id="settings-btn"
-                            class="btn btn-secondary start material-symbols-outlined"
+                            class="btn btn-secondary start"
                             data-bs-toggle="tooltip"
                             data-bs-placement="bottom"
                             title="Advanced scan settings"
                         >
-                            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>
@@ -59,13 +59,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>

lanscape/ui/templates/scan/config.html

@@ -8,21 +8,24 @@
       <div class="modal-body">
         <div class="d-flex gap-2 mb-3">
             <div class="config-option p-3 flex-fill flex-wrap" id="config-fast" data-config="fast" onclick="setScanConfig('fast')">
-                <h5 class="mb-1 d-flex align-items-center justify-content-center">
-                    <span class="material-symbols-outlined me-1">bolt</span>Fast
-                </h5>
+                <div class="d-flex flex-column align-items-center justify-content-center">
+                    <i class="fa-solid fa-bolt mb-2" style="font-size: 1.5em;"></i>
+                    <h5 class="mb-1">Fast</h5>
+                </div>
                 <p class="mb-0">Fast scan, Low accuracy</p>
             </div>
             <div class="config-option p-3 flex-fill" id="config-balanced" data-config="balanced" onclick="setScanConfig('balanced')">
-                <h5 class="mb-1 d-flex align-items-center justify-content-center">
-                    <span class="material-symbols-outlined me-1">balance</span>Balanced
-                </h5>
+                <div class="d-flex flex-column align-items-center justify-content-center">
+                    <i class="fa-solid fa-scale-balanced mb-2" style="font-size: 1.5em;"></i>
+                    <h5 class="mb-1">Balanced</h5>
+                </div>
                 <p class="mb-0">Balanced scan, Moderate accuracy</p>
             </div>
             <div class="config-option p-3 flex-fill" id="config-accurate" data-config="accurate" onclick="setScanConfig('accurate')">
-                <h5 class="mb-1 d-flex align-items-center justify-content-center">
-                    <span class="material-symbols-outlined me-1">target</span>Accurate
-                </h5>
+                <div class="d-flex flex-column align-items-center justify-content-center">
+                    <i class="fa-solid fa-bullseye mb-2" style="font-size: 1.5em;"></i>
+                    <h5 class="mb-1">Accurate</h5>
+                </div>
                 <p class="mb-0">Thorough scan, High accuracy</p>
             </div>
         </div>
@@ -51,15 +54,13 @@
                                     ARP Lookup
                                 </label>
                                 {% if not is_arp_supported %}
-                                    <span
-                                        class="material-symbols-outlined arp-help-ico"
+                                    <i
+                                        class="fa-solid fa-circle-question arp-help-ico"
                                         data-bs-toggle="tooltip"
                                         data-bs-placement="top"
                                         title="ARP lookup is not supported on this system, click for more info"
                                         onclick="window.open('https://github.com/mdennis281/LANscape/blob/main/docs/arp-issues.md', '_blank')"
-                                    >
-                                        help
-                                    </span>
+                                    ></i>
                                 {% endif %}
                             </div>
                             <div class="form-check">

lanscape/ui/templates/scan/device-detail.html

@@ -49,7 +49,7 @@
               <div class="chip-group mt-1">
                 {% for p in ports %}
                   <span class="chip" title="Port {{ p }}">
-                    <span class="material-symbols-outlined">lan</span>{{ p }}
+                    <i class="fa-solid fa-network-wired"></i>{{ p }}
                   </span>
                 {% endfor %}
               </div>
@@ -65,7 +65,7 @@
                 {% for svc, svc_ports in services|dictsort %}
                   <div class="service-row">
                     <div class="service-name">
-                      <span class="material-symbols-outlined align-middle me-1">dns</span>{{ svc|default('Unknown') }}
+                      <i class="fa-solid fa-server align-middle me-1"></i>{{ svc|default('Unknown') }}
                     </div>
                     <div class="service-ports">
                       {% set s_ports = svc_ports|default([]) %}
@@ -91,7 +91,7 @@
               <ul class="list-unstyled error-list mt-1">
                 {% for err in errors %}
                   <li class="text-danger">
-                    <span class="material-symbols-outlined align-middle me-1">error</span>
+                    <i class="fa-solid fa-circle-exclamation align-middle me-1"></i>
                     {{ err }}
                   </li>
                 {% endfor %}

lanscape/ui/templates/scan/ip-table-row.html

@@ -1,10 +1,10 @@
 <tr>
     <td>
         <div class="info-icon-container">
-            <span 
-            class="material-symbols-outlined info-icon" 
+            <i 
+            class="fa-solid fa-circle-info info-icon" 
             onclick="parent.openDeviceDetail('{{ device.ip }}')" 
-            >info</span>
+            ></i>
         </div>
     </td>
     <td>

{lanscape-2.0.2a4.dist-info → lanscape-2.1.0b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lanscape
-Version: 2.0.2a4
+Version: 2.1.0b1
 Summary: A python based local network scanner
 Author-email: Michael Dennis <michael@dipduo.com>
 License-Expression: MIT

{lanscape-2.0.2a4.dist-info → lanscape-2.1.0b1.dist-info}/RECORD

@@ -28,7 +28,7 @@ lanscape/resources/services/definitions.jsonc,sha256=M9BDeK-mh25sEVj8xDEYbU2ix7E
 lanscape/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lanscape/ui/app.py,sha256=rg4UGHgbVHpU2jdabSwBoSqGna7WGOunPkPc5Tvds9w,4076
 lanscape/ui/main.py,sha256=UCrhHnyFBqVmHTMus33CTp3vdNn3miT1xXJatR4N7ho,4176
-lanscape/ui/shutdown_handler.py,sha256=He2aYlcfHvQjpJuKbdbjmUd2RkJeCrcSSHX9HFMbBOg,1705
+lanscape/ui/shutdown_handler.py,sha256=HrEnWrdYSzLDVsPgD8tf9FgtAwQrZNECDu6wnEs27EY,1704
 lanscape/ui/blueprints/__init__.py,sha256=EjPtaR5Nh17pGiOVYTJULVNaZntpFZOiYyep8rBWAiE,265
 lanscape/ui/blueprints/api/__init__.py,sha256=5Z4Y7B36O-bNFenpomfuNhPuJ9dW_MC0TPUU3pCFVfA,103
 lanscape/ui/blueprints/api/port.py,sha256=KlfLrAmlTqN44I1jLVDy-mWOcor4kL-b0Cl4AcTMCys,1976
@@ -37,7 +37,7 @@ lanscape/ui/blueprints/api/tools.py,sha256=jr9gt0VhvBFgJ61MLgNIM6hin-MUmJLGdmStP
 lanscape/ui/blueprints/web/__init__.py,sha256=NvgnjP0X4LwqVhSEyh5RUzoG45N44kHK1MEFlfvBxTg,118
 lanscape/ui/blueprints/web/routes.py,sha256=f5TzfTzelJ_erslyBXTOpFr4BlIfB1Mb1ye6ioH7IL0,4534
 lanscape/ui/static/lanscape.webmanifest,sha256=07CqA-PQsO35KJD8R96sI3Pxix6UuBjijPDCuy9vM3s,446
-lanscape/ui/static/css/style.css,sha256=qXDshNhj77__06AuL-RhsxlrqZ5S0JFAmy3M1sk1Sm8,21098
+lanscape/ui/static/css/style.css,sha256=9IQru_W0WUpcxNJuHbqwjfxLOC5n1EeGcxf_kDVY3jc,21232
 lanscape/ui/static/img/ico/android-chrome-192x192.png,sha256=JmFT6KBCCuoyxMV-mLNtF9_QJbVBvfWPUizKN700fi8,18255
 lanscape/ui/static/img/ico/android-chrome-512x512.png,sha256=88Jjx_1-4XAnZYz64KP6FdTl_kYkNG2_kQIKteQwSh4,138055
 lanscape/ui/static/img/ico/apple-touch-icon.png,sha256=tEJlLwBZtF4v-NC90YCfRJQ2prTsF4i3VQLK_hnv2Mw,16523
@@ -54,24 +54,24 @@ lanscape/ui/static/js/scan-config.js,sha256=TiUwWWUGqqQbC3ZJnQCNQpoR492RXA3jLkAL
 lanscape/ui/static/js/shutdown-server.js,sha256=Mx8UGmmktHaCK7DL8TVUxah6VEcN0wwLFfhbCId-K8U,453
 lanscape/ui/static/js/subnet-info.js,sha256=osZM6CGs-TC5QpBJWkNWCtXNOKzjyIiWKHwKi4vlDf8,559
 lanscape/ui/static/js/subnet-selector.js,sha256=2YKCAuKU2Ti1CmJrqi4_vNTD2LQbxx7chIDqND_1eAY,358
-lanscape/ui/templates/base.html,sha256=cnKU-kHUBpt6Xg4gPLE4dWkcXr3H-K4Vz1Im8xDKdOQ,1448
+lanscape/ui/templates/base.html,sha256=HIHLFEUMDTGEaeuSpeNg-vkXXb9VNbZnbFWlYetVL18,1377
 lanscape/ui/templates/error.html,sha256=bqGJbf_ix9wtpUlXk5zvz_XyFpeTbEO-4f0ImgLtUGk,1033
-lanscape/ui/templates/info.html,sha256=gu8SGFUaFQc46Rm4TkZD8HM4Tnls-ZWsJ0FJNhx9wEs,2545
-lanscape/ui/templates/main.html,sha256=ubxKUQcWQ27A0YpvBgj6AnIqgVSfW3exYXyn7EgrKJM,3895
+lanscape/ui/templates/info.html,sha256=SQ6RpTs9_v9HF32mr3FBsh6vTJneYqFz_WrC9diXzHg,2958
+lanscape/ui/templates/main.html,sha256=jTFLH9xuMNayQRkDNB_8BIQopaD4YtI5MI2zMpaMsMA,3842
 lanscape/ui/templates/scan.html,sha256=00QX2_1S_1wGzk42r00LjEkJvoioCLs6JgjOibi6r20,376
 lanscape/ui/templates/shutdown.html,sha256=iXVCq2yl5TjZfNFl4esbDJra3gJA2VQpae0jj4ipy9w,701
-lanscape/ui/templates/core/head.html,sha256=eZiebt24xYd_NALe-fFL25rb4uFjUrF4XJjxFH61MgM,779
+lanscape/ui/templates/core/head.html,sha256=zP1RkTYuaKCC6RtnSEHFKPw3wKWfSyV0HZg5XsAxWik,719
 lanscape/ui/templates/core/scripts.html,sha256=rSRi4Ut8iejajMPhOc5bzEz-Z3EHxpj_3PxwwyyhmTQ,640
-lanscape/ui/templates/scan/config.html,sha256=nmk7Vn-9sXrTDJxSSR7JbCUJEVVadXSMji7LJv2tzKQ,14604
-lanscape/ui/templates/scan/device-detail.html,sha256=Yo4t4S5tkOboMQ3b0y-dHlTJIp6_Zb--9iopyQjNMSc,4825
+lanscape/ui/templates/scan/config.html,sha256=X95xayNtJrRUeGUlPbtUjd1228hH6re9BT6jcbaSnl8,14704
+lanscape/ui/templates/scan/device-detail.html,sha256=3N0WcdnWopbSFwsnKogBaHOYsLMAfKBZdkP7HQG4vLA,4794
 lanscape/ui/templates/scan/export.html,sha256=Nvs_unojzT3qhN_ZnEgYHou2C9wqWGr3dVr2UiLnYjY,749
-lanscape/ui/templates/scan/ip-table-row.html,sha256=nO5ZMhl3Gnlc8lg5nWmE05_6_5oz9ZfVCDUOgegVGpg,1267
+lanscape/ui/templates/scan/ip-table-row.html,sha256=iSW3PYev3_k7pxTZUJUboqDUgdhsWNOrYxysYismyI0,1255
 lanscape/ui/templates/scan/ip-table.html,sha256=AT2ZvCPYdKl-XJiAkEAawPOVuQw-w0MXumGQTr3zyKM,926
 lanscape/ui/templates/scan/overview.html,sha256=xWj9jWDPg2KcPLvS8fnSins23_UXjKCdb2NJwNG2U2Q,1176
 lanscape/ui/templates/scan/scan-error.html,sha256=wmAYQ13IJHUoO8fAGNDjMvNml7tu4rsIU3Vav71ETlA,999
-lanscape-2.0.2a4.dist-info/licenses/LICENSE,sha256=VLoE0IrNTIc09dFm7hMN0qzk4T3q8V0NaPcFQqMemDs,1070
-lanscape-2.0.2a4.dist-info/METADATA,sha256=4gxey7gdxrvoYxVsMgsnaezruGtRS_5qen7Pp2zVFfQ,3486
-lanscape-2.0.2a4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lanscape-2.0.2a4.dist-info/entry_points.txt,sha256=evxSxUikFa1OEd4e0Boky9sLH87HdgM0YqB_AbB2HYc,51
-lanscape-2.0.2a4.dist-info/top_level.txt,sha256=E9D4sjPz_6H7c85Ycy_pOS2xuv1Wm-ilKhxEprln2ps,9
-lanscape-2.0.2a4.dist-info/RECORD,,
+lanscape-2.1.0b1.dist-info/licenses/LICENSE,sha256=VLoE0IrNTIc09dFm7hMN0qzk4T3q8V0NaPcFQqMemDs,1070
+lanscape-2.1.0b1.dist-info/METADATA,sha256=4bfiG3YJu6XHs2bFT3OfxyCOgyafjkZk2waK0c0xjBg,3486
+lanscape-2.1.0b1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lanscape-2.1.0b1.dist-info/entry_points.txt,sha256=evxSxUikFa1OEd4e0Boky9sLH87HdgM0YqB_AbB2HYc,51
+lanscape-2.1.0b1.dist-info/top_level.txt,sha256=E9D4sjPz_6H7c85Ycy_pOS2xuv1Wm-ilKhxEprln2ps,9
+lanscape-2.1.0b1.dist-info/RECORD,,