Skip to content

Commit 5297864

Browse files
committed
add logo; fix pagination order
1 parent 8ceea09 commit 5297864

File tree

2 files changed

+21
-6
lines changed

2 files changed

+21
-6
lines changed

app/controllers/job_applications_controller.rb

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ class JobApplicationsController < ApplicationController
55
def index
66
@job_applications = filter_and_sort_job_applications
77
@job_application_count = @job_applications.count
8-
@job_applications = @job_applications.order(created_at: :desc).paginate(page: params[:page], per_page: 10)
8+
@job_applications = @job_applications.paginate(page: params[:page], per_page: 10)
99

1010
@pagination_info = {
1111
current_page: @job_applications.current_page,
@@ -108,11 +108,18 @@ def filter_and_sort_job_applications
108108

109109
sort_column = sort_column(params[:sort])
110110
sort_direction = sort_direction(params[:direction])
111-
job_applications.order(sort_column => sort_direction)
111+
112+
if sort_column == "created_at" || params[:sort].blank?
113+
# If sorting by created_at or no sorting specified, always use desc order
114+
job_applications.order(created_at: :desc)
115+
else
116+
# For other columns, use the specified sort direction
117+
job_applications.order(sort_column => sort_direction)
118+
end
112119
end
113120

114121
def sort_column(column)
115-
%w[date_applied company_name position_title].include?(column) ? column : "date_applied"
122+
%w[date_applied company_name position_title created_at].include?(column) ? column : "created_at"
116123
end
117124

118125
def sort_direction(direction)

app/views/job_applications/index.html.erb

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,17 @@
44
</div>
55
<div class="my-2 md:my-8">
66
<div class="mb-8 flex justify-between items-center">
7-
<h2 class="hidden md:block md:text-2xl font-semibold text-gray-700 shadow-2xl">
8-
Job Tracker
9-
</h2>
7+
<div class="flex items-center">
8+
<%= image_tag(asset_path('apple-touch-icon.png'),
9+
height: '32',
10+
width: '32',
11+
class: "rounded-full object-cover shadow-sm border-2 border-gray-200 mr-2",
12+
aria: { label: "Job Tracker logo" },
13+
title: "Job Tracker logo") %>
14+
<h2 class="hidden md:block md:text-2xl font-semibold text-gray-700 shadow-2xl">
15+
Job Tracker
16+
</h2>
17+
</div>
1018
<%= link_to 'New Job Application', new_job_application_path, class: 'text-sm bg-blue-600 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded cursor-pointer', data: { turbo_frame: "_top" } %>
1119
</div>
1220
<%= form_with url: job_applications_path, method: :get, data: { controller: "job-filter", turbo_frame: "job_applications_table" } do |form| %>

0 commit comments

Comments
 (0)