diff --git a/app/Http/Controllers/ActivitiesAttendedController.php b/app/Http/Controllers/ActivitiesAttendedController.php
index 5b93161..b2d5c7a 100644
--- a/app/Http/Controllers/ActivitiesAttendedController.php
+++ b/app/Http/Controllers/ActivitiesAttendedController.php
@@ -178,9 +178,9 @@ class ActivitiesAttendedController extends Controller
// View proof button for everyone
if ($response->proof) {
- $actions[] = 'View';
+ $actions[] = '';
} else {
- $actions[] = 'No Proof';
+ $actions[] = '';
}
// Edit button with role-appropriate route
@@ -194,10 +194,10 @@ class ActivitiesAttendedController extends Controller
$editRoute = route('faculty.ActivitiesAttended.edit', $response->id);
}
- $actions[] = 'Edit';
+ $actions[] = '';
$deleteRoute = route('activitiesAttended.destroy', $response->id);
- $actions[] = '';
+ $actions[] = '';
return implode(' ', $actions);
})
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index cd69709..fb522f5 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -99,6 +99,9 @@
.dataTables_wrapper .dataTables_length,
.dataTables_wrapper .dataTables_filter {
margin-bottom: 1.5rem;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
}
.dataTables_wrapper .dataTables_length select,
@@ -106,17 +109,65 @@
border: 1px solid #d1d5db;
border-radius: 0.375rem;
padding: 0.375rem 0.75rem;
+ transition: all 0.3s ease;
+ }
+ .dataTables_wrapper .dataTables_paginate .paginate_button {
+ padding: 0;
}
- .dataTables_wrapper .dataTables_paginate .paginate_button {
- margin: 0 0.25rem;
- border-radius: 0.375rem;
+ .dataTables_wrapper .dataTables_length select:hover,
+ .dataTables_wrapper .dataTables_filter input:hover {
+ border-color: var(--primary-color);
+ box-shadow: 0 0 5px rgba(59, 130, 246, 0.5);
+ }
+
+
+
+ .dataTables_wrapper .dataTables_paginate .paginate_button:hover {
+ background-color: "#fff";
+ border-color: "#fff";
+ color: white;
}
.dataTables_wrapper .dataTables_paginate .paginate_button.current {
background: var(--primary-color) !important;
border-color: var(--primary-color) !important;
color: white !important;
+ font-weight: bold;
+ }
+
+ .dataTables_wrapper .dataTables_info {
+ margin-top: 1rem;
+ font-size: 0.875rem;
+ color: #6b7280;
+ }
+
+ .dataTables_wrapper .dataTables_scroll {
+ border: 1px solid #e5e7eb;
+ border-radius: 0.375rem;
+ overflow: hidden;
+ }
+
+ .dataTables_wrapper .dataTables_scroll .dataTables_scrollHead {
+ background-color: #f8fafc;
+ border-bottom: 1px solid #e5e7eb;
+ }
+
+ .dataTables_wrapper .dataTables_scroll .dataTables_scrollBody {
+ background-color: white;
+ }
+
+ .dataTables_wrapper .dataTables_scroll .dataTables_scrollBody tr:hover {
+ background-color: rgba(59, 130, 246, 0.05);
+ }
+
+ .dataTables_wrapper .dataTables_scroll .dataTables_scrollBody td {
+ padding: 0.75rem;
+ border-bottom: 1px solid #e5e7eb;
+ }
+
+ .dataTables_wrapper .dataTables_scroll .dataTables_scrollBody td:last-child {
+ border-right: none;
}
.dt-buttons {
diff --git a/resources/views/layouts/partials/sidebar_navigators.blade.php b/resources/views/layouts/partials/sidebar_navigators.blade.php
index 79b1002..f3af039 100644
--- a/resources/views/layouts/partials/sidebar_navigators.blade.php
+++ b/resources/views/layouts/partials/sidebar_navigators.blade.php
@@ -5,7 +5,7 @@
-
 }})
+
@@ -16,7 +16,7 @@
-
 }})
+
@@ -26,7 +26,7 @@
-
 }})
+
@@ -36,7 +36,7 @@
-
 }})
+
@@ -46,7 +46,7 @@
-
 }})
+
@@ -56,7 +56,7 @@
-
 }})
+
@@ -66,7 +66,7 @@
-
 }})
+
@@ -76,7 +76,7 @@
-
 }})
+
@@ -86,7 +86,7 @@
-
 }})
+
@@ -98,7 +98,7 @@
-
 }})
+
@@ -108,7 +108,7 @@
-
 }})
+
@@ -118,7 +118,7 @@
-
 }})
+
@@ -128,7 +128,7 @@
-
 }})
+
@@ -138,7 +138,7 @@
-
 }})
+
@@ -148,7 +148,7 @@
-
 }})
+
@@ -158,7 +158,7 @@
-
 }})
+
@@ -168,12 +168,13 @@
-
 }})
+
+
@elseif(auth()->user()->role->name === 'Faculty')
diff --git a/resources/views/pages/activities-organised/index.blade.php b/resources/views/pages/activities-organised/index.blade.php
index 2d5d054..bb4a444 100644
--- a/resources/views/pages/activities-organised/index.blade.php
+++ b/resources/views/pages/activities-organised/index.blade.php
@@ -1,36 +1,42 @@
@extends('layouts.app')
@section('content')
-
-
-
-
- All Activities Organised
-
-
-
-
-
-
-
- | ID |
- Title |
- Resource Person |
- Organisation |
- Target Audience |
- Department |
- Faculty |
- Venue |
- Activity Type |
- Category |
- Level |
- Participants |
- Actions |
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ | ID |
+ Title |
+ Resource Person |
+ Organisation |
+ Target Audience |
+ Department |
+ Faculty |
+ Venue |
+ Activity Type |
+ Category |
+ Level |
+ Participants |
+ Actions |
+
+
+
+
+
+
+
+
@@ -38,16 +44,6 @@
@endsection
@section('scripts')
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-