Skip to content

Commit 0f229f2

Browse files
CheeseLadCheeseLad
committed
started work on dedicated college view page, added merch section to main page
1 parent 4775e48 commit 0f229f2

File tree

16 files changed

+518
-6
lines changed

16 files changed

+518
-6
lines changed

‎mps_site/content.py

Lines changed: 245 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,19 @@
2727

2828
dcufm_stats_data = [
2929
{
30+
"id": "store",
3031
"icon_class": "fa-solid fa-hand-holding-heart",
3132
"number": "€1,570",
3233
"description": "Raised for CRY Ireland during the 12 Hour Broadcast in 2023"
3334
},
3435
{
36+
"id": "twitch",
3537
"icon_class": "fa-brands fa-twitch",
3638
"number": "1125",
3739
"description": "Followers on the DCUfm <a href=\"https://twitch.tv/dcufm\" target=\"_blank\">Twitch Channel</a>"
3840
},
3941
{
42+
"id": "shows",
4043
"icon_class": "fa-solid fa-hand-holding-heart",
4144
"number": "€2,658",
4245
"description": "Raised for ALONE during the 12 Hour Broadcast in 2022"
@@ -117,3 +120,245 @@
117120
]
118121
}
119122

123+
124+
merch = {
125+
"title": "Our Merch",
126+
"subtitle": "Represent MPS in style with your very own merch!",
127+
"products": [
128+
{
129+
"name": "MPS Hoodie",
130+
"image": "images/merch/merch1.png",
131+
"alt_text": "MPS Hoodie",
132+
"price": "€30",
133+
"description": "Stay warm and stylish with our MPS Hoodie!"
134+
},
135+
{
136+
"name": "MPS T-Shirt",
137+
"image": "images/merch/merch2.png",
138+
"alt_text": "MPS T-Shirt",
139+
"price": "€15",
140+
"description": "Show off your MPS pride with our T-Shirt!"
141+
},
142+
{
143+
"name": "MPS Mug",
144+
"image": "images/merch/merch3.png",
145+
"alt_text": "MPS Mug",
146+
"price": "€10",
147+
"description": "Start your day right with our MPS Mug!"
148+
},
149+
{
150+
"name": "MPS Sticker",
151+
"image": "images/merch/merch4.png",
152+
"alt_text": "MPS Sticker",
153+
"price": "€3",
154+
"description": "Decorate your laptop or phone with our MPS Sticker!"
155+
},
156+
{
157+
"name": "MPS Beanie",
158+
"image": "images/merch/merch5.png",
159+
"alt_text": "MPS Beanie",
160+
"price": "€12",
161+
"description": "Keep your head warm with our MPS Beanie!"
162+
}
163+
]
164+
}
165+
166+
tcv_family_tree = {
167+
168+
"title": "The College View Family Tree",
169+
"subtitle": "Check out all the editors who have worked for The College View over the years",
170+
"members": [
171+
{
172+
"year": "2024/2025",
173+
"name": "Katie O’Shaughnessy",
174+
},
175+
{
176+
"year": "2024/2025",
177+
"name": "Leonor Selas Amaral",
178+
},
179+
{
180+
"year": "2023/2024",
181+
"name": "Hannah Giron Daygo",
182+
},
183+
{
184+
"year": "2023/2024",
185+
"name": "Amy McLoughlin",
186+
},
187+
{
188+
"year": "2022/2023",
189+
"name": "Matthew Joyce",
190+
},
191+
{
192+
"year": "2022/2023",
193+
"name": "Muiris O'Cearbhaill",
194+
},
195+
{
196+
"year": "2021/2022",
197+
"name": "Jamie McCarron",
198+
},
199+
{
200+
"year": "2021/2022",
201+
"name": "Devin Sean Martin",
202+
},
203+
{
204+
"year": "2020/2021",
205+
"name": "Aoibhín Meghen",
206+
},
207+
{
208+
"year": "2020/2021",
209+
"name": "Shauna Burdis",
210+
},
211+
{
212+
"year": "2019/2020",
213+
"name": "Brendan Fernando Kelly Palenque",
214+
},
215+
{
216+
"year": "2019/2020",
217+
"name": "Aine O'Boyle",
218+
},
219+
{
220+
"year": "2018/2019",
221+
"name": "Callum Lavery",
222+
},
223+
{
224+
"year": "2018/2019",
225+
"name": "Gabija Gataveckaite",
226+
},
227+
{
228+
"year": "2017/2018",
229+
"name": "Callum Lavery",
230+
},
231+
{
232+
"year": "2017/2018",
233+
"name": "Gabija Gataveckaite",
234+
},
235+
{
236+
"year": "2016/2017",
237+
"name": "Aaron Gallagher",
238+
},
239+
{
240+
"year": "2016/2017",
241+
"name": "Aidan Geraghty",
242+
},
243+
{
244+
"year": "2015/2016",
245+
"name": "Catherine Devine",
246+
},
247+
{
248+
"year": "2015/2016",
249+
"name": "Katie O'Neill",
250+
},
251+
{
252+
"year": "2014/2015",
253+
"name": "Michael Cogley",
254+
},
255+
{
256+
"year": "2014/2015",
257+
"name": "Finnian Curran",
258+
},
259+
{
260+
"year": "2013/2014",
261+
"name": "Aoife Mullen",
262+
},
263+
{
264+
"year": "2013/2014",
265+
"name": "Mary McDonnell",
266+
},
267+
{
268+
"year": "2012/2013",
269+
"name": "Jenny Darmody",
270+
},
271+
{
272+
"year": "2012/2013",
273+
"name": "Sam Griffin",
274+
},
275+
{
276+
"year": "2011/2012",
277+
"name": "Ceile Varley",
278+
},
279+
{
280+
"year": "2011/2012",
281+
"name": "Catherine Dennehy",
282+
},
283+
{
284+
"year": "2010/2011",
285+
"name": "Steve Conlon",
286+
},
287+
{
288+
"year": "2010/2011",
289+
"name": "Niall Farrell",
290+
},
291+
{
292+
"year": "2009/2010",
293+
"name": "Audrey Donohue",
294+
},
295+
{
296+
"year": "2009/2010",
297+
"name": "Samuel Hamilton",
298+
},
299+
{
300+
"year": "2008/2009",
301+
"name": "Stephen Dunne",
302+
},
303+
{
304+
"year": "2008/2009",
305+
"name": "Michael McHale",
306+
},
307+
{
308+
"year": "2007/2008",
309+
"name": "Eoin O'Neill",
310+
},
311+
{
312+
"year": "2007/2008",
313+
"name": "Stephen Dunne",
314+
},
315+
{
316+
"year": "2006/2007",
317+
"name": "Aisling O' Rourke",
318+
},
319+
{
320+
"year": "2006/2007",
321+
"name": "Lyndsay McGregor",
322+
},
323+
{
324+
"year": "2005/2006",
325+
"name": "Cathal McMahon",
326+
},
327+
{
328+
"year": "2005/2006",
329+
"name": "Maeve Ni Ghealbhain",
330+
},
331+
{
332+
"year": "2002/2003",
333+
"name": "Adrienne Sweeney",
334+
},
335+
{
336+
"year": "2002/2003",
337+
"name": "Sean Carroll",
338+
},
339+
{
340+
"year": "2001/2002",
341+
"name": "Paul O'Flynn",
342+
},
343+
{
344+
"year": "2001/2002",
345+
"name": "Mary Regan",
346+
},
347+
{
348+
"year": "2000/2001",
349+
"name": "Michael Brennan",
350+
},
351+
{
352+
"year": "2000/2001",
353+
"name": "Paul O'Flynn",
354+
},
355+
{
356+
"year": "1999/2000",
357+
"name": "Laura Slattery",
358+
},
359+
{
360+
"year": "1999/2000",
361+
"name": "Jimmy Healy",
362+
}
363+
]
364+
}

‎mps_site/static/css/style.css

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,18 @@
55
--hover-color: #FFE085;
66
}
77

8+
.outside-box {
9+
background-color: var(--secondary-color);
10+
color: var(--text-color);
11+
border-radius: 24px;
12+
}
13+
14+
.inside2-box {
15+
background-color: var(--main-color);
16+
color: var(--text-color);
17+
border-radius: 16px;
18+
}
19+
820
.secondary-gradient {
921
background-color: linear-gradient(135deg, #9791FF 0%, #6A60FF 100%);
1022
}

‎mps_site/static/images/merch/merch1.png

669 KB
Loading

‎mps_site/static/images/merch/merch2.png

702 KB
Loading

‎mps_site/static/images/merch/merch3.png

678 KB
Loading

‎mps_site/static/images/merch/merch4.png

674 KB
Loading

‎mps_site/static/images/merch/merch5.png

867 KB
Loading

‎mps_site/templates/blog/detail.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ <h5><i>Blog Posted: {{ post.created_on.date }} | Written By: <a href="{% url 'bl
1515
<div class="row justify-content-center">
1616
<div class="col-md-12 custom-box shadow-lg bg-body">
1717
<div class="center-contents">
18-
<div class="container mt-4 blog-image-format">
19-
<div class="mx-3 px-3 py-3" style="font-size: 20px; text-align: left; background-color: #202E4E; border-radius: 15px;">
18+
<div class="container mt-3 blog-image-format">
19+
<div class=" px-3 py-3" style="font-size: 20px; text-align: left; background-color: #202E4E; border-radius: 15px;">
2020
<p>{{ post.body | safe }}</p>
2121
</div>
22-
<a class="btn btn-primary mt-4" style="background-color: #202E4E; border-radius: 25px; border-width: 4px; border-color: white;" href="{% url 'blog_index' %}">Back to Blog Homepage</a>
22+
<a class="btn btn-primary mt-3" style="background-color: #202E4E; border-radius: 25px; border-width: 4px; border-color: white;" href="{% url 'blog_index' %}">Back to Blog Homepage</a>
2323
</div>
2424
</div>
2525
</div>
@@ -31,7 +31,7 @@ <h1>Share This Blog</h1>
3131
<div class="row justify-content-center">
3232
<div class="col-md-7 custom-box shadow-lg bg-body">
3333
<div class="center-contents">
34-
<div class="mx-3 px-3 py-3" style="font-size: 20px; text-align: left; background-color: #202E4E; border-radius: 15px;">
34+
<div class="px-3 py-3" style="font-size: 20px; text-align: left; background-color: #202E4E; border-radius: 15px;">
3535
<div class="social-icons">
3636
<ul>
3737
<li><a href="https://api.whatsapp.com/send?text={{ post.title }}%20{{ link }}" target="_blank"><i class="fa-brands fa-whatsapp hvr-bounce-in"></i></a></li>

‎mps_site/templates/blog/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ <h5><i>The DCU MPS Blog is a creative outlet for all MPS members to voice their
1111
<div class="row justify-content-center">
1212
<div class="col-md-12 custom-box shadow-lg bg-body">
1313
<div class="center-contents">
14-
<div class="container mt-4">
14+
<div class="container mt-3">
1515
<div class="row">
1616
{% for post in posts %}
1717
<div class="col-md-4">

‎mps_site/templates/components/merch.html

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
{# templates/components/merch.html #}
2+
{% load static %}
3+
<h1>{{ merch.title }}</h1>
4+
<h5><i>{{ merch.subtitle }}</i></h5>
5+
<div class="container custom-box">
6+
<!-- Detailed product section at the top -->
7+
<div class="row justify-content-center mb-4">
8+
{% if merch.products %}
9+
{% with detailed_product=merch.products.0 %}
10+
<div class="col-md-12">
11+
<div class="d-flex flex-column flex-md-row text-center text-md-start align-items-center py-3 shadow-lg bg-body" style="background-color: #202E4E; border-radius: 25px;">
12+
<!-- Left side: Primary image -->
13+
<div class="col-md-4 d-flex justify-content-center">
14+
<img src="{% static detailed_product.image %}" class="img-fluid" alt="Merch Photo" width="80%" style="border-radius: 15px;">
15+
</div>
16+
<!-- Right side: Product details -->
17+
<div class="col-md-8 d-flex flex-column justify-content-center text-center text-md-start py-3 py-md-0">
18+
<h4>{{ detailed_product.name }}</h4>
19+
<p>{{ detailed_product.description }}</p>
20+
<p class="fw-bold">{{ detailed_product.price }}</p>
21+
<a href="https://forms.gle/your-google-form-link" class="btn btn-primary">Order Now</a>
22+
</div>
23+
</div>
24+
</div>
25+
{% endwith %}
26+
{% endif %}
27+
</div>
28+
29+
<!-- Images of other products -->
30+
<div class="row justify-content-center">
31+
<div class="col-md-12">
32+
<div class="row gy-4 row-cols-2 row-cols-md-4" style="color: white;">
33+
{% for merch_item in merch.products %}
34+
{% if forloop.first %}
35+
<!-- Skip the first item because it's already shown above -->
36+
{% else %}
37+
<div class="col my-2">
38+
<div class=" text-center d-flex flex-column justify-content-center align-items-center py-3 shadow-lg bg-body" style="background-color: #202E4E; border-radius: 25px;">
39+
<img src="{% static merch_item.image %}" class="img-fluid hvr-grow" alt="Merch Photo" width="80%" style="border-radius: 15px;">
40+
</div>
41+
</div>
42+
{% endif %}
43+
{% endfor %}
44+
</div>
45+
</div>
46+
</div>
47+
</div>

0 commit comments

Comments
 (0)