Skip to content

Commit 37d719b

Browse files
hussain-cdmhussain-cdm
committed
refactor: refactored the comment flow
1 parent 5dcce10 commit 37d719b

File tree

5 files changed

+87
-98
lines changed

5 files changed

+87
-98
lines changed

‎app/models/interview.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
class Interview < ApplicationRecord
22
belongs_to :job_application
33
belongs_to :user
4+
5+
validates :start_time, :end_time, :interviewers, presence: true
46
end

‎app/views/employer/job_applications/_comment.html.erb

Lines changed: 2 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -3,92 +3,11 @@
33
<h3 class="text-lg font-medium text-violet-700 mb-4">Comments</h3>
44

55
<% if @job_application.application_comments.any? %>
6-
<ul role="list" class="space-y-6">
7-
<% @job_application.application_comments.order(created_at: :desc).each do |comment| %>
8-
<li class="relative flex gap-x-4" data-comment-target="comment" data-comment-id="<%= comment.id %>">
9-
<div class="absolute top-0 -bottom-6 left-0 flex w-6 justify-center">
10-
<div class="w-px bg-gray-200"></div>
11-
</div>
12-
<div class="relative mt-3 size-6 flex-none rounded-full bg-violet-100 flex items-center justify-center">
13-
<%= inline_svg_tag "user_icon.svg", class: "h-4 w-4 text-violet-600" %>
14-
</div>
15-
<div class="flex-auto rounded-md p-3 ring-1 ring-gray-200 ring-inset">
16-
<div class="flex justify-between gap-x-4">
17-
<div class="py-0.5 text-xs/5 text-gray-500">
18-
<span class="font-medium text-gray-900"><%= comment.user.first_name %></span> commented
19-
</div>
20-
<div class="flex items-center gap-x-2">
21-
<time datetime="<%= comment.created_at.iso8601 %>" class="flex-none py-0.5 text-xs/5 text-gray-500">
22-
<%= time_ago_in_words(comment.created_at) %> ago
23-
</time>
24-
<% if comment.user == Current.user %>
25-
<div class="flex items-center gap-x-1">
26-
<button type="button"
27-
class="text-gray-400 hover:text-gray-500"
28-
data-action="comment#edit"
29-
data-comment-id="<%= comment.id %>">
30-
<%= inline_svg_tag "edit_icon.svg", class: "h-4 w-4" %>
31-
</button>
32-
<%= button_to employer_job_post_job_application_application_comment_path(@job_post, @job_application, comment),
33-
method: :delete,
34-
class: "text-gray-400 hover:text-gray-500",
35-
form: { class: "inline-block" },
36-
data: { turbo: false } do %>
37-
<%= inline_svg_tag "delete_icon.svg", class: "h-4 w-4" %>
38-
<% end %>
39-
</div>
40-
<% end %>
41-
</div>
42-
</div>
43-
<div data-comment-target="content">
44-
<p class="text-sm/6 text-gray-500"><%= comment.comment %></p>
45-
</div>
46-
<div class="hidden" data-comment-target="form">
47-
<%= form_with(model: [:employer, @job_post, @job_application, comment],
48-
local: true,
49-
class: "mt-2") do |f| %>
50-
<%= f.text_area :comment,
51-
rows: 2,
52-
value: comment.comment,
53-
class: "block w-full rounded-md border-0 px-3 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-violet-600 sm:text-sm sm:leading-6",
54-
data: { comment_target: "textarea" } %>
55-
<div class="mt-2 flex justify-end gap-x-2">
56-
<button type="button"
57-
class="rounded px-2 py-1 text-sm text-gray-600 hover:text-gray-800"
58-
data-action="comment#cancelEdit">
59-
Cancel
60-
</button>
61-
<%= f.submit "Update",
62-
class: "rounded-md bg-violet-600 px-2 py-1 text-sm font-semibold text-white shadow-sm hover:bg-violet-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-violet-600" %>
63-
</div>
64-
<% end %>
65-
</div>
66-
</div>
67-
</li>
68-
<% end %>
69-
</ul>
6+
<%= render "comment_item" %>
707
<% else %>
718
<p class="text-gray-500 text-sm">No comments yet.</p>
729
<% end %>
7310

7411
<!-- New comment form -->
75-
<div class="mt-6 flex gap-x-3">
76-
<div class="size-6 flex-none rounded-full bg-violet-100 flex items-center justify-center">
77-
<%= inline_svg_tag "user_icon.svg", class: "h-4 w-4 text-violet-600" %>
78-
</div>
79-
<%= form_with(model: [:employer, @job_post, @job_application, ApplicationComment.new], local: true, class: "relative flex-auto") do |f| %>
80-
<div class="overflow-hidden rounded-lg pb-12 outline-1 -outline-offset-1 outline-gray-300 focus-within:outline-2 focus-within:-outline-offset-2 focus-within:outline-indigo-600">
81-
<%= f.label :comment, "Add your comment", class: "sr-only" %>
82-
<%= f.text_area :comment, rows: 2,
83-
class: "block w-full resize-none bg-transparent px-3 py-1.5 text-base text-gray-900 placeholder:text-gray-400 focus:outline-none sm:text-sm/6",
84-
placeholder: "Add your comment..." %>
85-
</div>
86-
87-
<div class="absolute inset-x-0 bottom-0 flex justify-between py-2 pr-2 pl-3">
88-
<div class="flex items-center space-x-5">
89-
<%= f.submit "Post", class: "rounded-md bg-blue-600 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600" %>
90-
</div>
91-
</div>
92-
<% end %>
93-
</div>
12+
<%= render "comment_form" %>
9413
</div>

‎app/views/employer/job_applications/_comment_form.html.erb

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<div class="mt-6 flex gap-x-3">
2+
<div class="size-6 flex-none rounded-full bg-violet-100 flex items-center justify-center">
3+
<%= inline_svg_tag "user_icon.svg", class: "h-4 w-4 text-violet-600" %>
4+
</div>
5+
<%= form_with(model: [:employer, @job_post, @job_application, ApplicationComment.new], local: true, class: "relative flex-auto") do |f| %>
6+
<div class="overflow-hidden rounded-lg pb-12 outline-1 -outline-offset-1 outline-gray-300 focus-within:outline-2 focus-within:-outline-offset-2 focus-within:outline-indigo-600">
7+
<%= f.label :comment, "Add your comment", class: "sr-only" %>
8+
<%= f.text_area :comment, rows: 2,
9+
class: "block w-full resize-none bg-transparent px-3 py-1.5 text-base text-gray-900 placeholder:text-gray-400 focus:outline-none sm:text-sm/6",
10+
placeholder: "Add your comment..." %>
11+
</div>
12+
13+
<div class="absolute inset-x-0 bottom-0 flex justify-between py-2 pr-2 pl-3">
14+
<div class="flex items-center space-x-5">
15+
<%= f.submit "Post", class: "rounded-md bg-blue-600 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600" %>
16+
</div>
17+
</div>
18+
<% end %>
19+
</div>

‎app/views/employer/job_applications/_comment_item.html.erb

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
<ul class="space-y-6">
2+
<% @job_application.application_comments.order(created_at: :desc).each do |comment| %>
3+
<li class="relative flex gap-x-4" data-comment-target="comment" data-comment-id="<%= comment.id %>">
4+
<div class="absolute top-0 -bottom-6 left-0 flex w-6 justify-center">
5+
<div class="w-px bg-gray-200"></div>
6+
</div>
7+
<div class="relative mt-3 h-6 w-6 flex-none rounded-full bg-violet-100 flex items-center justify-center">
8+
<%= inline_svg_tag "user_icon.svg", class: "h-4 w-4 text-violet-600" %>
9+
</div>
10+
<div class="flex-auto rounded-md p-3 ring-1 ring-gray-200 ring-inset">
11+
<div class="flex justify-between gap-x-4">
12+
<div class="py-0.5 text-xs text-gray-500">
13+
<span class="font-medium text-gray-900"><%= comment.user.first_name %></span> commented
14+
</div>
15+
<div class="flex items-center gap-x-2">
16+
<time datetime="<%= comment.created_at.iso8601 %>" class="flex-none py-0.5 text-xs text-gray-500">
17+
<%= time_ago_in_words(comment.created_at) %> ago
18+
</time>
19+
<% if comment.user == Current.user %>
20+
<div class="flex items-center gap-x-1">
21+
<button type="button"
22+
class="text-gray-400 hover:text-gray-500"
23+
data-action="comment#edit"
24+
data-comment-id="<%= comment.id %>">
25+
<%= inline_svg_tag "edit_icon.svg", class: "h-4 w-4" %>
26+
</button>
27+
<%= button_to employer_job_post_job_application_application_comment_path(@job_post, @job_application, comment),
28+
method: :delete,
29+
class: "text-gray-400 hover:text-gray-500",
30+
form: { class: "inline-block" },
31+
data: { turbo: false } do %>
32+
<%= inline_svg_tag "delete_icon.svg", class: "h-4 w-4" %>
33+
<% end %>
34+
</div>
35+
<% end %>
36+
</div>
37+
</div>
38+
<div data-comment-target="content">
39+
<p class="text-sm text-gray-500"><%= comment.comment %></p>
40+
</div>
41+
<div class="hidden" data-comment-target="form">
42+
<%= form_with(model: [:employer, @job_post, @job_application, comment],
43+
local: true,
44+
class: "mt-2") do |f| %>
45+
<%= f.text_area :comment,
46+
rows: 2,
47+
value: comment.comment,
48+
class: "block w-full rounded-md border-0 px-3 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-violet-600 sm:text-sm sm:leading-6",
49+
data: { comment_target: "textarea" } %>
50+
<div class="mt-2 flex justify-end gap-x-2">
51+
<button type="button"
52+
class="rounded px-2 py-1 text-sm text-gray-600 hover:text-gray-800"
53+
data-action="comment#cancelEdit">
54+
Cancel
55+
</button>
56+
<%= f.submit "Update",
57+
class: "rounded-md bg-violet-600 px-2 py-1 text-sm font-semibold text-white shadow-sm hover:bg-violet-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-violet-600" %>
58+
</div>
59+
<% end %>
60+
</div>
61+
</div>
62+
</li>
63+
<% end %>
64+
</ul>

‎lib/Google_calendar/google_calendar_event_creator.rb

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,6 @@ def create_event
3232
end
3333

3434
def authorization_url(callback_url)
35-
if ENV["GOOGLE_CLIENT_ID"].blank?
36-
Rails.logger.error "Missing GOOGLE_CLIENT_ID. Please ensure it is set in your environment."
37-
return nil
38-
end
39-
40-
if ENV["GOOGLE_CLIENT_SECRET"].blank?
41-
Rails.logger.error "Missing GOOGLE_CLIENT_SECRET. Please ensure it is set in your environment."
42-
return nil
43-
end
44-
4535
client = Google::Apis::CalendarV3::CalendarService.new
4636
client.authorization = Google::Auth::UserRefreshCredentials.new(
4737
client_id: ENV["GOOGLE_CLIENT_ID"],
@@ -60,11 +50,6 @@ def authorization_url(callback_url)
6050
def google_calendar_client
6151
return :needs_authentication if @user.google_access_token.blank? || @user.google_refresh_token.blank?
6252

63-
unless ENV["GOOGLE_CLIENT_ID"].present? && ENV["GOOGLE_CLIENT_SECRET"].present?
64-
Rails.logger.error "Missing Google OAuth credentials. Please ensure GOOGLE_CLIENT_ID and GOOGLE_CLIENT_SECRET are set in your environment."
65-
return false
66-
end
67-
6853
client = Google::Apis::CalendarV3::CalendarService.new
6954

7055
client.authorization = Google::Auth::UserRefreshCredentials.new(

0 commit comments

Comments
 (0)