From 05e00337635668f035cfc05eeb432dd530677a1a Mon Sep 17 00:00:00 2001
From: Ben Harris <ben@tilde.team>
Date: Fri, 8 Jun 2018 17:34:05 -0400
Subject: [PATCH] add services wiki page

---
 header.php                    | 13 ++---------
 index.php                     | 13 +----------
 services.php                  | 22 ++++++++++++++++++
 signup/index.php              |  5 ++++
 wiki/pages/code-of-conduct.md |  2 +-
 wiki/pages/services.md        | 43 +++++++++++++++++++++++++++++++++++
 6 files changed, 74 insertions(+), 24 deletions(-)
 create mode 100644 services.php
 create mode 100644 wiki/pages/services.md

diff --git a/header.php b/header.php
index ac9ffc3..e20259d 100644
--- a/header.php
+++ b/header.php
@@ -44,20 +44,11 @@
                 <li><a href="/wiki/">wiki</a></li>
 
                 <li class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">tildeverse
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">~team stuff
                         <span class="caret"></span>
                     </a>
                     <ul class="dropdown-menu" role="menu">
-                        <li><a class="btn btn-default" href="https://git.tilde.team">
-                            <i class="fa fa-code-fork"></i> ~gitea~</a></li>
-                        <li><a class="btn btn-default" href="https://tilde.zone/invite/9xjfCyYJ">
-                            <i class="fa fa-retweet"></i> ~mastodon~</a></li>
-                        <li><a class="btn btn-default" href="/discord/">
-                            <i class="fa fa-comments"></i> ~discord~</a></li>
-                        <li><a class="btn btn-default" href="https://forum.tilde.team/">
-                            <i class="fa fa-comment"></i> ~forum~</a></li>
-                        <li><a class="btn btn-default" href="https://irc.tilde.team">
-                            <i class="fa fa-comments-o"></i> ~irc~</a></li>
+                        <?php $navbar = true; include 'services.php'; ?>
                     </ul>
                 </li>
             </ul>
diff --git a/index.php b/index.php
index 66894b2..e4e5824 100755
--- a/index.php
+++ b/index.php
@@ -34,18 +34,7 @@
 
         <h3>other tilde.team stuff</h3>
 
-        <a class="btn btn-default" href="https://git.tilde.team/meta">
-            <i class="fa fa-code-fork"></i> ~gitea~</a>
-        <a class="btn btn-default" href="https://tilde.zone/invite/9xjfCyYJ">
-            <i class="fa fa-retweet"></i> ~mastodon~</a>
-        <a class="btn btn-default" href="/discord/">
-            <i class="fa fa-comments"></i> ~discord~</a>
-        <a class="btn btn-default" href="https://forum.tilde.team/">
-            <i class="fa fa-comment"></i> ~forum~</a>
-        <a class="btn btn-default" href="/irc/">
-            <i class="fa fa-comments-o"></i> ~irc~</a>
-        <a class="btn btn-default" href="/wiki/">
-            <i class="fa fa-book"></i> ~wiki~</a>
+        <?php include 'services.php'; ?>
 
         <br>
         <hr>
diff --git a/services.php b/services.php
new file mode 100644
index 0000000..a92e53e
--- /dev/null
+++ b/services.php
@@ -0,0 +1,22 @@
+<?php
+
+$services = [
+    'gitea' => ['fa' => 'code-fork', 'url' => 'https://git.tilde.team'],
+    'forum' => ['fa' => 'comment', 'url' => 'https://forum.tilde.team'],
+    'wiki' => ['fa' => 'book', 'url' => '/wiki/'],
+    'mastodon' => ['fa' => 'retweet', 'url' => 'https://tilde.zone'],
+    'chat' => ['fa' => 'comments-o', 'url' => '/wiki/?page=irc'],
+    'cryptpad' => ['fa' => 'sticky-note', 'url' => 'https://pad.tilde.team'],
+];
+
+$nav = isset($navbar);
+unset($navbar);
+
+foreach ($services as $name => $service) { ?>
+    <?php if ($nav) echo '<li>'; ?>
+    <a href="<?=$service['url']?>"
+        <?php if (!$nav) echo 'class="btn btn-default"'; ?>>
+        <i class="fa fa-<?=$service['fa']?>"></i> ~<?=$name?>~</a>
+    <?php if ($nav) echo '</li>'; ?>
+<?php }
+
diff --git a/signup/index.php b/signup/index.php
index 937643d..aa6ce6d 100644
--- a/signup/index.php
+++ b/signup/index.php
@@ -119,8 +119,13 @@ include __DIR__.'/../header.php';
             <div class="form-group">
                 <label>SSH public key</label>
                 <textarea required class="form-control" name="sshkey" id="" cols="30" rows="10"><?=$_REQUEST["sshkey"] ?? ""?></textarea>
+                <p>if you don't have a key, don't worry! <a href="/wiki/?page=ssh">check out our guide to ssh keys</a> and make sure that you only put your pubkey here</p>
             </div>
 
+            <p>
+                <em>signing up implies agreement with our <a href="/wiki/?page=code-of-conduct">code of conduct</a>. please give it a read.</em>
+            </p>
+
             <button class="btn btn-primary" type="submit">submit</button>
 
         </form>
diff --git a/wiki/pages/code-of-conduct.md b/wiki/pages/code-of-conduct.md
index 389276a..cdb6937 100644
--- a/wiki/pages/code-of-conduct.md
+++ b/wiki/pages/code-of-conduct.md
@@ -1,6 +1,6 @@
 ---
 author: ~ben
-published: false
+published: true
 title: code of conduct
 category: 
     - main
diff --git a/wiki/pages/services.md b/wiki/pages/services.md
new file mode 100644
index 0000000..3033e9c
--- /dev/null
+++ b/wiki/pages/services.md
@@ -0,0 +1,43 @@
+---
+author: ~ben
+published: true
+title: services
+category: 
+    - main
+---
+
+# tilde.team services
+
+i'll keep this wiki page updated with the services that are running on our little vps box :)
+
+
+## our deployed projects
+
+* [forum](https://forum.tilde.team) ([source](https://git.tilde.team/meta/forum))
+
+
+## code related stuff
+
+* [gitea](https://git.tilde.team/)
+
+
+## general utilities
+
+* [cryptpad](https://pad.tilde.team)
+    - [cryptdrive](https://pad.tilde.team/drive/)
+    - [markdown/code editor](https://pad.tilde.team/code/)
+    - [presentation slides editor](https://pad.tilde.team/slides/)
+    - [polls](https://pad.tilde.team/poll/)
+    - [kanban boards](https://pad.tilde.team/kanban/)
+    - [whiteboard](https://pad.tilde.team/whiteboard/)
+    - [file drop](https://pad.tilde.team/file/)
+    - [todo lists](https://pad.tilde.team/todo/)
+
+
+## social/communications
+
+irc
+    * [ircd](https://tilde.team/wiki/?page=irc) (irc.tilde.team) 6667 and 6697 with ssl
+    * [thelounge webclient](https://irc.tilde.team)
+    * bridged to the [tilde.team discord server](https://tilde.team/discord/)
+* [mastodon](https://tilde.zone)
\ No newline at end of file