Merge branch 'main' of https://github.com/mpkendall/blueprint

Author: mpkendall

Dockerfile

@@ -35,7 +35,7 @@ RUN apt-get update -qq && \
 
 # Install application gems
 COPY Gemfile Gemfile.lock ./
-RUN bundle install && \
+RUN bundle install --jobs=4 --retry=3 && \
     rm -rf ~/.bundle/ "${BUNDLE_PATH}"/ruby/*/cache "${BUNDLE_PATH}"/ruby/*/bundler/gems/*/.git && \
     bundle exec bootsnap precompile --gemfile
 

app/jobs/backfill_geocoding_job.rb

@@ -39,7 +39,7 @@ def perform(dry_run: false, all: false)
     total_visits_unfiltered = all_visits_unfiltered.count
     total_ips_unfiltered = all_visits_unfiltered.map(&:ip).uniq.count
 
-    all_visits = all_visits_unfiltered.reject { |v| cloudflare_ip?(v.ip) }
+    all_visits = all_visits_unfiltered # .reject { |v| cloudflare_ip?(v.ip) }
 
     # Group by IP to only geocode each unique IP once
     visits_by_ip = all_visits.group_by(&:ip)

app/views/home/_blueprint_progress.html.erb

@@ -28,9 +28,9 @@
       </div>
     </div>
 
-    <% if @bp_progress > 100 %>
-      <p class="mt-1 text-xs text-white/80">
-        You exceeded the goal by <%= @bp_progress - 100 %>% — keep going!
+    <% if @bp_progress >= 100 %>
+      <p class="mt-1 text-white/80">
+        You've reached 100%! You'll be sent an email to confirm your spot within 2 business days.
       </p>
     <% end %>
   </div>

app/views/home/index.html.erb

@@ -5,6 +5,18 @@
       <p class="text-lg md:text-xl">Here's what's cooking today</p>
     </div>
     <div class="grid grid-cols-1 md:grid-cols-2 gap-4 md:gap-8">
+      <% if current_user.idv_linked? && !current_user.ysws_verified  %>
+        <%= render 'shared/card', class: 'col-span-1 md:col-span-2 border-bp-warning border-2 space-y-0 flex flex-row items-center' do %>
+          <div class="grow">
+            <p class="font-rc-full text-2xl md:text-3xl">Finish verifying your identity</p>
+            <p>Upload your documents to Hack Club Account and wait for manual
+              review.</p>
+          </div>
+          <div>
+            <%= render 'shared/button', text: "Verify Now", url: "https://account.hackclub.com/verifications/document" %>
+          </div>
+        <% end %>
+      <% end %>
       <% unless current_user.is_pro %>
         <%= render 'shared/card', class: 'col-span-1 md:col-span-2 flex flex-col motion-safe:transition-colors border-2 border-bp-warning border-solid' do %>
           <p class="text-2xl md:text-3xl font-rc-full mb-8">Build your first hardware project. Start with Hackpad!</p>

config/initializers/ahoy.rb

@@ -1,4 +1,17 @@
 class Ahoy::Store < Ahoy::DatabaseStore
+  def track_visit(data)
+    data[:ip] = request.headers["CF-Connecting-IP"] || request.remote_ip
+
+    if request.session[:user_id] == 1
+      begin
+        Sentry.capture_message("Ahoy Headers for User 1", extra: { headers: request.headers.to_h })
+      rescue => e
+        Sentry.capture_exception(e)
+      end
+    end
+
+    super(data)
+  end
 end
 
 # set to true for JavaScript tracking
@@ -7,4 +20,5 @@ class Ahoy::Store < Ahoy::DatabaseStore
 # set to true for geocoding (and add the geocoder gem to your Gemfile)
 # we recommend configuring local geocoding as well
 # see https://github.com/ankane/ahoy#geocoding
-Ahoy.geocode = false
+Ahoy.geocode = true
+Ahoy.job_queue = :background

docs/about/faq.md

@@ -30,6 +30,10 @@ Yes!
 
 Anything within budget!
 
+## Do I need the journal in my repo?
+
+No! It just needs to be in [blueprint.hackclub.com](blueprint.hackclub.com) :D 
+
 ## How long may reviews take?
 
 Reviews may vary in time! They can take a week or more. We try to review as soon as possible :)