From 6d51384c6a2d60f6e5bf5d07fe65250c79424f75 Mon Sep 17 00:00:00 2001
From: Kevin Mok <kevin.mok@live.ca>
Date: Sat, 28 Dec 2019 17:32:08 -0500
Subject: [PATCH] Add requirements for 2nd clan

Refactor about.html to use range. Revert clan logo from Christmas.
---
 assets/sass/custom.scss     |  5 ++++
 config.toml                 |  5 ++--
 data/about.yml              | 37 +++++++++++++++++++--------
 layouts/partials/about.html | 50 +++++++++++++++++++++----------------
 4 files changed, 62 insertions(+), 35 deletions(-)

diff --git a/assets/sass/custom.scss b/assets/sass/custom.scss
index f942e35..22fea79 100644
--- a/assets/sass/custom.scss
+++ b/assets/sass/custom.scss
@@ -54,6 +54,11 @@ p, h3, h4 {
   }
 }
 
+.req-section-title {
+  font-size: 1.25em;
+  color: white;
+}
+
 // .slick-dots {
   // li {
     // button {
diff --git a/config.toml b/config.toml
index 2a12726..8b2cd22 100644
--- a/config.toml
+++ b/config.toml
@@ -57,7 +57,8 @@ custom_css = ["css/custom.css"]
     bgImage = "images/slider/hero-area.jpg"
     # bgImage = "images/slider/eagle.png"
     heading = "Ataraxy"
-    content= "Top 400, MP-focused clan that is currently looking for friendly and active clan members to play together with."
+    # content= "Top 400, MP-focused clan that is currently looking for friendly and active clan members to play together with."
+    content= "Family of CoD:M clans that are currently looking for friendly and active clan members to play together with."
     btn = true
     btnText="Requirements"
     btnURL="#requirements"
@@ -69,7 +70,7 @@ custom_css = ["css/custom.css"]
         [[params.counter.counterItem]]
         title = "Season 2 Ranking"
         icon = "tf-ion-trophy"
-        count = "414"
+        count = "384"
 
         [[params.counter.counterItem]]
         title = "Avg. MP Rank (Season 2)"
diff --git a/data/about.yml b/data/about.yml
index a826937..0218ad9 100644
--- a/data/about.yml
+++ b/data/about.yml
@@ -3,16 +3,31 @@ heading : Requirements
 # headingSpan : Us
 aboutItem : 
 - content : ""
+logo: "/images/clan-logo.png"
+# logo: "/images/clan-logo-christmas.png"
 
-requirements :
-- "Elite 3+ in Season 2 MP"
-- "420+ contribution/week (average ~10 MP/BR games/day)"
-- "16 years or older"
-- "be active on Discord server"
-- "use mic for ranked games (English)"
+requirementsTitle: Requirements 
+requirementSections:
+  - title: Shared Requirements 
+    bullets:
+      - bullet: "16 years or older"
+      - bullet: "be active on Discord server"
+      - bullet: "use mic for ranked games (English)"
 
-benefits :
-- "vibrant and respectful Discord community"
-- "leadership opportunities"
-- "MEE6 leaderboard"
-- "various mini-games (Pokecord, raids, gambling and more)"
+  - title: Ataraxy Requirements
+    bullets:
+      - bullet: "Elite 3+ in Season 2 MP"
+      - bullet: "420+ contribution/week (average ~10 MP/BR games/day)"
+
+  - title: Ataraxy2.0 Requirements
+    bullets:
+      - bullet: "Level 50+"
+      - bullet: "120+ contribution/week (average ~3 MP/BR games/day)"
+      - bullet: "Elite 1+ in either mode for Season 2 (preferred)"
+
+benefitsTitle: Benefits
+benefitsBullets:
+  - bullet: "vibrant and respectful Discord community"
+  - bullet: "leadership opportunities"
+  - bullet: "MEE6 leaderboard"
+  - bullet: "various mini-games (Pokecord, raids, gambling and more)"
diff --git a/layouts/partials/about.html b/layouts/partials/about.html
index cee1454..1ca37a4 100644
--- a/layouts/partials/about.html
+++ b/layouts/partials/about.html
@@ -6,51 +6,57 @@
             <div class="col-lg-12">
                 {{"<!-- section title -->" | safeHTML}}
                 <div class="title text-center wow fadeIn" data-wow-duration="1500ms">
-                    <h2>{{ .Site.Data.about.heading}} <span class="color">{{ .Site.Data.about.headingSpan}}</span> </h2>
+                    <h2>{{ .Site.Data.about.requirementsTitle }}</h2>
                     <div class="border-meghna"></div>
                 </div>
+                {{"<!-- /section title -->" | safeHTML}}
             </div>
-            {{"<!-- /section title -->" | safeHTML}}
 
-            {{"<!-- About item -->" | safeHTML}}
             <div class="mx-auto wow fadeInUp" data-wow-duration="500ms">
-                <div class="block" id="requirements">
-                    {{"<!-- Express About Yourself -->" | safeHTML}}
-                    <ul>
-                      {{ range $requirement := $.Site.Data.about.requirements }}
-                      <li>{{ $requirement }}</li>
-                      {{ end }}
-                    </ul>
+                <div class="block">
+                  {{ range .Site.Data.about.requirementSections }}
+                  <p class="req-section-title">{{ .title }}</p>
+                  <ul>
+                    {{ range .bullets }}
+                    <li>{{ .bullet }}</li>
+                    {{ end }}
+                  </ul>
+                  {{ end }}
                 </div>
             </div>
         </div>
+
         <div class="row">
             <div class="col-lg-12">
                 {{"<!-- section title -->" | safeHTML}}
                 <div class="title text-center wow fadeIn" data-wow-duration="1500ms">
-                    <h2>Benefits</h2>
+                    <h2>{{ .Site.Data.about.benefitsTitle }}</h2>
                     <div class="border-meghna"></div>
                 </div>
+                {{"<!-- /section title -->" | safeHTML}}
             </div>
-            {{"<!-- /section title -->" | safeHTML}}
 
-            {{"<!-- About item -->" | safeHTML}}
             <div class="mx-auto wow fadeInUp" data-wow-duration="500ms">
-                <div class="block" id="benefits">
-                    {{"<!-- Express About Yourself -->" | safeHTML}}
-                    <ul>
-                      {{ range $benefit := $.Site.Data.about.benefits }}
-                      <li>{{ $benefit }}</li>
-                      {{ end }}
-                    </ul>
+                <div class="block">
+                  <ul>
+                    {{ range .Site.Data.about.benefitsBullets }}
+                      <li>{{ .bullet }}</li>
+                    {{ end }}
+                  </ul>
                 </div>
             </div>
         </div>
+
+        <div class="row">
+          <a class="mx-auto btn btn-transparent"
+            href="https://forms.gle/rd3ZZL2QhY4eR4LK9" target="_blank">Apply Now</a>
+        </div>
+
         <div class="row">
-          <!-- <img id="clan-logo" class="img-fluid mx-auto" src="/images/clan-logo.png" alt="clan-logo"/> -->
           <img id="clan-logo" class="img-fluid mx-auto wow fadeInUp"
-          src="/images/clan-logo-christmas.png" alt="clan-logo"/>
+          src="{{ .Site.Data.about.logo }}" alt="clan-logo"/>
         </div>
+
     </div>
 </section>
 {{"<!-- /about -->" | safeHTML}}