Skip to content

Fix Frontend err #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MeMMa137 merged 3 commits into from
Jan 5, 2026
Merged

Fix Frontend err #25

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16bfbfe
Merge pull request #24 from hackclub/frontend
MeMMa137 Jan 5, 2026
0567854
Fix shop err500
MeMMa137 Jan 5, 2026
43e7268
Fix shop graphics
MeMMa137 Jan 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 19 additions & 32 deletions app/views/pages/shop.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,38 +78,23 @@
<div class="shop-variant__thumb">
<img src="<%= img_src %>" alt="<%= label_text %>">
</div>

<% if @shop_items.any? %>
<div class="shop-grid">
<% @shop_items.each do |item| %>
<div class="shop-card card" data-id="<%= item.id %>" data-cost="<%= item.cost %>" data-category="<%= item.status || 'standard' %>">
<% if item.image_url.present? %>
<img class="shop-card__image" src="<%= item.image_url %>" alt="<%= item.name %>">
<% else %>
<div class="shop-card__image shop-card__image--placeholder">🪛</div>
<% end %>

<div class="shop-card__body">
<h3 class="shop-card__title"><%= item.name.presence || "Unnamed Item" %></h3>
<p class="shop-card__description muted"><%= item.description.presence || "No description" %></p>

<% item_cost = item.cost || 0 %>
<div class="shop-card__footer">
<div>
<span class="shop-card__price"><%= item_cost.to_i %> 🪛</span>
<% if item.status.present? %>
<span class="pill" style="background: #e8f0e8; color: #4a7c59; padding: 4px 8px; border-radius: 4px; font-size: 0.8rem; margin-left: 0.5rem;">
<%= item.status.capitalize %>
</span>
<% end %>
</div>
<%= form_with url: purchase_path, method: :post, local: true, class: "purchase-form" do %>
<input type="hidden" name="item_id" value="<%= item.id %>">
<button type="submit" class="btn btn--primary"
<%= 'disabled' if @current_user.balance < item_cost %>>
<%= @current_user.balance >= item_cost ? 'Purchase' : 'Not enough bolts' %>
</button>
<% end %>
<div class="shop-variant__name"><%= label_text %></div>
<div class="shop-variant__meta">
<button type="button"
class="shop-variant__priceBox price-btn"
data-item-id="<%= item&.id %>"
data-name="<%= cat %>"
data-variant="<%= key %>"
data-display="<%= label_text %>"
data-price="<%= price %>"
data-grant="<%= grant_amount %>"
data-bolts="<%= base_bolts %>"
data-img="<%= img_src %>"
data-desc="<%= desc_text.to_s.gsub('\"','&quot;') %>">
<span class="shop-variant__price"><%= price %></span>
<img src="https://files.slack.com/files-pri/T09V59WQY1E-F0A793FGJ2V/bolt.png?pub_secret=7acc4044c5" alt="bolts" class="bolt-icon">
</button>
<span class="shop-variant__pill shop-variant__pill--<%= key %>"><%= label_text %></span>
</div>

<!-- Purchase action moved to modal -->
Expand All @@ -118,6 +103,8 @@
</div>
</div>
<% end %>


</section>
</div>
<div class="card" style="margin-top: 12px; background: #fff3cd; border: 1px solid #ffeeba; color: #856404; padding: 10px; text-align: center;">
Expand Down
Loading