Update screenshot and share ux

Author: rossta

app/javascript/controllers/snippets/tweet.ts

@@ -28,7 +28,7 @@ export default class extends Controller {
 
     const tweetText = encodeURIComponent(`Created with @joyofrails ${url}`);
 
-    const tweetUrl = `https://twitter.com/intent/tweet?text=${tweetText}`;
+    const tweetUrl = `https://x.com/intent/post?text=${tweetText}`;
 
     window.open(
       tweetUrl,

app/views/share/snippets/index.html.erb

@@ -7,8 +7,13 @@
   <% end %>
 
   <% @snippets.each do |snippet| %>
-    <%= link_to share_snippet_path(snippet), class: "block" do %>
-      <%= render CodeBlock::Snippet.new(snippet) %>
-    <% end %>
+    <div id="<%= dom_id(snippet) %>" class="section-content">
+      <%= link_to share_snippet_path(snippet), class: "block" do %>
+        <%= render CodeBlock::Snippet.new(snippet) %>
+      <% end %>
+      <div>
+        <%= render Share::Snippets::Toolbar.new(snippet, current_user: current_user) %>
+      </div>
+    </div>
   <% end %>
 </div>

app/views/share/snippets/show.html.erb

@@ -16,7 +16,9 @@
     <%= render CodeBlock::Snippet.new(@snippet) %>
   <% end %>
 
-  <%= render Share::Snippets::Toolbar.new(@snippet, current_user: current_user) %>
+  <div>
+    <%= render Share::Snippets::Toolbar.new(@snippet, current_user: current_user) %>
+  </div>
 
   <div>
     <%= link_to "Back to snippets", share_snippets_path %>

app/views/share/snippets/toolbar.rb

@@ -9,13 +9,19 @@ def initialize(snippet, current_user: nil)
   end
 
   def view_template
-    div do
-      flex_block do
-        link_to "Share", new_share_snippet_tweet_path(@snippet, auto: "true"), class: "button primary"
-        if @current_user&.can_edit?(@snippet)
-          link_to "Edit this snippet", edit_share_snippet_path(@snippet), class: "button secondary"
-        end
+    flex_block do
+      link_to "Share", share_url, class: "button primary"
+      if @current_user&.can_edit?(@snippet)
+        link_to "Edit this snippet", edit_share_snippet_path(@snippet), class: "button secondary"
       end
     end
   end
+
+  def share_url
+    if @snippet.screenshot.attached?
+      new_share_snippet_tweet_path(@snippet, auto: "true")
+    else
+      new_share_snippet_screenshot_path(@snippet)
+    end
+  end
 end

spec/rails_helper.rb

@@ -71,4 +71,8 @@
   # config.filter_gems_from_backtrace("gem name")
 
   config.include ActiveSupport::Testing::TimeHelpers
+
+  config.after(:all) do
+    FileUtils.rm_rf(ActiveStorage::Blob.service.root)
+  end
 end

spec/system/snippets_spec.rb

@@ -42,4 +42,27 @@
     expect(page).to have_content("lib/models/blog.rb")
     expect(page).to have_content("class Blog\n  has_many :posts\nend")
   end
+
+  it "can attach a screenshot" do
+    snippet = FactoryBot.create(:snippet, author: login_as_user)
+
+    visit share_snippet_path(snippet)
+
+    click_link "Share"
+
+    expect(page).to have_content("Screenshot")
+  end
+
+  it "can share Snippet" do
+    snippet = FactoryBot.create(:snippet, author: login_as_user)
+
+    visit share_snippets_path
+
+    within("#snippets") do
+      expect(page).to have_content(snippet.filename)
+      click_link "Share"
+    end
+
+    expect(page).to have_content("Screenshot")
+  end
 end