Merge branch 'main' into dev

assets/dist/icons/upload.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" fill="#000000" viewBox="0 0 256 256"><path d="M240,136v64a16,16,0,0,1-16,16H32a16,16,0,0,1-16-16V136a16,16,0,0,1,16-16H80a8,8,0,0,1,0,16H32v64H224V136H176a8,8,0,0,1,0-16h48A16,16,0,0,1,240,136ZM85.66,77.66,120,43.31V128a8,8,0,0,0,16,0V43.31l34.34,34.35a8,8,0,0,0,11.32-11.32l-48-48a8,8,0,0,0-11.32,0l-48,48A8,8,0,0,0,85.66,77.66ZM200,168a12,12,0,1,0-12,12A12,12,0,0,0,200,168Z"></path></svg>

data/services.json

@@ -58,6 +58,22 @@
             "exclude_from_index": false,
             "exclude_from_simple": false
         },
+        {
+            "name": "Transfer.coffee",
+            "url": "https://transfer.coffee",
+            "short_description": "Transfer files securely using peer-to-peer connections.",
+            "long_description": "Transfer.coffee allows you to transfer files securely using peer-to-peer connections. Your files are never stored on our servers.",
+            "status": "OK",
+            "links": [
+                {
+                    "name": "Go to Transfer.coffee",
+                    "url": "https://transfer.coffee"
+                }
+            ],
+            "icon": "upload",
+            "exclude_from_index": false,
+            "exclude_from_simple": false
+        },
         {
             "name": "MyIP.Coffee",
             "url": "https://myip.coffee",
@@ -142,22 +158,6 @@
             "exclude_from_index": false,
             "exclude_from_simple": false
         },
-        {
-            "name": "GotHub",
-            "url": "https://gothub.private.coffee",
-            "short_description": "Alternative GitHub interface that respects privacy.",
-            "long_description": "Gothub is an alternative GitHub interface that respects your privacy. It is currently in alpha, but you can browse and download repositories, and you can also clone them using git+https (although the text on the main page would disagree).",
-            "status": "OK",
-            "links": [
-                {
-                    "name": "Go to GotHub",
-                    "url": "https://gothub.private.coffee"
-                }
-            ],
-            "icon": "git-branch",
-            "exclude_from_index": false,
-            "exclude_from_simple": false
-        },
         {
             "name": "redlib",
             "url": "https://redlib.private.coffee",
@@ -334,6 +334,22 @@
             "exclude_from_index": false,
             "exclude_from_simple": false
         },
+        {
+            "name": "GotHub",
+            "url": "https://gothub.private.coffee",
+            "short_description": "Alternative GitHub interface that respects privacy.",
+            "long_description": "Gothub is an alternative GitHub interface that respects your privacy. It is currently in alpha, but you can browse and download repositories, and you can also clone them using git+https (although the text on the main page would disagree).",
+            "status": "OK",
+            "links": [
+                {
+                    "name": "Go to GotHub",
+                    "url": "https://gothub.private.coffee"
+                }
+            ],
+            "icon": "git-branch",
+            "exclude_from_index": false,
+            "exclude_from_simple": false
+        },
         {
             "name": "Binternet",
             "url": "https://binternet.private.coffee",

templates/simple.html

@@ -10,7 +10,7 @@
         <h2 style="color: #333;">Welcome to Private.coffee</h2>
         <p>Thanks for using our Element instance! Now, why don't you join our rooms?</p>
         <ul style="list-style: none; padding: 0;">
-          <li style="padding: 8px 0;"><a style="color: #1a5dab; text-decoration: none;" href="https://element.private.coffee/#/#private-coffee:private.coffee">#private-coffee:private.coffee</a> - The Private.coffee Space, containing all rooms</li>
+          <li style="padding: 8px 0;"><a style="color: #1a5dab; text-decoration: none;" href="https://element.private.coffee/#/#coffeespace:private.coffee">#coffeespace:private.coffee</a> - The Private.coffee Space, containing all rooms</li>
           <li style="padding: 8px 0;"><a style="color: #1a5dab; text-decoration: none;" href="https://element.private.coffee/#/#private.coffee:private.coffee">#private.coffee:private.coffee</a> - General support for our services</li>
           <li style="padding: 8px 0;"><a style="color: #1a5dab; text-decoration: none;" href="https://element.private.coffee/#/#matrix:private.coffee">#matrix:private.coffee</a> - Support for our Matrix server</li>
           <li style="padding: 8px 0;"><a style="color: #1a5dab; text-decoration: none;" href="https://element.private.coffee/#/#coffeebreak:private.coffee">#coffeebreak:private.coffee</a> - ☕ Coffee Break ☕ - our off-topic room</li>