From 5df8de4f94620b1852ff014c4261ec7c9a86965b Mon Sep 17 00:00:00 2001 From: Jah Seng Lee Date: Sun, 26 Nov 2023 17:07:13 +0800 Subject: [PATCH 1/5] Install meta-tags gem --- Gemfile | 3 +++ Gemfile.lock | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Gemfile b/Gemfile index ef4975e..f8882e9 100644 --- a/Gemfile +++ b/Gemfile @@ -78,6 +78,9 @@ gem "stripe" # Markdown support gem "redcarpet" +# SEO +gem "meta-tags" + group :development, :test do # See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem gem "debug", platforms: %i[ mri mingw x64_mingw ] diff --git a/Gemfile.lock b/Gemfile.lock index 32bff38..e519d65 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -181,6 +181,8 @@ GEM net-smtp marcel (1.0.2) matrix (0.4.2) + meta-tags (2.19.0) + actionpack (>= 3.2.0, < 7.2) method_source (1.0.0) mini_magick (4.11.0) mini_mime (1.1.5) @@ -361,6 +363,7 @@ DEPENDENCIES image_processing (~> 1.8) jbuilder jsbundling-rails + meta-tags pagy (~> 6.0) pg (>= 0.18, < 2.0) pg_search From 3354abb108b0b86daa769d83a5767bb6c8039be3 Mon Sep 17 00:00:00 2001 From: Jah Seng Lee Date: Wed, 29 Nov 2023 15:12:44 +0800 Subject: [PATCH 2/5] Setup favicons --- .gitignore | 2 +- app/views/layouts/application.html.erb | 7 +++++++ public/apple-touch-icon.png | Bin 0 -> 5733 bytes public/favicon.ico | Bin 0 -> 1077 bytes public/favicon.svg | 1 + 5 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 public/favicon.svg diff --git a/.gitignore b/.gitignore index 576c7de..f14b919 100644 --- a/.gitignore +++ b/.gitignore @@ -40,5 +40,5 @@ /node_modules .byebug_history -public/ +public/uploads .yarn/cache diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 5aaf565..17f0a71 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -8,11 +8,18 @@ <% end %> + + + + <%= csrf_meta_tags %> <%= csp_meta_tag %> <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %> <%= javascript_include_tag "application", "data-turbo-track": "reload", defer: true %> + + <%= display_meta_tags site: "Nomadstation" %> + diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..bb74339de950b72b23ec71995fb7848cae2fa9a2 100644 GIT binary patch literal 5733 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 literal 0 HcmV?d00001 diff --git a/public/favicon.ico b/public/favicon.ico index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..14aa04cf61853a7edaa24b2f0323af978a2031c1 100644 GIT binary patch literal 1077 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}EvXTnX}-P; zT0k}j11qBt12aeo5Hc`IF|dN!3=Ce3(r|VVqXtwB69YqgCIbspO%#v@0ZAYR>W0$H z3m6e5E?|PIR#?D{V1u*?@?>}cDb50q$YKTt<{Kc)nCG5s3N$S;GbExU!q>+tIX_n~ zF(p4KRj(qq0Hlk-rosxy%uOvxRH(?!$t$+1uvG%9umZ9{!um=IU?nBlwn`Dc0SeCf zMX3sAdIow1N_Jcd3JNwwDQQ+gE^bimK%T8qMoCG5mA-y?dAVM>v0i>ry1t>MrKP@s zk-m|UE>MMTab;dfVufyAu`tKo-FP#GNIX zX$YJ0ilN>DdQcxEqi?8Zpbs}2sMQ7}YUN*)nF_QSWWJrD4Ok_L7}OpceURlyj)C|T zEDH3h9hZ$hJlO2GB;y{k0|WV~r;B4q1n1jn_WCS=B1ez!U!lU)%XHsiidJvfBkKza z8ZMevYXdy4)UZx<5qZSyVG`Zp<>b=-AY#Kxw!`LY*-Yv##rU+>He0&yGoCy26R8V+EvPW$nmH2!>|nt zvOXW$QuI72c~`B{8uy1=@+|5-DyJXXZ6N$?$HAW6nIu@8aQ>W^($*Dy=kUzT3NR*8kn#CmC9@XGS;t(fh&t^Tv(h?RT~F zt$r@{5J;?-5aBry-x~4k2?vA!!ONXa63^ZKg|b{PW||gx+c)dKmJy%&_0LSxv@Mww z;#(rWWf$2Wp6a)oe^z)7f8pg5?x8)0wiwl2F;W!|Um1H`O1WWr&-~A4P96=dYF(FM zqnX3Sak4eWX8tp0W3v_FuP=17Y9o_YOF zmstJ$@~NyBCvH&KV0)eE`>VQhrrXaXIkCTB%2nH@Gl#pT=zNRqLjM~=H;i^o>{LAT z$j>zGYJ%^9UES+G#&=xm;j;+q5Yjs|!+FNeoy>caqC}S&rTZvu=$H~vw_V`iex?2D gpOW(opI&U_&%d($lJTqiv7o%;>FVdQ&MBb@0L8v@oB#j- literal 0 HcmV?d00001 diff --git a/public/favicon.svg b/public/favicon.svg new file mode 100644 index 0000000..1d2ce14 --- /dev/null +++ b/public/favicon.svg @@ -0,0 +1 @@ + \ No newline at end of file From ecd4e4159a4e12293a3bf7dd03945469efe41dc2 Mon Sep 17 00:00:00 2001 From: Jah Seng Lee Date: Wed, 29 Nov 2023 16:18:04 +0800 Subject: [PATCH 3/5] Add meta tags --- app/views/channels/new.html.erb | 7 +++++++ app/views/chats/show.html.erb | 13 +++++++------ app/views/choose_plans/show.html.erb | 8 ++++++++ app/views/devise/confirmations/new.html.erb | 9 +++++++++ app/views/devise/passwords/edit.html.erb | 7 +++++++ app/views/devise/passwords/new.html.erb | 9 +++++++++ app/views/devise/registrations/new.html.erb | 9 +++++++++ app/views/devise/sessions/new.html.erb | 9 +++++++++ app/views/home/index.html.erb | 9 +++++++++ app/views/layouts/application.html.erb | 7 ------- app/views/locations/edit.html.erb | 7 +++++++ app/views/locations/show.html.erb | 13 +++++++++---- app/views/profiles/show.html.erb | 9 +++++++++ app/views/reviews/edit.html.erb | 9 +++++++++ app/views/reviews/index.html.erb | 13 +++++++++---- app/views/reviews/new.html.erb | 11 ++++++++++- app/views/reviews/show.html.erb | 13 +++++++++---- app/views/visa_information/edit.html.erb | 7 +++++++ app/views/visa_information/show.html.erb | 13 +++++++++---- app/views/visas/edit.html.erb | 7 +++++++ app/views/visas/new.html.erb | 7 +++++++ 21 files changed, 166 insertions(+), 30 deletions(-) diff --git a/app/views/channels/new.html.erb b/app/views/channels/new.html.erb index 0886bb1..ae5713e 100644 --- a/app/views/channels/new.html.erb +++ b/app/views/channels/new.html.erb @@ -27,3 +27,10 @@ %> <% end %> + +<% + set_meta_tags( + index: false, + follow: false + ) +%> diff --git a/app/views/chats/show.html.erb b/app/views/chats/show.html.erb index 10c6935..1b3dd5c 100644 --- a/app/views/chats/show.html.erb +++ b/app/views/chats/show.html.erb @@ -1,12 +1,13 @@ - <% if content_for? :page_title %> - <%= yield :page_title %> | Nomadstation - <% else %> - Nomadstation - <% end %> - + <% + # Looks like meta-tags gem doesn't play nice with a custom layout + # Just do it manually here + %> + Nomadstation | <%= @channel.present? ? "#{@channel.name} chat channel" : "Chat" %> + + <%= csrf_meta_tags %> <%= csp_meta_tag %> diff --git a/app/views/choose_plans/show.html.erb b/app/views/choose_plans/show.html.erb index acfb610..3e540fa 100644 --- a/app/views/choose_plans/show.html.erb +++ b/app/views/choose_plans/show.html.erb @@ -7,3 +7,11 @@ > + +<% + set_meta_tags( + title: "Choose your Nomadstation plan", + index: true, + follow: false + ) +%> diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb index 20d75e1..977fa6a 100644 --- a/app/views/devise/confirmations/new.html.erb +++ b/app/views/devise/confirmations/new.html.erb @@ -31,3 +31,12 @@
+ +<% + set_meta_tags( + title: "Resend confirmation instructions", + description: "Lost your confirmation email? Fill out this form and we'll send you another.", + index: true, + follow: true + ) +%> diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb index 0cc4885..c95bb23 100644 --- a/app/views/devise/passwords/edit.html.erb +++ b/app/views/devise/passwords/edit.html.erb @@ -40,3 +40,10 @@
+ +<% + set_meta_tags( + index: false, + follow: false + ) +%> diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb index 4619344..90463ca 100644 --- a/app/views/devise/passwords/new.html.erb +++ b/app/views/devise/passwords/new.html.erb @@ -29,3 +29,12 @@
+ +<% + set_meta_tags( + title: "Forgot your password?", + description: "Forgot your password? Fill out this form and we'll send you an email to reset it.", + index: true, + follow: true + ) +%> diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index e407359..9dc8fcd 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -96,3 +96,12 @@ + +<% + set_meta_tags( + title: "Sign up for your Digital Nomad toolkit and community", + description: "An all-in-one toolkit and community for researching destinations, finding up-to-date tailored visa information and meeting other like minded individuals.", + index: true, + follow: true + ) +%> diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index b5d8611..99b07b2 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -93,3 +93,12 @@ + +<% + set_meta_tags( + title: "Welcome back!", + description: "Sign back in to Nomadstation for your personalised Digital Nomad toolkit and community.", + index: true, + follow: true + ) +%> diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 8071f1c..cf60890 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -20,3 +20,12 @@ } %> + +<% + set_meta_tags( + title: "A digital nomad toolkit and community", + description: "Whether you're researching your next Digital Nomad destination, wanting to make online or in person connections or figuring out which visas you're eligible for, Nomadstation provides everything you need as a modern traveller.", + index: true, + follow: true + ) +%> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 17f0a71..524cd77 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,12 +1,6 @@ - <% if content_for? :page_title %> - <%= yield :page_title %> | Nomadstation - <% else %> - Nomadstation - <% end %> - @@ -19,7 +13,6 @@ <%= javascript_include_tag "application", "data-turbo-track": "reload", defer: true %> <%= display_meta_tags site: "Nomadstation" %> - diff --git a/app/views/locations/edit.html.erb b/app/views/locations/edit.html.erb index 78db2b5..152565f 100644 --- a/app/views/locations/edit.html.erb +++ b/app/views/locations/edit.html.erb @@ -40,3 +40,10 @@ <% end %> <% end %> + +<% + set_meta_tags( + index: false, + follow: false + ) +%> diff --git a/app/views/locations/show.html.erb b/app/views/locations/show.html.erb index 22febb1..82bce75 100644 --- a/app/views/locations/show.html.erb +++ b/app/views/locations/show.html.erb @@ -1,7 +1,3 @@ -<% content_for :page_title do %> - <%= @location.name %>, <%= @location.country.name %> -<% end %> - <%= render partial: "locations/header", locals: { location: @location, @@ -141,3 +137,12 @@ + +<% + set_meta_tags( + title: "#{@location.name_utf8}, #{@location.country.name}", + description: helper_location_short_description(location: @location), + index: true, + follow: true + ) +%> diff --git a/app/views/profiles/show.html.erb b/app/views/profiles/show.html.erb index c17bf31..3a78c14 100644 --- a/app/views/profiles/show.html.erb +++ b/app/views/profiles/show.html.erb @@ -132,3 +132,12 @@ + +<% + set_meta_tags( + title: "Update your profile", + description: "Customise your Digital Nomad profile to get a tailored experience, made just for you.", + index: true, + follow: false + ) +%> diff --git a/app/views/reviews/edit.html.erb b/app/views/reviews/edit.html.erb index d9a68c5..56b8155 100644 --- a/app/views/reviews/edit.html.erb +++ b/app/views/reviews/edit.html.erb @@ -16,3 +16,12 @@ } %> + +<% + set_meta_tags( + title: "Update your review for #{@location.name_utf8}, #{@location.country.name}", + description: "Help others with their Digital Nomad adventures by reviewing #{@location.name_utf8}, #{@location.country.name}.", + index: true, + follow: true + ) +%> diff --git a/app/views/reviews/index.html.erb b/app/views/reviews/index.html.erb index 34c1242..e07587d 100644 --- a/app/views/reviews/index.html.erb +++ b/app/views/reviews/index.html.erb @@ -1,7 +1,3 @@ -<% content_for :page_title do %> - Reviews for <%= @location.name %>, <%= @location.country.name %> -<% end %> - <%= render partial: "locations/header", locals: { location: @location, @@ -40,3 +36,12 @@ <% end %> + +<% + set_meta_tags( + title: "Reviews for #{@location.name_utf8}, #{@location.country.name}", + description: "Still unsure about #{@location.name_utf8} as your next Digital Nomad experience? Find out what other experienced travellers think!", + index: true, + follow: true + ) +%> diff --git a/app/views/reviews/new.html.erb b/app/views/reviews/new.html.erb index d9a68c5..a5297ae 100644 --- a/app/views/reviews/new.html.erb +++ b/app/views/reviews/new.html.erb @@ -6,7 +6,7 @@ %>

- Review for <%= @location.name_utf8 %>, <%= @location.country.name %> + Reviewing <%= @location.name_utf8 %>, <%= @location.country.name %>

<%= render partial: "reviews/shared/form", @@ -16,3 +16,12 @@ } %> + +<% + set_meta_tags( + title: "Reviewing #{@location.name_utf8}, #{@location.country.name}", + description: "Help others with their Digital Nomad adventures by reviewing #{@location.name_utf8}, #{@location.country.name}.", + index: true, + follow: true + ) +%> diff --git a/app/views/reviews/show.html.erb b/app/views/reviews/show.html.erb index 3aedeff..f12cd46 100644 --- a/app/views/reviews/show.html.erb +++ b/app/views/reviews/show.html.erb @@ -1,7 +1,3 @@ -<% content_for :page_title do %> - Review for <%= @location.name %>, <%= @location.country.name %> - by <%= @review.user.display_name %> -<% end %> <%= render partial: "locations/header", locals: { @@ -59,3 +55,12 @@ <% end %> + +<% + set_meta_tags( + title: "Review for #{@location.name_utf8}, #{@location.country.name} by #{@review.user.display_name}", + description: "Unsure about #{@location.name_utf8} as your next Digital Nomad experience? Find out what #{@review.user.display_name} thinks about #{@location.name}", + index: true, + follow: true + ) +%> diff --git a/app/views/visa_information/edit.html.erb b/app/views/visa_information/edit.html.erb index f3d85bd..c703dd5 100644 --- a/app/views/visa_information/edit.html.erb +++ b/app/views/visa_information/edit.html.erb @@ -26,3 +26,10 @@ %> <% end %> + +<% + set_meta_tags( + index: false, + follow: false + ) +%> diff --git a/app/views/visa_information/show.html.erb b/app/views/visa_information/show.html.erb index ed770a9..1575002 100644 --- a/app/views/visa_information/show.html.erb +++ b/app/views/visa_information/show.html.erb @@ -1,7 +1,3 @@ -<% content_for :page_title do %> - <%= @location.name %>, <%= @location.country.name %> -<% end %> - <%= render partial: "locations/header", locals: { location: @location, @@ -104,3 +100,12 @@

<% end %> + +<% + set_meta_tags( + title: "Visa info for #{@location.name_utf8}, #{@location.country.name}", + description: "Up to date visa information for #{@location.name}, #{@location.country.name}, specially tailored for you!", + index: true, + follow: true + ) +%> diff --git a/app/views/visas/edit.html.erb b/app/views/visas/edit.html.erb index 962728a..8458571 100644 --- a/app/views/visas/edit.html.erb +++ b/app/views/visas/edit.html.erb @@ -90,3 +90,10 @@ %> + +<% + set_meta_tags( + index: false, + follow: false + ) +%> diff --git a/app/views/visas/new.html.erb b/app/views/visas/new.html.erb index 0157c1a..6705c03 100644 --- a/app/views/visas/new.html.erb +++ b/app/views/visas/new.html.erb @@ -28,3 +28,10 @@ <%= f.submit "Add visa", class: "btn btn-success" %> <% end %> + +<% + set_meta_tags( + index: false, + follow: false + ) +%> From a41bb9970d44ccf390dd155c2dcb4726aa47be7f Mon Sep 17 00:00:00 2001 From: Jah Seng Lee Date: Wed, 29 Nov 2023 16:25:37 +0800 Subject: [PATCH 4/5] Update copy for joining --- app/views/devise/registrations/new.html.erb | 6 +++--- app/views/devise/sessions/new.html.erb | 4 ++-- app/views/{ => devise}/shared/_joining_reasons.html.erb | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) rename app/views/{ => devise}/shared/_joining_reasons.html.erb (55%) diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index 9dc8fcd..c0c2220 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -86,10 +86,10 @@
-
-
Your digital nomad community
+
+

Your digital nomad toolkit + community

- <%= render partial: "shared/joining_reasons" %> + <%= render partial: "devise/shared/joining_reasons" %>

diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 99b07b2..fc00835 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -75,13 +75,13 @@
-
+
Haven't got an account?

That's okay! It takes a few quick minutes to sign up and join Nomadstation.

- <%= render partial: "shared/joining_reasons" %> + <%= render partial: "devise/shared/joining_reasons" %>

<%= link_to( "Join now!", diff --git a/app/views/shared/_joining_reasons.html.erb b/app/views/devise/shared/_joining_reasons.html.erb similarity index 55% rename from app/views/shared/_joining_reasons.html.erb rename to app/views/devise/shared/_joining_reasons.html.erb index 02e79ce..a6fe370 100644 --- a/app/views/shared/_joining_reasons.html.erb +++ b/app/views/devise/shared/_joining_reasons.html.erb @@ -1,9 +1,9 @@ For just $8 a month, you'll get access to:
    -
  • A fully moderated user chat
    • -
  • Visa information, travel information and more for the best nomad locations
    • +
  • Personalised visa information, travel recommendations and more for the best nomad locations
  • Guides, articles and blogs aimed at both seasoned and aspiring Digital Nomads
    • +
  • A fully moderated user chat
  • ... and more!
We're a small but growing community. -Our aim is to build the Digital Nomad community in the world! +Our aim is to build the best Digital Nomad toolkit and community in the world. From 5c0854fe96df0e1d7b8dacb830fd687fc29b8e3a Mon Sep 17 00:00:00 2001 From: Jah Seng Lee Date: Wed, 29 Nov 2023 16:30:17 +0800 Subject: [PATCH 5/5] Update feature test's expectation copy --- spec/features/adding_a_location_review_spec.rb | 4 ++-- spec/features/auto_generating_a_location_review_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/features/adding_a_location_review_spec.rb b/spec/features/adding_a_location_review_spec.rb index 0182984..e54fbd6 100644 --- a/spec/features/adding_a_location_review_spec.rb +++ b/spec/features/adding_a_location_review_spec.rb @@ -35,7 +35,7 @@ it "shows the 'Add review' form" do expect(page).to have_content( - "Review for #{location.name_utf8}, #{location.country.name}" + "Reviewing #{location.name_utf8}, #{location.country.name}" ) expect(page).to have_button("Finish") @@ -59,7 +59,7 @@ it "saves the review to the location" do # Redirected successfully expect(page).not_to have_content( - "Review for #{location.name_utf8}, #{location.country.name}" + "Reviewing #{location.name_utf8}, #{location.country.name}" ) expect(page).to have_content("Saved review") diff --git a/spec/features/auto_generating_a_location_review_spec.rb b/spec/features/auto_generating_a_location_review_spec.rb index 4c79b7b..1dddc14 100644 --- a/spec/features/auto_generating_a_location_review_spec.rb +++ b/spec/features/auto_generating_a_location_review_spec.rb @@ -38,7 +38,7 @@ it "shows the 'Add review' form with an 'Auto-generate review' button" do expect(page).to have_content( - "Review for #{location.name_utf8}, #{location.country.name}" + "Reviewing #{location.name_utf8}, #{location.country.name}" ) expect(page).to have_content("Auto-generate review")