2024 05 16 integrate user feedback

.github/workflows/rubyonrails.yml

@@ -59,3 +59,22 @@ jobs:
 
       - name: Lint Ruby files
         run: bundle exec rubocop --parallel
+
+  brakeman:
+      runs-on: ubuntu-latest
+      steps:
+        - name: Checkout code
+          uses: actions/checkout@v3
+        - name: Install Ruby and gems
+          uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
+          with:
+            bundler-cache: true
+        - name: Install dependencies
+          run: bundle install
+        - name: Run Brakeman
+          run: bundle exec brakeman -f sarif -o output.sarif.json
+          continue-on-error: true
+        - name: Upload SARIF
+          uses: github/codeql-action/upload-sarif@v2
+          with:
+            sarif_file: output.sarif.json

.slugignore

@@ -34,6 +34,9 @@ spec/**
 .gitignore
 .dockerignore
 
+# Ignore contributing files
+CONTRIBUTING.md
+
 # Ignore yml files generated by VCR.
 spec/fixtures/cassettes/ApplicantTrackingSystem/*.yml
 

Gemfile

@@ -88,7 +88,7 @@ gem 'rails-html-sanitizer'
 gem "flipper-active_record", "~> 1.3"
 
 # Monitoring
-# gem 'newrelic_rpm' # TODO: install this gem for monitoring
+gem 'newrelic_rpm'
 
 # Analytics
 # gem 'analytics-ruby', '~> 2.4.0', :require => 'segment/analytics' # TODO: install this gem for analytics
@@ -124,6 +124,9 @@ group :development, :test do
   gem 'rubocop-rails'
   gem 'rubocop-rspec'
 
+  # Security
+  gem 'brakeman', require: false
+
   # Email
   # gem 'letter_opener' # TODO: install this gem for email testing
 end
@@ -135,9 +138,6 @@ group :development do
   gem "better_errors"
   gem "binding_of_caller"
 
-  # Security
-  # gem 'brakeman', require: false # TODO: install this gem for security checks
-
   # Performance
   # Add speed badges [https://github.com/MiniProfiler/rack-mini-profiler]
   # gem "rack-mini-profiler" # TODO: install this gem for performance monitoring

Gemfile.lock

@@ -114,6 +114,8 @@ GEM
     bootstrap (5.3.2)
       autoprefixer-rails (>= 9.1.0)
       popper_js (>= 2.11.8, < 3)
+    brakeman (6.1.2)
+      racc
     builder (3.2.4)
     bullet (7.1.6)
       activesupport (>= 3.0.0)
@@ -246,6 +248,7 @@ GEM
       timeout
     net-smtp (0.5.0)
       net-protocol
+    newrelic_rpm (9.9.0)
     nio4r (2.7.1)
     nokogiri (1.16.4-aarch64-linux)
       racc (~> 1.4)
@@ -484,6 +487,7 @@ DEPENDENCIES
   binding_of_caller
   bootsnap
   bootstrap
+  brakeman
   bullet
   capybara
   cloudinary
@@ -502,6 +506,7 @@ DEPENDENCIES
   importmap-rails
   json (~> 2.6, >= 2.6.3)
   meta-tags
+  newrelic_rpm
   nokogiri
   pg (~> 1.1)
   pg_search

app/views/jobs/_add_job_to_basket.html.erb

@@ -0,0 +1,23 @@
+<div class="d-flex align-items-center justify-content-center me-3">
+  <% if user_signed_in? %>
+    <% if @saved_job_ids.include?(job.id) %>
+      <%= link_to saved_job_path(job.saved_job_ids), data: {turbo_method: :delete} do %>
+        <i class="fa-solid fa-bookmark pe-2"></i>
+      <% end %>
+    <% else %>
+      <%= link_to job_saved_jobs_path(job), data: {turbo_method: :post} do %>
+        <i class="fa-regular fa-bookmark pe-2"></i>
+      <% end %>
+    <% end %>
+    <% include_checkboxes ||= false %>
+    <% if include_checkboxes %>
+      <div class="ms-3">
+        <%= check_box_tag "job_ids[]", job.id, onclick: "document.getElementById('apply_button').disabled = false" %>
+      </div>
+    <% end %>
+  <% end %>
+
+  <%= link_to job.posting_url, target: "_blank" do %>
+    <i class="fa-solid fa-arrow-up-right-from-square"></i>
+  <% end %>
+</div>

app/views/jobs/_basic_info.html.erb

@@ -0,0 +1,13 @@
+<div class="basic-info d-flex flex-column align-items-end justify-space-between text-sm">
+  <div class="salaryBudget"><%= job.salary.present? ? job.salary : "<br>".html_safe %></div>
+  <div class="my-1"><%= job.employment_type %> •
+    <% if job.remote %>
+      <%= "Remote"%>
+    <% elsif job.hybrid %>
+      <%= "Hybrid" %>
+    <% else %>
+      <%= "In-office" %>
+    <% end %>
+  </div>
+  <div><%= job.date_posted.strftime("%d/%m") %> <span class="meter"><hr class="line-horizontal"><div class="triangle-inverted-blue" style="left:<%= (job.deadline.nil? || job.deadline < Date.today) ? 50 : (Date.today - job.date_posted).to_i.fdiv((job.deadline - job.date_posted).to_i) * 100 %>%;"></div></span> <%= (job.deadline.nil? || job.deadline < Date.today) ? "Rolling" : job.deadline.strftime("%d/%m") %></div>
+</div>

app/views/jobs/_category_sidebar.html.erb

@@ -1,4 +1,4 @@
-<div class="col-sm-3" data-job-index-toggle-target="leftSection">
+<div data-job-index-toggle-target="leftSection">
 
   <div class = "d-flex">
     <p class="pb-0"><%= @jobs.count %> jobs • <%= link_to 'Clear filters', jobs_path %></p>
@@ -20,5 +20,4 @@
   <% @resources.each_with_index do |(resource, data), index| %>
     <%= render partial: 'category_sidebar_section', locals: {title: section_titles[index], resource: resource, resources: data, icon: icons[index]} %>
   <% end %>
-
 </div>

app/views/jobs/_climate_rating.html.erb

@@ -0,0 +1,3 @@
+<div class="d-flex flex-column align-items-center justify-content-center text-sm">
+  <div class="climate-rating"><%# job.company.carbon_pledge || 'no data' %>no data</div>
+</div>

app/views/jobs/_difficulty_rating.html.erb

@@ -0,0 +1,13 @@
+<div class="d-flex flex-column align-items-center justify-content-center text-sm">
+  <div class="apply-rating">
+    <%# To-do: Create a difficulty column for jobs table and transfer this logic to JobCreator; eventually GetFormFieldsJob will distinguish between input and text fields (for longer responses), which will help with accurate classification %>
+    <% if job.requirement.no_of_qs < 8 && !job.requirement.cover_letter %>
+      <% apply_rating = 'no data' %>
+    <% elsif job.requirement.no_of_qs > 15 %>
+      <% apply_rating = 'hard' %>
+    <% else %>
+      <% apply_rating = 'medium' %>
+    <% end %>
+    <%= apply_rating %>
+  </div>
+</div>

app/views/jobs/_job_card.html.erb

@@ -1,103 +1,17 @@
 <div class="card job-card mb-2" data-select-by-job-type-target="jobRow">
   <div class="row card-body">
-    <%# TODO: Store company logo, use clearbit when we don't have one %>
-
-    <%# Logo %>
-    <div class="col-5 d-flex flex-row align-items-center">
-      <div class="d-flex justify-content-center align-items-center mx-2">
-        <%= link_to company_path(job.company), target: "_blank" do %>
-          <%= image_tag("https://logo.clearbit.com/#{job.company.url_website}", onerror: "this.src='https://i.pinimg.com/736x/ec/d9/c2/ecd9c2e8ed0dbbc96ac472a965e4afda.jpg'", style: "width: 60px; height: 60px; padding-right: 0.5rem;") %>
-        <% end %>
-      </div>
-
-      <%# Job Title, Company, Location %>
-      <div class="d-flex flex-column justify-content-center align-items-start" data-role="<%= job.title %>">
-        <%= link_to job_path(job), target: "_blank" do %>
-          <strong><%= job.title.truncate(35) %></strong>
-        <% end %>
-
-        <%= link_to company_path(job.company), target: "_blank" do %>
-          <strong class="text-sm"><%= job.company.name %></strong>
-        <% end %>
-
-        <div class="text-sm">
-          <% if job.remote || job.locations.empty? %>
-            Remote
-          <% else %>
-            <%= job.locations.map(&:city).join(' | ') %>
-          <% end %>
-          <% if job.countries.loaded? || job.countries.count == 1 %>
-            <%= " | #{job.countries.first.name}" if job.countries.count == 1 %>
-          <% else %>
-            <%= " | #{job.countries.first.name}" if job.countries.size == 1 %>
-          <% end %>
-        </div>
-      </div>
+    <%# Logo & Info %>
+    <div class="col-12 col-md-5 col-lg-5 d-flex flex-row align-items-center mb-2 mb-md-0">
+      <%= render partial: 'jobs/logo', locals: { job: job } %>
+      <%= render partial: 'jobs/job_info', locals: { job: job } %>
     </div>
 
     <%# Job Details %>
-    <div class="col-7 d-flex flex-row justify-content-between align-items-center">
-
-      <%# Salary etc. %>
-      <div class="basic-info d-flex flex-column align-items-end justify-space-between text-sm">
-        <div class="salaryBudget"><%= job.salary.present? ? job.salary : "<br>".html_safe %></div>
-        <div class="my-1"><%= job.employment_type %> •
-          <% if job.remote %>
-            <%= "Remote"%>
-          <% elsif job.hybrid %>
-            <%= "Hybrid" %>
-          <% else %>
-            <%= "In-office" %>
-          <% end %>
-        </div>
-        <div><%= job.date_posted.strftime("%d/%m") %> <span class="meter"><hr class="line-horizontal"><div class="triangle-inverted-blue" style="left:<%= (job.deadline.nil? || job.deadline < Date.today) ? 50 : (Date.today - job.date_posted).to_i.fdiv((job.deadline - job.date_posted).to_i) * 100 %>%;"></div></span> <%= (job.deadline.nil? || job.deadline < Date.today) ? "Rolling" : job.deadline.strftime("%d/%m") %></div>
-      </div>
-
-      <%# Net Zero Rating %>
-      <div class="d-flex flex-column align-items-center justify-content-center text-sm">
-        <div class="climate-rating"><%# job.company.carbon_pledge || 'no data' %>no data</div>
-      </div>
-
-      <%# Ease of Applying %>
-      <div class="d-flex flex-column align-items-center justify-content-center text-sm">
-        <div class="apply-rating">
-          <%# To-do: Create a difficulty column for jobs table and transfer this logic to JobCreator; eventually GetFormFieldsJob will distinguish between input and text fields (for longer responses), which will help with accurate classification %>
-          <% if job.requirement.no_of_qs < 8 && !job.requirement.cover_letter %>
-            <% apply_rating = 'no data' %>
-          <% elsif job.requirement.no_of_qs > 15 %>
-            <% apply_rating = 'hard' %>
-          <% else %>
-            <% apply_rating = 'medium' %>
-          <% end %>
-          <%= apply_rating %>
-        </div>
-      </div>
-
-
-      <%# Add job to basket %>
-      <div class="d-flex align-items-center justify-content-center me-3">
-        <% if user_signed_in? %>
-          <% if @saved_job_ids.include?(job.id) %>
-            <%= link_to saved_job_path(job.saved_job_ids), data: {turbo_method: :delete} do %>
-              <i class="fa-solid fa-bookmark pe-2"></i>
-            <% end %>
-          <% else %>
-            <%= link_to job_saved_jobs_path(job), data: {turbo_method: :post} do %>
-              <i class="fa-regular fa-bookmark pe-2"></i>
-            <% end %>
-          <% end %>
-          <% include_checkboxes ||= false %>
-          <% if include_checkboxes %>
-            <div class="ms-3">
-              <%= check_box_tag "job_ids[]", job.id, onclick: "document.getElementById('apply_button').disabled = false" %>
-            </div>
-          <% end %>
-        <% end %>
-
-        <%= link_to job.posting_url, target: "_blank" do %>
-          <i class="fa-solid fa-arrow-up-right-from-square"></i>
-        <% end %>
-      </div>
+    <div class="col-12 col-md-7 col-lg-7 d-flex flex-row justify-content-between align-items-center">
+      <%= render partial: 'jobs/basic_info', locals: { job: job } %>
+      <%= render partial: 'jobs/climate_rating', locals: { job: job } %>
+      <%= render partial: 'jobs/difficulty_rating', locals: { job: job } %>
+      <%= render partial: 'jobs/add_job_to_basket', locals: { job: job, saved_job_ids: @saved_job_ids } %>
     </div>
   </div>
 </div>

app/views/jobs/_job_cards_container.html.erb

@@ -1,4 +1,4 @@
-<div class="col-sm-9">
+<div>
   <turbo-frame id="job-cards-frame">
     <%= render partial: 'job_card', collection: @jobs, as: :job %>
   </turbo-frame>

app/views/jobs/_job_info.html.erb

@@ -0,0 +1,22 @@
+<div class="d-flex flex-column justify-content-center align-items-start" data-role="<%= job.title %>">
+  <%= link_to job_path(job), target: "_blank" do %>
+    <strong><%= job.title.truncate(35) %></strong>
+  <% end %>
+
+  <%= link_to company_path(job.company), target: "_blank" do %>
+    <strong class="text-sm"><%= job.company.name %></strong>
+  <% end %>
+
+  <div class="text-sm">
+    <% if job.remote || job.locations.empty? %>
+      Remote
+    <% else %>
+      <%= job.locations.map(&:city).join(' | ') %>
+    <% end %>
+    <% if job.countries.loaded? || job.countries.count == 1 %>
+      <%= " | #{job.countries.first.name}" if job.countries.count == 1 %>
+    <% else %>
+      <%= " | #{job.countries.first.name}" if job.countries.size == 1 %>
+    <% end %>
+  </div>
+</div>

app/views/jobs/_logo.html.erb

@@ -0,0 +1,5 @@
+<div class="d-flex justify-content-center align-items-center mx-2">
+  <%= link_to company_path(job.company), target: "_blank" do %>
+    <%= image_tag("https://logo.clearbit.com/#{job.company.url_website}", onerror: "this.src='https://i.pinimg.com/736x/ec/d9/c2/ecd9c2e8ed0dbbc96ac472a965e4afda.jpg'", style: "width: 60px; height: 60px; padding-right: 0.5rem;") %>
+  <% end %>
+</div>

app/views/jobs/index.html.erb

@@ -1,16 +1,20 @@
-<%# The title meta tag here seems to be affecting the filter_category_sidebar. Not sure how to fix because I don't want to break anything but uncomment the title "All Jobs" below to see what I mean %>
-
-<%# <% title "All Jobs" %>
-<% description "Discover thousands of jobs on our platform. With Cheddar's innovative one-click applciation process, you can select multiple positions that interest you and apply to all of them at once without having to leave our site." %>
+<% title "Find Jobs" %>
+<% description "Discover and apply to thousands of jobs with Cheddar's innovative one-click application process. Add jobs that interest you to your basket and apply to all of them at once, without ever need to leave our site." %>
 
 <div class="container" data-controller="select-by-job-type">
 
-  <div class="d-flex justify-content-center align-items-center pb-4">
-    <%= render 'search' %>
+  <div class="row d-flex justify-content-center align-items-center pb-4">
+    <div class="col-12 col-md-8">
+      <%= render 'search' %>
+    </div>
   </div>
-  
+
   <div class="row">
-    <%= render 'category_sidebar' %>
-    <%= render 'job_cards_container' %>
+    <div class="col-12 col-md-9 order-md-2">
+      <%= render 'job_cards_container' %>
+    </div>
+    <div class="col-12 col-md-3 order-md-1 mb-4 mb-md-0">
+      <%= render 'category_sidebar' %>
+    </div>
   </div>
 </div>