From ff955672ebbdc81ea41e29850d18cac03b6817b7 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Mon, 13 May 2024 22:34:23 +0100 Subject: [PATCH 01/94] minor update to re-push --- .slugignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.slugignore b/.slugignore index ef9d84b4..3ee05081 100644 --- a/.slugignore +++ b/.slugignore @@ -34,6 +34,9 @@ spec/** .gitignore .dockerignore +# Ignore contributing files +CONTRIBUTING.md + # Ignore yml files generated by VCR. spec/fixtures/cassettes/ApplicantTrackingSystem/*.yml From f1fcdf828b3ab4d1d7135a449cb5de7e988f880f Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Mon, 13 May 2024 22:56:11 +0100 Subject: [PATCH 02/94] change matching for log and tmp files --- .slugignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.slugignore b/.slugignore index 3ee05081..8a700ce9 100644 --- a/.slugignore +++ b/.slugignore @@ -8,8 +8,8 @@ !/.env*.erb # Ignore all logfiles and tempfiles. -/log/* -/tmp/* +log/** +tmp/** !/log/.keep !/tmp/.keep From 45b4d5aff6f483026e64b86d25cac3e523c67c4a Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Tue, 14 May 2024 07:32:49 +0100 Subject: [PATCH 03/94] change log file matching --- .slugignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.slugignore b/.slugignore index 8a700ce9..3ee05081 100644 --- a/.slugignore +++ b/.slugignore @@ -8,8 +8,8 @@ !/.env*.erb # Ignore all logfiles and tempfiles. -log/** -tmp/** +/log/* +/tmp/* !/log/.keep !/tmp/.keep From d3c9e4835540a98cb04dacf8feab2add6c911576 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Fri, 17 May 2024 16:40:06 +0100 Subject: [PATCH 04/94] refactor job card into separate partials --- app/views/jobs/_add_job_to_basket.html.erb | 24 +++++ app/views/jobs/_basic_info.html.erb | 13 +++ app/views/jobs/_climate_rating.html.erb | 3 + app/views/jobs/_difficulty_rating.html.erb | 13 +++ app/views/jobs/_job_card.html.erb | 101 ++------------------- app/views/jobs/_job_info.html.erb | 22 +++++ app/views/jobs/_logo.html.erb | 5 + 7 files changed, 87 insertions(+), 94 deletions(-) create mode 100644 app/views/jobs/_add_job_to_basket.html.erb create mode 100644 app/views/jobs/_basic_info.html.erb create mode 100644 app/views/jobs/_climate_rating.html.erb create mode 100644 app/views/jobs/_difficulty_rating.html.erb create mode 100644 app/views/jobs/_job_info.html.erb create mode 100644 app/views/jobs/_logo.html.erb diff --git a/app/views/jobs/_add_job_to_basket.html.erb b/app/views/jobs/_add_job_to_basket.html.erb new file mode 100644 index 00000000..7e8d33a3 --- /dev/null +++ b/app/views/jobs/_add_job_to_basket.html.erb @@ -0,0 +1,24 @@ +
+ <% 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 %> + + <% end %> + <% else %> + <%= link_to job_saved_jobs_path(job), data: {turbo_method: :post} do %> + + <% end %> + <% end %> + <% include_checkboxes ||= false %> + <% if include_checkboxes %> +
+ <%= check_box_tag "job_ids[]", job.id, onclick: "document.getElementById('apply_button').disabled = false" %> +
+ <% end %> + <% end %> + + <%= link_to job.posting_url, target: "_blank" do %> + + <% end %> +
+ diff --git a/app/views/jobs/_basic_info.html.erb b/app/views/jobs/_basic_info.html.erb new file mode 100644 index 00000000..264e8161 --- /dev/null +++ b/app/views/jobs/_basic_info.html.erb @@ -0,0 +1,13 @@ +
+
<%= job.salary.present? ? job.salary : "
".html_safe %>
+
<%= job.employment_type %> • + <% if job.remote %> + <%= "Remote"%> + <% elsif job.hybrid %> + <%= "Hybrid" %> + <% else %> + <%= "In-office" %> + <% end %> +
+
<%= job.date_posted.strftime("%d/%m") %>
<%= (job.deadline.nil? || job.deadline < Date.today) ? "Rolling" : job.deadline.strftime("%d/%m") %>
+
diff --git a/app/views/jobs/_climate_rating.html.erb b/app/views/jobs/_climate_rating.html.erb new file mode 100644 index 00000000..f23cfa1f --- /dev/null +++ b/app/views/jobs/_climate_rating.html.erb @@ -0,0 +1,3 @@ +
+
<%# job.company.carbon_pledge || 'no data' %>no data
+
diff --git a/app/views/jobs/_difficulty_rating.html.erb b/app/views/jobs/_difficulty_rating.html.erb new file mode 100644 index 00000000..e404e4f8 --- /dev/null +++ b/app/views/jobs/_difficulty_rating.html.erb @@ -0,0 +1,13 @@ +
+
+ <%# 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 %> +
+
diff --git a/app/views/jobs/_job_card.html.erb b/app/views/jobs/_job_card.html.erb index 2f64adf3..0b6dd6f9 100644 --- a/app/views/jobs/_job_card.html.erb +++ b/app/views/jobs/_job_card.html.erb @@ -1,103 +1,16 @@
- <%# TODO: Store company logo, use clearbit when we don't have one %> - - <%# Logo %> + <%# Logo & Info %>
-
- <%= 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 %> -
- - <%# Job Title, Company, Location %> -
- <%= link_to job_path(job), target: "_blank" do %> - <%= job.title.truncate(35) %> - <% end %> - - <%= link_to company_path(job.company), target: "_blank" do %> - <%= job.company.name %> - <% end %> - -
- <% 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 %> -
-
+ <%= render partial: 'jobs/logo', locals: { job: job } %> + <%= render partial: 'jobs/job_info', locals: { job: job } %>
<%# Job Details %>
- - <%# Salary etc. %> -
-
<%= job.salary.present? ? job.salary : "
".html_safe %>
-
<%= job.employment_type %> • - <% if job.remote %> - <%= "Remote"%> - <% elsif job.hybrid %> - <%= "Hybrid" %> - <% else %> - <%= "In-office" %> - <% end %> -
-
<%= job.date_posted.strftime("%d/%m") %>
<%= (job.deadline.nil? || job.deadline < Date.today) ? "Rolling" : job.deadline.strftime("%d/%m") %>
-
- - <%# Net Zero Rating %> -
-
<%# job.company.carbon_pledge || 'no data' %>no data
-
- - <%# Ease of Applying %> -
-
- <%# 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 %> -
-
- - - <%# Add job to basket %> -
- <% 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 %> - - <% end %> - <% else %> - <%= link_to job_saved_jobs_path(job), data: {turbo_method: :post} do %> - - <% end %> - <% end %> - <% include_checkboxes ||= false %> - <% if include_checkboxes %> -
- <%= check_box_tag "job_ids[]", job.id, onclick: "document.getElementById('apply_button').disabled = false" %> -
- <% end %> - <% end %> - - <%= link_to job.posting_url, target: "_blank" do %> - - <% end %> -
-
+ <%= 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 } %>
diff --git a/app/views/jobs/_job_info.html.erb b/app/views/jobs/_job_info.html.erb new file mode 100644 index 00000000..86127fb0 --- /dev/null +++ b/app/views/jobs/_job_info.html.erb @@ -0,0 +1,22 @@ +
+ <%= link_to job_path(job), target: "_blank" do %> + <%= job.title.truncate(35) %> + <% end %> + + <%= link_to company_path(job.company), target: "_blank" do %> + <%= job.company.name %> + <% end %> + +
+ <% 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 %> +
+
diff --git a/app/views/jobs/_logo.html.erb b/app/views/jobs/_logo.html.erb new file mode 100644 index 00000000..cbe9aec4 --- /dev/null +++ b/app/views/jobs/_logo.html.erb @@ -0,0 +1,5 @@ +
+ <%= 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 %> +
From 35b627146593c060a6fc7bbae9ebbfb20d3ea7b1 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Fri, 17 May 2024 16:40:53 +0100 Subject: [PATCH 05/94] correct incorrectly placed div --- app/views/jobs/_add_job_to_basket.html.erb | 1 - app/views/jobs/_job_card.html.erb | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/jobs/_add_job_to_basket.html.erb b/app/views/jobs/_add_job_to_basket.html.erb index 7e8d33a3..4ac2b1ee 100644 --- a/app/views/jobs/_add_job_to_basket.html.erb +++ b/app/views/jobs/_add_job_to_basket.html.erb @@ -21,4 +21,3 @@ <% end %> - diff --git a/app/views/jobs/_job_card.html.erb b/app/views/jobs/_job_card.html.erb index 0b6dd6f9..0d119c1b 100644 --- a/app/views/jobs/_job_card.html.erb +++ b/app/views/jobs/_job_card.html.erb @@ -12,5 +12,6 @@ <%= 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 } %> + From 1409c342aec3b7bf86571640b7d8d7adcbe603ac Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Fri, 17 May 2024 16:53:59 +0100 Subject: [PATCH 06/94] update meta tags --- app/views/jobs/index.html.erb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/views/jobs/index.html.erb b/app/views/jobs/index.html.erb index 407cf02b..15be94c0 100644 --- a/app/views/jobs/index.html.erb +++ b/app/views/jobs/index.html.erb @@ -1,14 +1,12 @@ -<%# 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." %>
<%= render 'search' %>
- +
<%= render 'category_sidebar' %> <%= render 'job_cards_container' %> From 535439defab940de8ad0ca20b7a5165b864f6b62 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Fri, 17 May 2024 16:54:04 +0100 Subject: [PATCH 07/94] start to add responsiveness --- app/views/jobs/_job_card.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/jobs/_job_card.html.erb b/app/views/jobs/_job_card.html.erb index 0d119c1b..bdafd5a3 100644 --- a/app/views/jobs/_job_card.html.erb +++ b/app/views/jobs/_job_card.html.erb @@ -1,13 +1,13 @@
<%# Logo & Info %> -
+
<%= render partial: 'jobs/logo', locals: { job: job } %> <%= render partial: 'jobs/job_info', locals: { job: job } %>
<%# Job Details %> -
+
<%= render partial: 'jobs/basic_info', locals: { job: job } %> <%= render partial: 'jobs/climate_rating', locals: { job: job } %> <%= render partial: 'jobs/difficulty_rating', locals: { job: job } %> From 4f1192029f2f933615eaa4a9c4d8afe34dfc054f Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Fri, 17 May 2024 17:03:51 +0100 Subject: [PATCH 08/94] adding responsiveness to the index page --- app/views/jobs/_category_sidebar.html.erb | 3 +-- app/views/jobs/_job_cards_container.html.erb | 2 +- app/views/jobs/index.html.erb | 14 ++++++++++---- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/views/jobs/_category_sidebar.html.erb b/app/views/jobs/_category_sidebar.html.erb index 0794c6e1..ba480f32 100644 --- a/app/views/jobs/_category_sidebar.html.erb +++ b/app/views/jobs/_category_sidebar.html.erb @@ -1,4 +1,4 @@ -
+

<%= @jobs.count %> jobs • <%= link_to 'Clear filters', jobs_path %>

@@ -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 %> -
diff --git a/app/views/jobs/_job_cards_container.html.erb b/app/views/jobs/_job_cards_container.html.erb index ab9871d8..50b792a2 100644 --- a/app/views/jobs/_job_cards_container.html.erb +++ b/app/views/jobs/_job_cards_container.html.erb @@ -1,4 +1,4 @@ -
+
<%= render partial: 'job_card', collection: @jobs, as: :job %> diff --git a/app/views/jobs/index.html.erb b/app/views/jobs/index.html.erb index 15be94c0..c092ac82 100644 --- a/app/views/jobs/index.html.erb +++ b/app/views/jobs/index.html.erb @@ -3,12 +3,18 @@
-
- <%= render 'search' %> +
+
+ <%= render 'search' %> +
- <%= render 'category_sidebar' %> - <%= render 'job_cards_container' %> +
+ <%= render 'job_cards_container' %> +
+
+ <%= render 'category_sidebar' %> +
From 4cc794ffa703344d96885f0fbcbc05f3cd3b88b3 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Fri, 17 May 2024 20:47:51 +0100 Subject: [PATCH 09/94] install brakeman to review vulnerabilities --- Gemfile | 2 +- Gemfile.lock | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index d45eb469..7949fdfd 100644 --- a/Gemfile +++ b/Gemfile @@ -136,7 +136,7 @@ group :development do gem "binding_of_caller" # Security - # gem 'brakeman', require: false # TODO: install this gem for security checks + gem 'brakeman', require: false # Performance # Add speed badges [https://github.com/MiniProfiler/rack-mini-profiler] diff --git a/Gemfile.lock b/Gemfile.lock index 813f7628..77e3995b 100644 --- a/Gemfile.lock +++ b/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) @@ -484,6 +486,7 @@ DEPENDENCIES binding_of_caller bootsnap bootstrap + brakeman bullet capybara cloudinary From ea578117efb55af865d063fb71242bdbaefde70a Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Fri, 17 May 2024 21:12:29 +0100 Subject: [PATCH 10/94] add new relic --- Gemfile | 2 +- Gemfile.lock | 2 ++ config/newrelic.yml | 66 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 config/newrelic.yml diff --git a/Gemfile b/Gemfile index 7949fdfd..3b4697ab 100644 --- a/Gemfile +++ b/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 diff --git a/Gemfile.lock b/Gemfile.lock index 77e3995b..d4d25a32 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -248,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) @@ -505,6 +506,7 @@ DEPENDENCIES importmap-rails json (~> 2.6, >= 2.6.3) meta-tags + newrelic_rpm nokogiri pg (~> 1.1) pg_search diff --git a/config/newrelic.yml b/config/newrelic.yml new file mode 100644 index 00000000..cc703582 --- /dev/null +++ b/config/newrelic.yml @@ -0,0 +1,66 @@ +# +# This file configures the New Relic Agent. New Relic monitors Ruby, Java, +# .NET, PHP, Python, Node, and Go applications with deep visibility and low +# overhead. For more information, visit www.newrelic.com. +# +# Generated October 28, 2022 +# +# This configuration file is custom generated for NewRelic Administration +# +# For full documentation of agent configuration options, please refer to +# https://docs.newrelic.com/docs/agents/ruby-agent/installation-configuration/ruby-agent-configuration + +common: &default_settings + # Required license key associated with your New Relic account. + license_key: 'eu01xxe39d912918d76719c3e7f88b36FFFFNRAL' + + # Your application name. Renaming here affects where data displays in New + # Relic. For more details, see https://docs.newrelic.com/docs/apm/new-relic-apm/maintenance/renaming-applications + app_name: 'cheddar' + + distributed_tracing: + enabled: true + + # To disable the agent regardless of other settings, uncomment the following: + + # agent_enabled: false + + # Logging level for log/newrelic_agent.log + log_level: info + + application_logging: + # If `true`, all logging-related features for the agent can be enabled or disabled + # independently. If `false`, all logging-related features are disabled. + enabled: true + forwarding: + # If `true`, the agent captures log records emitted by this application. + enabled: true + # Defines the maximum number of log records to buffer in memory at a time. + max_samples_stored: 10000 + metrics: + # If `true`, the agent captures metrics related to logging for this application. + enabled: true + local_decorating: + # If `true`, the agent decorates logs with metadata to link to entities, hosts, traces, and spans. + # This requires a log forwarder to send your log files to New Relic. + # This should not be used when forwarding is enabled. + enabled: false + +# Environment-specific settings are in this section. +# RAILS_ENV or RACK_ENV (as appropriate) is used to determine the environment. +# If your application has other named environments, configure them here. +development: + <<: *default_settings + app_name: 'cheddar (Development)' + +test: + <<: *default_settings + # It doesn't make sense to report to New Relic from automated test runs. + monitor_mode: false + +staging: + <<: *default_settings + app_name: 'cheddar (Staging)' + +production: + <<: *default_settings From f15d3f3cee89098ff3a0126aff4a2f711220549e Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sat, 18 May 2024 08:00:29 +0100 Subject: [PATCH 11/94] hide license key --- config/newrelic.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/newrelic.yml b/config/newrelic.yml index cc703582..dd41b117 100644 --- a/config/newrelic.yml +++ b/config/newrelic.yml @@ -12,7 +12,7 @@ common: &default_settings # Required license key associated with your New Relic account. - license_key: 'eu01xxe39d912918d76719c3e7f88b36FFFFNRAL' + license_key: ENV.fetch('NEW_RELIC_LICENSE_KEY') # Your application name. Renaming here affects where data displays in New # Relic. For more details, see https://docs.newrelic.com/docs/apm/new-relic-apm/maintenance/renaming-applications From 90f23ac8054f312b577c76f8d451ead5a4f7cf23 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sat, 18 May 2024 08:01:29 +0100 Subject: [PATCH 12/94] fetch key --- config/newrelic.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/newrelic.yml b/config/newrelic.yml index dd41b117..e975b4a4 100644 --- a/config/newrelic.yml +++ b/config/newrelic.yml @@ -12,7 +12,7 @@ common: &default_settings # Required license key associated with your New Relic account. - license_key: ENV.fetch('NEW_RELIC_LICENSE_KEY') + license_key: '<%= ENV["NEW_RELIC_LICENSE_KEY"] %>' # Your application name. Renaming here affects where data displays in New # Relic. For more details, see https://docs.newrelic.com/docs/apm/new-relic-apm/maintenance/renaming-applications From 9fa647465bd3d9d170a44c806f8d3629984fcc9e Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sat, 18 May 2024 08:15:34 +0100 Subject: [PATCH 13/94] test adding brakeman to github actions --- .github/workflows/rubyonrails.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.github/workflows/rubyonrails.yml b/.github/workflows/rubyonrails.yml index 67d8a841..bd80b58b 100644 --- a/.github/workflows/rubyonrails.yml +++ b/.github/workflows/rubyonrails.yml @@ -59,3 +59,21 @@ 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: brakeman -f sarif -o output.sarif.json + - name: Upload SARIF + uses: github/codeql-action/upload-sarif@v2 + with: + sarif_file: output.sarif.json From 9b49a8f770c0ced89773e305905472e6c3f97a09 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sat, 18 May 2024 08:20:03 +0100 Subject: [PATCH 14/94] enable brakeman in test environment --- Gemfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 3b4697ab..3a8f0d44 100644 --- a/Gemfile +++ b/Gemfile @@ -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 - # Performance # Add speed badges [https://github.com/MiniProfiler/rack-mini-profiler] # gem "rack-mini-profiler" # TODO: install this gem for performance monitoring From 6ab248de841a33d228449db9de4e942031bd5e70 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sat, 18 May 2024 08:23:33 +0100 Subject: [PATCH 15/94] bundle exec --- .github/workflows/rubyonrails.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rubyonrails.yml b/.github/workflows/rubyonrails.yml index bd80b58b..83660f0f 100644 --- a/.github/workflows/rubyonrails.yml +++ b/.github/workflows/rubyonrails.yml @@ -72,7 +72,7 @@ jobs: - name: Install dependencies run: bundle install - name: Run Brakeman - run: brakeman -f sarif -o output.sarif.json + run: bundle exec brakeman -f sarif -o output.sarif.json - name: Upload SARIF uses: github/codeql-action/upload-sarif@v2 with: From 5b90e0c17dbbe7ca28093afc492bcc5cad36a596 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sat, 18 May 2024 08:26:19 +0100 Subject: [PATCH 16/94] continue on error --- .github/workflows/rubyonrails.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/rubyonrails.yml b/.github/workflows/rubyonrails.yml index 83660f0f..244200ef 100644 --- a/.github/workflows/rubyonrails.yml +++ b/.github/workflows/rubyonrails.yml @@ -73,6 +73,7 @@ jobs: 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: From 551dc24f751e1f259fd740e16e70b2bff15c36a4 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sat, 18 May 2024 17:43:55 +0100 Subject: [PATCH 17/94] add hubspot api client --- Gemfile | 3 ++- Gemfile.lock | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 3a8f0d44..0bb7f885 100644 --- a/Gemfile +++ b/Gemfile @@ -77,7 +77,8 @@ gem "ruby-openai" gem 'meta-tags' # gem 'sitemap_generator' # TODO: install this gem for sitemap generation -# Email +# Email & CRM +gem 'hubspot-api-client' # gem 'sendgrid-ruby' # TODO: install this gem for sending emails # Importing, Parsing & APIs diff --git a/Gemfile.lock b/Gemfile.lock index d4d25a32..0d5b0448 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -162,6 +162,8 @@ GEM erubi (1.12.0) et-orbi (1.2.11) tzinfo + ethon (0.16.0) + ffi (>= 1.15.0) event_stream_parser (1.0.0) execjs (2.9.1) factory_bot (6.4.6) @@ -202,6 +204,9 @@ GEM httparty (0.21.0) mini_mime (>= 1.0.0) multi_xml (>= 0.5.2) + hubspot-api-client (18.0.0) + json (~> 2.1, >= 2.1.0) + typhoeus (~> 1.4.0) i18n (1.14.4) concurrent-ruby (~> 1.0) importmap-rails (2.0.1) @@ -436,6 +441,8 @@ GEM railties (>= 6.0.0) turbo_power (0.6.1) turbo-rails (>= 1.3.0) + typhoeus (1.4.1) + ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) @@ -503,6 +510,7 @@ DEPENDENCIES geocoder high_voltage (~> 3.1) htmltoword + hubspot-api-client importmap-rails json (~> 2.6, >= 2.6.3) meta-tags From 15d7b84ed45778997bfbf958528a9ba370625060 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sat, 18 May 2024 17:44:25 +0100 Subject: [PATCH 18/94] add utility class for background color --- app/assets/stylesheets/components/_utility_classes.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/components/_utility_classes.scss b/app/assets/stylesheets/components/_utility_classes.scss index fc003879..075ef706 100644 --- a/app/assets/stylesheets/components/_utility_classes.scss +++ b/app/assets/stylesheets/components/_utility_classes.scss @@ -17,3 +17,7 @@ .small-text { font-size: 0.8rem; } + +.bg-main { + background-color: $main-color; +} From e4939cdcbf225ba32f867c7374d964a742cc7a22 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sat, 18 May 2024 17:44:31 +0100 Subject: [PATCH 19/94] update footer --- app/views/pages/_footer.html.erb | 62 ++++++++++++++++---------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/app/views/pages/_footer.html.erb b/app/views/pages/_footer.html.erb index 979bb7e2..80edb272 100644 --- a/app/views/pages/_footer.html.erb +++ b/app/views/pages/_footer.html.erb @@ -1,39 +1,39 @@ -
-
-
-
-
- A <%= link_to "Net Zero from Day Zero", "/#" %> company -
-
- - - -
-
-
-
For Applicants
- <%= link_to "How It Works", how_it_works_path %> +
+
+
+
+
Subscribe
+

Get the latest roles in your inbox

+
+
+ + +
+
-
-
For Employers
- Cheddar For Business -
-
-
- About - FAQs - D&I - Careers +
+
+
Resources
+ How It Works + About
- Contact - Terms - Privacy +
Company
+ Contact + Terms + Privacy
+ +
+
+

© 2024 Cheddar. All Rights Reserved

+
+
+ + +
+
- -<%# TODO: Change this to vertical columns on RHS for better alignnment %> From 6ec2de8a4ccda7660e1f46b31e6cc70f063c5d57 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sat, 18 May 2024 17:44:43 +0100 Subject: [PATCH 20/94] remove unnecessary css --- .../stylesheets/components/_footer.scss | 47 ++----------------- 1 file changed, 3 insertions(+), 44 deletions(-) diff --git a/app/assets/stylesheets/components/_footer.scss b/app/assets/stylesheets/components/_footer.scss index 691fb117..0345a0ee 100644 --- a/app/assets/stylesheets/components/_footer.scss +++ b/app/assets/stylesheets/components/_footer.scss @@ -9,49 +9,8 @@ } .footer { - background: #F4F4F4; - display: flex; - align-items: center; - justify-content: space-between; - height: 160px; - padding: 0px 50px; - color: rgba(0,0,0,0.3); - flex-shrink: 0; + border-top: 1px solid rgba(0,0,0,0.1); + height: 20vh; width: 100%; - margin-top: 24px; -} - -.footer-links { - display: flex; - align-items: center; + color: rgba(0, 0, 0, 0.5); } - -.footer-links a { - color: black; - opacity: 0.3; - text-decoration: none; - font-size: 24px; - padding: 0px 10px; -} - -.footer-links a:hover { - opacity: 1; -} - -.footer .fa-heart { - color: #D23333; -} - -.page-links a { - color: black; - opacity: 0.3; - text-decoration: none; - font-size: 16px; - padding: 0px 10px; -} - -// .footer-copyright { -// display: flex; -// justify-content: right; -// align-items: right; -// } From a73ec06da47dfb04e5cd623d10acbdb232b35c93 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sat, 18 May 2024 17:56:40 +0100 Subject: [PATCH 21/94] clean about page --- app/assets/stylesheets/pages/_about.scss | 134 ----------------------- app/views/pages/about.html.erb | 8 -- 2 files changed, 142 deletions(-) diff --git a/app/assets/stylesheets/pages/_about.scss b/app/assets/stylesheets/pages/_about.scss index 35c8588c..e69de29b 100644 --- a/app/assets/stylesheets/pages/_about.scss +++ b/app/assets/stylesheets/pages/_about.scss @@ -1,134 +0,0 @@ -#about-page { - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - margin-top: 24px; - color: $main-color; - text-align: center; - width: 100%; - - h1 { - font-weight: bold; - margin: 16px 0; - - } - - h3 { - font-weight: normal; - margin: 16px 0; - width: 60%; - font-size: 1.4rem; - } - - #about-text-logo { - width: 15%; - margin-bottom: 16px; - } - - #about-logo { - width: 10%; - } - - .about-team-row { - display: flex; - align-items: flex-start; - justify-content: space-around; - width: 60%; - } - - .about-team-card { - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - text-align: center; - width: 25%; - - h3 { - width: 100%; - } - - #charlie-avatar, #ilya-avatar, #dan-avatar, #alejandro-avatar, #chris-avatar, #jamie-avatar { - height: 200px; - width: 200px; - background-size: cover; - display: flex; - align-items: center; - justify-content: center; - border-radius: 50%; - - &:hover { - .team-icons { - display: flex; - width: 60%; - justify-content: space-around; - align-items: center; - filter: brightness(1) !important; - } - } - } - - #charlie-avatar { - background-image: image-url("team/charlie_avatar.png"); - - &:hover { - background-image: linear-gradient(to right, rgba(0, 0, 0, 0.7), rgba(0, 0, 0, 0.7)), image-url("team/charlie_avatar.png"); - } - } - - #ilya-avatar { - background-image: image-url("team/ilya_avatar.png"); - - &:hover { - background-image: linear-gradient(to right, rgba(0, 0, 0, 0.7), rgba(0, 0, 0, 0.7)), image-url("team/ilya_avatar.png"); - } - } - - #dan-avatar { - background-image: image-url("team/dan_avatar.png"); - - &:hover { - background-image: linear-gradient(to right, rgba(0, 0, 0, 0.7), rgba(0, 0, 0, 0.7)), image-url("team/dan_avatar.png"); - } - } - - #alejandro-avatar { - background-image: image-url("team/alejandro_avatar.png"); - - &:hover { - background-image: linear-gradient(to right, rgba(0, 0, 0, 0.7), rgba(0, 0, 0, 0.7)), image-url("team/alejandro_avatar.png"); - } - } - - #chris-avatar { - background-image: image-url("team/chris_avatar.png"); - - &:hover { - background-image: linear-gradient(to right, rgba(0, 0, 0, 0.7), rgba(0, 0, 0, 0.7)), image-url("team/chris_avatar.png"); - } - } - - #jamie-avatar { - background-image: image-url("team/jamie_avatar.png"); - - &:hover { - background-image: linear-gradient(to right, rgba(0, 0, 0, 0.7), rgba(0, 0, 0, 0.7)), image-url("team/jamie_avatar.png"); - } - } - - .team-icons { - display: none; - - i { - color: white; - font-size: 2rem; - - &:hover { - color: #ff9433; - } - } - } - } - -} diff --git a/app/views/pages/about.html.erb b/app/views/pages/about.html.erb index 27102dd9..e69de29b 100644 --- a/app/views/pages/about.html.erb +++ b/app/views/pages/about.html.erb @@ -1,8 +0,0 @@ -
- <%= image_tag "cheddar-3d-icon.png", alt: "Cheddar 3D Icon", id: "about-logo" %> -

The all-in-one job application platform for grads

-

Navigating the labyrinth of job applications, graduates often find themselves drowning in a sea of platforms and forms. Cheddar aims to alleviate these burdens by streamlining the application process.

-

By integrating all job postings into a single platform and securely storing applicant data, Cheddar makes job hunting a seamless experience. With the initial focus on the UK graduate market, which comprises approximately 1 million individuals annually, Cheddar empowers graduates to efficiently discover, review, and apply to multiple positions—all in one place.

-

Our goal is simple: to remove unnecessary steps from the application process, granting applicants valuable time without compromising application quality. Drawing inspiration from e-commerce platforms like Amazon, Cheddar operates as a one-stop shop for job seekers, allowing them to select positions like products and complete applications in one transaction.

-

Think of it as a common app for jobs, where Cheddar saves employment data and interfaces directly with company websites, enabling students to batch apply without sacrificing attention to detail. By enhancing the applicant experience tenfold, Cheddar not only serves individuals but also offers an unparalleled proposition for companies, positioning itself as the ultimate job marketplace.

-
From 5f8ce4075c5970408b967e258fcff2d4b16834d5 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sat, 18 May 2024 17:56:45 +0100 Subject: [PATCH 22/94] update pages controller --- app/controllers/pages_controller.rb | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index 25e98787..a64d5da2 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -1,10 +1,10 @@ class PagesController < ApplicationController - skip_before_action :authenticate_user!, only: %i[home test faqs how_it_works about jobs landing privacy ts_and_cs] + skip_before_action :authenticate_user!, only: %i[home faqs how_it_works about landing privacy ts_and_cs] def home end - def test + def about end def faqs @@ -13,21 +13,12 @@ def faqs def how_it_works end - def jobs - end - - def temp - end - def climate end def landing end - def about - end - def privacy end From 7b55a1ef52423620cf09b467d15ce441cd086fc9 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sat, 18 May 2024 17:56:52 +0100 Subject: [PATCH 23/94] comment out footer for now --- app/views/pages/_footer.html.erb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/views/pages/_footer.html.erb b/app/views/pages/_footer.html.erb index 80edb272..665b436d 100644 --- a/app/views/pages/_footer.html.erb +++ b/app/views/pages/_footer.html.erb @@ -13,15 +13,17 @@
-
Resources
- How It Works + <%#
Company
%> + <%# How It Works About + Mission + Climate %>
-
Company
- Contact + <%#
Company
%> + <%# Contact Terms - Privacy + Privacy %>
From ae060c6bacea9cb1d0f954eaf0367fb42953d07c Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sat, 18 May 2024 17:57:00 +0100 Subject: [PATCH 24/94] remove old pages --- app/views/pages/temp.html.erb | 5 ----- app/views/pages/test.html.erb | 0 2 files changed, 5 deletions(-) delete mode 100644 app/views/pages/temp.html.erb delete mode 100644 app/views/pages/test.html.erb diff --git a/app/views/pages/temp.html.erb b/app/views/pages/temp.html.erb deleted file mode 100644 index ed4522c2..00000000 --- a/app/views/pages/temp.html.erb +++ /dev/null @@ -1,5 +0,0 @@ - -
- -
diff --git a/app/views/pages/test.html.erb b/app/views/pages/test.html.erb deleted file mode 100644 index e69de29b..00000000 From 5ac013645a38b9f10a00fa725a67949710169fc4 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sat, 18 May 2024 17:57:04 +0100 Subject: [PATCH 25/94] tidy routes --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index e8de5218..f959c157 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -18,11 +18,11 @@ # Pages root to: "pages#home" - get 'landing', to: 'pages#landing', as: 'landing' get 'about', to: 'pages#about', as: 'about' get 'how_it_works', to: 'pages#how_it_works', as: 'how_it_works' get 'privacy', to: 'pages#privacy', as: 'privacy' get 'ts&cs', to: 'pages#ts_and_cs', as: 'ts_and_cs' + get 'landing', to: 'pages#landing', as: 'landing' # Users get 'profile', to: 'users#show', as: 'profile' From cf6c1afc697b7576ac2f3db6d2845dacb0923449 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sat, 18 May 2024 17:58:33 +0100 Subject: [PATCH 26/94] minor updates --- app/views/pages/home.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/pages/home.html.erb b/app/views/pages/home.html.erb index 7ff96193..a2be97c6 100644 --- a/app/views/pages/home.html.erb +++ b/app/views/pages/home.html.erb @@ -1,4 +1,4 @@ -<% title "Home" %> +<% title "Homepage" %>
@@ -16,7 +16,7 @@
    - <%# TODO: Update brands drifting across %> + <%# TODO: Delete and replace %>
    • From a95fd2a9ff4a47328c83491d2cf6e0fdd0164b1c Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sat, 18 May 2024 18:41:04 +0100 Subject: [PATCH 27/94] add todo --- config/routes.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index f959c157..e75fcc06 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,7 +5,7 @@ mount Sidekiq::Web => '/sidekiq' end - mount ActionCable.server => "/cable" + mount ActionCable.server => "/cable" # TODO: fix as not found at the moment mount Avo::Engine, at: '/avo' devise_for :users, except: [:fetch_template] @@ -23,6 +23,7 @@ get 'privacy', to: 'pages#privacy', as: 'privacy' get 'ts&cs', to: 'pages#ts_and_cs', as: 'ts_and_cs' get 'landing', to: 'pages#landing', as: 'landing' + get 'faqs', to: 'pages#faqs', as: 'faqs' # Users get 'profile', to: 'users#show', as: 'profile' @@ -52,5 +53,4 @@ resources :saved_jobs, only: [:index, :show, :destroy] resources :educations, only: [:new, :create] - end From dfb0810d2c74735f144edb757d0f4856d29923b0 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sat, 18 May 2024 18:41:07 +0100 Subject: [PATCH 28/94] remove --- app/views/pages/faqs.html.erb | 114 ---------------------------------- 1 file changed, 114 deletions(-) diff --git a/app/views/pages/faqs.html.erb b/app/views/pages/faqs.html.erb index 81031cac..e69de29b 100644 --- a/app/views/pages/faqs.html.erb +++ b/app/views/pages/faqs.html.erb @@ -1,114 +0,0 @@ -
    -
    -
    - -
    -
    -

    FAQ

    -
    -
    -
    -
    -
    -
    -
    -
    - 1What is Lorem Ipsum? -
    -
    -
    -
    -
    -

    Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book.

    -
    -
    -
    -
    -
    -
    -
    - 2 Where does it come from? -
    -
    -
    -
    -
    -

    Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old.

    -
    -
    -
    -
    -
    -
    -
    - 3Why do we use it? -
    -
    -
    -
    -
    -

    It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, as opposed to using 'Content here, content here.

    -
    -
    -
    -
    -
    -
    -
    - 4 Where can I get some? -
    -
    -
    -
    -
    -

    There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable.

    -
    -
    -
    -
    -
    -
    -
    - 5 What is Lorem Ipsum? -
    -
    -
    -
    -
    -

    It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing

    -
    -
    -
    -
    -
    -
    -
    - 6 Where does it come from? -
    -
    -
    -
    -
    -

    The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for those interested. Sections 1.10.32 and 1.10.33 from "de Finibus Bonorum et Malorum" by Cicero are also reproduced in their exact original form, accompanied by English versions from the 1914 translation by H. Rackham.

    -
    -
    -
    -
    -
    -
    -
    - 7 Why do we use it? -
    -
    -
    -
    -
    -

    Many desktop publishing packages and web page editors now use Lorem Ipsum as their default model text, and a search for 'lorem ipsum' will uncover many web sites still in their infancy. Various versions have evolved over the years, sometimes by accident, sometimes on purpose (injected humour and the like).

    -
    -
    -
    -
    -
    -
    -
    -
    From 74eb1baaf79485bfc25cc4a1231a282d5bfb18db Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sat, 18 May 2024 18:45:24 +0100 Subject: [PATCH 29/94] adding example component for testing --- app/assets/stylesheets/pages/_faqs.scss | 154 ++++++++------------- app/views/pages/faqs.html.erb | 173 ++++++++++++++++++++++++ 2 files changed, 228 insertions(+), 99 deletions(-) diff --git a/app/assets/stylesheets/pages/_faqs.scss b/app/assets/stylesheets/pages/_faqs.scss index faa2ca4f..7861a6aa 100644 --- a/app/assets/stylesheets/pages/_faqs.scss +++ b/app/assets/stylesheets/pages/_faqs.scss @@ -1,114 +1,70 @@ -.faq-section { - background: #fdfdfd; - min-height: 100vh; - padding: 10vh 0 0; -} -.faq-title h2 { +/*=========================== + about-06 css +===========================*/ +.about-six { + padding-top: 90px; + padding-bottom: 120px; position: relative; - margin-bottom: 45px; - display: inline-block; - font-weight: 600; - line-height: 1; } -.faq-title h2::before { - content: ""; - position: absolute; - left: 50%; - width: 60px; - height: 2px; - background-color: #6007C6; - bottom: -25px; - margin-left: -30px; +.about-six .faq-title .sub-title { + color: var(--primary); + text-transform: uppercase; } -.faq-title p { - padding: 0 190px; - margin-bottom: 10px; +.about-six .faq-title .title { + padding-top: 10px; } - -.faq { - background: #fdfdfd; - box-shadow: 0 2px 48px 0 rgba(0, 0, 0, 0.06); - border-radius: 4px; +.about-six .faq-accordion { + margin-top: 45px; } - -.faq .card { - border: none; +.about-six .faq-accordion .accordion .card { + border: 0; background: none; - border-bottom: 1px dashed #CEE1F8; } - -.faq .card .card-header { - padding: 0px; - border: none; +.about-six .faq-accordion .accordion .card .card-header { + padding: 0; + border: 0; background: none; - -webkit-transition: all 0.3s ease 0s; - -moz-transition: all 0.3s ease 0s; - -o-transition: all 0.3s ease 0s; - transition: all 0.3s ease 0s; + margin-top: 40px; +} +.about-six .faq-accordion .accordion .card .card-header a { + font-size: 18px; + font-weight: 500; + color: var(--black); + display: block; + position: relative; + padding-right: 20px; } - -.faq .card .card-header:hover { - background: rgba(136, 66, 216, 0.8); - padding-left: 10px; +@media only screen and (min-width: 992px) and (max-width: 1199px) { + .about-six .faq-accordion .accordion .card .card-header a { + font-size: 16px; + } } -.faq .card .card-header .faq-title { - width: 100%; - text-align: left; - padding: 0px; - padding-left: 30px; - padding-right: 30px; - font-weight: 400; - font-size: 15px; - letter-spacing: 1px; - color: #3B566E; - text-decoration: none !important; - -webkit-transition: all 0.3s ease 0s; - -moz-transition: all 0.3s ease 0s; - -o-transition: all 0.3s ease 0s; - transition: all 0.3s ease 0s; - cursor: pointer; - padding-top: 20px; - padding-bottom: 20px; +@media (max-width: 767px) { + .about-six .faq-accordion .accordion .card .card-header a { + font-size: 16px; + } } - -.faq .card .card-header .faq-title .badge { - display: inline-block; - width: 20px; - height: 20px; - line-height: 14px; - float: left; - -webkit-border-radius: 100px; - -moz-border-radius: 100px; - border-radius: 100px; - text-align: center; - background: #FFEC00; - color: #fff; - font-size: 12px; - margin-right: 20px; +.about-six .faq-accordion .accordion .card .card-header a::before { + content: "\eb30"; + font-family: "LineIcons"; + position: absolute; + top: 50%; + right: 0; + -webkit-transform: translateY(-50%); + -moz-transform: translateY(-50%); + -ms-transform: translateY(-50%); + -o-transform: translateY(-50%); + transform: translateY(-50%); } - -.faq .card .card-body { - padding: 30px; - padding-left: 35px; - padding-bottom: 16px; - font-weight: 400; - font-size: 16px; - color: #6F8BA4; - line-height: 28px; - letter-spacing: 1px; - border-top: 1px solid #F3F8FF; +.about-six .faq-accordion .accordion .card .card-header .collapsed::before { + content: "\eb5c"; } - -.faq .card .card-body p { - margin-bottom: 14px; +.about-six .faq-accordion .accordion .card .card-body { + padding: 20px 20px 0; } - -@media (max-width: 991px) { - .faq { - margin-bottom: 30px; - } - .faq .card .card-header .faq-title { - line-height: 26px; - margin-top: 10px; - } +.about-six .faq-image { + margin-top: 50px; +} +.about-six .faq-image img { + width: 100%; } diff --git a/app/views/pages/faqs.html.erb b/app/views/pages/faqs.html.erb index e69de29b..e0a9480a 100644 --- a/app/views/pages/faqs.html.erb +++ b/app/views/pages/faqs.html.erb @@ -0,0 +1,173 @@ + +
    +
    +
    +
    +
    +
    +
    A Little More About Us
    +

    + Frequently Asked Questions
    + About Our Site +

    +
    + +
    +
    +
    + +
    +
    +

    + Morbi vehicula arcu et pellentesque tincidunt. Nunc + ligula nulla, lobortis a elementum non, vulputate ut + arcu. Aliquam erat volutpat. Nullam lacinia felis. +

    +
    +
    +
    + +
    + +
    +
    +

    + Morbi vehicula arcu et pellentesque tincidunt. Nunc + ligula nulla, lobortis a elementum non, vulputate ut + arcu. Aliquam erat volutpat. Nullam lacinia felis. +

    +
    +
    +
    + +
    + +
    +
    +

    + Morbi vehicula arcu et pellentesque tincidunt. Nunc + ligula nulla, lobortis a elementum non, vulputate ut + arcu. Aliquam erat volutpat. Nullam lacinia felis. +

    +
    +
    +
    + +
    + +
    +
    +

    + Morbi vehicula arcu et pellentesque tincidunt. Nunc + ligula nulla, lobortis a elementum non, vulputate ut + arcu. Aliquam erat volutpat. Nullam lacinia felis. +

    +
    +
    +
    + +
    + +
    +
    +

    + Morbi vehicula arcu et pellentesque tincidunt. Nunc + ligula nulla, lobortis a elementum non, vulputate ut + arcu. Aliquam erat volutpat. Nullam lacinia felis. +

    +
    +
    +
    + +
    +
    + +
    + +
    +
    +
    + faq +
    + +
    +
    + +
    + +
    + From 74f45b927c08dd058c85199f7fecb798f3427565 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sat, 18 May 2024 20:55:06 +0100 Subject: [PATCH 30/94] install sendgrid gem --- Gemfile | 4 ++-- Gemfile.lock | 12 ++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index 0bb7f885..6ae28f31 100644 --- a/Gemfile +++ b/Gemfile @@ -78,8 +78,8 @@ gem 'meta-tags' # gem 'sitemap_generator' # TODO: install this gem for sitemap generation # Email & CRM -gem 'hubspot-api-client' -# gem 'sendgrid-ruby' # TODO: install this gem for sending emails +# gem 'hubspot-api-client' # This can be installed later when we need a full CRM +gem 'sendgrid-ruby' # Importing, Parsing & APIs gem 'csv' # can probably use ruby standard library diff --git a/Gemfile.lock b/Gemfile.lock index 0d5b0448..6db1e226 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -162,8 +162,6 @@ GEM erubi (1.12.0) et-orbi (1.2.11) tzinfo - ethon (0.16.0) - ffi (>= 1.15.0) event_stream_parser (1.0.0) execjs (2.9.1) factory_bot (6.4.6) @@ -204,9 +202,6 @@ GEM httparty (0.21.0) mini_mime (>= 1.0.0) multi_xml (>= 0.5.2) - hubspot-api-client (18.0.0) - json (~> 2.1, >= 2.1.0) - typhoeus (~> 1.4.0) i18n (1.14.4) concurrent-ruby (~> 1.0) importmap-rails (2.0.1) @@ -389,6 +384,7 @@ GEM faraday (>= 1) faraday-multipart (>= 1) ruby-progressbar (1.13.0) + ruby_http_client (3.5.5) rubyzip (2.3.2) rufus-scheduler (3.9.1) fugit (~> 1.1, >= 1.1.6) @@ -405,6 +401,8 @@ GEM rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) + sendgrid-ruby (6.7.0) + ruby_http_client (~> 3.4) shoulda-matchers (6.1.0) activesupport (>= 5.2.0) sidekiq (6.5.12) @@ -441,8 +439,6 @@ GEM railties (>= 6.0.0) turbo_power (0.6.1) turbo-rails (>= 1.3.0) - typhoeus (1.4.1) - ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) @@ -510,7 +506,6 @@ DEPENDENCIES geocoder high_voltage (~> 3.1) htmltoword - hubspot-api-client importmap-rails json (~> 2.6, >= 2.6.3) meta-tags @@ -529,6 +524,7 @@ DEPENDENCIES ruby-openai sassc-rails selenium-webdriver (~> 4.18.1) + sendgrid-ruby shoulda-matchers (= 6.1.0) sidekiq (~> 6.5.5) sidekiq-failures (~> 1.0) From 04ef0dfd0425ce5960dea65e3fda9ad05e2ea2ec Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sat, 18 May 2024 20:55:17 +0100 Subject: [PATCH 31/94] put signup form in a partial for reuse elsewhere --- app/views/pages/_footer.html.erb | 7 +------ app/views/shared/_email_signup.html.erb | 6 ++++++ 2 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 app/views/shared/_email_signup.html.erb diff --git a/app/views/pages/_footer.html.erb b/app/views/pages/_footer.html.erb index 665b436d..9d92c3d0 100644 --- a/app/views/pages/_footer.html.erb +++ b/app/views/pages/_footer.html.erb @@ -4,12 +4,7 @@
    Subscribe

    Get the latest roles in your inbox

    -
    -
    - - -
    -
    + <%= render 'shared/email_signup' %>
    diff --git a/app/views/shared/_email_signup.html.erb b/app/views/shared/_email_signup.html.erb new file mode 100644 index 00000000..a6f50266 --- /dev/null +++ b/app/views/shared/_email_signup.html.erb @@ -0,0 +1,6 @@ +
    +
    + + +
    +
    From 21ebb18bff924e07b9db3958b53b476d57f98485 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sat, 18 May 2024 21:09:42 +0100 Subject: [PATCH 32/94] add user mailer --- app/mailers/user_mailer.rb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 app/mailers/user_mailer.rb diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb new file mode 100644 index 00000000..04c627a2 --- /dev/null +++ b/app/mailers/user_mailer.rb @@ -0,0 +1,8 @@ +class UserMailer < ApplicationMailer + default from: 'no-reply@yourdomain.com' + + def confirmation_email(email) + @email = email + mail(to: @email, subject: 'Subscription Confirmation') + end +end From f98b711383dc08bc318485c11186ddbf1b78dea3 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sat, 18 May 2024 21:09:50 +0100 Subject: [PATCH 33/94] add mailer views --- app/views/user_mailer/confirmation_email.html.erb | 12 ++++++++++++ app/views/user_mailer/confirmation_email.text.erb | 3 +++ 2 files changed, 15 insertions(+) create mode 100644 app/views/user_mailer/confirmation_email.html.erb create mode 100644 app/views/user_mailer/confirmation_email.text.erb diff --git a/app/views/user_mailer/confirmation_email.html.erb b/app/views/user_mailer/confirmation_email.html.erb new file mode 100644 index 00000000..b2f77ad7 --- /dev/null +++ b/app/views/user_mailer/confirmation_email.html.erb @@ -0,0 +1,12 @@ + + + + + + +

    Thank you for subscribing!

    +

    + You have successfully subscribed with the email: <%= @email %>. +

    + + diff --git a/app/views/user_mailer/confirmation_email.text.erb b/app/views/user_mailer/confirmation_email.text.erb new file mode 100644 index 00000000..5c873cbc --- /dev/null +++ b/app/views/user_mailer/confirmation_email.text.erb @@ -0,0 +1,3 @@ +Thank you for subscribing! + +You have successfully subscribed with the email: <%= @email %>. From e7b48a171f93235826b07fc968393c3f2d5edc1c Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sat, 18 May 2024 21:09:59 +0100 Subject: [PATCH 34/94] add config for sendgrid --- config/environments/development.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/config/environments/development.rb b/config/environments/development.rb index 1c7019b5..3ebea1f1 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -10,6 +10,17 @@ Bullet.add_footer = true end + config.action_mailer.delivery_method = :smtp + config.action_mailer.smtp_settings = { + user_name: 'apikey', + password: ENV.fetch('SENDGRID_API_KEY'), + domain: 'localhost', + address: 'smtp.sendgrid.net', + port: 587, + authentication: :plain, + enable_starttls_auto: true + } + config.action_mailer.default_url_options = { host: "http://localhost:3000" } # Settings specified here will take precedence over those in config/application.rb. From 03e5e104f562d24391ccffb9feefd66e8aa8365a Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sat, 18 May 2024 21:10:08 +0100 Subject: [PATCH 35/94] add factory bot to rails helper --- spec/rails_helper.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 645c2628..d45c3950 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -1,5 +1,6 @@ # This file is copied to spec/ when you run 'rails generate rspec:install' require 'spec_helper' +require 'factory_bot_rails' ENV['RAILS_ENV'] ||= 'test' require_relative '../config/environment' From 92198b9ccd820c7621da310bf813583375b0807d Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sat, 18 May 2024 21:11:46 +0100 Subject: [PATCH 36/94] require vcr --- spec/spec_helper.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index f189d7df..ad3b8b4c 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -15,6 +15,7 @@ # See https://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration require 'rails_helper' require 'capybara/rspec' +require 'vcr' require 'webmock/rspec' Capybara.configure do |config| From a8487c30bec96bf19d7c8638ed9a738ba6fe1bbf Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sat, 18 May 2024 21:12:23 +0100 Subject: [PATCH 37/94] add emails controller - working this time with proper requires in place --- app/controllers/emails_controller.rb | 2 ++ spec/requests/emails_spec.rb | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 app/controllers/emails_controller.rb create mode 100644 spec/requests/emails_spec.rb diff --git a/app/controllers/emails_controller.rb b/app/controllers/emails_controller.rb new file mode 100644 index 00000000..1608c8e8 --- /dev/null +++ b/app/controllers/emails_controller.rb @@ -0,0 +1,2 @@ +class EmailsController < ApplicationController +end diff --git a/spec/requests/emails_spec.rb b/spec/requests/emails_spec.rb new file mode 100644 index 00000000..30fd9c6e --- /dev/null +++ b/spec/requests/emails_spec.rb @@ -0,0 +1,7 @@ +require 'rails_helper' + +RSpec.describe "Emails", type: :request do + describe "GET /index" do + pending "add some examples (or delete) #{__FILE__}" + end +end From 6896fffce21c6143dce9019dbec67e2bdadb1018 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sat, 18 May 2024 21:26:31 +0100 Subject: [PATCH 38/94] add emails to routes --- config/routes.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/routes.rb b/config/routes.rb index e75fcc06..05073724 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -51,6 +51,7 @@ end end + resources :emails, only: [:create] resources :saved_jobs, only: [:index, :show, :destroy] resources :educations, only: [:new, :create] end From 2399d178c74cfd0acda7825ac1370bca4781e304 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sat, 18 May 2024 21:26:36 +0100 Subject: [PATCH 39/94] add emails controller --- app/controllers/emails_controller.rb | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/app/controllers/emails_controller.rb b/app/controllers/emails_controller.rb index 1608c8e8..b9c5f6ec 100644 --- a/app/controllers/emails_controller.rb +++ b/app/controllers/emails_controller.rb @@ -1,2 +1,27 @@ class EmailsController < ApplicationController + require 'sendgrid-ruby' + include SendGrid + + def create + email = params[:email] + + send_confirmation_email(email) + + redirect_to root_path, notice: 'Subscription successful. Please check your email for confirmation.' + end + + def send_confirmation_email(email) + from = SendGrid::Email.new(email: 'charlie@cheddar.jobs') + to = SendGrid::Email.new(email:) + subject = 'Cheddar sign up confirmation' + content = SendGrid::Content.new(type: 'text/plain', value: 'Thank you for subscribing!') + + mail = SendGrid::Mail.new(from, subject, to, content) + + sg = SendGrid::API.new(api_key: ENV.fetch('SENDGRID_API_KEY')) + response = sg.client.mail._('send').post(request_body: mail.to_json) + puts response.status_code + puts response.body + puts response.headers + end end From 013384a5a1b26c3944f0900302813a4f8c6d7f72 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sat, 18 May 2024 21:26:41 +0100 Subject: [PATCH 40/94] update user mailer --- app/mailers/user_mailer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb index 04c627a2..74ecdb37 100644 --- a/app/mailers/user_mailer.rb +++ b/app/mailers/user_mailer.rb @@ -1,5 +1,5 @@ class UserMailer < ApplicationMailer - default from: 'no-reply@yourdomain.com' + default from: 'charlie@cheddar.jobs' def confirmation_email(email) @email = email From 1123e438470ec700769d24095f9e8326548a620a Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sat, 18 May 2024 21:26:47 +0100 Subject: [PATCH 41/94] add post request to form --- app/views/shared/_email_signup.html.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/shared/_email_signup.html.erb b/app/views/shared/_email_signup.html.erb index a6f50266..c5697535 100644 --- a/app/views/shared/_email_signup.html.erb +++ b/app/views/shared/_email_signup.html.erb @@ -1,6 +1,6 @@ -
    +<%= form_with url: emails_path, method: :post, local: true do |form| %>
    - - + <%= form.text_field :email, class: 'rounded-start-pill form-control bg-white', placeholder: 'Type your email', aria: { label: 'Email' } %> + <%= form.submit 'Subscribe', class: 'input-group-text rounded-end-pill bg-main text-white' %>
    -
    +<% end %> From 92e0f95dce5500d2c8f208fec50195d731859e49 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sat, 18 May 2024 21:28:01 +0100 Subject: [PATCH 42/94] tidy --- app/controllers/emails_controller.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/controllers/emails_controller.rb b/app/controllers/emails_controller.rb index b9c5f6ec..dcdaaa58 100644 --- a/app/controllers/emails_controller.rb +++ b/app/controllers/emails_controller.rb @@ -4,9 +4,7 @@ class EmailsController < ApplicationController def create email = params[:email] - send_confirmation_email(email) - redirect_to root_path, notice: 'Subscription successful. Please check your email for confirmation.' end From cbf1462a75cada82402935921195172b4d3306e5 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sun, 19 May 2024 08:33:16 +0100 Subject: [PATCH 43/94] install hotjar --- app/views/layouts/application.html.erb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 1dc4e650..afcc2e3e 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -8,6 +8,17 @@ <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %> <%= javascript_importmap_tags %> <%= favicon_link_tag asset_path("cheddar_logo_new_3.svg") %> + + From 2ca2c7145e062d2e47d6fe050d4fb03f5fcc2570 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sun, 19 May 2024 08:36:03 +0100 Subject: [PATCH 44/94] tidying --- app/views/layouts/application.html.erb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index afcc2e3e..9e2acc9a 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -3,11 +3,18 @@ <%= display_meta_tags site: "Cheddar" %> + + <%= csrf_meta_tags %> <%= csp_meta_tag %> <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %> + + <%= javascript_importmap_tags %> + + <%= favicon_link_tag asset_path("cheddar_logo_new_3.svg") %> + + + From ade5242085832bbbebfab5b1f0b3466464939be9 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sun, 19 May 2024 08:37:47 +0100 Subject: [PATCH 45/94] refactor script into partial --- app/views/layouts/application.html.erb | 11 +---------- app/views/shared/_hotjar.html.erb | 10 ++++++++++ 2 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 app/views/shared/_hotjar.html.erb diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 9e2acc9a..5cb83f53 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -16,16 +16,7 @@ <%= favicon_link_tag asset_path("cheddar_logo_new_3.svg") %> - + <%= render "shared/hotjar" %> diff --git a/app/views/shared/_hotjar.html.erb b/app/views/shared/_hotjar.html.erb new file mode 100644 index 00000000..21657abc --- /dev/null +++ b/app/views/shared/_hotjar.html.erb @@ -0,0 +1,10 @@ + From fd6bcd7586cf50742d1fcd5743bbd58079805d8b Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sun, 19 May 2024 08:39:48 +0100 Subject: [PATCH 46/94] tidying 2 --- app/views/layouts/application.html.erb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 5cb83f53..0546df88 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,20 +1,19 @@ - <%= display_meta_tags site: "Cheddar" %> - - + + <%= display_meta_tags site: "Cheddar" %> <%= csrf_meta_tags %> <%= csp_meta_tag %> <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %> - - <%= javascript_importmap_tags %> - <%= favicon_link_tag asset_path("cheddar_logo_new_3.svg") %> + + <%= javascript_importmap_tags %> + <%= render "shared/hotjar" %> From 54f8afe7b59aa3612cc1948ee5dcb23e231e0a71 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sun, 19 May 2024 08:55:26 +0100 Subject: [PATCH 47/94] install google analytics --- app/views/layouts/application.html.erb | 3 +++ app/views/shared/_google_analytics.html.erb | 8 ++++++++ 2 files changed, 11 insertions(+) create mode 100644 app/views/shared/_google_analytics.html.erb diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 0546df88..952d1fde 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -14,6 +14,9 @@ <%= javascript_importmap_tags %> + + <%= render "shared/google_analytics" %> + <%= render "shared/hotjar" %> diff --git a/app/views/shared/_google_analytics.html.erb b/app/views/shared/_google_analytics.html.erb new file mode 100644 index 00000000..27d94b66 --- /dev/null +++ b/app/views/shared/_google_analytics.html.erb @@ -0,0 +1,8 @@ + + From ed22258ac656a387b70b0a88ae1f2c6a2d850a2d Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sun, 19 May 2024 08:55:50 +0100 Subject: [PATCH 48/94] tidying 3 --- app/views/layouts/application.html.erb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 952d1fde..e521e905 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -14,10 +14,8 @@ <%= javascript_importmap_tags %> - + <%= render "shared/google_analytics" %> - - <%= render "shared/hotjar" %> From 49855f5855abc217698be9277fab8601b1ccb977 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sun, 19 May 2024 09:03:33 +0100 Subject: [PATCH 49/94] move tinymce - will need to check this doesn't break anything --- app/views/job_applications/new.html.erb | 2 ++ app/views/layouts/application.html.erb | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/views/job_applications/new.html.erb b/app/views/job_applications/new.html.erb index ee1817b4..ed20ec9a 100644 --- a/app/views/job_applications/new.html.erb +++ b/app/views/job_applications/new.html.erb @@ -9,6 +9,8 @@ }) + +
    diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index e521e905..a9719999 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -17,9 +17,6 @@ <%= render "shared/google_analytics" %> <%= render "shared/hotjar" %> - - - From 356e5433d547eaa3cf34a09a06bd70ad6a30f3d5 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sun, 19 May 2024 09:04:12 +0100 Subject: [PATCH 50/94] tidying 5 --- app/views/job_applications/new.html.erb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/views/job_applications/new.html.erb b/app/views/job_applications/new.html.erb index ed20ec9a..67bc2c56 100644 --- a/app/views/job_applications/new.html.erb +++ b/app/views/job_applications/new.html.erb @@ -1,5 +1,6 @@ <%= provide(:title, 'New job applications') %> + - -
    From 89b8203b169a96fc3590b49f7246f52cf7de9f29 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sun, 19 May 2024 09:19:02 +0100 Subject: [PATCH 51/94] add contact to sendgrid support --- app/controllers/emails_controller.rb | 31 ++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/app/controllers/emails_controller.rb b/app/controllers/emails_controller.rb index dcdaaa58..12e6639e 100644 --- a/app/controllers/emails_controller.rb +++ b/app/controllers/emails_controller.rb @@ -4,8 +4,34 @@ class EmailsController < ApplicationController def create email = params[:email] - send_confirmation_email(email) - redirect_to root_path, notice: 'Subscription successful. Please check your email for confirmation.' + response = add_contact_to_sendgrid(email) + + if response.status_code.to_i == 202 + send_confirmation_email(email) + redirect_to root_path, notice: 'Subscription successful. Please check your email for confirmation.' + else + redirect_to root_path, alert: 'Subscription failed. Please try again later.' + end + end + + private + + def add_contact_to_sendgrid(email) + sg = SendGrid::API.new(api_key: ENV.fetch('SENDGRID_API_KEY')) + + data = { + contacts: [ + { + email: email + } + ] + } + + response = sg.client.marketing.contacts.put(request_body: data.to_json) + puts response.status_code + puts response.body + puts response.headers + response end def send_confirmation_email(email) @@ -21,5 +47,6 @@ def send_confirmation_email(email) puts response.status_code puts response.body puts response.headers + response end end From e8265f851b514cb686988ec8a00ab0209aed2484 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sun, 19 May 2024 09:23:35 +0100 Subject: [PATCH 52/94] configure sendgrid in production --- config/environments/production.rb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/config/environments/production.rb b/config/environments/production.rb index bc347e3d..dd5524b7 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -1,7 +1,18 @@ require "active_support/core_ext/integer/time" Rails.application.configure do - config.action_mailer.default_url_options = { host: "http://TODO_PUT_YOUR_DOMAIN_HERE" } + config.action_mailer.delivery_method = :smtp + config.action_mailer.smtp_settings = { + user_name: 'apikey', + password: ENV.fetch('SENDGRID_API_KEY'), + domain: 'cheddar.jobs', + address: 'smtp.sendgrid.net', + port: 587, + authentication: :plain, + enable_starttls_auto: true + } + + config.action_mailer.default_url_options = { host: "www.cheddar.jobs", protocol: "https"} # Settings specified here will take precedence over those in config/application.rb. # Code is not reloaded between requests. From 0036d3f943d406b810c7ce14fafbd5df5aecad6f Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sun, 19 May 2024 09:23:54 +0100 Subject: [PATCH 53/94] rubocop change --- config/environments/production.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/environments/production.rb b/config/environments/production.rb index dd5524b7..c2594fbd 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -12,7 +12,7 @@ enable_starttls_auto: true } - config.action_mailer.default_url_options = { host: "www.cheddar.jobs", protocol: "https"} + config.action_mailer.default_url_options = { host: "www.cheddar.jobs", protocol: "https" } # Settings specified here will take precedence over those in config/application.rb. # Code is not reloaded between requests. From 5d8ea60f69cf81b99ad6e294622b4ecaad2cdff9 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sun, 19 May 2024 09:32:40 +0100 Subject: [PATCH 54/94] install hubspot api client gem --- Gemfile | 2 +- Gemfile.lock | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 6ae28f31..09c73f38 100644 --- a/Gemfile +++ b/Gemfile @@ -78,7 +78,7 @@ gem 'meta-tags' # gem 'sitemap_generator' # TODO: install this gem for sitemap generation # Email & CRM -# gem 'hubspot-api-client' # This can be installed later when we need a full CRM +gem 'hubspot-api-client' gem 'sendgrid-ruby' # Importing, Parsing & APIs diff --git a/Gemfile.lock b/Gemfile.lock index 6db1e226..8392fdd8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -162,6 +162,8 @@ GEM erubi (1.12.0) et-orbi (1.2.11) tzinfo + ethon (0.16.0) + ffi (>= 1.15.0) event_stream_parser (1.0.0) execjs (2.9.1) factory_bot (6.4.6) @@ -202,6 +204,9 @@ GEM httparty (0.21.0) mini_mime (>= 1.0.0) multi_xml (>= 0.5.2) + hubspot-api-client (18.0.0) + json (~> 2.1, >= 2.1.0) + typhoeus (~> 1.4.0) i18n (1.14.4) concurrent-ruby (~> 1.0) importmap-rails (2.0.1) @@ -439,6 +444,8 @@ GEM railties (>= 6.0.0) turbo_power (0.6.1) turbo-rails (>= 1.3.0) + typhoeus (1.4.1) + ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) @@ -506,6 +513,7 @@ DEPENDENCIES geocoder high_voltage (~> 3.1) htmltoword + hubspot-api-client importmap-rails json (~> 2.6, >= 2.6.3) meta-tags From 25a81f352e581095274e93826abbfc13217f30e7 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sun, 19 May 2024 09:33:23 +0100 Subject: [PATCH 55/94] omit hash value --- app/controllers/emails_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/emails_controller.rb b/app/controllers/emails_controller.rb index 12e6639e..f097a818 100644 --- a/app/controllers/emails_controller.rb +++ b/app/controllers/emails_controller.rb @@ -22,7 +22,7 @@ def add_contact_to_sendgrid(email) data = { contacts: [ { - email: email + email: } ] } From 759b61403f4aa2a36bd5cb0503eea016454a8d40 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sun, 19 May 2024 10:00:45 +0100 Subject: [PATCH 56/94] move hubspot and sendgrid into service classes to clean up controller --- app/controllers/emails_controller.rb | 50 +++++----------------------- app/services/email/hubspot.rb | 28 ++++++++++++++++ app/services/email/sendgrid.rb | 45 +++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 42 deletions(-) create mode 100644 app/services/email/hubspot.rb create mode 100644 app/services/email/sendgrid.rb diff --git a/app/controllers/emails_controller.rb b/app/controllers/emails_controller.rb index f097a818..fb9d6449 100644 --- a/app/controllers/emails_controller.rb +++ b/app/controllers/emails_controller.rb @@ -1,52 +1,18 @@ class EmailsController < ApplicationController - require 'sendgrid-ruby' - include SendGrid - def create email = params[:email] - response = add_contact_to_sendgrid(email) - if response.status_code.to_i == 202 - send_confirmation_email(email) + hubspot_service = Email::Hubspot.new + sendgrid_service = Email::Sendgrid.new + + hubspot_response = hubspot_service.add_contact(email) + sendgrid_response = sendgrid_service.add_contact(email) + + if sendgrid_response.status_code.to_i == 202 && hubspot_response + sendgrid_service.send_confirmation_email(email) redirect_to root_path, notice: 'Subscription successful. Please check your email for confirmation.' else redirect_to root_path, alert: 'Subscription failed. Please try again later.' end end - - private - - def add_contact_to_sendgrid(email) - sg = SendGrid::API.new(api_key: ENV.fetch('SENDGRID_API_KEY')) - - data = { - contacts: [ - { - email: - } - ] - } - - response = sg.client.marketing.contacts.put(request_body: data.to_json) - puts response.status_code - puts response.body - puts response.headers - response - end - - def send_confirmation_email(email) - from = SendGrid::Email.new(email: 'charlie@cheddar.jobs') - to = SendGrid::Email.new(email:) - subject = 'Cheddar sign up confirmation' - content = SendGrid::Content.new(type: 'text/plain', value: 'Thank you for subscribing!') - - mail = SendGrid::Mail.new(from, subject, to, content) - - sg = SendGrid::API.new(api_key: ENV.fetch('SENDGRID_API_KEY')) - response = sg.client.mail._('send').post(request_body: mail.to_json) - puts response.status_code - puts response.body - puts response.headers - response - end end diff --git a/app/services/email/hubspot.rb b/app/services/email/hubspot.rb new file mode 100644 index 00000000..652e324f --- /dev/null +++ b/app/services/email/hubspot.rb @@ -0,0 +1,28 @@ +module Email + class Hubspot + require 'hubspot-api-client' + + def initialize + @client = Hubspot::Client.new(api_key: ENV.fetch('HUBSPOT_API_KEY')) + end + + def add_contact(email) + contact_properties = { + properties: { + email: + } + } + + begin + response = @client.crm.contacts.basic_api.create(contact_properties) + p "HubSpot contact created: #{response.to_json}" + Rails.logger.info("HubSpot contact created: #{response.to_json}") + true + rescue Hubspot::ApiError => e + p "Error creating HubSpot contact: #{e.response_body}" + Rails.logger.error("Error creating HubSpot contact: #{e.response_body}") + false + end + end + end +end diff --git a/app/services/email/sendgrid.rb b/app/services/email/sendgrid.rb new file mode 100644 index 00000000..5973f069 --- /dev/null +++ b/app/services/email/sendgrid.rb @@ -0,0 +1,45 @@ +module Email + class Sendgrid + require 'sendgrid-ruby' + include SendGrid + + def initialize + @sg = SendGrid::API.new(api_key: ENV.fetch('SENDGRID_API_KEY')) + end + + def add_contact(email) + data = { + contacts: [ + { + email: + } + ] + } + + response = @sg.client.marketing.contacts.put(request_body: data.to_json) + log_response(response) + response + end + + def send_confirmation_email(email) + from = SendGrid::Email.new(email: 'charlie@cheddar.jobs') + to = SendGrid::Email.new(email:) + subject = 'Cheddar sign up confirmation' + content = SendGrid::Content.new(type: 'text/plain', value: 'Thank you for subscribing!') + + mail = SendGrid::Mail.new(from, subject, to, content) + + response = @sg.client.mail._('send').post(request_body: mail.to_json) + log_response(response) + response + end + + private + + def log_response(response) + puts response.status_code + puts response.body + puts response.headers + end + end +end From 24790247b2d233f65ae78b40a7df34069202cc2d Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sun, 19 May 2024 10:32:42 +0100 Subject: [PATCH 57/94] access token and hubspot tracking --- app/services/email/hubspot.rb | 2 +- app/views/layouts/application.html.erb | 1 + app/views/shared/_hubspot.html.erb | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 app/views/shared/_hubspot.html.erb diff --git a/app/services/email/hubspot.rb b/app/services/email/hubspot.rb index 652e324f..e9701577 100644 --- a/app/services/email/hubspot.rb +++ b/app/services/email/hubspot.rb @@ -3,7 +3,7 @@ class Hubspot require 'hubspot-api-client' def initialize - @client = Hubspot::Client.new(api_key: ENV.fetch('HUBSPOT_API_KEY')) + @client = Hubspot::Client.new(access_token: ENV.fetch('HUBSPOT_API_KEY')) end def add_contact(email) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index a9719999..35cd6c07 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -17,6 +17,7 @@ <%= render "shared/google_analytics" %> <%= render "shared/hotjar" %> + <%= render "shared/hubspot" %> diff --git a/app/views/shared/_hubspot.html.erb b/app/views/shared/_hubspot.html.erb new file mode 100644 index 00000000..c8fd0092 --- /dev/null +++ b/app/views/shared/_hubspot.html.erb @@ -0,0 +1 @@ + From 5b9c4fd746154e766eb38e9590aa2b15dcd87c8c Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sun, 19 May 2024 10:42:30 +0100 Subject: [PATCH 58/94] add hubspot todo and comment out gem for now --- Gemfile | 2 +- app/controllers/emails_controller.rb | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 09c73f38..af5d99fb 100644 --- a/Gemfile +++ b/Gemfile @@ -78,7 +78,7 @@ gem 'meta-tags' # gem 'sitemap_generator' # TODO: install this gem for sitemap generation # Email & CRM -gem 'hubspot-api-client' +# gem 'hubspot-api-client' gem 'sendgrid-ruby' # Importing, Parsing & APIs diff --git a/app/controllers/emails_controller.rb b/app/controllers/emails_controller.rb index fb9d6449..1b44120c 100644 --- a/app/controllers/emails_controller.rb +++ b/app/controllers/emails_controller.rb @@ -2,13 +2,14 @@ class EmailsController < ApplicationController def create email = params[:email] - hubspot_service = Email::Hubspot.new + # TODO: Integrate Hubspot via OAuth - at the moment we're using Sendgrid and this doesn't work + # hubspot_service = Email::Hubspot.new sendgrid_service = Email::Sendgrid.new - hubspot_response = hubspot_service.add_contact(email) + # hubspot_response = hubspot_service.add_contact(email) sendgrid_response = sendgrid_service.add_contact(email) - if sendgrid_response.status_code.to_i == 202 && hubspot_response + if sendgrid_response.status_code.to_i == 202 sendgrid_service.send_confirmation_email(email) redirect_to root_path, notice: 'Subscription successful. Please check your email for confirmation.' else From 9ab011fd5576be5fbec1d31ac804a68109a6b6f9 Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sun, 19 May 2024 10:44:23 +0100 Subject: [PATCH 59/94] add todo for later --- app/views/jobs/_difficulty_rating.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/jobs/_difficulty_rating.html.erb b/app/views/jobs/_difficulty_rating.html.erb index e404e4f8..9d6703b8 100644 --- a/app/views/jobs/_difficulty_rating.html.erb +++ b/app/views/jobs/_difficulty_rating.html.erb @@ -1,6 +1,6 @@
    - <%# 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 %> + <%# TODO: 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 %> From b83ea6516751526c3132cd2ee7618e531602b5de Mon Sep 17 00:00:00 2001 From: Charlie Cheesman Date: Sun, 19 May 2024 11:08:54 +0100 Subject: [PATCH 60/94] update html --- app/views/jobs/_search.html.erb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/jobs/_search.html.erb b/app/views/jobs/_search.html.erb index d49d4630..c06577e4 100644 --- a/app/views/jobs/_search.html.erb +++ b/app/views/jobs/_search.html.erb @@ -1,8 +1,9 @@ -
- -