Skip to content

Commit f848aca

Browse files
authored
Merge pull request #28 from MeMMa137/frontend
Add missing shop imgs
2 parents 636d543 + c08df59 commit f848aca

File tree

7 files changed

+39
-2
lines changed

7 files changed

+39
-2
lines changed

app/assets/stylesheets/application.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ h1, h2, h3, h4, h5, h6 {
467467
position: absolute;
468468
bottom: 0;
469469
left: 0;
470-
width: clamp(800px, 20vw, 280px);
470+
width: clamp(150px, 20vw, 280px);
471471
z-index: 2;
472472
}
473473

app/views/layouts/application.html.erb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,9 @@
2020
<% end %>
2121

2222
<%= yield %>
23+
<% unless content_for?(:page) && yield(:page) == 'signin' %>
24+
<img src="/images/img_2180.png" alt="bottom-left decoration" class="corner-img corner-img--left">
25+
<img src="/images/untitled_artwork.png" alt="bottom-right decoration" class="corner-img corner-img--right">
26+
<% end %>
2327
</body>
2428
</html>

app/views/pages/shop.html.erb

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,25 @@
6161
'https://files.slack.com/files-pri/T09V59WQY1E-F0A6W5FN41Y/vecteezy_3d-monitor-for-office_53739745.png?pub_secret=6a16537f48',
6262
'https://files.slack.com/files-pri/T09V59WQY1E-F0A6EN1NVP1/vecteezy_sleek-black-computer-monitor-with-vibrant-red-abstract_56609224.png?pub_secret=5e30e2cd74'
6363
] if cat == 'Monitor' %>
64+
<% images_for_headphones = [
65+
'https://files.slack.com/files-pri/T09V59WQY1E-F0A75HW036Y/vecteezy_sleek-white-wireless-headphones-premium-audio-bluetooth_55130517.png?pub_secret=51ed82f735',
66+
'https://files.slack.com/files-pri/T09V59WQY1E-F0A6VJMSHLK/vecteezy_modern-silver-headphones-for-audiophiles_51767617.png?pub_secret=c9009d25e9',
67+
'https://files.slack.com/files-pri/T09V59WQY1E-F0A6VJMAZRR/vecteezy_headphone-png-with-ai-generated_26773824.png?pub_secret=7edb592517',
68+
'https://files.slack.com/files-pri/T09V59WQY1E-F0A6ZUNQC8N/vecteezy_3d-gaming-headphone_53295526.png?pub_secret=72d6d1c41a'
69+
] if cat == 'Headphones' %>
70+
<% images_for_webcam = [
71+
'https://files.slack.com/files-pri/T09V59WQY1E-F0A7W9U4HU0/vecteezy_ai-generated-security-camera-on-transparent-background-ai_39213084.png?pub_secret=0ec47b5d57',
72+
'https://files.slack.com/files-pri/T09V59WQY1E-F0A75J7CTDJ/vecteezy_high-definition-webcam-modern-design-sleek-silver-black_67821519.png?pub_secret=22c6d549e5',
73+
'https://files.slack.com/files-pri/T09V59WQY1E-F0A6VK098QK/vecteezy_sleek-modern-webcam-for-conferencing-and-streaming_60580277.png?pub_secret=02494c1a84',
74+
'https://files.slack.com/files-pri/T09V59WQY1E-F0A6ZV27UQN/vecteezy_camera-with-lens_54402726.png?pub_secret=6527a83f20'
75+
] if cat == 'Webcam' %>
6476
<% variants.each_with_index do |(label_text, key), variant_idx| %>
6577
<% img_src = (
6678
(cat == 'Keyboard' && images_for_keyboard && images_for_keyboard[variant_idx]) ||
6779
(cat == 'Mouse' && images_for_mouse && images_for_mouse[variant_idx]) ||
6880
(cat == 'Monitor' && images_for_monitor && images_for_monitor[variant_idx]) ||
81+
(cat == 'Headphones' && images_for_headphones && images_for_headphones[variant_idx]) ||
82+
(cat == 'Webcam' && images_for_webcam && images_for_webcam[variant_idx]) ||
6983
'/images/signin/hackclub.svg'
7084
) %>
7185
<% amount_map = { 'standard' => 50, 'quality' => 110, 'advanced' => 170, 'professional' => 230 } %>

public/images/img_2168.png

664 KB
Loading

public/images/img_2180.png

394 KB
Loading

public/images/untitled_artwork.png

663 KB
Loading

public/stylesheets/application.css

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,7 @@ a.project-row:hover {
671671
.shop-variant__thumb img {
672672
width: 100%;
673673
height: 100%;
674-
object-fit: cover;
674+
object-fit: contain;
675675
}
676676
.shop-variant__meta {
677677
display: flex;
@@ -1012,6 +1012,25 @@ a.project-row:hover {
10121012
}
10131013
}
10141014

1015+
/* Global corner images */
1016+
.corner-img {
1017+
position: fixed;
1018+
bottom: 0;
1019+
z-index: 5;
1020+
pointer-events: none;
1021+
user-select: none;
1022+
}
1023+
.corner-img--left {
1024+
left: 0;
1025+
width: clamp(120px, 14vw, 220px);
1026+
height: auto;
1027+
}
1028+
.corner-img--right {
1029+
right: 0;
1030+
width: clamp(120px, 16vw, 260px);
1031+
height: auto;
1032+
}
1033+
10151034
/* Respect reduced motion */
10161035
@media (prefers-reduced-motion: reduce) {
10171036
* {

0 commit comments

Comments
 (0)