Merge branch 'main' into dellis1972-patreon-updates

dellis1972 · web-flow · commit 877cb6d12800 · 2024-10-20T19:08:32.000+01:00
diff --git a/website/.config/markdownit-plugins/admonitions.js b/website/.config/markdownit-plugins/admonitions.js
@@ -196,9 +196,7 @@ function admonition(state, startLine, endLine, silent) {
 /// Adds the admonition parsing plugin to markdown-it
 ////////////////////////////////////////////////////////////////////////////////
 function admonitionPlugin(md) {
-    md.block.ruler.before("code", "admonition", admonition, {
-        alt: ["paragraph", "reference", "blockquote", "list"]
-    });
+    md.block.ruler.before("code", "admonition", admonition);
     md.renderer.rules["admonition_open"] = render;
     md.renderer.rules["admonition_title_open"] = render;
     md.renderer.rules["admonition_title_close"] = render;
diff --git a/website/_data/timeline.json b/website/_data/timeline.json
@@ -216,5 +216,14 @@
                 "description": "The MonoGame Foundation is formed."
             }
         ]
+    },
+    {
+        "year": "2024",
+        "events": [
+            {
+                "date": "August 16th",
+                "description": "MonoGame 3.8.2 is released."
+            }
+        ]
     }
 ]
diff --git a/website/_includes/partials/_footer.njk b/website/_includes/partials/_footer.njk
@@ -62,7 +62,7 @@
 
         <div class="d-flex flex-column flex-sm-row justify-content-between align-items-center gap-3 py-4 my-4">
             <div>
-                Copyright © 2009-2024 MonoGame Foundation, Inc. <br/> Designed with
+                © 2009-2024 MonoGame Foundation, Inc. is a 501(c)(3) non-profit. EIN 93-3803929<br/>Designed with
                 <span class="text-danger">❤</span>
                 by
                 <a href="https://github.com/MonoGame/monogame.github.io/graphs/contributors">MonoGame Community</a>
diff --git a/website/content/about.njk b/website/content/about.njk
@@ -7,8 +7,14 @@ title: About
     <section class="container-xxl my-5">
         <h1 id="foundation" class="fw-bold"><a href="#foundation">Foundation</a></h1>
         <p>
-            The <span class="fw-bold">MonoGame Foundation</span> was established in September of 2023
-            to direct the future of the project. The current board members are:
+            The <span class="fw-bold">MonoGame Foundation</span> is a US based 501(c)(3) non-profit organization established in September of 2023
+            to direct the future of the framework and promote game development education.
+        </p>
+        <p>
+	    Our funding comes from individual and corporate <a href="/donate">donations</a> and is used to drive improvements to the framework code, creation of educational resources, supporting community events, and general project infrastructure.
+        </p>
+        <p>
+	     The current members of the board are:
         </p>
         <div class="row">
             {% for member in foundation %}
@@ -30,9 +36,12 @@ title: About
             {% endfor %}
         </div>
         <p>
-            You can read the foundation <a href="https://docs.monogame.net/foundation/">bylaws</a> or review the <a href="/blog/meeting">meeting minutes </a>
+            You can read the Foundation <a href="https://docs.monogame.net/foundation/">bylaws</a> or review the <a href="/blog/meeting">meeting minutes</a>
             to keep track of our progress.
         </p>
+        <p>
+            Our IRS Tax ID Number (TIN) is 93-3803929.
+        </p>
     </section>
 
     <section class="container-xxl mb-5">
diff --git a/website/content/blog/2024-09-11-meeting.md b/website/content/blog/2024-09-11-meeting.md
@@ -53,7 +53,7 @@ Work continues on all existing bounties, but these updates were at the top of mi
 
 - DX12 / GDK support is a ready and completing final adoption
 - The [Basis Universal](https://github.com/MonoGame/MonoGame/pull/8456) bounty is complete
-- [Shared native base]](https://github.com/MonoGame/MonoGame/issues/8242) is nearing completion and will be usable in the coming months.
+- [Shared native base](https://github.com/MonoGame/MonoGame/issues/8242) is nearing completion and will be usable in the coming months.
 
 ### Full Time maintainer - full steam ahead
 
diff --git a/website/content/donate.njk b/website/content/donate.njk
@@ -7,34 +7,45 @@ title: Donate
     <section class="container-xxl my-5">
         <div class="container-fluid">
             <div class="row">
-                <div class="col-xl-7 mb-5">
+                <div class="col-xl-9 mb-5">
                     <h1 id="support-monogame" class="fw-bold"><a href="#support-monogame">Support MonoGame</a></h1>
                     <p>MonoGame is an open-source answer to expensive, restrictive game engines.  It is free to use on ALL platforms, even on game consoles.  This was achieved by the generous donation of code by hundreds of independent developers over the last 15 years.</p>
-<p>To ensure MonoGame continues to thrive into the future the non-profit MonoGame Foundation needs your support.  Your donations help us keep pace with advancing technology and new platforms, ensuring MonoGame remains a powerful tool for all game developers.</p>
+<p>To ensure MonoGame continues to thrive into the future the MonoGame Foundation <b>needs your support</b>.  Your donations help us keep pace with advancing technology and new platforms, ensuring MonoGame remains a powerful tool for all game developers.</p>
 <p>If your time using MonoGame has been enjoyable, educational, or it helped create your successful game, consider giving back to the project.  Your contributions ensure a future where game development is accessible to everyone.</p>
 <p>Donate now and be a part of this exciting journey.</p>
-                    <a class="btn mg-patreon-button" type="button" href="https://www.patreon.com/bePatron?u=3142012" target="_blank">
-                        {% include 'svgs/logos/patreon.svg'%}
-                        Become a member!
-                    </a>
+    <br/>
+                    <div class="row justify-content-center">
+                        <div class="col-md-auto mb-2 mx-4">
+                            <a class="btn mg-patreon-button px-4" type="button" href="https://github.com/sponsors/MonoGame" target="_blank">
+                                    <i class="bi bi-heart"></i> GitHub
+                            </a>
+                        </div>
+                        <div class="col-md-auto mb-2 mx-4">
+                            <a class="btn mg-patreon-button px-4" type="button" href="https://www.patreon.com/bePatron?u=3142012" target="_blank">
+                                    {% include 'svgs/logos/patreon.svg'%} Patreon
+                            </a>
+                        </div>
+                    </div>
                 </div>
-                <div class="col-md-5 patreon-stats">
+                <div class="col-sm-3 patreon-stats">
                     <div class="patreon-stat monthly">
                         <span id="per-month"></span>
-                        <p>monthly</p>
+                        <p>Monthly</p>
                     </div>
                     <div class="patreon-stat patreon">
                         <span id="total-patrons"></span>
-                        <p>patrons</p>
+                        <p>Sponsors</p>
                     </div>
                 </div>
             </div>
         </div>
     </section>
 
     <section class="container-xxl mb-5">
-        <h1 id="sponsors" class="fw-bold"><a href="#sponsors">MonoGame Is Sponsored By</a></h1>
-        <div class="row">
+        <h1 id="sponsors" class="fw-bold"><a href="#sponsors">Corporate Sponsors</a></h1>
+	<p>If you're interested in becoming a headline sponsor of MonoGame please <a href="/about/#contact-us">contact us</a>.</p>
+    <br/>
+        <div class="row justify-content-center">
             {% for sponsor in sponsors %}
                 <div class="col-lg-6 mb-5">
                     <a class="hide-external-icon" href="{{sponsor.url}}" title="{{sponsor.name}}">
@@ -45,73 +56,74 @@ title: Donate
         </div>
     </section>
     <section class="container-xxl mb-5">
-        <h1 id="patreons" class="fw-bold"><a href="#patreons">Patreons By Tier</a></h2>
+        <h1 id="patreons" class="fw-bold"><a href="#patreons">Monthly Sponsors</a></h1>
         <p>
-            The following is a preserved list of individuals and studios that continue to support MonoGame through Patreon.
-        </p>        
-        <h4 id="EnvironmentMapEffect" class="fw-bold"><a href="https://www.patreon.com/monogame/membership">EnvironmentMapEffect  - $64 / month</a></h4>
-        <div class="row">
+            The following is a partial list of individuals and studios that support us through <a href="https://www.patreon.com/bePatron?u=3142012">Patreon</a>.
+        </p>
+        <br/>        
+        <h4 class="text-center" id="EnvironmentMapEffect">EnvironmentMapEffect</h4>
+        <div class="row justify-content-center mb-3">
             {% for patreon in patreons | sort() %}
                 {% if patreon.tier == "EnvironmentMapEffect" %}
-                <div class="col-lg-3 mb-3 text-center">
+                <div class="col-sm-4 mb-1 text-center">
                     {% if patreon.url %}<a href="{{patreon.url}}">{% endif %}
-                        <strong>{{patreon.name}}</strong>
+                        {{patreon.name}}
                     {% if patreon.url %}</a>{% endif %}
                     <br />
                 </div>
                 {% endif %}
             {% endfor %}
         </div>
         <br />
-        <h4 id="Model.Draw" class="fw-bold"><a href="https://www.patreon.com/monogame/membership">Model.Draw  - $32 / month</a></h4>
-        <div class="row">
+        <h4 class="text-center" id="Model.Draw">Model.Draw</h4>
+        <div class="row justify-content-center mb-3">
             {% for patreon in patreons | sort() %}
                 {% if patreon.tier == "Model.Draw" %}
-                <div class="col-lg-3 mb-3 text-center">
+                <div class="col-sm-4 mb-1 text-center">
                     {% if patreon.url %}<a href="{{patreon.url}}">{% endif %}
-                        <strong>{{patreon.name}}</strong>
+                        {{patreon.name}}
                     {% if patreon.url %}</a>{% endif %}
                     <br />
                 </div>
                 {% endif %}
             {% endfor %}
         </div>
         <br />
-        <h4 id="DrawUserPrimitives" class="fw-bold"><a href="https://www.patreon.com/monogame/membership">DrawUserPrimitives  - $16 / month</a></h4>
-        <div class="row">
+        <h4 class="text-center" id="DrawUserPrimitives">DrawUserPrimitives</h4>
+        <div class="row justify-content-center mb-3">
             {% for patreon in patreons | sort() %}
                 {% if patreon.tier == "DrawUserPrimitives" %}
-                <div class="col-lg-3 mb-3 text-center">
+                <div class="col-sm-4 mb-1 text-center">
                     {% if patreon.url %}<a href="{{patreon.url}}">{% endif %}
-                        <strong>{{patreon.name}}</strong>
+                        {{patreon.name}}
                     {% if patreon.url %}</a>{% endif %}
                     <br />
                 </div>
                 {% endif %}
             {% endfor %}
         </div>
         <br />
-        <h4 id="SpriteBatch" class="fw-bold"><a href="https://www.patreon.com/monogame/membership">SpriteBatch  - $4 / month</a></h4>
-        <div class="row">
+        <h4 class="text-center" id="SpriteBatch">SpriteBatch</h4>
+        <div class="row justify-content-center mb-3">
             {% for patreon in patreons | sort() %}
                 {% if patreon.tier == "SpriteBatch" %}
-                <div class="col-lg-3 mb-3 text-center">
+                <div class="col-sm-4 mb-1 text-center">
                     {% if patreon.url %}<a href="{{patreon.url}}">{% endif %}
-                        <strong>{{patreon.name}}</strong>
+                        {{patreon.name}}
                     {% if patreon.url %}</a>{% endif %}
                     <br />
                 </div>
                 {% endif %}
             {% endfor %}
         </div>
         <br />
-        <h4 id="Cornflower Blue" class="fw-bold"><a href="https://www.patreon.com/monogame/membership">Cornflower Blue  - $2 / month</a></h4>
-        <div class="row">
+        <h4 class="text-center" id="Cornflower Blue">Cornflower Blue</h4>
+        <div class="row justify-content-center mb-3">
             {% for patreon in patreons | sort() %}
                 {% if patreon.tier == "Cornflower Blue" %}
-                <div class="col-lg-3 mb-3 text-center">
+                <div class="col-sm-4 mb-1 text-center">
                     {% if patreon.url %}<a href="{{patreon.url}}">{% endif %}
-                        <strong>{{patreon.name}}</strong>
+                        {{patreon.name}}
                     {% if patreon.url %}</a>{% endif %}
                     <br />
                 </div>
@@ -129,7 +141,7 @@ title: Donate
             {% for donor in donations | sort(true, false, 'amount') %}
                 <div class="col-lg-3 mb-3 text-center">
                     {% if donor.url %}<a href="{{donor.url}}">{% endif %}
-                        <strong>{{donor.name}}</strong>
+                        {{donor.name}}
                     {% if donor.url %}</a>{% endif %}
                     <br />
                     {{ (donor.amount / 100).toLocaleString('en-US', {style: 'currency', currency: 'USD'}) }}
diff --git a/website/content/index.njk b/website/content/index.njk
@@ -12,10 +12,10 @@ title: MonoGame
             </p>
             <div class="carousel-button-container">
                 <a type="button" class="btn btn-lrg mg-button" href="https://docs.monogame.net/articles/getting_started/index.html">
-                    Getting Started <i class="bi bi-arrow-right"></i>
+                    Getting Started <i class="bi bi-mortarboard"></i>
                 </a>
                 <a type="button" class="btn btn-lrg mg-button" href="https://github.com/MonoGame/MonoGame">
-                    Fork Us <i class="bi bi-github"></i>
+                    Github <i class="bi bi-github"></i>
                 </a>
             </div>
         </div>
diff --git a/website/content/public/js/patreon.js b/website/content/public/js/patreon.js
@@ -25,7 +25,16 @@
     if(data.included && data.included.length > 0) {
         const attributes = data.included[0].attributes;
         const patron_count = attributes.patron_count;
-        const pledge_sum = attributes.pledge_sum;
+        let pledge_sum = attributes.pledge_sum;
+
+        // HACK: Add in a few things from other services.
+        {
+            // Re-logic's monthly donation.
+            pledge_sum += 100000;
+
+            // TODO: Get GitHub sponsors and merge them with this.
+            // Requires a personal access token to do so.
+        }
 
         const total_patrons = document.getElementById('total-patrons');
         countUp(total_patrons, patron_count, (x) => x);
diff --git a/website/content/redirects.md b/website/content/redirects.md
@@ -3,6 +3,6 @@ pagination:
     data: redirects
     size: 1
     alias: redirect
-permalink: "{{ redirect.from }}"
+permalink: "{{ redirect.from }}/index.html"
 layout: "layouts/redirect.layout.njk"
 ---

Original file line number	Diff line number	Diff line change
`@@ -216,5 +216,14 @@`
`216`	`216`	`"description": "The MonoGame Foundation is formed."`
`217`	`217`	`}`
`218`	`218`	`]`
	`219`	`+ },`
	`220`	`+ {`
	`221`	`+ "year": "2024",`
	`222`	`+ "events": [`
	`223`	`+ {`
	`224`	`+ "date": "August 16th",`
	`225`	`+ "description": "MonoGame 3.8.2 is released."`
	`226`	`+ }`
	`227`	`+ ]`
`219`	`228`	`}`
`220`	`229`	`]`