Merge pull request #7 from jaredliw/team-structure-term2

update term 2/2024 team structure

assets/about.css

@@ -3,4 +3,5 @@
     width: 120px;
     height: 120px;
     border-radius: 50%;
+    object-fit: cover;
 }

data/team.json

@@ -3,189 +3,204 @@
     "department": "Executive",
     "members": [
       {
-        "name": "John Doe",
-        "role": "Director",
-        "avatar": "https://i.pravatar.cc/300?img=48"
+        "name": "Chiang Ru",
+        "role": "Executive Director",
+        "avatar": "about/exco-cr.jpg"
+      },
+      {
+        "name": "Alyqa",
+        "role": "Internal & External Affairs Officer",
+        "avatar": "about/exco-alyqa.jpg"
       },
       {
-        "name": "Lorem Ipsum",
-        "role": "Secretary",
-        "avatar": "https://i.pravatar.cc/300?img=43"
+        "name": "Farah Hana Sophia",
+        "role": "Internal & External Affairs Officer",
+        "avatar": "about/exco-sophia.png"
       },
       {
-        "name": "Dolor Sit",
-        "role": "Treasurer",
-        "avatar": "https://i.pravatar.cc/300?img=32"
+        "name": "Hsien Loong",
+        "role": "Head of Secretarial-Treasury",
+        "avatar": "about/exco-hsien-loong.jpg"
+      },
+      {
+        "name": "Wong Kai Qing",
+        "role": "Assistant of Secretarial-Treasury",
+        "avatar": "about/exco-kai-qing.jpg"
       }
     ]
   },
   {
     "department": "Welfare-Operations",
     "members": [
       {
-        "name": "Jane Doe",
+        "name": "Steven Yee",
         "role": "Director",
-        "avatar": "https://i.pravatar.cc/300?img=25"
+        "avatar": "about/wops-steven.jpg"
       },
       {
-        "name": "Ipsum Lorem",
+        "name": "Jocelyn Wong",
         "role": "Deputy Director",
-        "avatar": "https://i.pravatar.cc/300?img=14"
+        "avatar": "about/wops-jocelyn.jpg"
       },
       {
-        "name": "Ipsum Lorem",
+        "name": "Jason Chong",
         "role": "Deputy Director",
-        "avatar": "https://i.pravatar.cc/300?img=12"
-      },
-      {
-        "name": "Dolor Sit",
-        "role": "Executive",
-        "avatar": "https://i.pravatar.cc/300?img=6"
-      },
-      {
-        "name": "Dolor Sit",
-        "role": "Executive",
-        "avatar": "https://i.pravatar.cc/300?img=5"
+        "avatar": "about/wops-jason.jpg"
       },
       {
-        "name": "Dolor Sit",
+        "name": "Teo Jia Sing",
         "role": "Executive",
-        "avatar": "https://i.pravatar.cc/300?img=4"
+        "avatar": "about/wops-jia-sing.jpg"
       },
       {
-        "name": "Dolor Sit",
+        "name": "Fatin Amni",
         "role": "Executive",
-        "avatar": "https://i.pravatar.cc/300?img=3"
+        "avatar": "about/wops-fatin-amni.jpg"
       },
       {
-        "name": "Dolor Sit",
+        "name": "Dawn Lee",
         "role": "Executive",
-        "avatar": "https://i.pravatar.cc/300?img=2"
+        "avatar": "about/wops-dawn.jpg"
       },
       {
-        "name": "Dolor Sit",
+        "name": "Isleha Francis",
         "role": "Executive",
-        "avatar": "https://i.pravatar.cc/300?img=1"
+        "avatar": "about/wops-isleha.jpg"
       }
     ]
   },
   {
     "department": "Public Relations",
     "members": [
       {
-        "name": "Jane Doe",
-        "role": "Director",
-        "avatar": "https://i.pravatar.cc/300?img=56"
+        "name": "Zi Yee",
+        "role": " Director",
+        "avatar": "about/pr-zi-yee.png"
       },
       {
-        "name": "Ipsum Lorem",
+        "name": "Zixuan",
         "role": "Deputy Director",
-        "avatar": "https://i.pravatar.cc/300?img=57"
+        "avatar": "about/pr-zixuan.jpg"
       },
       {
-        "name": "Dolor Sit",
+        "name": "Xin Yue",
+        "role": "Deputy Director",
+        "avatar": "about/pr-xin-yue.jpg"
+      },
+      {
+        "name": "Aqyf Mohd Ghazali",
         "role": "Executive",
-        "avatar": "https://i.pravatar.cc/300?img=62"
+        "avatar": "about/pr-aqyf.png"
       },
       {
-        "name": "Dolor Sit",
+        "name": "Jeriel Fam",
         "role": "Executive",
-        "avatar": "https://i.pravatar.cc/300?img=58"
+        "avatar": "about/pr-jeriel.jpg"
       },
       {
-        "name": "Dolor Sit",
+        "name": "Bahiah Chek Peei",
         "role": "Executive",
-        "avatar": "https://i.pravatar.cc/300?img=48"
+        "avatar": "about/pr-bahiah.jpg"
       },
       {
-        "name": "Dolor Sit",
+        "name": "Priscilla Tang",
         "role": "Executive",
-        "avatar": "https://i.pravatar.cc/300?img=37"
+        "avatar": "about/pr-priscilla.jpg"
       }
     ]
   },
   {
     "department": "Tech",
     "members": [
       {
-        "name": "Jane Doe",
+        "name": "Raihanah Husna",
         "role": "Director",
-        "avatar": "https://i.pravatar.cc/300?img=3"
+        "avatar": "about/tech-raihanah.jpg"
       },
       {
-        "name": "Ipsum Lorem",
+        "name": "Lynn Goh",
         "role": "Deputy Director",
-        "avatar": "https://i.pravatar.cc/300?img=1"
+        "avatar": "about/tech-lynn.jpeg"
+      },
+      {
+        "name": "Aidil Iskandar",
+        "role": "Executive",
+        "avatar": "about/tech-aidil.jpg"
       },
       {
-        "name": "Dolor Sit",
+        "name": "Aqil Amani",
         "role": "Executive",
-        "avatar": "https://i.pravatar.cc/300?img=2"
+        "avatar": "about/tech-aqil.jpg"
       },
       {
-        "name": "Dolor Sit",
+        "name": "Khong Yirou",
         "role": "Executive",
-        "avatar": "https://i.pravatar.cc/300?img=70"
+        "avatar": "about/tech-yirou.jpg"
       }
     ]
   },
   {
     "department": "Outreach",
     "members": [
       {
-        "name": "Jane Doe",
+        "name": "Alyssa Lee",
         "role": "Director",
-        "avatar": "https://i.pravatar.cc/300?img=54"
+        "avatar": "about/outreach-alyssa.jpg"
       },
       {
-        "name": "Ipsum Lorem",
+        "name": "Jaymie Liew",
         "role": "Deputy Director",
-        "avatar": "https://i.pravatar.cc/300?img=13"
+        "avatar": "about/outreach-jaymie.jpg"
       },
       {
-        "name": "Dolor Sit",
+        "name": "Ashley Ann",
         "role": "Executive",
-        "avatar": "https://i.pravatar.cc/300?img=22"
+        "avatar": "about/outreach-shley.jpg"
       },
       {
-        "name": "Dolor Sit",
+        "name": "Chia Hui En",
         "role": "Executive",
-        "avatar": "https://i.pravatar.cc/300?img=20"
+        "avatar": "about/outreach-hui-en.jpeg"
       },
       {
-        "name": "Amet Consectetur",
+        "name": "Jeff Ng",
         "role": "Executive",
-        "avatar": "https://i.pravatar.cc/300?img=15"
+        "avatar": "about/outreach-jeff.jpg"
       }
     ]
   },
   {
     "department": "Resource",
     "members": [
       {
-        "name": "Jane Doe",
+        "name": "Abigail Maya Surin",
         "role": "Director",
-        "avatar": "https://i.pravatar.cc/300?img=43"
+        "avatar": "about/resource-abigail.jpg"
       },
       {
-        "name": "Ipsum Lorem",
+        "name": "Eng Zhen Shen",
         "role": "Deputy Director",
-        "avatar": "https://i.pravatar.cc/300?img=42"
+        "avatar": "about/resource-zhen-shen.jpg"
+      },
+      {
+        "name": "Leong Khoi Yern",
+        "role": "Executive",
+        "avatar": "about/resource-khoi-yern.jpeg"
       },
       {
-        "name": "Dolor Sit",
+        "name": "Vivashdheeran",
         "role": "Executive",
-        "avatar": "https://i.pravatar.cc/300?img=28"
+        "avatar": "about/resource-vivashdheeran.jpg"
       },
       {
-        "name": "Dolor Sit",
+        "name": "Lee Jia Yi (Cheryl)",
         "role": "Executive",
-        "avatar": "https://i.pravatar.cc/300?img=30"
+        "avatar": "about/resource-cheryl.jpg"
       },
       {
-        "name": "Amet Consectetur",
+        "name": "Lim Cheng Hong",
         "role": "Executive",
-        "avatar": "https://i.pravatar.cc/300?img=25"
+        "avatar": "about/resource-cheng-hong.jpeg"
       }
     ]
   }

layouts/page/about.html

@@ -1,44 +1,54 @@
-{{- define "main" -}}
-    {{ partial "nav.html" (dict "nav_white" 1) }}
+{{- define "main" -}} {{ partial "nav.html" (dict "nav_white" 1) }}
 
-    <div class="row justify-content-center page-section px-3 px-md-5" style="padding-top: 6.5rem;">
-        <h2 class="text-center text-primary fw-lighter">
-            Our <span class="fw-bold">story</span>.
-        </h2>
-        <hr class="divider my-4"/>
+<div class="row justify-content-center page-section px-3 px-md-5" style="padding-top: 6.5rem" >
+	<h2 class="text-center text-primary fw-lighter">
+		Our <span class="fw-bold">story</span>.
+	</h2>
+	<hr class="divider my-4" />
+	{{ .Content }}
+</div>
 
-        {{ .Content }}
-    </div>
+<div class="row justify-content-center bg-body-secondary page-section px-3 pb-5">
+	<div class="text-center">
+		<h2 class="text-primary fw-lighter">
+			Meet the <span class="fw-bold">team</span>.
+		</h2>
+		<hr class="divider my-4" />
 
-    <div class="row justify-content-center bg-body-secondary page-section px-3 pb-5">
-        <div class="text-center">
-            <h2 class="text-primary fw-lighter">Meet the <span class="fw-bold">team</span>.</h2>
-            <hr class="divider my-4"/>
+		<div class="container container-fluid px-5">
+			{{ $first := true }} {{ range site.Data.team }}
+			<h6 class="text-uppercase {{ if $first -}} pt-0 {{- else -}} pt-5 {{- end -}}">
+				-&nbsp;{{- .department -}}&nbsp;-
+			</h6>
+			<div class="d-flex justify-content-around align-items-center flex-wrap gap-2 gap-lg-4 gap-xxl-5">
+				{{ $Director := 0 }} 
+
+                {{ range .members }} 
 
-            <div class="container container-fluid px-5">
-                {{ $first := true }}
-                {{ range site.Data.team }}
-                    <h6 class="text-uppercase {{ if $first -}} pt-0 {{- else -}} pt-5 {{- end -}}">
-                        -&nbsp;{{- .department -}}&nbsp;-
-                    </h6>
-                    <div class="d-flex justify-content-around align-items-center flex-wrap gap-2 gap-lg-4 gap-xxl-5">
-                        {{ range .members }}
-                            <div class="pb-3">
-                                <img src="{{ absURL .avatar }}" alt="avatar" class="avatar my-3">
-                                <p style="letter-spacing: 1px;" class=" mb-0 fw-lighter">{{ .name }}</p>
-                                <small class="text-primary text-uppercase fw-bold">{{ .role }}</small>
-                            </div>
-                        {{ end }}
-                    </div>
-                    {{ $first = false }}
-                {{ end }}
+                {{ if and (not (strings.Contains .role "Director")) (eq $Director 0)}} 
+                {{/*  Creates new row for non-director roles  */}}
             </div>
-        </div>
-    </div>
+			<div class="d-flex justify-content-around align-items-center flex-wrap gap-2 gap-lg-4 gap-xxl-5">
+                {{ $Director = 1}} 
+
+				{{ end }} 
+
+				<div class="pb-3">
+					<img src="{{ absURL .avatar }}" alt="avatar" class="avatar my-3"/>
+					<p style="letter-spacing: 1px" class="mb-0 fw-lighter">
+						{{ .name }}
+					</p>
+					<small class="text-primary text-uppercase fw-bold">{{ .role }}</small>
+				</div>
+				{{ end }}
+			</div>
+			{{ $first = false }} {{ end }}
+		</div>
+	</div>
+</div>
 
-    {{ partial "footer.html" }}
-
-    {{ with resources.Get "about.css" | postCSS | minify }}
-        <link rel="stylesheet" href="{{ .Permalink }}">
-    {{ end }}
-{{- end -}}
+{{ partial "footer.html" }}
+{{ with resources.Get "about.css" | postCSS | minify }}
+  <link rel="stylesheet" href="{{ .Permalink }}" />
+{{ end }}
+{{- end -}}