From 4075ef4907a0ecf772be467a9101d4163925a4fa Mon Sep 17 00:00:00 2001
From: Ben Burwood <ben.burwood@outlook.com>
Date: Wed, 28 Feb 2024 20:16:32 +0000
Subject: [PATCH 1/6] Implement IP Base Index Page

Base IP and Router IP
---
 NetworkMapper/ip/templates/base/sidebar.html |  2 +-
 NetworkMapper/ip/templates/ip/index.html     | 39 ++++++++++++++++++++
 NetworkMapper/ip/urls.py                     |  1 +
 NetworkMapper/ip/views/__init__.py           |  2 +-
 NetworkMapper/ip/views/index.py              | 16 ++++++++
 5 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 NetworkMapper/ip/templates/ip/index.html
 create mode 100644 NetworkMapper/ip/views/index.py

diff --git a/NetworkMapper/ip/templates/base/sidebar.html b/NetworkMapper/ip/templates/base/sidebar.html
index f348849..94bf005 100644
--- a/NetworkMapper/ip/templates/base/sidebar.html
+++ b/NetworkMapper/ip/templates/base/sidebar.html
@@ -9,7 +9,7 @@ <h2>NetworkMapper</h2>
 
 <style>
     #sidebar {
-        width: 200px;
+        width: 250px;
         height: 100vh;
         background-color: #f0f0f0;
         padding: 10px;
diff --git a/NetworkMapper/ip/templates/ip/index.html b/NetworkMapper/ip/templates/ip/index.html
new file mode 100644
index 0000000..549221b
--- /dev/null
+++ b/NetworkMapper/ip/templates/ip/index.html
@@ -0,0 +1,39 @@
+{% extends "../base/master.html" %}
+
+
+{% block title %}
+IP Network Management
+{% endblock %}
+
+
+{% block content %}
+
+<div class="container mt-5">
+    <div class="row">
+        <div class="col-md-6">
+            <h2>Base IP</h2>
+            <form method="post" action="{% url 'index' %}">
+                {% csrf_token %}
+                <div class="form-group">
+                    <label for="base_ip">Base IP:</label>
+                    <input type="text" class="form-control" id="base_ip" name="base_ip" value="{{ base_ip }}">
+                </div>
+                <button type="submit" name="base_ip-submit" class="btn btn-primary">Save Base IP</button>
+            </form>
+        </div>
+
+        <div class="col-md-6">
+            <h2>Route IP</h2>
+            <form method="post" action="{% url 'index' %}">
+                {% csrf_token %}
+                <div class="form-group">
+                    <label for="router_ip">Router IP:</label>
+                    <input type="text" class="form-control" id="router_ip" name="router_ip" value="{{ router_ip }}">
+                </div>
+                <button type="submit" name="router_ip-submit" class="btn btn-primary">Save Route IP</button>
+            </form>
+        </div>
+    </div>
+</div>
+
+{% endblock %}
\ No newline at end of file
diff --git a/NetworkMapper/ip/urls.py b/NetworkMapper/ip/urls.py
index 7b27b5b..5d775cd 100644
--- a/NetworkMapper/ip/urls.py
+++ b/NetworkMapper/ip/urls.py
@@ -3,6 +3,7 @@
 from . import views
 
 urlpatterns = [
+    path("", views.index.index, name="index"),
     path("vlan", views.vlan.index, name="vlan.index"),
     path("vlan/create", views.vlan.create, name="vlan.create"),
     path("vlan/<int:vlan_id>/edit", views.vlan.edit, name="vlan.edit"),
diff --git a/NetworkMapper/ip/views/__init__.py b/NetworkMapper/ip/views/__init__.py
index 59dea35..2c4b302 100644
--- a/NetworkMapper/ip/views/__init__.py
+++ b/NetworkMapper/ip/views/__init__.py
@@ -1 +1 @@
-from . import device, vlan, wifi
+from . import device, index, vlan, wifi
diff --git a/NetworkMapper/ip/views/index.py b/NetworkMapper/ip/views/index.py
new file mode 100644
index 0000000..b7b5beb
--- /dev/null
+++ b/NetworkMapper/ip/views/index.py
@@ -0,0 +1,16 @@
+from django.shortcuts import render
+
+
+def index(request):
+    base_ip = request.POST.get("base_ip", "0.0")
+    router_ip = request.POST.get("router_ip", "0.0.0.0")
+
+    if request.method == "POST":
+        if "base_ip-submit" in request.POST:
+            base_ip = request.POST.get("base_ip")
+            # Logic for handling Form 1 submission
+        elif "router_ip-submit" in request.POST:
+            router_ip = request.POST.get("router_ip")
+            # Logic for handling Form 2 submission
+
+    return render(request, "ip/index.html", {"base_ip": base_ip, "router_ip": router_ip})

From 7c1a723c217b58c0343b4e383015f3ebd0f4fb9f Mon Sep 17 00:00:00 2001
From: Ben Burwood <ben.burwood@outlook.com>
Date: Wed, 28 Feb 2024 20:24:13 +0000
Subject: [PATCH 2/6] Implement Reading YAML Config

---
 NetworkMapper/ip/views/index.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/NetworkMapper/ip/views/index.py b/NetworkMapper/ip/views/index.py
index b7b5beb..9bd157b 100644
--- a/NetworkMapper/ip/views/index.py
+++ b/NetworkMapper/ip/views/index.py
@@ -1,9 +1,15 @@
+import yaml
+from django.conf import settings
 from django.shortcuts import render
 
 
 def index(request):
-    base_ip = request.POST.get("base_ip", "0.0")
-    router_ip = request.POST.get("router_ip", "0.0.0.0")
+    with open(settings.CONFIG_FILE_PATH, "r") as yaml_file:
+        yaml_data = yaml.safe_load(yaml_file)
+        if not yaml_data:
+            yaml_data = {}
+    base_ip = yaml_data.get("base_ip", "0.0")
+    router_ip = yaml_data.get("router_ip", "0.0.0.0")
 
     if request.method == "POST":
         if "base_ip-submit" in request.POST:

From f0fd772e56f1389f8c85137cf391ed40374905de Mon Sep 17 00:00:00 2001
From: Ben Burwood <ben.burwood@outlook.com>
Date: Wed, 28 Feb 2024 20:35:58 +0000
Subject: [PATCH 3/6] Implement Writing YAML Config

---
 NetworkMapper/ip/views/index.py | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/NetworkMapper/ip/views/index.py b/NetworkMapper/ip/views/index.py
index 9bd157b..1b21eb9 100644
--- a/NetworkMapper/ip/views/index.py
+++ b/NetworkMapper/ip/views/index.py
@@ -1,22 +1,32 @@
 import yaml
 from django.conf import settings
-from django.shortcuts import render
+from django.shortcuts import redirect, render
+from django.urls import reverse
 
 
-def index(request):
-    with open(settings.CONFIG_FILE_PATH, "r") as yaml_file:
-        yaml_data = yaml.safe_load(yaml_file)
-        if not yaml_data:
-            yaml_data = {}
-    base_ip = yaml_data.get("base_ip", "0.0")
-    router_ip = yaml_data.get("router_ip", "0.0.0.0")
+def update_config_value(key: str, value: str) -> None:
+    with open(settings.CONFIG_FILE_PATH, "r+") as yaml_file:
+        yaml_data = yaml.safe_load(yaml_file) or {}
+        yaml_data[key] = value
+        yaml_file.seek(0)
+        yaml.dump(yaml_data, yaml_file)
+        yaml_file.truncate()
+
 
+def index(request):
     if request.method == "POST":
         if "base_ip-submit" in request.POST:
             base_ip = request.POST.get("base_ip")
-            # Logic for handling Form 1 submission
+            update_config_value("base_ip", base_ip)
+            return redirect(reverse("index"))
         elif "router_ip-submit" in request.POST:
             router_ip = request.POST.get("router_ip")
-            # Logic for handling Form 2 submission
+            update_config_value("router_ip", router_ip)
+            return redirect(reverse("index"))
+
+    with open(settings.CONFIG_FILE_PATH, "r") as yaml_file:
+        yaml_data = yaml.safe_load(yaml_file) or {}
+    base_ip = yaml_data.get("base_ip", "0.0")
+    router_ip = yaml_data.get("router_ip", "0.0.0.0")
 
     return render(request, "ip/index.html", {"base_ip": base_ip, "router_ip": router_ip})

From 56ef1f58df8a1229c97fda7ffc7dd81e7c085668 Mon Sep 17 00:00:00 2001
From: Ben Burwood <ben.burwood@outlook.com>
Date: Wed, 28 Feb 2024 20:41:32 +0000
Subject: [PATCH 4/6] Extract Config Utils

---
 NetworkMapper/ip/utils/__init__.py |  0
 NetworkMapper/ip/utils/config.py   | 18 ++++++++++++++++++
 NetworkMapper/ip/views/index.py    | 18 +++---------------
 3 files changed, 21 insertions(+), 15 deletions(-)
 create mode 100644 NetworkMapper/ip/utils/__init__.py
 create mode 100644 NetworkMapper/ip/utils/config.py

diff --git a/NetworkMapper/ip/utils/__init__.py b/NetworkMapper/ip/utils/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/NetworkMapper/ip/utils/config.py b/NetworkMapper/ip/utils/config.py
new file mode 100644
index 0000000..93e97d5
--- /dev/null
+++ b/NetworkMapper/ip/utils/config.py
@@ -0,0 +1,18 @@
+from typing import Any
+
+import yaml
+from django.conf import settings
+
+def get_config_value(key: str, default: Any) -> str:
+    with open(settings.CONFIG_FILE_PATH, "r") as yaml_file:
+        yaml_data = yaml.safe_load(yaml_file) or {}
+    return yaml_data.get(key, default)
+
+
+def update_config_value(key: str, value: str) -> None:
+    with open(settings.CONFIG_FILE_PATH, "r+") as yaml_file:
+        yaml_data = yaml.safe_load(yaml_file) or {}
+        yaml_data[key] = value
+        yaml_file.seek(0)
+        yaml.dump(yaml_data, yaml_file)
+        yaml_file.truncate()
diff --git a/NetworkMapper/ip/views/index.py b/NetworkMapper/ip/views/index.py
index 1b21eb9..b7c0de5 100644
--- a/NetworkMapper/ip/views/index.py
+++ b/NetworkMapper/ip/views/index.py
@@ -1,17 +1,7 @@
-import yaml
-from django.conf import settings
 from django.shortcuts import redirect, render
 from django.urls import reverse
 
-
-def update_config_value(key: str, value: str) -> None:
-    with open(settings.CONFIG_FILE_PATH, "r+") as yaml_file:
-        yaml_data = yaml.safe_load(yaml_file) or {}
-        yaml_data[key] = value
-        yaml_file.seek(0)
-        yaml.dump(yaml_data, yaml_file)
-        yaml_file.truncate()
-
+from ..utils.config import get_config_value, update_config_value
 
 def index(request):
     if request.method == "POST":
@@ -24,9 +14,7 @@ def index(request):
             update_config_value("router_ip", router_ip)
             return redirect(reverse("index"))
 
-    with open(settings.CONFIG_FILE_PATH, "r") as yaml_file:
-        yaml_data = yaml.safe_load(yaml_file) or {}
-    base_ip = yaml_data.get("base_ip", "0.0")
-    router_ip = yaml_data.get("router_ip", "0.0.0.0")
+    base_ip = get_config_value("base_ip", "0.0")
+    router_ip = get_config_value("router_ip", "0.0.0.0")
 
     return render(request, "ip/index.html", {"base_ip": base_ip, "router_ip": router_ip})

From 1c7f4b3aed2ee189e25def99261dfba08c5d73c6 Mon Sep 17 00:00:00 2001
From: Ben Burwood <ben.burwood@outlook.com>
Date: Wed, 28 Feb 2024 20:45:06 +0000
Subject: [PATCH 5/6] Extract base Util Package

---
 NetworkMapper/ip/views/index.py          | 3 ++-
 NetworkMapper/{ip => }/utils/__init__.py | 0
 NetworkMapper/{ip => }/utils/config.py   | 0
 3 files changed, 2 insertions(+), 1 deletion(-)
 rename NetworkMapper/{ip => }/utils/__init__.py (100%)
 rename NetworkMapper/{ip => }/utils/config.py (100%)

diff --git a/NetworkMapper/ip/views/index.py b/NetworkMapper/ip/views/index.py
index b7c0de5..7d2bd79 100644
--- a/NetworkMapper/ip/views/index.py
+++ b/NetworkMapper/ip/views/index.py
@@ -1,7 +1,8 @@
 from django.shortcuts import redirect, render
 from django.urls import reverse
 
-from ..utils.config import get_config_value, update_config_value
+from utils.config import get_config_value, update_config_value
+
 
 def index(request):
     if request.method == "POST":
diff --git a/NetworkMapper/ip/utils/__init__.py b/NetworkMapper/utils/__init__.py
similarity index 100%
rename from NetworkMapper/ip/utils/__init__.py
rename to NetworkMapper/utils/__init__.py
diff --git a/NetworkMapper/ip/utils/config.py b/NetworkMapper/utils/config.py
similarity index 100%
rename from NetworkMapper/ip/utils/config.py
rename to NetworkMapper/utils/config.py

From c4c01534292bf09be730b426be0ebeb448bbe6ae Mon Sep 17 00:00:00 2001
From: Ben Burwood <ben.burwood@outlook.com>
Date: Wed, 28 Feb 2024 20:54:04 +0000
Subject: [PATCH 6/6] Update CSS

---
 NetworkMapper/ip/templates/ip/index.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/NetworkMapper/ip/templates/ip/index.html b/NetworkMapper/ip/templates/ip/index.html
index 549221b..03ef46c 100644
--- a/NetworkMapper/ip/templates/ip/index.html
+++ b/NetworkMapper/ip/templates/ip/index.html
@@ -14,11 +14,11 @@
             <h2>Base IP</h2>
             <form method="post" action="{% url 'index' %}">
                 {% csrf_token %}
-                <div class="form-group">
+                <div class="form-group d-flex">
                     <label for="base_ip">Base IP:</label>
-                    <input type="text" class="form-control" id="base_ip" name="base_ip" value="{{ base_ip }}">
+                    <input type="text" id="base_ip" name="base_ip" value="{{ base_ip }}" class="form-control">
+                    <button type="submit" name="base_ip-submit" class="btn btn-primary">Save</button>
                 </div>
-                <button type="submit" name="base_ip-submit" class="btn btn-primary">Save Base IP</button>
             </form>
         </div>
 
@@ -26,11 +26,11 @@ <h2>Base IP</h2>
             <h2>Route IP</h2>
             <form method="post" action="{% url 'index' %}">
                 {% csrf_token %}
-                <div class="form-group">
+                <div class="form-group d-flex">
                     <label for="router_ip">Router IP:</label>
-                    <input type="text" class="form-control" id="router_ip" name="router_ip" value="{{ router_ip }}">
+                    <input type="text" id="router_ip" name="router_ip" value="{{ router_ip }}" class="form-control">
+                    <button type="submit" name="router_ip-submit" class="btn btn-primary">Save</button>
                 </div>
-                <button type="submit" name="router_ip-submit" class="btn btn-primary">Save Route IP</button>
             </form>
         </div>
     </div>