Merge branch 'main' into main

shfryn · Mar 1, 2024 · 2db8621 · 2db8621
2 parents 2993386 + e1e91dd
commit 2db8621
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 19 deletions.
diff --git a/_data/gmc-rss.json b/_data/gmc-rss.json
diff --git a/_data/price-responses/rpl-usd.json b/_data/price-responses/rpl-usd.json
@@ -1 +1,2 @@
-{"jsonrpc":"2.0","id":1,"result":"0x00000000000000000000000000000000000000000000000000000000bb284ae0"}
+{"jsonrpc":"2.0","id":1,"result":"0x00000000000000000000000000000000000000000000000000000000bc3b8fa0"}
+
diff --git a/_includes/bounty-tags.html b/_includes/bounty-tags.html
@@ -15,6 +15,9 @@
   {% elsif bounty.external-status =="closed" %}
     <div class="bounty-tag-status-closed">
     <img src="assets/xmark-solid.svg" class="tag-icon"/>
+  {% elsif bounty.external-status =="unavailable" %}
+    <div class="bounty-tag-status-unavailable">
+    <img src="assets/xmark-solid.svg" class="tag-icon"/>
   {% elsif bounty.external-status =="draft" %}
     <div class="bounty-tag-status-draft">
     <img src="assets/pen-ruler-solid.svg" class="tag-icon icon-adjust-smaller icon-adjust-up"/>

diff --git a/_includes/contact.html b/_includes/contact.html
@@ -0,0 +1,17 @@
+{% assign contactData = include.contact %}
+{% assign contactRole = include.role %}
+
+<div class="contact-container">    
+    {% if contactData %}
+    <b>{% if contactRole %}{{contactRole}} - {% endif %}{{ contactData.name }}<br/>
+    {% if contactData.discord %}<a href="{{contactMeta.discord-prefix}}{{contactData.discord}}">
+        <img src="assets/discord.svg" class="social-icon"/>
+    </a> {% endif %}
+    {% if contactData.forum %}<a href="{{contactMeta.forum-prefix}}{{contactData.forum}}">
+        <img src="assets/discourse.svg" class="social-icon"/>
+    </a>{% endif %}
+    {% if contactData.github %}<a href="{{contactMeta.github-prefix}}{{contactData.github}}">
+        <img src="assets/github.svg" class="social-icon"/>
+    </a>{% endif %}
+    {% endif %}
+</div>
diff --git a/_layouts/bounty.html b/_layouts/bounty.html
@@ -19,46 +19,46 @@ <h1 class="post-title unconverted-price-page">{% include bounty-amount.html rewa
             {% if page.reward.unit == "RPL" %}
             <h3 class="converted-price">{% include bounty-amount.html reward=page.reward convert="RPL"%}</h3>
             {% endif %}
+            <span class="bounty-date"> {{page.creation-date | date_to_string: "ordinal", "US"}} </span>
           </div>
       </div>
       <div class="flex-justify">
         {% assign bounty = page %}
         {% include bounty-tags.html bounty=page show-code=true %}
+        <b class="bounty-date exclusion-dummy">{{page.creation-date | date_to_string: "ordinal", "US"}}</b>
       </div>
     </header>
 
     <div class="post-content">
       {{ content }}
       {% if page.contacts %}
       {% assign contactsData = site.data.contacts.contacts %}
+      {% assign rolesData = site.data.contacts.global-roles %}
       {% assign contactMeta = site.data.contacts.meta %}
       <div>
         <h2>Contacts</h2>
+        <div>
+        <!-- Always show the GMC admin  -->
+        {% assign currentAdmin = rolesData | where: 'name', "GMC Administrator" | first %}
+        {% assign contactData = contactsData | where: 'name', currentAdmin.current-fill | first %}
+        {% if contactData.name == currentAdmin.current-fill %}
+          {% include contact.html contact=contactData role="GMC Administrator" %}
+        {% endif %}
+        <!-- Get the entries from contacts.yml  -->
         {% for contact in page.contacts %}
-        <div class="contact-container">          
-        {% assign contactData = contactsData | where: 'name', contact | first %}
-          {% if contactData %}
-            <b>{{ contactData.name }}</b><br/>
-            {% if contactData.discord %}<a href="{{contactMeta.discord-prefix}}{{contactData.discord}}">
-              <img src="assets/discord.svg" class="social-icon"/>
-            </a> {% endif %}
-            {% if contactData.forum %}<a href="{{contactMeta.forum-prefix}}{{contactData.forum}}">
-              <img src="assets/discourse.svg" class="social-icon"/>
-            </a>{% endif %}
-            {% if contactData.github %}<a href="{{contactMeta.github-prefix}}{{contactData.github}}">
-              <img src="assets/github.svg" class="social-icon"/>
-            </a>{% endif %}
+          {% assign contactData = contactsData | where: 'name', contact | first %}
+          {% if contactData != null %}
+            {% include contact.html contact=contactData role="Support" %}
           {% endif %}
-        </div>
-        {% endfor %}      
+        {% endfor %}
+        <!-- Display individuals without contacts entries -->
         {% for contact in page.contacts %}
-        <div>
           {% assign contactData = contactsData | where: 'name', contact | first %}
           {% if contactData == null %}
             <b>{{ contact }}</b></br>
           {% endif %}
-        </div>
         {% endfor %}
+        </div>
       </div>
       {% endif %}
     </div>

diff --git a/_sass/bounty-item.scss b/_sass/bounty-item.scss
@@ -153,6 +153,12 @@ $tag-border-radius: 16px;
   background-color: $status-closed-col;
 }
 
+.bounty-tag-status-unavailable
+{
+  @extend .bounty-tag-flare;
+  background-color: $status-unavailable-col;
+}
+
 .bounty-tag-status-draft
 {
   @extend .bounty-tag-flare;

diff --git a/_sass/colors.scss b/_sass/colors.scss
@@ -5,6 +5,7 @@ $skillset-col: #694baf;
 $tag-col: #2e85b8;
 $status-open-col: #70b030;
 $status-closed-col: #cc3333;
+$status-unavailable-col: #d1b205;
 $status-draft-col: black;
 $status-default-col: black;
 $code-col: black;