Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DriverRepository.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DriverRepository.java	(revision c2c10df9fb9e08514602b58e086d386b97145ed8)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DriverRepository.java	(revision 95875dd8e105bf7a4e9842e34bf20b96ba611f8b)
@@ -2,4 +2,5 @@
 
 import lombok.NonNull;
+import mk.ukim.finki.db.distributorapp.model.dto.DeliveryDto;
 import mk.ukim.finki.db.distributorapp.model.entities.Driver;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -65,3 +66,58 @@
     )
     void delete(@NonNull Long id);
+
+    //    ---------------Dashboard queries------------------------------------------
+    @Query(
+            nativeQuery = true,
+            value = """
+                    select de.del_id as id,
+                           de.del_date_created as dateCreated,
+                           de.del_date as delDate,
+                           de.del_start_km as delStartKm,
+                           de.del_end_km as delEndKm,
+                           de.del_start_time as delStartTime,
+                           de.del_end_time as delEndTime,
+                           de.d_status_id as delStatusId,
+                           ds.d_status_name as delStatus,
+                           v.veh_id as vehId,
+                           d.user_id as driverId,
+                           u.user_name as driverName,
+                           u.user_image as driverImg
+                    from driver d
+                    join users u on u.user_id = d.user_id
+                    join vehicle v on d.veh_id = v.veh_id
+                    join delivery de on v.veh_id = de.veh_id
+                    join delivery_status ds on de.d_status_id = ds.d_status_id
+                    where d.user_id = ?1 and de.d_status_id = 1
+                    order by de.del_date desc
+                    """
+    )
+    List<DeliveryDto> activeAssignedDeliveries(@NonNull Long id);
+
+    @Query(
+            nativeQuery = true,
+            value = """
+                    select de.del_id as id,
+                           de.del_date_created as dateCreated,
+                           de.del_date as delDate,
+                           de.del_start_km as delStartKm,
+                           de.del_end_km as delEndKm,
+                           de.del_start_time as delStartTime,
+                           de.del_end_time as delEndTime,
+                           de.d_status_id as delStatusId,
+                           ds.d_status_name as delStatus,
+                           v.veh_id as vehId,
+                           d.user_id as driverId,
+                           u.user_name as driverName,
+                           u.user_image as driverImg
+                    from driver d
+                    join users u on u.user_id = d.user_id
+                    join vehicle v on d.veh_id = v.veh_id
+                    join delivery de on v.veh_id = de.veh_id
+                    join delivery_status ds on de.d_status_id = ds.d_status_id
+                    where d.user_id = ?1 and de.d_status_id not between 1 and 3
+                    order by de.del_date desc
+                    """
+    )
+    List<DeliveryDto> finishedAssignedDeliveries(@NonNull Long id);
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DeliveryService.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DeliveryService.java	(revision c2c10df9fb9e08514602b58e086d386b97145ed8)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DeliveryService.java	(revision 95875dd8e105bf7a4e9842e34bf20b96ba611f8b)
@@ -23,6 +23,4 @@
     void deleteById(Long del_id);
 
-    List<DeliveryDto> getAllNewDeliveriesByDriver(Driver driver);
-
     List<DeliveryDto> getCurrentDeliveriesByCustomer (Customer customer);
 
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DriverService.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DriverService.java	(revision c2c10df9fb9e08514602b58e086d386b97145ed8)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DriverService.java	(revision 95875dd8e105bf7a4e9842e34bf20b96ba611f8b)
@@ -1,4 +1,5 @@
 package mk.ukim.finki.db.distributorapp.service;
 
+import mk.ukim.finki.db.distributorapp.model.dto.DeliveryDto;
 import mk.ukim.finki.db.distributorapp.model.dto.DriverDto;
 import mk.ukim.finki.db.distributorapp.model.entities.Driver;
@@ -21,3 +22,7 @@
 
     void deleteById(Long id);
+
+    List<DeliveryDto> getNewAssignedDeliveries(Long driverId);
+
+    List<DeliveryDto> getFinishedAssignedDeliveries(Long driverId);
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryServiceImpl.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryServiceImpl.java	(revision c2c10df9fb9e08514602b58e086d386b97145ed8)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryServiceImpl.java	(revision 95875dd8e105bf7a4e9842e34bf20b96ba611f8b)
@@ -112,10 +112,4 @@
 
     @Override
-    public List<DeliveryDto> getAllNewDeliveriesByDriver(Driver driver) {
-        List<Delivery> deliveries = this.deliveryRepository.getNewDeliveriesByDriver(driver.getUserId());
-        return buildDto(deliveries);
-    }
-
-    @Override
     public List<DeliveryDto> getCurrentDeliveriesByCustomer(Customer customer) {
         List<Delivery> deliveries = this.deliveryRepository.getCurrentDeliveriesByCustomer(customer.getUserId());
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DriverServiceImpl.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DriverServiceImpl.java	(revision c2c10df9fb9e08514602b58e086d386b97145ed8)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DriverServiceImpl.java	(revision 95875dd8e105bf7a4e9842e34bf20b96ba611f8b)
@@ -2,4 +2,5 @@
 
 import lombok.RequiredArgsConstructor;
+import mk.ukim.finki.db.distributorapp.model.dto.DeliveryDto;
 import mk.ukim.finki.db.distributorapp.model.dto.DriverDto;
 import mk.ukim.finki.db.distributorapp.model.entities.Driver;
@@ -81,3 +82,13 @@
         this.driverRepository.deleteById(id);
     }
+
+    @Override
+    public List<DeliveryDto> getNewAssignedDeliveries(Long driverId) {
+        return this.driverRepository.activeAssignedDeliveries(driverId);
+    }
+
+    @Override
+    public List<DeliveryDto> getFinishedAssignedDeliveries(Long driverId) {
+        return this.driverRepository.finishedAssignedDeliveries(driverId);
+    }
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/DriverController.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/DriverController.java	(revision c2c10df9fb9e08514602b58e086d386b97145ed8)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/DriverController.java	(revision 95875dd8e105bf7a4e9842e34bf20b96ba611f8b)
@@ -2,9 +2,5 @@
 
 import lombok.RequiredArgsConstructor;
-import mk.ukim.finki.db.distributorapp.model.dto.DriverDto;
 import mk.ukim.finki.db.distributorapp.model.dto.UserDto;
-import mk.ukim.finki.db.distributorapp.security.auth.AuthService;
-import mk.ukim.finki.db.distributorapp.service.CityService;
-import mk.ukim.finki.db.distributorapp.service.DeliveryService;
 import mk.ukim.finki.db.distributorapp.service.DriverService;
 import mk.ukim.finki.db.distributorapp.service.UsersService;
@@ -21,8 +17,5 @@
 public class DriverController {
     private final DriverService driverService;
-    private final AuthService authService;
     private final UsersService usersService;
-    private final DeliveryService deliveryService;
-    private final CityService cityService;
 
     @GetMapping("/all")
@@ -38,7 +31,7 @@
         String userEmail = authentication.getName();
         UserDto user = this.usersService.findUserDtoByEmail(userEmail);
-        DriverDto driver = this.driverService.findById(user.getId());
-//        model.addAttribute("newDeliveries", deliveryService.getAllNewDeliveriesByDriver(driver));
-//        model.addAttribute("doneDeliveries", deliveryService.getAllDeliveriesByDriver(driver));
+        model.addAttribute("user", user);
+        model.addAttribute("newDeliveries", this.driverService.getNewAssignedDeliveries(user.getId()));
+        model.addAttribute("finishedDeliveries", this.driverService.getFinishedAssignedDeliveries(user.getId()));
         return "home/driver";
     }
Index: backend/src/main/resources/templates/home/driver.html
===================================================================
--- backend/src/main/resources/templates/home/driver.html	(revision c2c10df9fb9e08514602b58e086d386b97145ed8)
+++ backend/src/main/resources/templates/home/driver.html	(revision 95875dd8e105bf7a4e9842e34bf20b96ba611f8b)
@@ -8,9 +8,49 @@
 <body>
 <div th:replace="~{fragments/navbar :: navbar}"></div>
+<div class="container mt-4">
+    <h1 th:text="'Here is your dashboard '+${user.getFirstName()}" class="mb-4"></h1>
+    <div class="row">
+        <div class="col-md-6">
+            <h2>New Deliveries</h2>
+            <table class="table table-striped">
+                <thead>
+                <tr>
+                    <th>Delivery ID</th>
+                    <th>Driver Name</th>
+                    <th>Delivery Date</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr th:each="delivery : ${newDeliveries}">
+                    <td th:text="${delivery.getId()}"></td>
+                    <td th:text="${delivery.getDriverName()}"></td>
+                    <td th:text="${delivery.getDelDate()}"></td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
 
-<div class="container mt-4">
-    <h1>Welcome to the Home Page</h1>
-    <p th:text="'Hello, ' + ${userType} + '!'"></p>
+        <div class="col-md-6">
+            <h2>Delivery History</h2>
+            <table class="table table-striped">
+                <thead>
+                <tr>
+                    <th>Delivery ID</th>
+                    <th>Driver Name</th>
+                    <th>Delivery Date</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr th:each="delivery : ${finishedDeliveries}">
+                    <td th:text="${delivery.getId()}"></td>
+                    <td th:text="${delivery.getDriverName()}"></td>
+                    <td th:text="${delivery.getDelDate()}"></td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
 </div>
+
 
 <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/js/bootstrap.bundle.min.js"></script>