Merge server with master

Refactor about.html to use range. Revert clan logo from Christmas.

assets/sass/custom.scss

@@ -13,11 +13,11 @@ p, h3, h4 {
   margin-bottom: 60px;
 }
 
-.about {
+// .about {
-  .block {
+  // .block {
-    margin-bottom: 50px;
+    // margin-bottom: 50px;
-  }
+  // }
-}
+// }
 
 .client-thumb img {
   border-radius: 50%;
@@ -59,6 +59,10 @@ p, h3, h4 {
   color: white;
 }
 
+.row {
+  margin-bottom: 2em;
+}
+
 // .slick-dots {
   // li {
     // button {
@@ -106,6 +110,10 @@ p, h3, h4 {
   // height: auto;
 }
 
+#clan-pic {
+  max-height: 500px;
+}
+
 #counter {
   background-position: center;
   background-repeat: no-repeat;

config.toml

@@ -33,10 +33,10 @@ summaryLength = 10
     URL = "members"
     weight = 6
 
-    [[menu.nav]]
+    # [[menu.nav]]
-    name = "Contact"
+    # name = "Contact"
-    URL = "contact-us"
+    # URL = "contact-us"
-    weight = 8
+    # weight = 8
 
 # Site params
 [params]
@@ -58,7 +58,7 @@ custom_css = ["css/custom.css"]
     # 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= "Family of CoD:M clans that are currently looking for friendly and active clan members to play together with."
+    content= "Family of NA CoD:M clans that are always looking for friendly and active clan members to play together with."
     btn = true
     btnText="Requirements"
     btnURL="#requirements"
@@ -67,30 +67,30 @@ custom_css = ["css/custom.css"]
     [params.counter]
     enable = true
     bgImage = "images/backgrounds/codm-reddit-banner.jpg"
-        [[params.counter.counterItem]]
-        title = "Season 2 Ranking"
-        icon = "tf-ion-trophy"
-        count = "384"
-
-        [[params.counter.counterItem]]
-        title = "Avg. MP Rank (Season 2)"
-        icon = "tf-ion-android-contacts"
-        count = "Pro 2"
-
         # [[params.counter.counterItem]]
-        # title = "Avg. Games Played Daily"
+        # title = "Season 3 Ranking"
-        # icon = "tf-ion-ios-play"
+        # icon = "tf-ion-trophy"
-        # count = "791"
+        # count = "177"
+
+        [[params.counter.counterItem]]
+        title = "Avg. MP Rank (Season 3)"
+        icon = "tf-ion-android-contacts"
+        count = "Master 2"
+
+        [[params.counter.counterItem]]
+        title = "Avg. Daily Games"
+        icon = "tf-ion-ios-play"
+        count = "21"
+
+        [[params.counter.counterItem]]
+        title = "Discord Members in Clans"
+        icon = "tf-ion-ios-people"
+        count = "57"
 
         [[params.counter.counterItem]]
         title = "Avg. Level"
         icon = "tf-ion-android-arrow-up"
-        count = "121"
+        count = "125"
-
-        [[params.counter.counterItem]]
-        title = "Members"
-        icon = "tf-ion-ios-people"
-        count = "40"
 
     # footer
     [params.footer]

data/about.yml

@@ -3,6 +3,7 @@ heading : Requirements
 # headingSpan : Us
 aboutItem : 
 - content : ""
+clan: "/images/clan.jpg"
 logo: "/images/clan-logo.png"
 # logo: "/images/clan-logo-christmas.png"
 
@@ -11,23 +12,26 @@ requirementSections:
   - title: Shared Requirements 
     bullets:
       - bullet: "16 years or older"
-      - bullet: "be active on Discord server"
+      - bullet: "live in North America"
+      - bullet: "be active on clans' shared Discord server"
       - bullet: "use mic for ranked games (English)"
 
   - title: Ataraxy Requirements
     bullets:
-      - bullet: "Elite 3+ in Season 2 MP"
+      - bullet: "Pro 3+ MP highest rank"
       - bullet: "420+ contribution/week (average ~10 MP/BR games/day)"
 
   - title: Ataraxy2.0 Requirements
     bullets:
-      - bullet: "Level 50+"
+      - bullet: "Elite 1+ highest rank in either mode"
       - bullet: "120+ contribution/week (average ~3 MP/BR games/day)"
-      - bullet: "Elite 1+ in either mode for Season 2 (preferred)"
+      - bullet: "Level 50+"
 
 benefitsTitle: Benefits
 benefitsBullets:
   - bullet: "vibrant and respectful Discord community"
+  - bullet: "nightly scheduled rank lobbies"
+  - bullet: "in-house strategy discussion"
+  - bullet: "giveaways"
   - bullet: "leadership opportunities"
-  - bullet: "MEE6 leaderboard"
+  - bullet: "Discord mini-games (Pokecord, raids, gambling and more)"
-  - bullet: "various mini-games (Pokecord, raids, gambling and more)"

data/contact.yml

@@ -1,4 +1,4 @@
-enable : true
+enable : false
 heading : Get In
 headingSpan : Touch
 title : Discord

data/team.yml

@@ -2,42 +2,31 @@ enable : true
 heading : Our
 headingSpan : Team
 teamMember :
-  - imageName : josh
-    name : JoshuaAustin07
-    designation : Clan Master
-    description : Oversees entire clan's operations. Has final say on all major clan decisions.
-
   - imageName : bakkuteh
-    name : bakkuteh
+    name : bakkutteh
-    designation : Vice Master
+    designation : Ataraxy Clan Master
-    description : In charge of player management. Created spreadsheet to help keep track of player performance metrics.
+    description : Executive leader and director of the main Ataraxy clan. In charge of player management. 
+
+  - imageName : hunter
+    name : Predator
+    designation : Ataraxy Vice Master (Gameplay)
+    description : "Responsible for all things gameplay-related: lobbies, events, strategies and tactics."
+
+  - imageName : josh
+    name : Austin
+    designation : Ataraxy Vice Master (Membership)
+    description : Responsible for member management and engagement. Designed clan logo.
 
   - imageName : pistolfist
-    name : PistolFist
+    name : Pistol
-    designation : Vice Master
+    designation : Ataraxy2.0 Clan Master
-    description : In charge of recruiting. Assists with player management. Created this site and co-designed clan logo. Founder of clan. 
+    description : Executive leader and director of Ataraxy2.0. Created this site. Founder of both clans.
     # socialIcon :
       # - icon : tf-ion-social-facebook
         # url : "#"
 
-  - imageName : hunter
-  # - imageName : hunter-rs
-    name : Hunter
-    designation : MP Leader
-    description : Runs MP lobbies and go-to person for MP strategy.
-
-  - imageName : duck
-    name : Duckmaster
-    designation : BR Leader
-    description : Runs BR lobbies and go-to person for BR strategy.
-
-  - imageName : slade
-  # - imageName : slade-rs
-    name : Slade
-    designation : BR Leader
-    description : Runs BR lobbies and go-to person for BR strategy.
-
   - imageName : helen
     name : Heleners
-    designation : Discord Administrator
+    designation : Ataraxy2.0 Vice Master
-    description : Manages Discord server. Co-founder of clan.
+    description : Leads recruitment initiatives for both clans. Co-founder of both clans.
+

layouts/partials/about.html

@@ -49,7 +49,7 @@
 
         <div class="row">
           <a class="mx-auto btn btn-transparent"
-            href="https://forms.gle/rd3ZZL2QhY4eR4LK9" target="_blank">Apply Now</a>
+            href="/apply" target="_blank">Apply Now</a>
         </div>
 
         <div class="row">
@@ -57,6 +57,11 @@
           src="{{ .Site.Data.about.logo }}" alt="clan-logo"/>
         </div>
 
+        <div class="row">
+          <img id="clan-pic" class="img-fluid mx-auto mh-50 wow fadeInUp"
+          src="{{ .Site.Data.about.clan }}" alt="clan"/>
+        </div>
+
     </div>
 </section>
 {{"<!-- /about -->" | safeHTML}}

layouts/partials/head_custom.html

@@ -22,7 +22,7 @@ Do not put anything in this file - it's only here so that hugo won't throw an er
 <meta property="og:title" content="Ataraxy | Call of Duty: Mobile Clan" />
 <meta property="og:type" content="website" />
 <meta property="og:url" content="http://codm.ataraxy.tk/" />
-<meta property="og:description" content="Come check out our site for the clan for more information like requirements, members and the Discord server!" />
+<meta property="og:description" content="Come check out our clan's site for more information on requirements, stats and our application form!"/>
 <meta property="og:site_name" content="Ataraxy" />
 <!-- <meta property="og:image" content="http://codm.ataraxy.tk/images/logo/c.png" /> -->
 <meta property="og:image" content="http://codm.ataraxy.tk/images/url-preview.png" />