Merge 623ed3f256 into cb1d45cab6

.github/README.md

@@ -241,13 +241,6 @@ Thank you to all who have contributed to, or sponsored this project!
             <sub><b>Brent</b></sub>
         </a>
     </td>
-    <td align="center">
-        <a href="https://github.com/hernanpopper">
-            <img src="https://avatars.githubusercontent.com/u/104868017?v=4" width="80;" alt="hernanpopper"/>
-            <br />
-            <sub><b>Hernanpopper</b></sub>
-        </a>
-    </td>
     <td align="center">
         <a href="https://github.com/terminaltrove">
             <img src="https://avatars.githubusercontent.com/u/121595180?v=4" width="80;" alt="terminaltrove"/>
@@ -437,10 +430,10 @@ If you've found this repository helpful, consider sponsoring me on GitHub if you
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/101lols">
-            <img src="https://avatars.githubusercontent.com/u/29000894?v=4" width="80;" alt="101lols"/>
+        <a href="https://github.com/leon-costa">
+            <img src="https://avatars.githubusercontent.com/u/83498565?v=4" width="80;" alt="leon-costa"/>
             <br />
-            <sub><b>101lols</b></sub>
+            <sub><b>Leon Costa</b></sub>
         </a>
     </td>
     <td align="center">
@@ -544,13 +537,6 @@ If you've found this repository helpful, consider sponsoring me on GitHub if you
         </a>
     </td></tr>
 <tr>
-    <td align="center">
-        <a href="https://github.com/apraile">
-            <img src="https://avatars.githubusercontent.com/u/9890538?v=4" width="80;" alt="apraile"/>
-            <br />
-            <sub><b>Apraile</b></sub>
-        </a>
-    </td>
     <td align="center">
         <a href="https://github.com/elesiuta">
             <img src="https://avatars.githubusercontent.com/u/8146662?v=4" width="80;" alt="elesiuta"/>
@@ -585,15 +571,15 @@ If you've found this repository helpful, consider sponsoring me on GitHub if you
             <br />
             <sub><b>Axel</b></sub>
         </a>
-    </td></tr>
-<tr>
+    </td>
     <td align="center">
         <a href="https://github.com/ogoregen">
             <img src="https://avatars.githubusercontent.com/u/37447279?v=4" width="80;" alt="ogoregen"/>
             <br />
             <sub><b>Oğuzhan</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/omahs">
             <img src="https://avatars.githubusercontent.com/u/73983677?v=4" width="80;" alt="omahs"/>
@@ -628,15 +614,15 @@ If you've found this repository helpful, consider sponsoring me on GitHub if you
             <br />
             <sub><b>Theblackmallard</b></sub>
         </a>
-    </td></tr>
-<tr>
+    </td>
     <td align="center">
         <a href="https://github.com/titanism">
             <img src="https://avatars.githubusercontent.com/u/101466223?v=4" width="80;" alt="titanism"/>
             <br />
             <sub><b>Titanism</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/0x192">
             <img src="https://avatars.githubusercontent.com/u/55300518?v=4" width="80;" alt="0x192"/>
@@ -644,6 +630,13 @@ If you've found this repository helpful, consider sponsoring me on GitHub if you
             <sub><b>W1nst0n</b></sub>
         </a>
     </td>
+    <td align="center">
+        <a href="https://github.com/101lols">
+            <img src="https://avatars.githubusercontent.com/u/29000894?v=4" width="80;" alt="101lols"/>
+            <br />
+            <sub><b>101lols</b></sub>
+        </a>
+    </td>
     <td align="center">
         <a href="https://github.com/boushley">
             <img src="https://avatars.githubusercontent.com/u/101239?v=4" width="80;" alt="boushley"/>
@@ -851,13 +844,6 @@ If you've found this repository helpful, consider sponsoring me on GitHub if you
             <br />
             <sub><b>Dominik Piątkowski</b></sub>
         </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/leon-costa">
-            <img src="https://avatars.githubusercontent.com/u/83498565?v=4" width="80;" alt="leon-costa"/>
-            <br />
-            <sub><b>Leon Costa</b></sub>
-        </a>
     </td></tr>
 </table>
 <!-- readme: contributors -end -->

web/src/components/psc/progress.tsx

@@ -325,7 +325,14 @@ export default component$(() => {
       </div>
       {/* Something ??? */}
       <div class="p-4 rounded-box bg-front shadow-md w-96 flex-grow">
-        <p>Coming Soon!</p>
+        <p class="text-sm opacity-80 mb-2">
+          Next up, consider switching to more secure and
+          privacy-respecting apps and services.
+        </p>
+        <p class="text-lg">
+          View our directory of recommended software,
+          at <a class="link link-secondary font-bold" href="https://awesome-privacy.xyz">awesome-privacy.xyz</a>
+        </p>
       </div>
     </div>
 

web/src/routes/about/about-content.ts

@@ -7,6 +7,12 @@ export const intro = [
   All edits are then reviewed by maintainers before being merged and going live.
   `];
 
+export const contributing = [
+  `This project is only possible thanks to contributors like you!`,
+  `You can make changes to any of the checklist content, by editing `
+  + `[\`personal-security-checklist.yml\`](https://github.com/Lissy93/personal-security-checklist/blob/master/personal-security-checklist.yml)`,
+];
+
 export const projects = [
   {
     title: 'Web-Check',

web/src/routes/about/index.tsx

@@ -2,7 +2,8 @@ import { component$, useResource$, Resource } from "@builder.io/qwik";
 import type { DocumentHead } from "@builder.io/qwik-city";
 
 import Icon from "~/components/core/icon";
-import { projects, socials, intro, license } from './about-content';
+import { projects, socials, intro, contributing, license } from './about-content';
+import { marked } from "marked";
 
 export default component$(() => {
 
@@ -15,6 +16,9 @@ export default component$(() => {
     name: string;
   }
 
+  const parseMarkdown = (text: string | undefined): string => {
+    return marked.parse(text || '', { async: false }) as string || '';
+  };
 
   const contributorsResource = useResource$<Contributor[]>(async () => {
     const url = 'https://api.github.com/repos/lissy93/personal-security-checklist/contributors?per_page=100';
@@ -46,7 +50,15 @@ export default component$(() => {
       <div class="divider"></div>
 
       <article class="bg-back p-8 mx-auto max-w-[1200px] m-8 rounded-lg shadow-md">
-        <h2 class="text-3xl mb-2">Credits</h2>
+        <h2 class="text-3xl mb-2">Contributing</h2>
+        {contributing.map((paragraph, index) => (
+          <p class="mb-2" key={index} dangerouslySetInnerHTML={parseMarkdown(paragraph)}></p>
+        ))}        
+      </article>
+      <div class="divider"></div>
+
+      <article class="bg-back p-8 mx-auto max-w-[1200px] m-8 rounded-lg shadow-md">
+        <h2 class="text-3xl mb-2">Acknowledgments</h2>
 
 
         <h3 class="text-2xl mb-2">Sponsors</h3>