Merge branch 'main' into feature/add_signup_permission

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Added support to disable user sign up in the admin control panel
+- Extended the glossary of the resources page by _Deflation_, _Inflation_ and _Stagflation_
 
 ## 1.218.0 - 2022-12-12
 

README.md

@@ -15,8 +15,10 @@
     <a href="https://ghostfol.io"><strong>Ghostfol.io</strong></a> | <a href="https://ghostfol.io/en/demo"><strong>Live Demo</strong></a> | <a href="https://ghostfol.io/en/pricing"><strong>Ghostfolio Premium</strong></a> | <a href="https://ghostfol.io/en/faq"><strong>FAQ</strong></a> | <a href="https://ghostfol.io/en/blog"><strong>Blog</strong></a> | <a href="https://join.slack.com/t/ghostfolio/shared_invite/zt-vsaan64h-F_I0fEo5M0P88lP9ibCxFg"><strong>Slack</strong></a> | <a href="https://twitter.com/ghostfolio_"><strong>Twitter</strong></a>
   </p>
   <p>
+    <a href="https://www.buymeacoffee.com/ghostfolio">
+      <img src="https://img.shields.io/badge/Buy%20me%20a%20coffee-Support-yellow?logo=buymeacoffee"/></a>
     <a href="#contributing">
-      <img src="https://img.shields.io/badge/contributions-welcome-orange.svg"/></a>
+      <img src="https://img.shields.io/badge/Contributions-Welcome-orange.svg"/></a>
     <a href="https://www.gnu.org/licenses/agpl-3.0" rel="nofollow">
       <img src="https://img.shields.io/badge/License-AGPL%20v3-blue.svg" alt="License: AGPL v3"/></a>
   </p>

apps/client/src/app/pages/resources/resources-page.html

@@ -91,6 +91,22 @@
             </div>
           </div>
         </div>
+        <div class="mb-4 media">
+          <div class="media-body">
+            <h3 class="h5 mt-0">Deflation</h3>
+            <div class="mb-1">
+              Deflation is a decrease of the general price level for goods and
+              services in an economy over a period of time.
+            </div>
+            <div>
+              <a
+                href="https://www.investopedia.com/terms/d/deflation.asp"
+                target="_blank"
+                >Deflation →</a
+              >
+            </div>
+          </div>
+        </div>
         <div class="mb-4 media">
           <div class="media-body">
             <h3 class="h5 mt-0">Dollar-Cost Averaging (DCA)</h3>
@@ -109,7 +125,7 @@
             </div>
           </div>
         </div>
-        <div class="media">
+        <div class="mb-4 media">
           <div class="media-body">
             <h3 class="h5 mt-0">Financial Independence</h3>
             <div class="mb-1">
@@ -126,6 +142,38 @@
             </div>
           </div>
         </div>
+        <div class="mb-4 media">
+          <div class="media-body">
+            <h3 class="h5 mt-0">Inflation</h3>
+            <div class="mb-1">
+              Inflation is an increase of the general price level for goods and
+              services in an economy over a period of time.
+            </div>
+            <div>
+              <a
+                href="https://www.investopedia.com/terms/i/inflation.asp"
+                target="_blank"
+                >Inflation →</a
+              >
+            </div>
+          </div>
+        </div>
+        <div class="mb-4 media">
+          <div class="media-body">
+            <h3 class="h5 mt-0">Stagflation</h3>
+            <div class="mb-1">
+              Stagflation describes a situation in which there is a stagnant
+              economy with high unemployment and high inflation.
+            </div>
+            <div>
+              <a
+                href="https://www.investopedia.com/terms/s/stagflation.asp"
+                target="_blank"
+                >Stagflation →</a
+              >
+            </div>
+          </div>
+        </div>
       </div>
     </div>
   </div>