From 542b6a43b01a55f33194ae025c125e8e52c4c45d Mon Sep 17 00:00:00 2001
From: NexusGKSoftwares <nexusgk3@gmail.com>
Date: Mon, 9 Dec 2024 07:01:45 +0300
Subject: [PATCH] updated db.sqlite

---
 .../templates/admin_panel/add_job.html        |   2 +-
 .../admin_panel/admin_manage_users.html       |   2 +-
 .../templates/admin_panel/dashboard.html      |  29 +++++++++--------
 .../templates/admin_panel/delete_job.html     |   2 +-
 .../templates/admin_panel/edit_job.html       |   2 +-
 admin_panel/templates/admin_panel/navbar.html |  30 +++++++-----------
 .../templates/admin_panel/sidebar.html        |   6 ++--
 .../templates/admin_panel/view_job.html       |   2 +-
 admin_panel/templates/base.html               |   2 +-
 db.sqlite3                                    | Bin 233472 -> 233472 bytes
 freelancer/__pycache__/views.cpython-312.pyc  | Bin 10951 -> 11030 bytes
 .../templates/freelancer/dashboard.html       |   4 ++-
 .../freelancer/freelancer_ongoing_jobs.html   |  27 ++++++++++++++++
 freelancer/templates/freelancer/navbar.html   |   5 ++-
 freelancer/views.py                           |  22 ++++++-------
 15 files changed, 78 insertions(+), 57 deletions(-)

diff --git a/admin_panel/templates/admin_panel/add_job.html b/admin_panel/templates/admin_panel/add_job.html
index 7af8b46..ddf84b8 100644
--- a/admin_panel/templates/admin_panel/add_job.html
+++ b/admin_panel/templates/admin_panel/add_job.html
@@ -25,7 +25,7 @@ <h2 class="text-center">Add Job</h2>
             <textarea class="form-control" id="description" name="description" rows="5" required></textarea>
         </div>
         <div class="mb-3">
-            <label for="budget" class="form-label">Budget ($)</label>
+            <label for="budget" class="form-label">Budget (Kshs)</label>
             <input type="number" class="form-control" id="budget" name="budget" min="1" required>
         </div>
         <div class="mb-3">
diff --git a/admin_panel/templates/admin_panel/admin_manage_users.html b/admin_panel/templates/admin_panel/admin_manage_users.html
index bdf61e0..a5ff1bc 100644
--- a/admin_panel/templates/admin_panel/admin_manage_users.html
+++ b/admin_panel/templates/admin_panel/admin_manage_users.html
@@ -5,7 +5,7 @@
     <div class="card shadow-sm">
         <div class="card-header bg-primary text-white d-flex justify-content-between align-items-center">
             <h4>
-                <i class="bi bi-people-fill me-2"></i> User Management
+                <i class="bi bi-people-fill text-white me-2"></i> User Management
             </h4>
             <a href="{% url 'add_user' %}" class="btn btn-light btn-sm">
                 <i class="bi bi-plus-circle me-2"></i>Add New User
diff --git a/admin_panel/templates/admin_panel/dashboard.html b/admin_panel/templates/admin_panel/dashboard.html
index 55bf0b6..0142ba0 100644
--- a/admin_panel/templates/admin_panel/dashboard.html
+++ b/admin_panel/templates/admin_panel/dashboard.html
@@ -4,6 +4,7 @@
 
 {% block content %}
 <style>
+   
     .card {
         background: linear-gradient(to bottom right, #f0f4c3, #3256ce); /* Default gradient */
         border: none;
@@ -19,12 +20,12 @@
     }
 
     .gradient-manage-users {
-        background: linear-gradient(to bottom right, #2196f3, #64b5f6);
+        background: linear-gradient(to bottom right, #008afc, #2700b3);
         color: #fff;
     }
 
     .gradient-job-postings {
-        background: linear-gradient(to bottom right, #4caf50, #81c784);
+        background: linear-gradient(to bottom right, #24eb2b, #5c8f5f);
         color: #fff;
     }
 
@@ -74,7 +75,7 @@ <h4 class="mb-0">Welcome, Admin!</h4>
                 <div class="card-body">
                     <i class="fas fa-users fa-3x"></i>
                     <h5 class="card-title mt-3">Manage Users</h5>
-                    <p class="card-text">View and manage all platform users.</p>
+                    <p class="card-text" style="color: white;" style="color: white;">View and manage all platform users.</p>
                     <a href="{% url 'admin_manage_users' %}" class="btn btn-outline-light">View Users</a>
                 </div>
             </div>
@@ -85,7 +86,7 @@ <h5 class="card-title mt-3">Manage Users</h5>
         <div class="card-body">
             <i class="fas fa-clipboard-list fa-3x"></i>
             <h5 class="card-title mt-3">Job Postings Overview</h5>
-            <p class="card-text">Monitor all job postings and their statuses.</p>
+            <p class="card-text" style="color: white;">Monitor all job postings and their statuses.</p>
             <a href="{% url 'job_postings' %}" class="btn btn-outline-light">View Jobs</a>
         </div>
     </div>
@@ -97,7 +98,7 @@ <h5 class="card-title mt-3">Job Postings Overview</h5>
         <div class="card-body">
             <i class="fas fa-dollar-sign fa-3x"></i>
             <h5 class="card-title mt-3">Payment Management</h5>
-            <p class="card-text">Manage and review all platform payments.</p>
+            <p class="card-text" style="color: white;">Manage and review all platform payments.</p>
             <a href="{% url 'admin_payments' %}" class="btn btn-outline-light">Manage Payments</a>
         </div>
     </div>
@@ -109,7 +110,7 @@ <h5 class="card-title mt-3">Payment Management</h5>
         <div class="card-body">
             <i class="fas fa-cogs fa-3x"></i>
             <h5 class="card-title mt-3">System Activity</h5>
-            <p class="card-text">Monitor system performance and user activities.</p>
+            <p class="card-text" style="color: white;">Monitor system performance and user activities.</p>
             <a href="{% url 'admin_system_activity' %}" class="btn btn-outline-light">View Activity</a>
         </div>
     </div>
@@ -123,7 +124,7 @@ <h5 class="card-title mt-3">System Activity</h5>
                 <div class="card-body">
                     <i class="fas fa-chart-line fa-3x"></i>
                     <h5 class="card-title mt-3">Analytics</h5>
-                    <p class="card-text">View platform performance, traffic, and growth metrics.</p>
+                    <p class="card-text" style="color: white;">View platform performance, traffic, and growth metrics.</p>
                     <a href="{% url 'admin_analytics' %}" class="btn btn-outline-light">View Analytics</a>
                 </div>
             </div>
@@ -135,7 +136,7 @@ <h5 class="card-title mt-3">Analytics</h5>
                 <div class="card-body">
                     <i class="fas fa-bell fa-3x"></i>
                     <h5 class="card-title mt-3">Notifications</h5>
-                    <p class="card-text">Manage and view system notifications for admin actions.</p>
+                    <p class="card-text" style="color: white;">Manage and view system notifications for admin actions.</p>
                     <a href="{% url 'admin_notifications' %}" class="btn btn-outline-light">Manage Notifications</a>
                 </div>
             </div>
@@ -147,7 +148,7 @@ <h5 class="card-title mt-3">Notifications</h5>
                 <div class="card-body">
                     <i class="fas fa-headset fa-3x"></i>
                     <h5 class="card-title mt-3">Support Tickets</h5>
-                    <p class="card-text">Manage support tickets submitted by users or freelancers.</p>
+                    <p class="card-text" style="color: white;">Manage support tickets submitted by users or freelancers.</p>
                     <a href="{% url 'admin_support_tickets' %}" class="btn btn-outline-light">View Tickets</a>
                 </div>
             </div>
@@ -159,7 +160,7 @@ <h5 class="card-title mt-3">Support Tickets</h5>
                 <div class="card-body">
                     <i class="fas fa-comments fa-3x"></i>
                     <h5 class="card-title mt-3">User Feedback</h5>
-                    <p class="card-text">View and manage user feedback and reviews.</p>
+                    <p class="card-text" style="color: white;">View and manage user feedback and reviews.</p>
                     <a href="{% url 'admin_user_feedback' %}" class="btn btn-outline-dark">View Feedback</a>
                 </div>
             </div>
@@ -174,7 +175,7 @@ <h5 class="card-title mt-3">User Feedback</h5>
                 <div class="card-body">
                     <i class="fas fa-user-tie fa-3x"></i>
                     <h5 class="card-title mt-3">Manage Freelancers</h5>
-                    <p class="card-text">Monitor and manage freelancer profiles and activities.</p>
+                    <p class="card-text" style="color: white;">Monitor and manage freelancer profiles and activities.</p>
                     <a href="{% url 'admin_manage_freelancers' %}" class="btn btn-outline-light">View Freelancers</a>
                 </div>
             </div>
@@ -186,7 +187,7 @@ <h5 class="card-title mt-3">Manage Freelancers</h5>
                 <div class="card-body">
                     <i class="fas fa-users-cog fa-3x"></i>
                     <h5 class="card-title mt-3">Manage Clients</h5>
-                    <p class="card-text">View and manage client accounts and their projects.</p>
+                    <p class="card-text" style="color: white;">View and manage client accounts and their projects.</p>
                     <a href="{% url 'admin_manage_clients' %}" class="btn btn-outline-light">View Clients</a>
                 </div>
             </div>
@@ -198,7 +199,7 @@ <h5 class="card-title mt-3">Manage Clients</h5>
                 <div class="card-body">
                     <i class="fas fa-heartbeat fa-3x"></i>
                     <h5 class="card-title mt-3">System Health</h5>
-                    <p class="card-text">Check the health and uptime of the system.</p>
+                    <p class="card-text" style="color: white;">Check the health and uptime of the system.</p>
                     <a href="{% url 'admin_system_health' %}" class="btn btn-outline-light">View Health</a>
                 </div>
             </div>
@@ -210,7 +211,7 @@ <h5 class="card-title mt-3">System Health</h5>
                 <div class="card-body">
                     <i class="fas fa-user-plus fa-3x"></i>
                     <h5 class="card-title mt-3">New Registrations</h5>
-                    <p class="card-text">View and manage new freelancer and client registrations.</p>
+                    <p class="card-text" style="color: white;">View and manage new freelancer and client registrations.</p>
                     <a href="{% url 'admin_new_registrations' %}" class="btn btn-outline-light">View Registrations</a>
                 </div>
             </div>
diff --git a/admin_panel/templates/admin_panel/delete_job.html b/admin_panel/templates/admin_panel/delete_job.html
index c2b6c8e..412c60b 100644
--- a/admin_panel/templates/admin_panel/delete_job.html
+++ b/admin_panel/templates/admin_panel/delete_job.html
@@ -9,7 +9,7 @@ <h2 class="text-center">Delete Job</h2>
     <form method="post">
         {% csrf_token %}
         <button type="submit" class="btn btn-danger">Yes, Delete</button>
-        <a href="{% url 'admin_job_postings' %}" class="btn btn-secondary">Cancel</a>
+        <a href="{% url 'job_postings' %}" class="btn btn-secondary">Cancel</a>
     </form>
 </div>
 {% endblock %}
diff --git a/admin_panel/templates/admin_panel/edit_job.html b/admin_panel/templates/admin_panel/edit_job.html
index d61ec20..26dd80f 100644
--- a/admin_panel/templates/admin_panel/edit_job.html
+++ b/admin_panel/templates/admin_panel/edit_job.html
@@ -25,7 +25,7 @@ <h2 class="text-center">Edit Job</h2>
             <textarea class="form-control" id="description" name="description" rows="5" required>{{ job.description }}</textarea>
         </div>
         <div class="mb-3">
-            <label for="budget" class="form-label">Budget ($)</label>
+            <label for="budget" class="form-label">Budget (Kshs)</label>
             <input type="number" class="form-control" id="budget" name="budget" value="{{ job.budget }}" min="1" required>
         </div>
         <div class="mb-3">
diff --git a/admin_panel/templates/admin_panel/navbar.html b/admin_panel/templates/admin_panel/navbar.html
index 6c2716c..1820457 100644
--- a/admin_panel/templates/admin_panel/navbar.html
+++ b/admin_panel/templates/admin_panel/navbar.html
@@ -1,12 +1,18 @@
 <!-- Add Font Awesome and Animate.css link -->
 <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css" rel="stylesheet">
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css">
-
-<nav class="navbar navbar-expand-lg bg-primary">
+<style>
+    .navbar {
+    background: #030250;
+    box-shadow: 0px 4px 6px rgba(0, 0, 0, 0.1);
+  }
+</style>
+<nav class="navbar navbar-expand-lg ">
   <div class="container-fluid" data-collapse="medium" data-animation="default" data-duration="400" class="navbar w-nav">
     <!-- Brand and toggle for mobile -->
-    <a class="navbar-brand text-light" href="#">
-      <i class="fas fa-cogs"></i> Admin Panel
+    <a class="navbar-brand text-white fw-bold" href="{% url 'freelancer_dashboard' %}">
+      <img src="http://uploads.webflow.com/5862ff0a48ddaea33e96e0ef/587523cda9cb9b0448b0f616_Logo.png" width="50" />
+        Freelancer Admin  Panel
     </a>
     <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
       <span class="navbar-toggler-icon"></span>
@@ -73,22 +79,8 @@
         </li>
       </ul>
 
-      <!-- Dark Mode Toggle -->
-      <div class="form-check form-switch text-light ms-2">
-        <input class="form-check-input" type="checkbox" id="darkModeToggle">
-        <label class="form-check-label" for="darkModeToggle">Dark Mode</label>
-      </div>
     </div>
   </div>
 </nav>
 
-<!-- Optional Dark Mode Script -->
-<script>
-  const darkModeToggle = document.getElementById('darkModeToggle');
-  darkModeToggle.addEventListener('change', () => {
-    document.body.classList.toggle('bg-dark', darkModeToggle.checked);
-    document.body.classList.toggle('text-light', darkModeToggle.checked);
-    const navbar = document.querySelector('.navbar');
-    navbar.classList.toggle('bg-dark', darkModeToggle.checked);
-  });
-</script>
+
diff --git a/admin_panel/templates/admin_panel/sidebar.html b/admin_panel/templates/admin_panel/sidebar.html
index 04644b5..cad311e 100644
--- a/admin_panel/templates/admin_panel/sidebar.html
+++ b/admin_panel/templates/admin_panel/sidebar.html
@@ -1,19 +1,19 @@
 <!-- Normal Sidebar for Large Screens -->
-<nav id="sidebarMenu" class=" sidebar" style="background: linear-gradient(45deg, #1e3c72, #1f63d8); height:100%; color: white;">
+<nav id="sidebarMenu" class=" sidebar" style="background: #030250; height:100%; color: white;">
     <div class="position-sticky pt-3">
         <ul class="nav flex-column">
             <!-- Dashboard -->
             <li class="nav-item">
                 <a class="nav-link active" href="/admin_panel/dashboard/" style="color: white;">
                     <i class="fa fa-tachometer" style="color: white;"></i>
-                    <span class="menu-text">Dashboard</span>
+                    <span class="menu-text" >Dashboard</span>
                 </a>
             </li>
 
             <!-- User Management -->
             <li class="nav-item">
                 <a class="nav-link" href="/admin_panel/manage_users/" style="color: white;">
-                    <i class="fa fa-users" style="color: white;"></i>
+                    <i class="fa fa-users" style="color: #f3f3f3;"></i>
                     <span class="menu-text">User Management</span>
                 </a>
             </li>
diff --git a/admin_panel/templates/admin_panel/view_job.html b/admin_panel/templates/admin_panel/view_job.html
index bc464c4..edda236 100644
--- a/admin_panel/templates/admin_panel/view_job.html
+++ b/admin_panel/templates/admin_panel/view_job.html
@@ -8,7 +8,7 @@ <h2 class="text-center">View Job</h2>
     <h3>{{ job.title }}</h3>
     <p><strong>Category:</strong> {{ job.category }}</p>
     <p><strong>Description:</strong> {{ job.description }}</p>
-    <p><strong>Budget:</strong> ${{ job.budget }}</p>
+    <p><strong>Budget:</strong> Kshs .{{ job.budget }}</p>
     <p><strong>Status:</strong> {{ job.status }}</p>
     <p><strong>Created At:</strong> {{ job.created_at|date:"d M Y" }}</p>
     <a href="{% url 'admin_edit_job' job.id %}" class="btn btn-warning">Edit</a>
diff --git a/admin_panel/templates/base.html b/admin_panel/templates/base.html
index be06f33..af16522 100644
--- a/admin_panel/templates/base.html
+++ b/admin_panel/templates/base.html
@@ -24,7 +24,7 @@
 <body>
   
   {% include 'admin_panel/navbar.html' %}
-  <div class="container-fluid">
+  <div class="container-fluid" style="background: #01048d; height: 100%;">
     <div class="row">
       <div class="col-md-2">
         {% include 'admin_panel/sidebar.html' %}
diff --git a/db.sqlite3 b/db.sqlite3
index 114cfe583ac947f6712d0fef2a42a21fda00c619..23e431647396d5f4da141fc67fb382cb65ea5c99 100644
GIT binary patch
delta 62
zcmV-E0Kxx&pbmhb4v-rGQjr`(0aAfrg<t`NU;?#Z1EPNnpa235s{;?$4XX{Svmqdz
U4Y#X}1N8v}0000tm!yvaT!LK`E&u=k

delta 62
zcmV-E0Kxx&pbmhb4v-rGQIQ-&0a1Zqg<t`NU;?#Z1EPNn&;SDss{;?$51<XJvmqdz
U4Y#X}1N8v}E&>Mtm!yvaT!;n~Q~&?~

diff --git a/freelancer/__pycache__/views.cpython-312.pyc b/freelancer/__pycache__/views.cpython-312.pyc
index 7931b678ab22026d1d6fb7834d3b69e31967968d..624ff4f90d594ca41d61ff316b4dd74c1583479d 100644
GIT binary patch
delta 826
zcmY*XOKTHR6z)x@PMRT|R@0<Tr+KugV@fT>ja03*);@eJVq=R*CNJADeOqoTN(2SP
zO%VhSbm>-#8_R56#EnJ;xiH`&_y_E2)P)P7c<$7o8Mud!@0{~}=bk(7XSQd(pS)gA
z1AaFeXN!Bg-rp^*s>hV%7MF0<@?A5#+Sc5Gs(aoj%&#o28Q+?)v?{C@ibhF;k$@jw
zAAL%67*<X+&0*>ZtZSXHrF04@>qs1Slp*<Ixx^A_HlbTmh6x$dRwAS|iM2GvLmERV
z=1BFcK9m|&LsFJ!26@QAvKp2O9Ny$Xhi!GhQ$+Y2&&CpbRwL-u9*0-jkUUXQ*i42^
zWi2VkgdEsPC(Ly19p-k|W27oBZsaIlrF7ge)Ps*a%b0q>rSj0)>xcbd5aoPn2!~X8
zydtyYEjC%Sqy;7{IC4hl9qDnpPlcB~tJt~2yQi?b9o~jD|M~J67EiJZDN9N-Ax(pr
zo^!!yhY#8!ABh29BPYo*M?vYnOxD5Zju8say5r(l*{CGSI_xPCQ|uWh(!UM$VM7r1
zqoO#lu(`T|d$<=JsN2(SRH@t3m*`;ACVIcYCsE*6K!wrXVR^FB$7ZwaQqGd{Ovv*q
znJ;^<{BLzIn_Fu;q+>hHKuBw^Qy$U!J$Etn0nf&L=i*yhN**gOvFQ{WPg|1C1l|0h
zO_S67r=a|~C|@+?`=XQwJ{sjJI}Of?sEWAiKD&B*{?3YVjy{G5G4o-T{A_G+wc4&`
zk|lNr!tX9O$=6s8ZNI~cWU<C_X!{&iAbO4E&~Eu#o2aoONz`haNukDa$lU^H*Gw`8
J^Z|5+{R3M-<1qjL

delta 828
zcmY*XOH30{6y=qHwlnF7Qm{;?Efi{LLJ1m)w3MQW2BIPMi{V?UEePTJT8Y*~6Aeo?
z-b6RXtsyZ+Gn)y~gcVkeVUk&B*tyhIi7RE}yQPgd$vrvm%$a*{&YP#BACi{O77Jg)
zp2vsDxtDJ(hhps?!LRTqL<2XXTVslRa@iym1b;4{rukGRozMQLWA=S+H9eOt$ndJ=
z8JU2~lApiH<PBE2dvISm%T4Kxad;yIOab+3(WLc9!O`BPG}`M)Lx8#H7{WM%f)n1$
zEn@fW{L&(wV1my~dC)p+!W3G15T@aQ+$zi<O(RUemfX$HGWvv7ZXUkNZERvw9DaKP
zV!ygj?9>M0x{%Pg1nhb2Fz@(z3dbgVWZyWSOVMmPQ*gklbCX|S@(b*e0;B6Z>tdaT
zL6>X{s;T0V7J>uG4I8dqVuKs4>--{fZlQY!zP5&%dR1X(OuKMh7a|%Lp-%SZmI2mW
zRv2jeL^5D<pCfj7?QVui_aIq;=WZWagI#yT(x>+Bw5wgZFr;xqxT6woze0q6vADqR
zk&KmCV7sHc=U5(W4y|Y4tEYD4{Rl~f8H7qmHct<qW9N6Q*tNtw%VJ0^6#KMrLKl)6
zmsIvVv&U!J;hI-IgO@-j8T{A%BC0b8mF}C~uDW%0{s<!;3BGy9#XdE-b5{#SbRnv7
zQRPx+j0Ewwpm<XhgQl1tT|>adD1N_HQ_hXbjPIL5ODmZ>i`g)J1Ydm0!#Md>TVrS_
z8O$V3N;XCh3?`DSsz^)CWz|Tgt18lxwXAX^T2+yj#EN&gsv5~~)oUiBRTU{tJI%(K
MN$f~IqUB}(0$OL-h5!Hn

diff --git a/freelancer/templates/freelancer/dashboard.html b/freelancer/templates/freelancer/dashboard.html
index d039bd7..90831ee 100644
--- a/freelancer/templates/freelancer/dashboard.html
+++ b/freelancer/templates/freelancer/dashboard.html
@@ -4,6 +4,8 @@
 
 {% block content %}
 <div class="container">
+    <br>
+    <br>
     <!-- Banner Section -->
     <div class="hero-banner" style="background-image: url('https://cdn.pixabay.com/photo/2021/03/02/13/04/laptop-6062423_960_720.jpg'); background-size: cover; background-position: center; padding: 100px 0; text-align: center; color: white; border-radius: 10px;">
         <div class="container text-light">
@@ -14,7 +16,7 @@ <h1 class="display-3 text-white">Welcome Back, {{ user }}!</h1>
             </a>
         </div>
     </div>
-    
+    <br><br>
     <!-- Header Section -->
     <div class="row mb-4 ">
         <div class="col-12">
diff --git a/freelancer/templates/freelancer/freelancer_ongoing_jobs.html b/freelancer/templates/freelancer/freelancer_ongoing_jobs.html
index e69de29..0cf68ca 100644
--- a/freelancer/templates/freelancer/freelancer_ongoing_jobs.html
+++ b/freelancer/templates/freelancer/freelancer_ongoing_jobs.html
@@ -0,0 +1,27 @@
+{% extends 'freelancer/base.html' %}
+
+{% block content %}
+<h1>Ongoing Jobs</h1>
+<ul>
+    {% for job in page_obj %}
+        <li>
+            <a href="{% url 'freelancer_job_details' job.id %}">{{ job.title }}</a> - {{ job.description|truncatechars:100 }}
+            <br><strong>Status:</strong> {{ job.status }}
+            <br><strong>Start Date:</strong> {{ job.start_date }}
+        </li>
+    {% empty %}
+        <li>No ongoing jobs found.</li>
+    {% endfor %}
+</ul>
+
+<!-- Pagination -->
+<div class="pagination">
+    {% if page_obj.has_previous %}
+        <a href="?page={{ page_obj.previous_page_number }}">Previous</a>
+    {% endif %}
+    <span>Page {{ page_obj.number }} of {{ page_obj.paginator.num_pages }}</span>
+    {% if page_obj.has_next %}
+        <a href="?page={{ page_obj.next_page_number }}">Next</a>
+    {% endif %}
+</div>
+{% endblock %}
diff --git a/freelancer/templates/freelancer/navbar.html b/freelancer/templates/freelancer/navbar.html
index 83fb41e..543683e 100644
--- a/freelancer/templates/freelancer/navbar.html
+++ b/freelancer/templates/freelancer/navbar.html
@@ -1,7 +1,7 @@
 <style>
   /* Navbar Styling */
   .navbar {
-    background: linear-gradient(90deg, #4e73df, #1cc88a);
+    background: #030250;
     box-shadow: 0px 4px 6px rgba(0, 0, 0, 0.1);
   }
   
@@ -50,8 +50,7 @@
       <!-- Brand -->
       <a class="navbar-brand text-white fw-bold" href="{% url 'freelancer_dashboard' %}">
         <img src="http://uploads.webflow.com/5862ff0a48ddaea33e96e0ef/587523cda9cb9b0448b0f616_Logo.png" width="50" />
-        <br>
-        Freelancer Panel
+          Freelancer Dashboard
       </a>
       <!-- Toggler -->
       <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
diff --git a/freelancer/views.py b/freelancer/views.py
index 86da1e1..21d177d 100644
--- a/freelancer/views.py
+++ b/freelancer/views.py
@@ -75,7 +75,7 @@ def freelancer_dashboard(request):
     available_jobs_count = Job.objects.filter(status='Available').count()
 
     # Fetch notifications for the freelancer
-    notifications = Notification.objects.filter(user=user).order_by('-created_at')
+    notifications = Notification.objects.filter(user=user).order_by('created_at')
 
     # Fetch feedback related to the freelancer
     feedbacks = Feedback.objects.filter(freelancer=freelancer).order_by('-date')
@@ -133,37 +133,37 @@ def freelancer_payment_overview(request):
 @login_required
 def freelancer_ongoing_jobs(request):
     freelancer = get_object_or_404(Freelancer, user=request.user)
-    ongoing_jobs = freelancer.jobs.filter(status='ongoing').order_by('-start_date')
+    ongoing_jobs = freelancer.jobs.filter(status='ongoing').order_by('deadline')
     
     # Add pagination
     paginator = Paginator(ongoing_jobs, 5)  # Show 5 jobs per page
     page_number = request.GET.get('page')
     page_obj = paginator.get_page(page_number)
     
-    return render(request, 'freelancer_ongoing_jobs.html', {'page_obj': page_obj})
+    return render(request, 'freelancer/freelancer_ongoing_jobs.html', {'page_obj': page_obj})
 
 
 @login_required
 def freelancer_available_jobs(request):
-    available_jobs = Job.objects.filter(status='available').order_by('-created_at')
+    available_jobs = Job.objects.filter(status='available').order_by('deadline')
     
     # Add pagination
     paginator = Paginator(available_jobs, 5)  # Show 5 jobs per page
     page_number = request.GET.get('page')
     page_obj = paginator.get_page(page_number)
     
-    return render(request, 'freelancer_available_jobs.html', {'page_obj': page_obj})
+    return render(request, 'freelancer/freelancer_available_jobs.html', {'page_obj': page_obj})
 
 
 @login_required
 def freelancer_notifications(request):
     freelancer = get_object_or_404(Freelancer, user=request.user)
-    notifications = Notification.objects.filter(freelancer=freelancer).order_by('-created_at')
+    notifications = Notification.objects.filter(freelancer=freelancer).order_by('deadline')
     
     # Mark all notifications as read when visiting this view
     notifications.update(is_read=True)
     
-    return render(request, 'freelancer_notifications.html', {'notifications': notifications})
+    return render(request, 'freelancer/freelancer_notifications.html', {'notifications': notifications})
 
 
 @login_required
@@ -171,7 +171,7 @@ def freelancer_feedback(request):
     freelancer = get_object_or_404(Freelancer, user=request.user)
     feedbacks = freelancer.feedbacks.all().order_by('-date_submitted')
     
-    return render(request, 'freelancer_feedback.html', {'feedbacks': feedbacks})
+    return render(request, 'freelancer/freelancer_feedback.html', {'feedbacks': feedbacks})
 
 
 @login_required
@@ -182,7 +182,7 @@ def freelancer_job_details(request, job_id):
     if job.freelancer != request.user.freelancer and job.status != 'available':
         raise Http404("You do not have permission to view this job.")
     
-    return render(request, 'freelancer_job_details.html', {'job': job})
+    return render(request, 'freelancer/freelancer_job_details.html', {'job': job})
 
 
 @login_required
@@ -195,7 +195,7 @@ def freelancer_payment_history(request):
     page_number = request.GET.get('page')
     page_obj = paginator.get_page(page_number)
     
-    return render(request, 'freelancer_payment_history.html', {'page_obj': page_obj})
+    return render(request, 'freelancer/freelancer_payment_history.html', {'page_obj': page_obj})
 
 
 @login_required
@@ -208,4 +208,4 @@ def freelancer_job_history(request):
     page_number = request.GET.get('page')
     page_obj = paginator.get_page(page_number)
     
-    return render(request, 'freelancer_job_history.html', {'page_obj': page_obj})
\ No newline at end of file
+    return render(request, 'freelancer/freelancer_job_history.html', {'page_obj': page_obj})
\ No newline at end of file