#51: Polished team page, link to team page

Swetugg · Jan 27, 2024 · b113c83 · b113c83
1 parent 2b272ad
commit b113c83
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 28 deletions.
diff --git a/Pages/Team.cshtml b/Pages/Team.cshtml
@@ -1,63 +1,84 @@
 @page
 @{
-    var contentGbg = "Content Gbg";
-    var contentSthlm = "Content Sthlm";
-    var website = "Website";
-    var tech = "Tech";
-    var sponsors = "Sponsors";
-    var finance = "Finance";
-    var locationSthlm = "Location Sthlm";
-    var locationGbg = "Location Gbg";
-    var speakers = "Speakers";
+    var boardMember = "board member";
+    var PLGbg = "PL gbg";
+    var sponsors = "sponsors";
+    var website = "website";
+    var PLSthlm = "PL sthlm";
+    var content = "content";
+    var chairman = "chairman";
+    var volunteers = "volunteers";
+    var boardAlternate = "board alternate";
+    var nominatingCommittee = "nominating committee";
+    var treasurer = "treasurer";
+    var tech = "tech";
+    var socialMedia = "social media";
+    var speakers = "speakers";
+    var party = "party";
 
     var team = new (string name, string image, string linkedIn, string twitter, IEnumerable<string> responsibilities)[]
     {
 ("Cecilia Wirén",
 "C4E03AQHfFAuaaeA2QA/profile-displayphoto-shrink_200_200/0/1555274870054?e=1707350400&v=beta&t=OWqq5wtVHdEcOoKExSRFNjoDzOvNz1gMJI19qn2VFLo",
-"ceciliasharp", "CeciliaSHARP", new string[]{contentSthlm, website}),
+"ceciliasharp", "CeciliaSHARP", new string[]{boardMember, PLGbg, sponsors, website}),
 ("Fabian Miiro",
 "C5603AQHGVJxdAf6zVA/profile-displayphoto-shrink_200_200/0/1517477264128?e=1707350400&v=beta&t=7QjyZBE_rUtTxdAMfNo-8WM8LgPjxwZuWxtWYQw6NuA",
-"iloabn", "iloabn", new string[]{}),
+"iloabn", "iloabn", new string[]{treasurer, tech}),
 ("Andrea Klintelius",
 "D4D35AQHMDiSzBx2-Mw/profile-framedphoto-shrink_200_200/0/1700741498408?e=1706299200&v=beta&t=7UKtZhLTq-BLByL850WWmNIBpdLckbC2iqdYfbqfHJ8",
-"andrea-klintelius-22445b9", "drea1112", new string[]{}),
+"andrea-klintelius-22445b9", "drea1112", new string[]{boardMember, volunteers}),
 ("Mattias Karlsson",
 "C5603AQHhVQaGxs4YTw/profile-displayphoto-shrink_200_200/0/1521304813735?e=1707350400&v=beta&t=MyjX6uF1AqJmC6Wk-6EGe5I7NoQzdZH8NW86HVE1eUU",
 "devlead", "devlead", new string[]{}),
+("Ulrika Bladh",
+"D4D03AQGqVbsfjtzISw/profile-displayphoto-shrink_200_200/0/1694293026391?e=1711584000&v=beta&t=9iT3fV8Ew7Tmzu8o5NgAtDnf_Hx9jC68DySMuA_JVOw",
+"ulrika-bladh", "devlead", new string[]{nominatingCommittee}),
+("Anders Ljusberg",
+"D4D03AQE5oa_d8Tq6ZQ/profile-displayphoto-shrink_200_200/0/1678289367667?e=1711584000&v=beta&t=nz6BHxd23Z3Ee6qz8jJuujusKtGKffq9WQxqV4DFwZ8",
+"ljusberg", "CodingInsomnia", new string[]{nominatingCommittee}),
 ("Jimmy Engström",
 "C5603AQFS4gsPsmgZzQ/profile-displayphoto-shrink_200_200/0/1520864864081?e=1707350400&v=beta&t=ENHPa92wxpXly7r_9hfVkQPvubEA31Wldzd1RXtbQvk",
-"engstromjimmy", "EngstromJimmy", new string[]{}),
+"engstromjimmy", "EngstromJimmy", new string[]{content, party}),
+("Jessica Engström",
+"D4D03AQE68gwKZPzzWg/profile-displayphoto-shrink_200_200/0/1688657824075?e=1711584000&v=beta&t=1JkuX02JmG_7wgJJ-iGqxX7bIJ7ZTIOcwpsGypwpmXU",
+"engstromjess", "grytlappen", new string[]{boardMember, PLSthlm, content, party}),
 ("Rickard öh",
 "C4E03AQEQ7GAd3varvg/profile-displayphoto-shrink_200_200/0/1566821273761?e=1707350400&v=beta&t=_vO3syWTFPcX8mZHCXMRD-TLqdcT8VvlcOGcADhZuzY",
-"rickardoh", "kalasp", new string[]{}),
+"rickardoh", "kalasp", new string[]{content}),
 ("Sebastian Rosengren",
 "C5603AQH6ykyqTec9uQ/profile-displayphoto-shrink_200_200/0/1584707294273?e=1707350400&v=beta&t=7MeXlOTqBSh64-W-S5bpd3cpQz2tWiJ1cWmsRpKf56Q",
 "srosengren", "srrosengren", new string[]{website}),
 ("Magnus Timner",
 "D4D03AQFIWGmzkDDjuA/profile-displayphoto-shrink_200_200/0/1700720800042?e=1707350400&v=beta&t=io34xfOLXjmSr5AQg5TJzbvpIGInz7tSPmDHU4eKDmE",
-"magnustimner", "MTimner", new string[]{}),
+"magnustimner", "MTimner", new string[]{speakers}),
 ("Mattias Lögdberg",
 "D4D03AQH2wwzOmXO8OA/profile-displayphoto-shrink_200_200/0/1686999949960?e=1707350400&v=beta&t=4rjIw2PHku6cvxmseqRrb9TMJriesXtRwRsBYf-KTEw",
-"logdberg", "mlogdberg", new string[]{}),
+"logdberg", "mlogdberg", new string[]{content}),
 ("Viktor Karlström",
 "C4D03AQFZzzP3cDZQ_Q/profile-displayphoto-shrink_200_200/0/1652276243149?e=1707350400&v=beta&t=XpPJdDirE0AI2TMeSmyn3pwD32zPtiG3qpDVwFqLGtM",
-"viktor-karlstrom", "karlstroems", new string[]{}),
+"viktor-karlstrom", "karlstroems", new string[]{socialMedia}),
 ("Johan Normén",
 "C4D03AQERLMj6sDykmA/profile-displayphoto-shrink_200_200/0/1517366286122?e=1707350400&v=beta&t=q9-QRnOUIPGfFLnqY-kEndWg62o_9o8puP3chCgy7Ds",
-"johannormen", "Johannormen", new string[]{}),
+"johannormen", "Johannormen", new string[]{boardAlternate}),
 ("Jim Elfving",
 "C4E03AQF-9z1qe75Y7g/profile-displayphoto-shrink_200_200/0/1642364527126?e=1707350400&v=beta&t=V1sOve08hJ_k2yx-tPjUy-DWmUaoLQ9lqkGWJl5VOJg",
-"jim-elfving-9b545842", "jim_elfving", new string[]{}),
+"jim-elfving-9b545842", "jim_elfving", new string[]{tech}),
+("Sigge Sax",
+"C5603AQELD_16lLEmog/profile-displayphoto-shrink_200_200/0/1567428294038?e=1711584000&v=beta&t=5s4rgC8CYw2pwnKJW_YtUc-uDdtZHEdT_wuW1rdmWMg",
+"sigge-sax-187ab0128", "SiggeSax", new string[]{chairman}),
 ("Mathias Olausson",
 "C4E03AQFxNzzu3HSbpw/profile-displayphoto-shrink_200_200/0/1516291006595?e=1707350400&v=beta&t=eVJa50oGdGiqGXNtqys27jmb2dEJv8jBHcaiFDaoSCM",
-"mathiasolausson", "molausson", new string[]{}),
+"mathiasolausson", "molausson", new string[]{speakers, content}),
 ("Manuel Ericstam",
 "D5603AQGwU4vfk7RzKw/profile-displayphoto-shrink_200_200/0/1673989706454?e=1707350400&v=beta&t=uyXdErpQrRD0Q73Xeb0H7jfQsiw6XQQm6TfbL_rrbGw",
-"manuel-ericstam", "EricstamManuel", new string[]{}),
+"manuel-ericstam", "EricstamManuel", new string[]{tech, content}),
+("Eric Johansson",
+"D4E03AQF3X6Xp-FdCuA/profile-displayphoto-shrink_200_200/0/1692287404519?e=1711584000&v=beta&t=X9bj-1xtuEBrRCgwpm6x1lfqm6jzixsphCusdFoqcrA",
+"eric-r-johansson", "ericjohansson", new string[]{website, content, party}),
 ("Abdirahman Farah",
 "C5603AQHis_BaY1MvCg/profile-displayphoto-shrink_200_200/0/1583769838019?e=1707350400&v=beta&t=gLaQ5658G2Ahy65kEODjqIMre-Ho8I7lTTVMwjljdhU",
-"abdirahman-farah-5b405b87", "", new string[]{})
-    }.OrderBy(member => member.name);
+"abdirahman-farah-5b405b87", "", new string[]{sponsors})
+    }.OrderBy(member => member.name.Split(' ').Last());
 }
 
 <div class="container">
@@ -70,7 +91,8 @@
                 <img alt="The profile photo of @member.name" src="https://media.licdn.com/dms/image/@member.image">
                 <div class="info">
                     <h2>@member.name</h2>
-                    <p class="responsibilities">@String.Join(", ", member.responsibilities.OrderBy(x => x))</p>
+                    <p class="responsibilities">@(member.responsibilities.Any() ? String.Join(", ",
+                    member.responsibilities.OrderBy(x => x)) : "member")</p>
                     <ul class="social">
                         @if (!string.IsNullOrWhiteSpace(member.linkedIn))
                         {
@@ -91,9 +113,9 @@
                                 <a href="https://twitter.com/@member.twitter" aria-label="Twitter profile of @member.name"
                                     target="_blank">
                                     <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor"
-                                        class="bi bi-twitter" viewBox="0 0 16 16">
+                                        class="bi bi-twitter-x" viewBox="0 0 16 16">
                                         <path
-                                            d="M5.026 15c6.038 0 9.341-5.003 9.341-9.334q.002-.211-.006-.422A6.7 6.7 0 0 0 16 3.542a6.7 6.7 0 0 1-1.889.518 3.3 3.3 0 0 0 1.447-1.817 6.5 6.5 0 0 1-2.087.793A3.286 3.286 0 0 0 7.875 6.03a9.32 9.32 0 0 1-6.767-3.429 3.29 3.29 0 0 0 1.018 4.382A3.3 3.3 0 0 1 .64 6.575v.045a3.29 3.29 0 0 0 2.632 3.218 3.2 3.2 0 0 1-.865.115 3 3 0 0 1-.614-.057 3.28 3.28 0 0 0 3.067 2.277A6.6 6.6 0 0 1 .78 13.58a6 6 0 0 1-.78-.045A9.34 9.34 0 0 0 5.026 15" />
+                                            d="M12.6.75h2.454l-5.36 6.142L16 15.25h-4.937l-3.867-5.07-4.425 5.07H.316l5.733-6.57L0 .75h5.063l3.495 4.633L12.601.75Zm-.86 13.028h1.36L4.323 2.145H2.865z" />
                                     </svg>
                                 </a>
                             </li>

diff --git a/Pages/_Layout.cshtml b/Pages/_Layout.cshtml
@@ -1,3 +1,4 @@
+@inject IConferenceService conferenceService
 @{
     var fbAppId = ViewData["FacebookAppId"];
     var appInsightsInstrumentationKey = ViewData["InstrumentationKey"];
@@ -77,7 +78,7 @@
     <div class="page">
         <nav>
             <div class="container">
-                <a href="/">Swetugg</a>
+                <a href="/">To @(conferenceService.GetCurrentConferenceMeta()?.Name ?? "Swetugg")</a>
             </div>
         </nav>
 

diff --git a/Pages/_Layout.cshtml.css b/Pages/_Layout.cshtml.css
@@ -20,7 +20,6 @@ nav a {
     text-transform: uppercase;
     display: inline-block;
     color: #F2FCFF;
-    height: 50px;
     font-family: "Rock Salt";
     font-size: 14px;
     padding: 17px 0;

diff --git a/Pages/sthlm-2024/Index.cshtml b/Pages/sthlm-2024/Index.cshtml
@@ -102,6 +102,9 @@
                 <p>
                     Swetugg is run by a group of volunteers with different IT backgrounds with a common denominator: A passion for creating good software and better software developers.
                 </p>
+                <p>
+                    <a href="/team" class="btn btn-default btn-lg">Meet the team</a>
+                </p>
             </div>
         </div>