Merge branch 'main' of https://git.qwik.space/BurnyLlama/qwik-site

.gitignore

@@ -41,6 +41,7 @@ build/Release
 # Dependency directories
 node_modules/
 jspm_packages/
+package-lock.json
 
 # Snowpack dependency directory (https://snowpack.dev/)
 web_modules/

content/pages/articles/privacy_policy.md

@@ -1,7 +1,7 @@
 %%-
 title: qwik - privacy policy
 header: Privacy Policy
-date: Last updated 9th August 2021
+date: Last updated 12th August 2021
 -%%
 
 # Introduction
@@ -54,8 +54,14 @@ isn't used for anything so it can be whatever. We would maybe even advise you to
 Gitea will require a username on signup, which you might consider personal. We would advise you to not use your real
 name and instead use an alias.
 
-Gitea also uses some cookies, but this is for your comfort. For example keeping you signed in and remembering your
+Gitea also uses some cookies, but this is for your comfort. For example keeping you signed in and remembering your settings or what not.
-settings or what not.
+
+## Hedgedoc
+Hedgedoc will collect your email upon registration. This email will just be used for logging in.
+
+The documents you write will be stored unecrypted. This also applies to image uploads.
+
+Hedgedoc also uses some cookies, they will be used to keeping you signed in and remembering your settings.
 
 ## Nitter, Bibliogram, Libreddit, Searx
 These services all use cookies to remember your settings.

content/pages/articles/xmpp/intro.md

@@ -1,12 +1,12 @@
 %%-
 title: XMPP - qwik docs
 header: XMPP
-date: 10th August 2021
+date: 11th August 2021
 -%%
 
 # Introduction
 XMPP is a protocol for instant messaging. It stands for *Extensible Messaging and Presence Protocol*.
-It supports most things you'd expect from from an instant messaging software, like: chat (duh?), sending images/videos/other
+It supports most things you'd expect from an instant messaging software, like: chat (duh?), sending images/videos/other
 files, chatrooms (group chats), and even calling (both voice and video). It also supports another great thing: encryption.
 
 The biggest problem with XMPP is that many of the clients (apps/programs you use to chat with people) could be better.
@@ -16,26 +16,26 @@ fine.
 
 
 # Usage
-To use XMPP you would need a client. Under here you can see our recommendations of clients for different platforms.
+To use XMPP you will need a client. Below you can see our recommendations of clients for different platforms.
 
 ## Clients
 **Linux**
 * Gajim ([Website](https://gajim.org/))
 * Dino ([Website](https://dino.im/))
 
-**Windows:**
+**Windows**
 * Gajim ([Website](https://gajim.org/))
 
-**macOS:**
+**macOS**
 * Monal IM ([Mac App Store](https://apps.apple.com/app/id1499227291))
 * Siskin IM ([Mac App Store](https://apps.apple.com/us/app/siskin-im/id1153516838))
 * Beagle IM ([Mac App Store](https://apps.apple.com/us/app/beagleim-by-tigase-inc/id1445349494))
 
-**Android:**
+**Android**
 * blabber.im ([F-Droid](https://f-droid.org/en/packages/de.pixart.messenger/)*, [Google Play](https://play.google.com/store/apps/details?id=im.blabber.messenger))
 * Conversations ([F-Droid](https://f-droid.org/en/packages/eu.siacs.conversations/)*, [Google Play](https://play.google.com/store/apps/details?id=eu.siacs.conversations))
 
-**iOS:**
+**iOS**
 * Monal IM ([App Store](https://apps.apple.com/us/app/monal-xmpp-chat/id317711500))
 * Siskin IM ([App Store](https://apps.apple.com/us/app/tigase-messenger/id1153516838))
 
@@ -56,7 +56,7 @@ use this address to contact you.
 
 When you've registered on our server you should get a welcome message kind of like this:
 >  Welcome to qwik.space!
-> You can find more information at https://qwik.space/xmpp.html
+> You can find more information at https://qwik.space/articles/xmpp/intro
 >
 > If you have any questions regarding the server, send a message on XMPP to [furo@qwik.space](xmpp:furo@qwik.space) 
 

content/pages/index.njk

@@ -109,6 +109,17 @@
                 <a href="http://qwikxi43yi7we5wq3gewkbzdxif7aogulmtdv3icep6ks6ghlrh7vpyd.onion/articles/xmpp/intro" class="onion">tor</a>
             </div>
         </div>
+
+        <div class="service">
+            <h2>Hedgedoc</h2>
+            <p>
+                Hedgedoc is an online markdown editor featuring real-time collaboration.
+            </p>
+            <div class="buttons">
+                <a href="https://docs.qwik.space">get writin'</a>
+                <a href="http://qwikxlobjyrg2vixrprthsldqjf72k2bihqk2ivd4pieboudrcfjyuyd.onion" class="onion">tor</a>
+            </div>
+        </div>
     </div>
 
     <a name="contact"></a>
@@ -163,4 +174,4 @@
         <p><a href="http://qwikxi43yi7we5wq3gewkbzdxif7aogulmtdv3icep6ks6ghlrh7vpyd.onion">qwikxi43yi7we5wq3gewkbzdxif7aogulmtdv3icep6ks6ghlrh7vpyd.onion<a>
     </footer>
 </body>
-</html>
+</html>