Skip to content

Frontend #30

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 6, 2026
Merged

Frontend #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b86da6
Removed shop banner
MeMMa137 Jan 6, 2026
21a26cb
Update general graphics
MeMMa137 Jan 6, 2026
dcf680d
Update general graphics again
MeMMa137 Jan 6, 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
23 changes: 23 additions & 0 deletions app/assets/stylesheets/application.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,29 @@ h1, h2, h3, h4, h5, h6 {
padding: 14px 24px;
}

/* Button size/shape utilities */
.btn--xl {
font-size: 20px;
padding: 14px 22px;
}
.btn--pill {
border-radius: 999px;
}

/* Subtle animated glow for call-to-action buttons */
@keyframes btn-glow-pulse {
0%, 100% {
box-shadow: 0 6px 14px var(--shadow), 0 0 0 0 rgba(210, 127, 70, 0.0);
transform: translateY(0);
}
50% {
box-shadow: 0 10px 22px var(--shadow), 0 0 18px 2px rgba(210, 127, 70, 0.35);
}
}
.btn--glow {
animation: btn-glow-pulse 2.4s ease-in-out infinite;
}

/* Flash messages */
.flash {
padding: 12px 16px;
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/pages_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ def request_review
# Shows the under construction page. Requires authentication.
def shop
require_auth or return
# @shop_items = ShopItem.where(status: [ "active", "in stock", "stock", nil, "" ]).order(:cost)
render :shop_under_construction
@shop_items = ShopItem.where(status: [ "active", "in stock", "stock", nil, "" ]).order(:cost)
# Renders app/views/pages/shop.html.erb by default
end

# POST /shop/purchase
Expand Down
8 changes: 3 additions & 5 deletions app/views/layouts/application.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<meta name="csrf-token" content="<%= form_authenticity_token %>">
<link rel="icon" type="image/png" href="https://files.slack.com/files-pri/T09V59WQY1E-F0A6UD211JS/animal.png?pub_secret=3e17f8e9df">
<link rel="shortcut icon" type="image/png" href="https://files.slack.com/files-pri/T09V59WQY1E-F0A6UD211JS/animal.png?pub_secret=3e17f8e9df">
<link rel="stylesheet" href="/stylesheets/application.css?v=6">
<link rel="stylesheet" href="/stylesheets/application.css?v=18">
<script defer src="/javascripts/application.js?v=2"></script>
</head>
<body data-page="<%= content_for?(:page) ? yield(:page) : '' %>">
Expand All @@ -20,9 +20,7 @@
<% end %>

<%= yield %>
<% unless content_for?(:page) && yield(:page) == 'signin' %>
<img src="/images/img_2180.png" alt="bottom-left decoration" class="corner-img corner-img--left">
<img src="/images/untitled_artwork.png" alt="bottom-right decoration" class="corner-img corner-img--right">
<% end %>
<img src="/images/img_2180.png" alt="bottom-left decoration" class="corner-img corner-img--left">
<img src="/images/untitled_artwork.png" alt="bottom-right decoration" class="corner-img corner-img--right">
</body>
</html>
32 changes: 24 additions & 8 deletions app/views/pages/faq.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,19 +46,35 @@
</main>

<style>
.page-title {
font-size: 64px;
letter-spacing: 0.5px;
text-shadow: 0 2px 6px rgba(0, 0, 0, 0.08);
margin-bottom: 10px;
}

.faq-section {
margin-bottom: 2rem;
border-radius: 12px;
}

.faq-section__title {
color: #8b5cf6;
font-size: 1.75rem;
color: var(--gold);
font-size: 2.5rem;
font-weight: 700;
margin: 0 0 1.5rem 0;
padding-bottom: 1rem;
border-bottom: 2px solid #f0f0f0;
}
.faq-section__title::after {
content: "";
display: block;
width: 80px;
height: 6px;
border-radius: 6px;
margin-top: 10px;
background: linear-gradient(90deg, var(--accent), rgba(210, 127, 70, 0.2));
}

.faq-qa {
display: flex;
Expand All @@ -77,15 +93,15 @@

.faq-item__question {
color: #1f2430;
font-size: 1rem;
font-size: 1.3rem;
font-weight: 700;
margin: 0 0 0.5rem 0;
line-height: 1.4;
}

.faq-item__answer {
color: #6b7280;
font-size: 0.95rem;
font-size: 1.2rem;
margin: 0;
line-height: 1.6;
}
Expand All @@ -101,7 +117,7 @@

.faq-list li {
color: #1f2430;
font-size: 0.95rem;
font-size: 1.2rem;
line-height: 1.6;
padding-left: 1.75rem;
position: relative;
Expand All @@ -111,13 +127,13 @@
content: "•";
position: absolute;
left: 0;
color: #8b5cf6;
color: var(--accent);
font-weight: bold;
font-size: 1.2rem;
}

.link {
color: #8b5cf6;
color: var(--accent);
text-decoration: none;
font-weight: 600;
transition: opacity 0.2s ease;
Expand All @@ -129,7 +145,7 @@
}

.highlight {
color: #8b5cf6;
color: var(--gold);
font-weight: 700;
}
</style>
27 changes: 18 additions & 9 deletions app/views/pages/shop.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,35 @@
<main class="container">
<div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 1rem;">
<h1 class="page-title" style="margin: 0;">Shop</h1>
<a href="/purchases" class="btn btn--secondary">Recent Purchases</a>
<a href="/purchases" class="btn btn--accent btn--accent-gradient btn--xl btn--pill btn--glow" style="display:inline-flex;align-items:center;gap:10px;">
<span>Recent Purchases</span>
</a>
</div>

<div class="shop-layout">
<aside class="shop-categories card">
<h3 class="shop-heading">Category</h3>
<ul class="shop-category-list">
<% categories = [ "Keyboard", "Mouse", "Monitor", "Headphones", "Webcam" ] %>
<% categories.each_with_index do |cat, idx| %>
<% categories_active = [ "Keyboard", "Mouse", "Monitor", "Headphones", "Webcam" ] %>
<% categories_soon = [ "Chair", "PC Components", "Desktop Accessories", "Suggest Something!" ] %>
<% categories_active.each_with_index do |cat, idx| %>
<li>
<button class="shop-category-item <%= 'is-active' if idx == 0 %>" data-target="cat-<%= cat.downcase %>">
<%= cat %>
</button>
</li>
<% end %>
<% categories_soon.each do |cat| %>
<li>
<button class="shop-category-item" disabled>
<span class="shop-category-item__label"><%= cat %></span>
<img
src="https://files.slack.com/files-pri/T09V59WQY1E-F0A73PBKWEN/1000_f_108839823_c2hrfq0hbz7wkf6ngjesajlakz74zm7b.jpg?pub_secret=76883edfeb"
alt="Coming Soon"
class="shop-category-item__badge">
</button>
</li>
<% end %>
</ul>
</aside>

Expand All @@ -32,7 +46,7 @@
</div>
</div>

<% categories.each_with_index do |cat, idx| %>
<% categories_active.each_with_index do |cat, idx| %>
<% item = @shop_items.find { |i| i.name.to_s.downcase.strip == cat.downcase } %>
<% base_cost = (item&.cost || 0).to_i %>
<div id="cat-<%= cat.downcase %>" class="shop-item-detail <%= 'is-active' if idx == 0 %>">
Expand Down Expand Up @@ -121,9 +135,6 @@

</section>
</div>
<div class="card" style="margin-top: 12px; background: #fff3cd; border: 1px solid #ffeeba; color: #856404; padding: 10px; text-align: center;">
Working progress! We're building the shop page, more items will be added soon!
</div>
</main>

<!-- Item Modal -->
Expand All @@ -150,9 +161,7 @@
</div>
<%= form_with url: purchase_path, method: :post, local: true, id: "shop-modal-form" do %>
<input type="hidden" name="item_id" id="shop-modal-item-id" value="">
<input type="hidden" name="category" id="shop-modal-category" value="">
<input type="hidden" name="variant" id="shop-modal-variant" value="">
<input type="hidden" name="quantity" id="shop-modal-quantity" value="1">
<button id="shop-modal-buy" type="submit" class="btn btn--primary btn--block">Purchase</button>
<% end %>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/views/pages/signin.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</a>

<div class="signin-content">
<img src="https://files.slack.com/files-pri/T09V59WQY1E-F0A6LSXCXPF/image.png?pub_secret=dc0d11081a" class="signin-crane-text" alt="Reboot">
<img src="https://files.slack.com/files-pri/T09V59WQY1E-F0A6XFGE0M9/img_2185.png?pub_secret=1776d88b52" class="signin-crane-text" alt="Reboot">

<%= form_tag("/auth/hack_club", method: :post) do %>
<button type="submit" class="signin-btn" style="background: transparent; padding: 0; box-shadow: none; border: none;">
Expand All @@ -23,5 +23,5 @@
<p class="signin-subtitle">Restore old projects --> upgrade your desktop setup!</p>
</div>

<img src="/images/signin/animal.png" class="signin-mole" alt="Mole">
<!-- Corner images now handled globally in layout -->
</div>
Loading
Loading