update to 2024-2025 committee

mps_site/data/committee.py

@@ -0,0 +1,184 @@
+committee_list = {
+  "title": "Meet the Committee",
+  "subtitle": "Meet the team who make the MPS magic possible!",
+  "video_id": "TqaiFaxgg0g",
+  "members": [
+    {
+      "name": "Sadhbh O’Grady Keeley",
+      "position": "Chairperson",
+      "image": "images/committee/2024-2025/1.png",
+      "social_link_1_url": "https://www.linkedin.com/in/sadhbh-o%E2%80%99grady-keeley-9184a3295?utm_source=share&utm_campaign=share_via&utm_content=profile&utm_medium=ios_app",
+      "social_link_1_icon": "fa-brands fa-linkedin",
+      "social_link_2_url": "https://www.instagram.com/sadhbhofxckinggrady?igsh=cXJwNGV4cGx6ZGl6&utm_source=qr",
+      "social_link_2_icon": "fa-brands fa-instagram",
+      "social_link_3_url": "mailto:[email protected]",
+      "social_link_3_icon": "fa-solid fa-envelope"
+    },
+    {
+      "name": "Matthew Willis",
+      "position": "Vice-Chairperson",
+      "image": "images/committee/2024-2025/2.png",
+      "social_link_1_url": "https://www.linkedin.com/in/matthew-willis-64a9712a1?utm_source=share&utm_campaign=share_via&utm_content=profile&utm_medium=android_app",
+      "social_link_1_icon": "fa-brands fa-linkedin",
+      "social_link_2_url": "https://www.instagram.com/matt_double.u?igsh=MTI4MHhtcHVjcTkwbg==",
+      "social_link_2_icon": "fa-brands fa-instagram",
+      "social_link_3_url": "mailto:[email protected]",
+      "social_link_3_icon": "fa-solid fa-envelope"
+    },
+    {
+      "name": "Molly McGurrin",
+      "position": "Secretary",
+      "image": "images/committee/2024-2025/3.png",
+      "social_link_1_url": "https://www.linkedin.com/in/molly-mcgurrin-9995a6322?utm_source=share&utm_campaign=share_via&utm_content=profile&utm_medium=ios_app",
+      "social_link_1_icon": "fa-brands fa-linkedin",
+      "social_link_2_url": "https://www.instagram.com/mollyxmcgurrin?igsh=MWF6Y2hoYmlheGpuOA%3D%3D&utm_source=qr",
+      "social_link_2_icon": "fa-brands fa-instagram",
+      "social_link_3_url": "mailto:[email protected]",
+      "social_link_3_icon": "fa-solid fa-envelope"
+    },
+    {
+      "name": "Sophie King",
+      "position": "Treasurer",
+      "image": "images/committee/2024-2025/4.png",
+      "social_link_1_url": "https://www.instagram.com/crystalb_txh04?igsh=NHRhMGhrZjNjZXhz&utm_source=qr",
+      "social_link_1_icon": "fa-brands fa-instagram",
+      "social_link_2_url": "https://www.instagram.com/sophie4socs24/profilecard/?igsh=Ymw5Z2QybmVuYWQ=",
+      "social_link_2_icon": "fa-brands fa-instagram",
+      "social_link_3_url": "mailto:[email protected]",
+      "social_link_3_icon": "fa-solid fa-envelope"
+    },
+    {
+      "name": "Jane O’Reilly",
+      "position": "Public Relations Officer",
+      "image": "images/committee/2024-2025/5.png",
+      "social_link_1_url": "https://www.instagram.com/janeoreill.y?igsh=Ymw0ZXNiZTkxaTAz&utm_source=qr",
+      "social_link_1_icon": "fa-brands fa-instagram",
+      "social_link_2_url": "https://www.tiktok.com/@janeorxxx?_t=8pIu05Z47u4&_r=1",
+      "social_link_2_icon": "fa-brands fa-tiktok",
+      "social_link_3_url": "mailto:[email protected]",
+      "social_link_3_icon": "fa-solid fa-envelope"
+    },
+    {
+      "name": "Liam O'Keeffe",
+      "position": "Brand Design Officer",
+      "image": "images/committee/2024-2025/6.png",
+      "social_link_1_url": "https://www.instagram.com/liamokeeffe_",
+      "social_link_1_icon": "fa-brands fa-instagram",
+      "social_link_2_url": "https://www.linkedin.com/in/liam-o-keeffe-556a43242",
+      "social_link_2_icon": "fa-brands fa-linkedin",
+      "social_link_3_url": "mailto:[email protected]",
+      "social_link_3_icon": "fa-solid fa-envelope"
+    },
+    {
+      "name": "Sarah Duff",
+      "position": "TV Manager",
+      "image": "images/committee/2024-2025/7.png",
+      "social_link_1_url": "https://www.instagram.com/sarahxduff?igsh=aDF5cXliczdmNzlo&utm_source=qr",
+      "social_link_1_icon": "fa-brands fa-instagram",
+      "social_link_2_url": "https://www.tiktok.com/@sarahxduff?_t=8pwVhKAMdWL&_r=1",
+      "social_link_2_icon": "fa-brands fa-tiktok",
+      "social_link_3_url": "mailto:[email protected]",
+      "social_link_3_icon": "fa-solid fa-envelope"
+    },
+    {
+      "name": "Samuel Kennedy",
+      "position": "TV Manager",
+      "image": "images/committee/2024-2025/8.png",
+      "social_link_1_url": "https://www.instagram.com/samuelkennnedy?igsh=MTBpbjNscGxuM2F4Zg%3D%3D&utm_source=qr",
+      "social_link_1_icon": "fa-brands fa-instagram",
+      "social_link_2_url": "https://www.linkedin.com/in/samuel-kennedy-793248258?utm_source=share&utm_campaign=share_via&utm_content=profile&utm_medium=ios_app",
+      "social_link_2_icon": "fa-brands fa-linkedin",
+      "social_link_3_url": "mailto:[email protected]",
+      "social_link_3_icon": "fa-solid fa-envelope"
+    },
+    {
+      "name": "Lauren Joyce",
+      "position": "FM Manager",
+      "image": "images/committee/2024-2025/9.png",
+      "social_link_1_url": "https://www.instagram.com/laurenjoyce03?igsh=cjJxZnA4eGhtd3Ny&utm_source=qr",
+      "social_link_1_icon": "fa-brands fa-instagram",
+      "social_link_2_url": "https://www.linkedin.com/in/lauren-joyce-94668020b?utm_source=share&utm_campaign=share_via&utm_content=profile&utm_medium=ios_app",
+      "social_link_2_icon": "fa-brands fa-linkedin",
+      "social_link_3_url": "mailto:[email protected]",
+      "social_link_3_icon": "fa-solid fa-envelope"
+    },
+    {
+      "name": "Eoin O’Sullivan",
+      "position": "FM Manager",
+      "image": "images/committee/2024-2025/10.png",
+      "social_link_1_url": "https://www.instagram.com/eoin_osull05?igsh=MWp2ZzA0OXF3NTk5dw%3D%3D&utm_source=qr",
+      "social_link_1_icon": "fa-brands fa-instagram",
+      "social_link_2_url": "https://www.linkedin.com/in/eoin-o-sullivan-94b5bb310?utm_source=share&utm_campaign=share_via&utm_content=profile&utm_medium=ios_app",
+      "social_link_2_icon": "fa-brands fa-linkedin",
+      "social_link_3_url": "mailto:[email protected]",
+      "social_link_3_icon": "fa-solid fa-envelope"
+    },
+    {
+      "name": "Shelby Brennan",
+      "position": "Events Manager",
+      "image": "images/committee/2024-2025/11.png",
+      "social_link_1_url": "https://www.instagram.com/shelbyyybrennan?igsh=MXh1YzZlYjF5cXpmOQ%3D%3D&utm_source=qr",
+      "social_link_1_icon": "fa-brands fa-instagram",
+      "social_link_2_url": "",
+      "social_link_2_icon": "",
+      "social_link_3_url": "mailto:[email protected]",
+      "social_link_3_icon": "fa-solid fa-envelope"
+    },
+      {
+      "name": "Holly O’Neill",
+      "position": "Events Manager",
+      "image": "images/committee/2024-2025/12.png",
+      "social_link_1_url": "https://www.instagram.com/hollyoneill243x?igsh=MTQ3MnRjenk4cm1tNA%3D%3D&utm_source=qr",
+      "social_link_1_icon": "fa-brands fa-instagram",
+      "social_link_2_url": "https://www.linkedin.com/in/holly-o%E2%80%99neill-36054b205?utm_source=share&utm_campaign=share_via&utm_content=profile&utm_medium=ios_app",
+      "social_link_2_icon": "fa-brands fa-linkedin",
+      "social_link_3_url": "mailto:[email protected]",
+      "social_link_3_icon": "fa-solid fa-envelope"
+    },
+    {
+      "name": "Jake Farrell",
+      "position": "Webmaster",
+      "image": "images/committee/2024-2025/13.png",
+      "social_link_1_url": "https://www.jakefarrell.ie/",
+      "social_link_1_icon": "fa-solid fa-link",
+      "social_link_2_url": "https://www.linkedin.com/in/jake-farrell-cs/",
+      "social_link_2_icon": "fa-brands fa-linkedin",
+      "social_link_3_url": "mailto:[email protected]",
+      "social_link_3_icon": "fa-solid fa-envelope"
+    },
+    {
+      "name": "Grace Collins",
+      "position": "Sponsorship Officer",
+      "image": "images/committee/2024-2025/14.png",
+      "social_link_1_url": "https://www.tiktok.com/@gracecollins384?_t=8pwWnn08RJx&_r=1",
+      "social_link_1_icon": "fa-brands fa-tiktok",
+      "social_link_2_url": "https://www.linkedin.com/in/grace-collins-33b5892ba?utm_source=share&utm_campaign=share_via&utm_content=profile&utm_medium=ios_app",
+      "social_link_2_icon": "fa-brands fa-linkedin",
+      "social_link_3_url": "mailto:[email protected]",
+      "social_link_3_icon": "fa-solid fa-envelope"
+    },
+    {
+      "name": "Katie O’Shaughnessy",
+      "position": "Editor in-Chief",
+      "image": "images/committee/2024-2025/15.png",
+      "social_link_1_url": "https://www.instagram.com/katieoshaughnessyy?igsh=djRpdnFmaDBibHZr&utm_source=qr",
+      "social_link_1_icon": "fa-brands fa-instagram",
+      "social_link_2_url": "",
+      "social_link_2_icon": "",
+      "social_link_3_url": "mailto:[email protected]",
+      "social_link_3_icon": "fa-solid fa-envelope"
+    },
+    {
+      "name": "Leonor Selas Amaral",
+      "position": "Deputy Editor in-Chief",
+      "image": "images/committee/2024-2025/16.png",
+      "social_link_1_url": "http://linkedin.com/in/leonor-selas-do-amaral-188a0a304e",
+      "social_link_1_icon": "fa-brands fa-linkedin",
+      "social_link_2_url": "",
+      "social_link_2_icon": "",
+      "social_link_3_url": "mailto:[email protected]",
+      "social_link_3_icon": "fa-solid fa-envelope"
+    }
+  ]
+}
+

mps_site/data/dcufm.py

@@ -42,18 +42,20 @@
     }
   ]
 
-dcufm_subcommittee = [
-  {
+dcufm_subcommittee = {
+  "members": [
+    {
     "name": "Sophie Alexander",
     "position": "Events Manager",
     "image": "assets/fm/SA.png",
-  },
-  {
-    "name": "Abbie Nolan",
+    },
+    {
+          "name": "Abbie Nolan",
     "position": "Flagship Captain",
     "image": "assets/fm/AN.png",
-  },
-]
+    }
+  ]
+}
 
 dcufm_subgroups = {
   "title": "Our Flagships",

mps_site/templates/committee.html

@@ -6,13 +6,14 @@
 <div class="title-small">
   <h1>Meet the Committee</h1>
   <h5><i>Meet the team who make the MPS magic possible!</i></h5>
+  <h5 class="contact-hover"><i>Want to get in contact? Send us an email at <a href="mailto:[email protected]">[email protected]</a></i></h5>
 </div>
 {% include 'components/youtube_video.html' with title="MPS Meet The Committee Video" latest_video_id=committee_video_id %}
 <div class="container">
 
 <div class="row justify-content-center">
   <a class="btn btn-primary" style="background-color: #202E4E; border-radius: 25px; border-width: 4px; border-color: white;" href="/committee/history">View Committee History</a>  
-  {% include 'components/committee_grid.html' with committee_members=committee_members %}
+  {% include 'components/committee_grid.html' with committee_members=committee_list %}
   </div>
 </div>
 </div>

mps_site/templates/components/committee_grid.html

@@ -3,10 +3,10 @@
   <div class="center-contents">
       <div class="container mt-4">
           <div class="row">
-              {% for member in committee_members %}
+              {% for member in committee_members.members %}
               <div class="col-md-4">
                   <div class="committee-member">
-                      <img src="{% static member.image %}" alt="{{ member.name }} - {{ member.position }}">
+                      <img src="{% static member.image %}" alt="{{ member.name }} - {{ member.position }}" style="background-color: #202E4E; border-radius: 25px;">
                       <div class="mx-4 py-2 px-2 hvr-bounce-in" style="background-color: #202E4E; border-radius: 15px;">
                           <h3>{{ member.name }}</h3>
                           <h5><i>{{ member.position }}</i></h5>

mps_site/templates/dcufm.html

@@ -9,7 +9,7 @@ <h3><i>At the heart of Dublin City University, we are DCUfm, the hub of student
 
 {% include 'components/carousel.html' with images=dcufm_carousel %}
 
-{% include 'components/about_section.html' with title="About DCUfm" names="FM Managers: Caoimhe & Matthew" %}
+{% include 'components/about_section.html' with title="About DCUfm" names="FM Managers: Lauren & Eoin" %}
 
 {% include 'components/managers.html' with title="Meet The FM Managers" subtitle="The team behind everything radio!" managers=fm_managers %}
 

mps_site/templates/dcutv.html

@@ -22,7 +22,7 @@ <h1>About DCUtv</h1>
         <br><br>We’ve got the camera’s, you bring the inspiration!
         <br><br>National Bic Award for Promotional Video 2023
       </p>
-      <h4 style="text-align: center;"><i>TV Managers: Shane & Donal</i></h4>
+      <h4 style="text-align: center;"><i>TV Managers: Sarah & Samuel</i></h4>
     </div>
   </div>
 </div>
@@ -41,7 +41,7 @@ <h5><i>You know you want to!</i></h5>
 
 <div class="container">
 <h1>Check out our "Meet the Committee" video</h1>
-<h5><i>Filmed by DCUtv across the globe!</h5></i>
+<h5><i>Travel through time with DCUtv!</h5></i>
 {% include 'components/youtube_video.html' with title="Meet the Committee" latest_video_id=committee_video_id %}
 </div>
 

mps_site/views.py

@@ -11,6 +11,7 @@
 from .data.dcufm import *
 from .data.dcutv import *
 from .data.thecollegeview import *
+from .data.committee import *
 
 def index(request):
         video = get_latest_video_id("https://www.youtube.com/feeds/videos.xml?channel_id=UCEnLsvcq1eFkSFFAIqBDgUw")
@@ -36,17 +37,16 @@ def tcv(request):
     posts = tcv_posts("https://thecollegeview.ie/wp-json/wp/v2/posts?per_page=10&orderby=date&_fields=id,date,title,content,link,author,featured_media")
     news = tcv_posts("https://thecollegeview.ie/wp-json/wp/v2/posts?per_page=3&orderby=date&categories=4&_fields=id,date,title,content,link,author,featured_media")
     sport = tcv_posts("https://thecollegeview.ie/wp-json/wp/v2/posts?per_page=3&orderby=date&categories=7&_fields=id,date,title,content,link,author,featured_media")
-    editors1 = CommitteeMember.objects.filter(position="Editor in Chief")
-    editors2 = CommitteeMember.objects.filter(position="Webmaster")
-    editors = editors1 | editors2
+    editors = [member for member in committee_list["members"] if member["position"] == "Editor in-Chief" or member["position"] == "Deputy Editor in-Chief"]
     return render(request, 'thecollegeview.html', {'page_name': 'The College View', 'posts': posts, 'news': news, 'sport': sport, 'family_tree' : tcv_family_tree, 'editors': editors})
 
 def committee(request):
     committee_members = CommitteeMember.objects.all()
     return render(request, 'committee.html', 
                   {'page_name': 'Committee', 
                    'committee_members': committee_members,
-                   'committee_video_id': 'TqaiFaxgg0g'})
+                   'committee_list': committee_list,
+                   'committee_video_id': '1wiscXP9nw0'})
 
 def committee_history(request):
     committee_history = CommitteeHistory.objects.all()
@@ -65,15 +65,16 @@ def contact(request):
                   {'page_name': 'Contact'})
 
 def dcutv(request):
+    tv_managers = [member for member in committee_list["members"] if member["position"] == "TV Manager"]
     return render(request, 'dcutv.html', 
                   {'page_name': 'DCUtv', 
                    'tv_thursday' : 'RON9_ByY190', 
                    'latest_video_id' : get_latest_video_id("https://www.youtube.com/feeds/videos.xml?channel_id=UCEnLsvcq1eFkSFFAIqBDgUw"), 
                    'most_recent_videos': get_latest_video_ids("https://www.youtube.com/feeds/videos.xml?channel_id=UCEnLsvcq1eFkSFFAIqBDgUw"), 
-                   'tv_managers': CommitteeMember.objects.filter(position="TV Manager"), 
+                   'tv_managers': tv_managers,
                    'dcutv_carousel': dcutv_carousel, 
                    'stats_data': dcutv_stats_data,
-                   'committee_video_id': 'TqaiFaxgg0g',})
+                   'committee_video_id': '1wiscXP9nw0',})
 
 def gallery(request):
     gallery_page_info = GalleryPage.objects.all().first()
@@ -83,7 +84,7 @@ def gallery(request):
 def dcufm(request):
     previous, current, next_show = get_date_time()
     family_tree = DCUfmFamilyTree.objects.all()
-    fm_managers = CommitteeMember.objects.filter(position="FM Manager")
+    fm_managers = [member for member in committee_list["members"] if member["position"] == "FM Manager"]
     return render(request, 'dcufm.html', 
                   {'page_name': 'DCUfm', 
                    'previous_show': previous,